From 147e8163d89491e214b240ffbf16c871d92ab44f Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 29 Mar 2011 13:02:44 -0500
Subject: [PATCH 001/829] minor fix: '.replace' doesn't change the source
 string, so save the modified USO update URL

---
 extension/modules/script/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index c70a234a..e772893f 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -476,7 +476,7 @@ Script.prototype = {
       return null;
     // userscripts.org url?
     if (url.match(/^https?:\/\/userscripts\.org\/.*?\.(?:user|meta)\.js$/i)) {
-      if (this._config.updateSecurely) url.replace(/^http:/i, "https:");
+      if (this._config.updateSecurely) url = url.replace(/^http:/i, "https:");
       return url.replace(/\.user\.js$/i, ".meta.js");
     }
     return (!this._config.updateSecurely || /^https:/i.test(url)) ? url : null;

From a5ddd37d26ded74c7520a1613edf1dc87a153577 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 29 Mar 2011 13:03:40 -0500
Subject: [PATCH 002/829] ignore case when checking for a valid updateURL
 scheme

---
 extension/modules/script/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index e772893f..ed574b24 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -472,7 +472,7 @@ Script.prototype = {
       var url = (this._updateURL || "");
     url = url.replace(/[\?#].*$/, "");
     // valid updateURL?
-    if (!url || !url.match(/^https?:\/\//) || !/\.(?:user|meta)\.js$/i.test(url))
+    if (!url || !url.match(/^https?:\/\//i) || !/\.(?:user|meta)\.js$/i.test(url))
       return null;
     // userscripts.org url?
     if (url.match(/^https?:\/\/userscripts\.org\/.*?\.(?:user|meta)\.js$/i)) {

From 852ba3596cbe1b1f20b3469f47fb5e443fc3a1cd Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 29 Mar 2011 13:04:32 -0500
Subject: [PATCH 003/829] Using '.test' rather than '.match' in a couple more
 places

---
 extension/modules/script/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index ed574b24..97b26990 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -472,10 +472,10 @@ Script.prototype = {
       var url = (this._updateURL || "");
     url = url.replace(/[\?#].*$/, "");
     // valid updateURL?
-    if (!url || !url.match(/^https?:\/\//i) || !/\.(?:user|meta)\.js$/i.test(url))
+    if (!url || !/^https?:\/\//i.test(url) || !/\.(?:user|meta)\.js$/i.test(url))
       return null;
     // userscripts.org url?
-    if (url.match(/^https?:\/\/userscripts\.org\/.*?\.(?:user|meta)\.js$/i)) {
+    if (/^https?:\/\/userscripts\.org\/.*?\.(?:user|meta)\.js$/i.test(url)) {
       if (this._config.updateSecurely) url = url.replace(/^http:/i, "https:");
       return url.replace(/\.user\.js$/i, ".meta.js");
     }

From 566ef716a8a561151d286b5caa9ac2fd3f4785df Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 30 Mar 2011 09:52:37 -0500
Subject: [PATCH 004/829] Closes #247  Only _save in Config's
 updateModifiedScripts if scripts have been modified (cherry picked from
 commit e0216f845955fea85c28928f02775d690191022f)

---
 extension/modules/config/config.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 89eab27e..536147ee 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -343,17 +343,19 @@ Config.prototype = {
   },
 
   updateModifiedScripts: function(scriptInjector) {
+    let hasChanged = false;
     for (let [, script] in Iterator(this._scripts)) {
       if (script.delayInjection) {
         script.delayedInjectors.push(scriptInjector);
         continue;
       }
       if (!script.isModified()) continue;
+      hasChanged = true;
       let parsedScript = this.parse(
           script.textContent,
           script._downloadURL && NetUtil.newURI(script._downloadURL), script);
       script.updateFromNewScript(parsedScript, scriptInjector);
     }
-    this._save();
+    if (hasChanged) this._save();
   }
 }

From 43cd6f99d8c0966e18f36bdd08e0066b59bda8bf Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 30 Mar 2011 19:26:09 -0700
Subject: [PATCH 005/829] Closes #112 Double check @version when upgrading a
 user script

---
 extension/modules/script/scriptdownloader.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index b6a30162..17f6b746 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -6,6 +6,7 @@ Cu.import("resource://scriptish/constants.js");
 Cu.import("resource://scriptish/logging.js");
 Cu.import("resource://scriptish/prefmanager.js");
 Cu.import("resource://scriptish/scriptish.js");
+Cu.import("resource://scriptish/script/script.js");
 Cu.import("resource://scriptish/script/scripticon.js");
 Cu.import("resource://scriptish/utils/Scriptish_alert.js");
 Cu.import("resource://scriptish/utils/Scriptish_getWriteStream.js");
@@ -90,6 +91,13 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
       }
     }
 
+    if (this.scriptInstaller) {
+      // make sure that the new version is greater than the old version
+      var remoteVersion = Script.parseVersion(req.responseText);
+      if (!remoteVersion || Services.vc.compare(this.scriptInstaller._script.version, remoteVersion) >= 0)
+        return this.handleErr();
+    }
+
     var source = req.responseText;
     this.script = Scriptish.config.parse(source, this.uri_);
 

From 60b74ad3ced1c04e93152f8988b61255b77e630e Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 1 Apr 2011 08:43:48 -0500
Subject: [PATCH 006/829] Log a message when saving any file

---
 extension/modules/config/config.js           | 3 ++-
 extension/modules/script/script.js           | 2 +-
 extension/modules/script/scriptdependency.js | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 536147ee..abe39e8c 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -124,7 +124,7 @@ Config.prototype = {
       var BLStream = Scriptish_getWriteStream(file);
       BLStream.write(json, json.length);
       BLStream.close();
-      Scriptish_log("Updated Scriptish blocklist");
+      Scriptish_log("Updated Scriptish blocklist " + SCRIPTISH_BLOCKLIST, true);
 
       self._blocklist = blocklist;
       self._blocklistHash = hash;
@@ -244,6 +244,7 @@ Config.prototype = {
 
     addNode("\n");
 
+    Scriptish_log("Saving " + SCRIPTISH_CONFIG, true);
     var configStream = Scriptish_getWriteStream(this._configFile);
     Instances.ds.serializeToStream(doc, configStream, "utf-8");
     configStream.close();
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 97b26990..7ea9f36a 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -557,7 +557,7 @@ Script.prototype = {
     file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0644);
     this._filename = file.leafName;
 
-    Scriptish_log("Moving script file from " + tempFile.path + " to " + file.path);
+    Scriptish_log("Moving script file from " + tempFile.path + " to " + file.path, true);
 
     file.remove(true);
     tempFile.moveTo(file.parent, file.leafName);
diff --git a/extension/modules/script/scriptdependency.js b/extension/modules/script/scriptdependency.js
index 8c6af92a..dd53d377 100644
--- a/extension/modules/script/scriptdependency.js
+++ b/extension/modules/script/scriptdependency.js
@@ -49,7 +49,7 @@ ScriptDependency.prototype = {
     file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0644);
     this._filename = file.leafName;
 
-    Scriptish_log("Moving dependency file from " + this._tempFile.path + " to " + file.path);
+    Scriptish_log("Moving dependency file from " + this._tempFile.path + " to " + file.path, true);
 
     file.remove(true);
     this._tempFile.moveTo(file.parent, file.leafName);

From d87493845b1ae278a7f428242b2cc1575a006daf Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 1 Apr 2011 14:23:27 -0500
Subject: [PATCH 007/829] Localize 'saving'/'moving' strings

---
 extension/locale/en-US/scriptish.properties  | 3 +++
 extension/modules/config/config.js           | 2 +-
 extension/modules/script/script.js           | 3 ++-
 extension/modules/script/scriptdependency.js | 4 +++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 155550a7..ca0a911e 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -62,6 +62,8 @@ menu.title.ak=S
 menuitem.install=Install This User Script...
 menuitem.manage=Manage User Scripts
 menuitem.new=New User Script
+moving.script=Moving script file from
+moving.dependency=Moving dependency file from
 newscript.description=Description
 newscript.excludes=Excludes (One per line)
 newscript.exists=A script with that name is already installed.\nOK to overwrite?
@@ -73,6 +75,7 @@ newscript.noID=Please provide a valid ID for your script.
 newscript.noName=Please provide a name for your script.
 openFolder=Open Folder
 openFolder.ak=O
+saving=Saving
 scriptOptions.includes=User Includes:
 scriptOptions.excludes=User Excludes:
 scriptOptions.disableScriptIncludes=Disable this script's include patterns and only use the user defined ones.
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index abe39e8c..4cadf1be 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -244,7 +244,7 @@ Config.prototype = {
 
     addNode("\n");
 
-    Scriptish_log("Saving " + SCRIPTISH_CONFIG, true);
+    Scriptish_log(Scriptish_stringBundle("saving") + " " + SCRIPTISH_CONFIG, true);
     var configStream = Scriptish_getWriteStream(this._configFile);
     Instances.ds.serializeToStream(doc, configStream, "utf-8");
     configStream.close();
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 7ea9f36a..5e4d963b 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -557,7 +557,8 @@ Script.prototype = {
     file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0644);
     this._filename = file.leafName;
 
-    Scriptish_log("Moving script file from " + tempFile.path + " to " + file.path, true);
+    Scriptish_log(Scriptish_stringBundle("moving.script") + " "
+        + tempFile.path + " --> " + file.path, true);
 
     file.remove(true);
     tempFile.moveTo(file.parent, file.leafName);
diff --git a/extension/modules/script/scriptdependency.js b/extension/modules/script/scriptdependency.js
index dd53d377..83b6255b 100644
--- a/extension/modules/script/scriptdependency.js
+++ b/extension/modules/script/scriptdependency.js
@@ -4,6 +4,7 @@ inc("resource://scriptish/constants.js");
 inc("resource://scriptish/logging.js");
 inc("resource://scriptish/utils/Scriptish_getUriFromFile.js");
 inc("resource://scriptish/utils/Scriptish_getContents.js");
+inc("resource://scriptish/utils/Scriptish_stringBundle.js");
 })(Components.utils.import)
 
 function ScriptDependency(aScript) {
@@ -49,7 +50,8 @@ ScriptDependency.prototype = {
     file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0644);
     this._filename = file.leafName;
 
-    Scriptish_log("Moving dependency file from " + this._tempFile.path + " to " + file.path, true);
+    Scriptish_log(Scriptish_stringBundle("moving.dependency") + " "
+        + this._tempFile.path + " --> " + file.path, true);
 
     file.remove(true);
     this._tempFile.moveTo(file.parent, file.leafName);

From 47923e6697179080ff4dcd00bbdcb9af5da6cec6 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 9 Apr 2011 15:48:02 -0500
Subject: [PATCH 008/829] Closes #259  Have GM_setValue return the value it was
 passed. (cherry picked from commit 2a301d83e68872a1a96ad762c9185ec24491406d)

---
 extension/modules/api/GM_ScriptStorage.js | 2 +-
 extension/modules/prefmanager.js          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/modules/api/GM_ScriptStorage.js b/extension/modules/api/GM_ScriptStorage.js
index 190f3e92..4ee668bb 100644
--- a/extension/modules/api/GM_ScriptStorage.js
+++ b/extension/modules/api/GM_ScriptStorage.js
@@ -13,7 +13,7 @@ GM_ScriptStorage.prototype.setValue = function(name, val) {
     throw new Error(Scriptish_stringBundle("error.api.noSecondArgValue"));
   }
 
-  this.prefMan.setValue(name, val);
+  return this.prefMan.setValue(name, val);
 };
 
 GM_ScriptStorage.prototype.getValue = function(name, defVal) {
diff --git a/extension/modules/prefmanager.js b/extension/modules/prefmanager.js
index 254eb1e4..b15f61b6 100644
--- a/extension/modules/prefmanager.js
+++ b/extension/modules/prefmanager.js
@@ -95,6 +95,7 @@ function Scriptish_PrefManager(startPoint) {
         pref.setIntPref(prefName, Math.floor(value));
         break;
     }
+    return value;
   }
 
   // deletes the named preference or subtree

From 80502f5c866de7b6514703456ae1a82b6a3a901a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 11 Apr 2011 17:56:12 -0700
Subject: [PATCH 009/829] Closes #260 Use Date.now() instead of (new
 Date()).getTime(), because it's faster.

---
 extension/modules/config/config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 4cadf1be..dd898ffd 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -190,7 +190,7 @@ Config.prototype = {
     // Try to fetch uso usage data if some time has passed
     let interval = Scriptish_prefRoot.getValue("update.uso.interval");
     let lastFetch = Scriptish_prefRoot.getValue("update.uso.lastFetch");
-    let now = Math.ceil((new Date()).getTime() / 1E3);
+    let now = Math.ceil(Date.now() / 1E3);
     if (now - lastFetch >= interval) {
       Scriptish_prefRoot.setValue("update.uso.lastFetch", now);
 
@@ -306,7 +306,7 @@ Config.prototype = {
     // Try to fetch a new list if blocklist is enabled and some time has passed
     let interval = Scriptish_prefRoot.getValue("blocklist.interval");
     let lastFetch = Scriptish_prefRoot.getValue("blocklist.lastFetch");
-    let now = Math.ceil((new Date()).getTime() / 1E3);
+    let now = Math.ceil(Date.now() / 1E3);
     if (now - lastFetch >= interval) {
       Scriptish_prefRoot.setValue("blocklist.lastFetch", now);
       this._fetchBlocklist();

From 5eb2b23ccd4a9c820306b4f6fdb28d717c85ba94 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 11 Apr 2011 18:23:35 -0700
Subject: [PATCH 010/829] do update check 1 sec after the first window opens,
 instead of 100ms after it opened.

---
 extension/content/js/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 70aa20c5..62cc1d90 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -147,7 +147,7 @@ Scriptish_BrowserUI.chromeLoad = function(e) {
   Scriptish_BrowserUIM.refreshStatus();
 
   // register for notifications from scriptish-service about ui type things
-  gmSvc.updateChk && setTimeout(function() gmSvc.updateChk(), 100);
+  gmSvc.updateChk && setTimeout(function() gmSvc.updateChk(), 1000);
 }
 
 Scriptish_BrowserUI.registerMenuCommand = function(menuCommand) {

From f560d1873555ba0b3e5fbb8eea1ed4b0e30ebc8c Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Thu, 14 Apr 2011 13:06:35 -0400
Subject: [PATCH 011/829] Closes #267 Allow installing scripts in frames.

---
 extension/components/scriptish.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index aa59d08c..838225fb 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -228,7 +228,8 @@ ScriptishService.prototype = {
     // don't interrupt the view-source: scheme
     if ("view-source" == cl.scheme) return ret;
 
-    if (ct == CP.TYPE_DOCUMENT && cl.spec.match(/\.user\.js$/)
+    if ((ct == CP.TYPE_DOCUMENT || CP.TYPE_SUBDOCUMENT)
+        && cl.spec.match(/\.user\.js$/)
         && !this.ignoreNextScript_ && !this.isTempScript(cl)) {
       tools.Scriptish_installUri(cl, ctx.contentWindow);
       ret = CP.REJECT_REQUEST;

From 3e1518107a933a8fc788731bab7f0f1ddd2cacda Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 15 Apr 2011 00:07:26 -0700
Subject: [PATCH 012/829] removing unused style

---
 extension/skin/browser.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/extension/skin/browser.css b/extension/skin/browser.css
index 3841ec06..c053b763 100644
--- a/extension/skin/browser.css
+++ b/extension/skin/browser.css
@@ -16,5 +16,3 @@ toolbar[iconsize="small"] #scriptish-button {
 toolbar[iconsize="small"] #scriptish-button[scriptish-disabled] {
 	list-style-image: url("chrome://scriptish/skin/icon_16_disabled.png");
 }
-
-#gm-status {width: 16px;}

From e5beedfcb2cc53982f1972c605958c2655bf2f03 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 15 Apr 2011 00:11:23 -0700
Subject: [PATCH 013/829] minor style changes

---
 extension/skin/install.css | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/extension/skin/install.css b/extension/skin/install.css
index 27c9da08..0b3842e1 100644
--- a/extension/skin/install.css
+++ b/extension/skin/install.css
@@ -12,7 +12,7 @@
   -moz-appearance:textfield;
   margin:2px 4px;
 }
-#itemBox {
+#itemBox{
   padding-top: 1ex;
   overflow:auto;
 }
@@ -34,9 +34,7 @@
 
 #scriptDescription strong{font-size: 1.25em;}
 
-#showSource-box {
-  margin: 1ex;
-}
+#showSource-box{margin: 1ex;}
 
 #itemBox vbox:not(#script-desc-vbox){
   margin:0 0 1em 1em;

From c765b6a3a232507effcf7f54a17984c5bf822386 Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Tue, 12 Apr 2011 15:50:22 -0400
Subject: [PATCH 014/829] Hide the addons-empty message, show our own in its
 place.

---
 extension/content/addonstab.xul   | 13 +++++++++++++
 extension/content/js/addonstab.js | 18 ++++++++++++++++++
 extension/skin/addonstab.css      |  7 +++++++
 3 files changed, 38 insertions(+)

diff --git a/extension/content/addonstab.xul b/extension/content/addonstab.xul
index 62d7d897..c77e1dc3 100644
--- a/extension/content/addonstab.xul
+++ b/extension/content/addonstab.xul
@@ -46,4 +46,17 @@
               command="cmd_scriptish_userscript_show"
               insertbefore="detail-prefs-btn" />
   </hbox>
+
+  <vbox id="list-view">
+  <vbox id="scriptish-list-empty" insertbefore="addon-list-empty"
+      class="alert-container" flex="1">
+    <spacer class="alert-spacer-before"/>
+    <vbox class="alert">
+      <label value="You don't have any user scripts installed"/>
+      <button id="scriptish-get-scripts-btn" label="Get user scripts"
+          class="addon-control"/>
+    </vbox>
+    <spacer class="alert-spacer-after"/>
+  </vbox>
+  </vbox>
 </overlay>
diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 0999d13f..4847f830 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -63,6 +63,24 @@ window.addEventListener("load", function() {
 
   $("category-userscripts").setAttribute(
       "name", Scriptish_stringBundle("userscripts"));
+
+  $("scriptish-get-scripts-btn").addEventListener("command", function() {
+    var gBrowser = Services.wm.getMostRecentWindow("navigator:browser").gBrowser;
+    gBrowser.selectedTab = gBrowser.addTab("http://userscripts.org");
+  }, false)
+
+  function onViewChanged() {
+    let de = document.documentElement;
+    if ("addons://list/userscript" == gViewController.currentViewId) {
+      de.className += ' scriptish';
+      $("scriptish-list-empty").collapsed = !!Scriptish.config.scripts.length;
+    } else {
+      de.className = de.className.replace(/ scriptish/g, '');
+      $("scriptish-list-empty").collapsed = true;
+    }
+  }
+  window.addEventListener('ViewChanged', onViewChanged, false);
+  onViewChanged(); // initialize on load as well as when it changes later
 }, false);
 
 window.addEventListener(
diff --git a/extension/skin/addonstab.css b/extension/skin/addonstab.css
index 0877d287..f8dad149 100644
--- a/extension/skin/addonstab.css
+++ b/extension/skin/addonstab.css
@@ -4,3 +4,10 @@
 .addon[type="userscript"] .control-container {
   -moz-binding: url("chrome://scriptish/content/addonstab.xml#control-container");
 }
+
+page.scriptish #addon-list-empty, #user-scripts-list-empty{
+  display: none;
+}
+page.scriptish #user-script-list-empty {
+  display: -moz-box;
+}

From 059a96c780822f17212a0d421ec27b450b684204 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 15 Apr 2011 09:07:34 -0700
Subject: [PATCH 015/829] When a script is installed the get user scripts
 message should not be displayed.

---
 extension/content/js/addonstab.js  | 20 ++++++++++++++++----
 extension/modules/config/config.js |  2 ++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 4847f830..379ee3d0 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -67,7 +67,7 @@ window.addEventListener("load", function() {
   $("scriptish-get-scripts-btn").addEventListener("command", function() {
     var gBrowser = Services.wm.getMostRecentWindow("navigator:browser").gBrowser;
     gBrowser.selectedTab = gBrowser.addTab("http://userscripts.org");
-  }, false)
+  }, false);
 
   function onViewChanged() {
     let de = document.documentElement;
@@ -81,9 +81,21 @@ window.addEventListener("load", function() {
   }
   window.addEventListener('ViewChanged', onViewChanged, false);
   onViewChanged(); // initialize on load as well as when it changes later
-}, false);
 
-window.addEventListener(
-    "unload", Scriptish.config.uninstallScripts.bind(Scriptish.config), false);
+  var installObserver = {
+    observe: function(aSubject, aTopic, aData) {
+      if ("scriptish-script-installed" != aTopic) return;
+      $("scriptish-list-empty").collapsed = true;
+      Services.obs.removeObserver(installObserver, "scriptish-script-installed");
+    },
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver])
+  };
+  Services.obs.addObserver(installObserver, "scriptish-script-installed", false);
+
+  window.addEventListener("unload", function() {
+    Services.obs.removeObserver(installObserver, "scriptish-script-installed");
+    Scriptish.config.uninstallScripts();
+  }, false);
+}, false);
 
 })(function(aID) document.getElementById(aID), {});
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index dd898ffd..8c26f8ed 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -270,6 +270,8 @@ Config.prototype = {
       if (aNewScript.version) msg += " " + aNewScript.version;
       msg += "' " + Scriptish_stringBundle("statusbar.installed");
       Scriptish_notification(msg, null, null, function() Scriptish.openManager());
+
+      Services.obs.notifyObservers(null, "scriptish-script-installed", aNewScript.id);
     }
     this.sortScripts();
   },

From 94047ca115a4968871ac37d7b8f514f0e3de23cc Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 16 Apr 2011 15:18:29 -0700
Subject: [PATCH 016/829] removing unsed event from Config

---
 extension/modules/config/config.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 8c26f8ed..96d6fa19 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -261,7 +261,6 @@ Config.prototype = {
     } else {
       aNewScript.installProcess();
       this.addScript(aNewScript);
-      this._changed(aNewScript, "install", null);
       AddonManagerPrivate.callInstallListeners(
           "onExternalInstall", null, aNewScript, null, false);
 
@@ -271,7 +270,7 @@ Config.prototype = {
       msg += "' " + Scriptish_stringBundle("statusbar.installed");
       Scriptish_notification(msg, null, null, function() Scriptish.openManager());
 
-      Services.obs.notifyObservers(null, "scriptish-script-installed", aNewScript.id);
+      Services.obs.notifyObservers(aNewScript, "scriptish-script-installed", null);
     }
     this.sortScripts();
   },

From 0b81777773cb66ca65c6bcd1e7f060824c9caa36 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 16 Apr 2011 15:18:40 -0700
Subject: [PATCH 017/829] minor style change

---
 extension/content/js/browser.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 62cc1d90..e228aa95 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -174,10 +174,9 @@ Scriptish_BrowserUI.showInstallBanner = function(browser) {
   // Remove existing notifications. Notifications get removed
   // automatically onclick and on page navigation, but we need to remove
   // them ourselves in the case of reload, or they stack up.
-  for (var i = 0, child; child = notificationBox.childNodes[i]; i++) {
+  for (var i = 0, child; child = notificationBox.childNodes[i]; i++)
     if (child.getAttribute("value") == "install-userscript")
       notificationBox.removeNotification(child);
-  }
 
   var notification = notificationBox.appendNotification(
     greeting,

From 21c0cf01f6708cc110d1cfbd9f01eea95ffd9dad Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 16 Apr 2011 16:18:49 -0700
Subject: [PATCH 018/829] using Services.obs for Config events now

---
 extension/modules/config/config.js | 44 ++++++++++++++----------------
 extension/modules/script/script.js | 17 ++++++------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 96d6fa19..f615d4d6 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -20,6 +20,7 @@ inc("resource://scriptish/script/script.js");
 })(Components.utils.import);
 
 function Config(aBaseDir) {
+  var self = this;
   this.timer = new Timer();
   this._observers = [];
   this._saveTimer = null;
@@ -50,34 +51,30 @@ function Config(aBaseDir) {
   this._load();
   (this._configFile = this._scriptDir).append(SCRIPTISH_CONFIG);
 
+  [
+    "scriptish-script-installed",
+    "scriptish-script-modified",
+    "scriptish-script-edit-enabled",
+    "scriptish-script-updated",
+    "scriptish-script-uninstalled"
+  ].forEach(function(i) Services.obs.addObserver(self, i, false));
+
   Components.utils.import("resource://scriptish/addonprovider.js");
 }
 Config.prototype = {
-  addObserver: function(observer, script) {
-    var observers = script ? script._observers : this._observers;
-    observers.push(observer);
-  },
-
-  removeObserver: function(observer, script) {
-    var observers = script ? script._observers : this._observers;
-    var index = observers.indexOf(observer);
-    if (index == -1)
-      throw new Error(Scriptish_stringBundle("error.observerNotFound"));
-    observers.splice(index, 1);
-  },
-
-  _notifyObservers: function(script, event, data) {
-    var observers = this._observers.concat(script._observers);
-    for (var i = 0, observer; observer = observers[i]; i++) {
-      observer.notifyEvent(script, event, data);
+  observe: function(aSubject, aTopic, aData) {
+    var data = aData || {};
+    switch(aTopic) {
+    case "scriptish-script-installed":
+    case "scriptish-script-modified":
+    case "scriptish-script-edit-enabled":
+    case "scriptish-script-updated":
+    case "scriptish-script-uninstalled":
+      //if (data.saved) this._save();
+      this._save(); // save no matter what atm.. TODO: improve
     }
   },
 
-  _changed: function(script, event, data, dontSave) {
-    if (!dontSave) this._save();
-    this._notifyObservers(script, event, data);
-  },
-
   installIsUpdate: function(script) this._find(script.id) > -1,
 
   addScript: function(aScript) { this._scripts.push(aScript); },
@@ -359,5 +356,6 @@ Config.prototype = {
       script.updateFromNewScript(parsedScript, scriptInjector);
     }
     if (hasChanged) this._save();
-  }
+  },
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver])
 }
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 5e4d963b..41ce3a5b 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -150,8 +150,10 @@ Script.prototype = {
     AddonManagerPrivate.callAddonListeners(
         val ? "onEnabling" : "onDisabling", this, false);
 
-    this._enabled = !val;
-    this._changed("edit-enabled", this._enabled);
+    Services.obs.notifyObservers(this, "scriptish-script-edit-enabled", {
+      enabled: (this._enabled = !val),
+      saved: false
+    });
 
     AddonManagerPrivate.callAddonListeners(
         val ? "onEnabled" : "onDisabled", this);
@@ -262,7 +264,7 @@ Script.prototype = {
   uninstallProcess: function() {
     this.removeSettings();
     this.removeFiles();
-    this._changed("uninstall", null);
+    Services.obs.notifyObservers(this, "scriptish-script-uninstalled", {saved: false});
   },
   removeSettings: function() {
     if (Scriptish_prefRoot.getValue("uninstallPreferences")) {
@@ -323,10 +325,6 @@ Script.prototype = {
         && !excludes.some(testI);
   },
 
-  _changed: function(aEvt, aData, aDontChg) {
-    this._config._changed(this, aEvt, aData, aDontChg);
-  },
-
   get id() {
     if (!this._id) this.id = this.name + "@" + this.namespace;
     return this._id;
@@ -596,7 +594,7 @@ Script.prototype = {
     msg += "' " + Scriptish_stringBundle("statusbar.updated");
     Scriptish_notification(msg, null, null, function() Scriptish.openManager());
     this.updateHelper();
-    this._changed("update");
+    Services.obs.notifyObservers(this, "scriptish-script-updated", {saved: false});
   },
   updateFromNewScript: function(newScript, scriptInjector) {
     var tools = {};
@@ -839,7 +837,8 @@ Script.prototype = {
     Scriptish_notification(msg, null, null, function() Scriptish.openManager());
 
     if (!noReload) this.updateHelper();
-    this._changed("modified", null, true);
+    Services.obs.notifyObservers(
+        this, "scriptish-script-modified", {saved: false});
   }
 };
 

From 01cc205236cfa7b34c91478f42f3401587f64efe Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 16 Apr 2011 16:25:17 -0700
Subject: [PATCH 019/829] removing the no longer used error.observerNotFound
 string

---
 extension/locale/en-US/scriptish.properties | 1 -
 extension/locale/ja-JP/scriptish.properties | 1 -
 extension/locale/ru-RU/scriptish.properties | 1 -
 3 files changed, 3 deletions(-)

diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index ca0a911e..1a14a26f 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -23,7 +23,6 @@ error.isInvalidValue=is an invalid value
 error.matchPattern.rules.file=File scheme @match pattern does not conform to pattern rules
 error.matchPattern.rules=@match pattern does not conform to pattern rules
 error.notSupported.Firefox=is not supported by this version of Firefox
-error.observerNotFound=Observer not found
 error.openingFile=Could not open file
 error.pattern.parsing=Pattern could not be parsed
 error.pref.type=Unsupported preference type. Valid types are: string, bool, and 32-bit integers.
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 38b0c284..2c78ce60 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -21,7 +21,6 @@ error.isInvalidValue=は不正な値です。
 error.matchPattern.rules.file=
 error.matchPattern.rules=@matchパターンがパターンのルールに合いません。
 error.notSupported.Firefox=はこのバージョンのFirefoxでサポートされていません。
-error.observerNotFound=
 error.openingFile=ファイルを開くことが出来ません。
 error.pattern.parsing=パターンはパースされませんでした。
 error.pref.type=選択された型はサポートされていません。 正しい型は次のものです: string, bool, 32ビットintegersです。
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index ceff8bf6..cd19a932 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -59,7 +59,6 @@ error.isInvalidValue= - неверное значение
 error.matchPattern.rules.file=File scheme @match pattern does not conform to pattern rules
 error.matchPattern.rules=@match pattern does not conform to pattern rules
 error.notSupported.Firefox=не поддерживается в этой версии Огненного Лиса
-error.observerNotFound=Observer not found
 error.openingFile=Не могу открыть файл
 error.pattern.parsing=Шаблон не парсится
 error.pref.type=Неподдерживаемый тип настройки. Правильные типы: строка, булев и 32хбитное целое.

From b17229eac8a63793de48eab93d58eae28fb16d20 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 16 Apr 2011 20:34:18 -0700
Subject: [PATCH 020/829] replacing direct calls to Config._save with events
 and event handlers

---
 extension/content/js/addonstab.js            |  5 ++++-
 extension/content/js/options.js              |  2 +-
 extension/content/js/script-options.js       |  2 +-
 extension/modules/config/config.js           | 19 ++++++++++++++-----
 extension/modules/script/script.js           | 11 +++++------
 extension/modules/script/scriptdownloader.js |  2 +-
 extension/modules/scriptish.js               |  4 ++++
 7 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 379ee3d0..7416ec79 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -82,18 +82,21 @@ window.addEventListener("load", function() {
   window.addEventListener('ViewChanged', onViewChanged, false);
   onViewChanged(); // initialize on load as well as when it changes later
 
+  var needToRemoveObserver = true;
   var installObserver = {
     observe: function(aSubject, aTopic, aData) {
       if ("scriptish-script-installed" != aTopic) return;
       $("scriptish-list-empty").collapsed = true;
       Services.obs.removeObserver(installObserver, "scriptish-script-installed");
+      needToRemoveObserver = false;
     },
     QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver])
   };
   Services.obs.addObserver(installObserver, "scriptish-script-installed", false);
 
   window.addEventListener("unload", function() {
-    Services.obs.removeObserver(installObserver, "scriptish-script-installed");
+    if (needToRemoveObserver)
+      Services.obs.removeObserver(installObserver, "scriptish-script-installed");
     Scriptish.config.uninstallScripts();
   }, false);
 }, false);
diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index 1f1c3798..b96e418b 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -64,5 +64,5 @@ function doSave() {
       !!$("check-copydownloadURL").checked);
 
   Scriptish.config.excludes = $("excludes").value.match(/.+/g);
-  Scriptish.config._save();
+  Scriptish.notify(null, "scriptish-preferences-change", {saved: true});
 }
diff --git a/extension/content/js/script-options.js b/extension/content/js/script-options.js
index 3591d8c9..0fccf746 100644
--- a/extension/content/js/script-options.js
+++ b/extension/content/js/script-options.js
@@ -40,7 +40,7 @@ function doSave() {
   if (script.getUserIncStr() != postInc || script.getUserIncStr("exclude") != postExc) {
     script.user_includes = postInc.match(/.+/g);
     script.user_excludes = postExc.match(/.+/g);
-    Scriptish.config._save();
+    Scriptish.notify(script, "scriptish-script-user-prefs-change", {saved: true});
 
     // display modified notification
     script.modificationProcess(true);
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index f615d4d6..9245f6b5 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -55,23 +55,31 @@ function Config(aBaseDir) {
     "scriptish-script-installed",
     "scriptish-script-modified",
     "scriptish-script-edit-enabled",
+    "scriptish-script-user-prefs-change",
     "scriptish-script-updated",
-    "scriptish-script-uninstalled"
+    "scriptish-script-uninstalled",
+    "scriptish-preferences-change",
+    "scriptish-config-saved"
   ].forEach(function(i) Services.obs.addObserver(self, i, false));
 
   Components.utils.import("resource://scriptish/addonprovider.js");
 }
 Config.prototype = {
   observe: function(aSubject, aTopic, aData) {
-    var data = aData || {};
+    var data = JSON.parse(aData || "{}");
     switch(aTopic) {
     case "scriptish-script-installed":
     case "scriptish-script-modified":
     case "scriptish-script-edit-enabled":
     case "scriptish-script-updated":
     case "scriptish-script-uninstalled":
-      //if (data.saved) this._save();
-      this._save(); // save no matter what atm.. TODO: improve
+    case "scriptish-preferences-change":
+    case "scriptish-script-user-prefs-change":
+      if (data.saved) Scriptish.notify(null, "scriptish-config-saved", null);
+      break;
+    case "scriptish-config-saved":
+      this._save();
+      break;
     }
   },
 
@@ -267,7 +275,8 @@ Config.prototype = {
       msg += "' " + Scriptish_stringBundle("statusbar.installed");
       Scriptish_notification(msg, null, null, function() Scriptish.openManager());
 
-      Services.obs.notifyObservers(aNewScript, "scriptish-script-installed", null);
+      Scriptish.notify(
+          aNewScript, "scriptish-script-installed", {saved:true});
     }
     this.sortScripts();
   },
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 41ce3a5b..6d013fe2 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -150,9 +150,9 @@ Script.prototype = {
     AddonManagerPrivate.callAddonListeners(
         val ? "onEnabling" : "onDisabling", this, false);
 
-    Services.obs.notifyObservers(this, "scriptish-script-edit-enabled", {
+    Scriptish.notify(this, "scriptish-script-edit-enabled", {
       enabled: (this._enabled = !val),
-      saved: false
+      saved: true
     });
 
     AddonManagerPrivate.callAddonListeners(
@@ -264,7 +264,7 @@ Script.prototype = {
   uninstallProcess: function() {
     this.removeSettings();
     this.removeFiles();
-    Services.obs.notifyObservers(this, "scriptish-script-uninstalled", {saved: false});
+    Scriptish.notify(this, "scriptish-script-uninstalled", {saved: false});
   },
   removeSettings: function() {
     if (Scriptish_prefRoot.getValue("uninstallPreferences")) {
@@ -594,7 +594,7 @@ Script.prototype = {
     msg += "' " + Scriptish_stringBundle("statusbar.updated");
     Scriptish_notification(msg, null, null, function() Scriptish.openManager());
     this.updateHelper();
-    Services.obs.notifyObservers(this, "scriptish-script-updated", {saved: false});
+    Scriptish.notify(this, "scriptish-script-updated", {saved: true});
   },
   updateFromNewScript: function(newScript, scriptInjector) {
     var tools = {};
@@ -837,8 +837,7 @@ Script.prototype = {
     Scriptish_notification(msg, null, null, function() Scriptish.openManager());
 
     if (!noReload) this.updateHelper();
-    Services.obs.notifyObservers(
-        this, "scriptish-script-modified", {saved: false});
+    Scriptish.notify(this, "scriptish-script-modified", {saved: false});
   }
 };
 
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 17f6b746..b3fef53b 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -289,7 +289,7 @@ ScriptDownloader.prototype.finishInstall = function() {
     this.script.useDelayedInjectors();
 
     // Save new values to config.xml
-    this.script._config._save();
+    Scriptish.notify(null, "scriptish-config-saved", null);
   } else if (this.installOnCompletion_) {
     this.installScript();
   } else if (this.scriptInstaller) {
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 76118880..95a09a7f 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -1,7 +1,11 @@
 var EXPORTED_SYMBOLS = ["Scriptish"];
 Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/prefmanager.js");
+
 const Scriptish = {
+  notify: function(aSubject, aTopic, aData) {
+    Services.obs.notifyObservers(aSubject, aTopic, JSON.stringify(aData));
+  },
   get config() Services.scriptish.config,
   get enabled() Scriptish_prefRoot.getValue("enabled", true),
   set enabled(aVal) Scriptish_prefRoot.setValue("enabled", !!aVal),

From e2f92dc48b23eb737b113525c0e0a13bfcfcd106 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 16 Apr 2011 21:20:47 -0700
Subject: [PATCH 021/829] adding icon created by Slowpoke for Scriptish

---
 assets/scriptish.png                            | Bin 0 -> 36710 bytes
 assets/scriptish16.png                          | Bin 0 -> 371 bytes
 extension/content/browser.xul                   |   6 +++---
 extension/content/js/browser.js                 |   2 +-
 extension/install.rdf                           |   3 ++-
 extension/modules/content/browser.js            |  10 ++++------
 .../modules/utils/Scriptish_notification.js     |   2 +-
 extension/skin/browser.css                      |  12 ++++--------
 extension/skin/icon_16.png                      | Bin 315 -> 0 bytes
 extension/skin/icon_16_disabled.png             | Bin 257 -> 0 bytes
 extension/skin/icon_24.png                      | Bin 211 -> 0 bytes
 extension/skin/icon_24_disabled.png             | Bin 213 -> 0 bytes
 extension/skin/icon_32_disabled.png             | Bin 418 -> 0 bytes
 extension/skin/icon_medium.png                  | Bin 344 -> 0 bytes
 extension/skin/scriptish16.png                  | Bin 0 -> 341 bytes
 extension/skin/scriptish16_disabled.png         | Bin 0 -> 358 bytes
 extension/skin/scriptish24.png                  | Bin 0 -> 364 bytes
 extension/skin/scriptish24_disabled.png         | Bin 0 -> 378 bytes
 extension/skin/scriptish32.png                  | Bin 0 -> 1612 bytes
 extension/skin/scriptish64.png                  | Bin 0 -> 3612 bytes
 20 files changed, 15 insertions(+), 20 deletions(-)
 create mode 100755 assets/scriptish.png
 create mode 100755 assets/scriptish16.png
 delete mode 100644 extension/skin/icon_16.png
 delete mode 100644 extension/skin/icon_16_disabled.png
 delete mode 100644 extension/skin/icon_24.png
 delete mode 100644 extension/skin/icon_24_disabled.png
 delete mode 100644 extension/skin/icon_32_disabled.png
 delete mode 100644 extension/skin/icon_medium.png
 create mode 100755 extension/skin/scriptish16.png
 create mode 100755 extension/skin/scriptish16_disabled.png
 create mode 100755 extension/skin/scriptish24.png
 create mode 100755 extension/skin/scriptish24_disabled.png
 create mode 100755 extension/skin/scriptish32.png
 create mode 100755 extension/skin/scriptish64.png

diff --git a/assets/scriptish.png b/assets/scriptish.png
new file mode 100755
index 0000000000000000000000000000000000000000..f7752abcc9302c2d3c03ad60ea1a9020d2eabc0f
GIT binary patch
literal 36710
zcmdRVWm8;T(>3lM0tAQP5L|;L5Zv8uaCdi4Ah>(*;O;g!!3KBN;DbZ3_gr_?^CR95
zKovD-?>;T7yI1%8P*#+}L?cFnfq}u4k^ZI%0|UGD-wz5B@E`xV?iAn;s*|*iD+~-)
z|9?NQ!;ZhrU|=X=WWIe>_sTw9_w?FZ^xu5C7w8co3ymFQZ8mP(lckpUfybyRQ$(Ys
zQ*U~*;+$Z5^7*oh^@m<AO}EyM^OW5^=OhY)`)Z+7{MCB0H2&r&dzoZ&83GOI1bv5(
zZC!Ao);%ug6g?Te#>^gs;Kqv+?=K*W;9gkv2mgb{3s|Z!95IytAAfQDRIeeS4AUl5
z_;<e&(4h{OUd>1KEiVa%pdio+45AR>p_@AW!XeW~ohg8^8Z5+)w8S8Ufs0efkDN`n
zO_>QvgtA~E3w#OZ&JM@%mxR;)zEPVoNNXIDF3jK{ekp6rRvVNLv!}dN)N7|~g@L5Z
zVAUmc((O^RXe=Fs<b?kq6d~FVWz>&#4jR%7EEN0B3|tMmwm!J5&FFJNj_L^V4H68p
zri|-@bvtC6!C|ffogFQqvFxVmpT&50tGU&3@p>#s>Yx?lI}6iQ4|B6}TV>l+a!+#a
z)Z(?vq%SeB;8EjSa`=7de{y=X&E4mp;UXv~r3ngO@{02I^E*KC=81|7@(n)wQun?&
z=eIp_Rg&k3-I!O#BgSiToSu_&6jrKZej^;BtihAg0#PU`W(+!}4ZV&2!wh0-o?f-Y
zSb{yCX-h<99DHEdps#nV_?ONfqUclu8qzT6bsTmF3_F)-7;!L;Vs#|q`8+={&<c~I
zK0(lO5>2l<t~17)F<u+vwC-x*DrPIXaAgv4BycAzTqpFFFs!*rzRiDske9!*3lVTQ
z=62T0^TF%CFn&Ocbpn|Nl8SvlNq`~PInX%;!S#26SA(8{yw#bvX2@-=5H&xhqbAPC
z$%X^x_qqk$-C{=C3tFArexA2Uv1yX+GNi{4-{Gf|(fv58r3Y^x#N>qF6~Tn*HzTlH
zV|@8hXn2#d%Y>@=CqgX_pCs2X5f*m7H#3wd;?F`Y=a&NEb&Qgb-#7KDtUb(eqPwPT
z))yXKi8T4kcB)mHW$H}o6&l1bLpD<z$C8Ebw?1sa@ZiB=5C-S%vG>4nJ6=wQ<D5{!
zvJCjJZ0$NBQ*DOtoCJm6P1UP1)irn|8;y4izDNMN;rF&&54Qbz6n1uX#mUUfoKwp)
zWVcbhfxwS>Ofe^+#wGD9c6*)lKoowP&R>J-TQnf-BIhtac@1(mMZYkEOI098s%7|~
zVAT22*zm~NxQXSdTiu*Hjf_~Ap{2KXMsYE%O%t&Rk%PmM;TR`WMzi$`((fc_A?dbO
z{I(SpZwhc=n%b#(Y`o*Q%Nll;=E(FE&3w`Q#ZvP0Q9?(y9sHb=2nRu@wA9qk!6Xv6
zbVr3D8X8+4vrWQLF)XJ$V?zB}7boyQ=`w&P$ku`3qAp;%2?u$>V!>ofF*9Sb8+-mq
z2o10+3tIm1ckx#<GkAoo`oDCm?u@n!{~&JlXVZf)9)zO!oa5EH98z)mW#P0@lutoy
z5f_q|9>!6P|I~NzvybQC)!Ht#VoST$D=Kvr6T@VS`@*jYwRH^(mhBwIL1k5DL7`yF
z?=n4aZ;|4i?--Y;21?>#2nyvJlDfcxK^I~iiWRMedTv@4<T-y*E|^R$&zJ*T@FiG2
zeR6(X^G;<R`=-LJ9qdcX@w-Pu!F8n-?97dQO^WQZ&O#M2ol?UhhQT*Te(>Wltw?-A
z?JTgC%ftU)f_31|#*geISJtNic8oT!OX|bP98+`iaQ;|iQMV2q<GT-OTr@-$KOV`q
zHa~V5Q}Jfs1Pxm0m?eI1fft?2+(rB%_?fuJaxK?;9m8;0@0!sW-_`kux>PBzM7Ijd
z=&xZp>hpUJ4VEn&f_s;s+5hQB(gzIUJ{>OZBl+RQ7nK%2>0Hnlh2BC~Y45mVf!y%b
zQlfz)Vt?O!GFza3W@g3-gRLeFULNF(5JVOxgz&7Qv`RC8lL$l5?})uxcBN+Z`XS2W
ze!=UVq5IRKBZR<#`B#pchHK&U)_4Y2wy<xiMT5ZS{8fbnR&hD_C9z8$a3s-0UIb1S
z0D~A@(K&vfP%pmLO?9gYwu@Y^d<Z<wFRRR{lSvFiCuDUxo?~Q6L6c#b%}KV(<H3M3
zS)lSOHkI1rfkvcZqPH8RgX05{pV=FIy3jaXGm6PJ8w=ytb7`ZfV<`kDGa4+dcr&eO
znG&v~Yp|@pj@o<4&z!$Qr{WDms3j5+Os73aoAwi~3XhPju)3Sp@%@)@B*ta!@^^}g
zRlk+p%h$an3Q?O#3_o5<4)D!snxH|a<$e!P0KAv@6YE%ujo@Z8*OVYPaxCdD)v}vF
zjdDY|(g9Pjq=_lfiG64okq90b<i)}%Gk%fpRpg(h=aTi#F#{#`WOpvN>JR(1Pg(U_
z2wllk#}Eof_J4;j#f_o8z3(FK*6g*R!KT@$`^WLYqFV*&yNon);n$=iYu_*;G2l!h
z1{**6%!|KkyUH;a(Oi4+(5??0wzfu94x4ylcJUPyN7Mtqw2fiC2+s~1sP_UmIc>es
ziNDOa`?I@L;eZPNP^1vK5kMV-KTzg0t;O}bv1M^1X#T}A5bu*^%lbIL4p=wTp3k%J
z;coJbny`(m%q5^AHE2E$6f*c{gGciFHVrHbQby>ul!_Vb6t@?TgwC>4G=@{a#2L!O
zr6G^hcN1FR1B<NZVCa0#YRk6Dv59Yl1VVQ4LR-~uP|XiBssSV*xI$%39~9MX1IwjS
zR^#&zV`|~%w1qL2og&g@FNkRdoc<HTIu{R`I(a5If^$<XAij@p+>UhhK9Zj@x;AXd
z3eW|+_Zs4<RhN-t7rlc92I<aD<`W*d<4ZIS2wnyzx)=Xa<M#sl5wG7fd5fjCdT_LX
zDQW~tR?nFMU?0PJLv@T?2_fop$MvY?U|QE6l09$mmdCp5_jt&Cxxh{Y0|Au%XMVb5
z9lSQoC=q_t`z@L%@m8U@!4J7bqbr$~AoTw(F-`gif`y4hk|<N_q&ohUtM)$hPt!RE
zQ9xFq{$J~kfhH>t<$(iQ8oy6aqD%=49emz2@`{8g>smNcbNaxz9dQPciC(!9@_`Z{
zt%uT62Q3^Q!d+&*X100{gVhz9U00!`SUu6|v*)5u&el*>yp7oHDxw2r1GT6{a@=~|
z4rD{LPW=9R&;xbH11+)Nchl_kwV`O<40zx)y4j33GI}=14(1e0?jH4-Tnkkn)By_$
zQd*^L2eM)&;)Y_163#W_7P9iVEAygDc<9c1aLv|L&(fbPo#cML<`4jLD0K~7X!YWF
zhg6KsCo*~h#gecoyEYAH<ln`c(sN+L8AWcJaC`Gw4tGcbiJXFFr>8D1Z_hf`zHbrt
z6JRDN0|qJ*qQO4(z(hHmQ3+a3+fDz{GeTt9U9Co;G>2T!1WTq?z8C%=Jk9C1s_Wts
zI5{2XI%PW+)>EEnLBfV&Kh)LwG9H_3A=eN~Y~hZpz8{2c#k!X<9BIhjJ~w+kzy7?O
z?mh934=04{W{CmNk{d>gPeu9Cpl2RLA1q1lS3wkz4llIWuNi|jNX;6-2s)R%WQafx
z?qYCR`@+Tt4f)%x)j1T<AL_Ve{$yyOkXp(aOz~@O9~*brxw*c6yg>>JS{nF5|6J4a
zR$<X(*fk>?wW{Lxo$Q%X>Ji2|LA5T}>^g!-C>sC!180=?Il}p0_fVuI>#f2tB2vm;
zs3O+2LlJby!dbiM+lZX95Ry;`NK|=8^3eJHPr~7f&C8h0jK`J505Y|AYFZd;wj4vy
z=eok@*S80Mkq1Hwt1uI<;<imDRMAn~08G?v%>N<`5};r12RA5ehin)sl;kLh;+JmD
znurXBK7I4UW^*GOpma!?z`D|A0eRV1q&>M9cQz^f)y2^Awjgu~AG-G&yZ70I4z(z=
zraHDI3=!puJaE5V3SV?W_bq$W+xtdTW6~+M7<ytl`B&LpmhnQR8={SnHom4ZIZ}Ug
z?d2PRF+%EIYa0oS3Ttr*d)H;Z1fD(pC^rI!iv7zAzqJ&&ER#7pMe|4fd`3}1Ho|$U
z>KEJM!j{g<Pj~k(*MWnld#4e6-I_I*dT%d$k4^V)Hu&_HD>aVVUoSndE+a?wAQAt;
zgf;zU@J@>|5qYmg`ywVWdudQlp`?7!wj4wE4{@Q{6AR2=ZrjQI7*Se<ULT_t;};lv
zEP{!O)j{T!3?1?A*U{ef=sK)^mvHo=KAe&!2LCPx#jN*pL?0$kKi+o}tZsDf3p$ft
zTT;AIbe<5tsV)7?v^82Go&-Jk#6llRc#Ok<WYgQ2gt#@!P_l%z7I|u8RD%RnNo|wH
z;{SP&<sA#TYuAAn<A{r!z=vLGV&79?_%75rG1Un%V_1aNI{8wi8IA8M{nPG7L{kj7
zp<#R7k4Dw<qT6(TGDyk$cbPXi0hx51X=zI3h=}vM>VJO9d-QZ}(lmGifuRz1-4XDe
zwX`uGKtLcVFQ4vts`xQS#YZ})AGs$XeSz~s^@?hp&+_gNuzM|4m5so!u@Gf_KUC+%
z7_nIBMdn1JyhqITl&mVb%yd)wT-(}{K5_A97xJ(a98<5!)-^;l`8Ml~)$`_Lhu6S+
zitpEN>bO1Jb3s31d7X8GX_&zg(et>s33UwoN58{vXGq+4(GSInRo<MD#QcD2%+Y!W
zB?i3`OQcedb;fqiU9`oTg6Var3Xq;ju&zbSL@rdZT2yEbc&W)9sx-UN84N79lT}iq
zI-S{=)(lauqP;mAKAd*OG}nj-sR<hHW*GUD;A#}|Kn#oVH(ygPwvf9|kT1J7Nbk*m
zZifcG!fw25yz%i?dOPDJ0b)Q`N3IV`{zKs=iZtR2`0fvgr$~mu7!pPkXwVjQ?SkNK
zdUHLQ$U!mNVwXO6uxVA4a#BuWsaC!{nV<yy=*5I@_$r#&0T;hF@>%7D3=tm)>v<?R
zWwclJZYI!ob+J2!!h1OGmc?(ikA3ej;M&rAlj3b-C6K)nMQGF{_gtnwA_yoa>^j<z
z`;B1DDfcw^PsMVV)1rcu;Mr>B$03RP>q0UOixbBQjRS?la0K_J0L=LlSuED63N&AP
zWUr>UqPM&sVKs9e)^99y^ulHZXDH=uk08hC^IkkfAa9Ozyxw+<n6ZxS=W3U;T;5T<
zRqw+`=61P}K6?rb+>2GP$F@?rWZ;D=Hh`6Wc@r9&s2qOv%fLPd1z85s|Bi=>5I>^~
zOO=nC5x43beD~tXTr6zOyQy5WP4iM8@ED415NvSRZiZ{i5$JTrK3mt{@~}0uyGk*7
z7?o|sua;RpYgp9^IJ6946Xf7^mW%6|?!FmMdpM_fs`e>d{(GLdsN5MG>Q`WiNn-pT
z)Ss0|_fa$+94l9sXCcQx%xXv$=oMk}eo2P*3_`0&Km5D)pA9|wRPw#8R8395pe%d;
zGjmE)DM_y#PRd={)nk`;Co1+>gR+k)TN=HHUkKsbVYID<GT9hv;NyDFap&=*mi^zw
z6_g>OfD`P1q`bGPybia8`x+FlYm~U(YutcOlHS!yj~f+eBT!QA1(5!$cvp9O43_%c
zFu(=Q5*SY~<g<QP#FO%A$QoL|fL<5Lz7|Ujxz%J6EI(3uRN1~0Yp&I9-I3joAz+OZ
zx@}O>=-+pmFx+;0iU^#Hd%F+~UU+GXHz}(hXnC1>^Vt4dS6Dom6M+-WcSTBZVlal3
z1ULk_pf}M2yn4mO39fUX?eGBuC)hIRqdw)q1nJI&?|KpDUTrids^>3n{C-=R3aON>
zD{2CRpUv)j3O*(#MpSCrEI8vxOFAUxj_do-o83}@e^OG5H#E_Ys%I}3k6&u-Eml*T
zb}gP?O5bANuHRlo@j`X{Q;Z+bv91ZsSRW!rtffI-qzAjFds6J3gc7+(yn#|li(8z-
zf4kO%(1nyj<KIRTg0YRV1fp75;IQEx!A|s1&fxBa3r!uStD#PY9=;30I|6kJ-y!F#
zSl6Qk$_9xJ>m7^nGNo+Yp<0Wtvn@UQtD$X2ZJ(_Bt6J~RpIZGPXO?+B=VkLU<bx+m
z{W+>r`$GV7nj|`<Z(1U=67--T47B<sB6)7tjab>M_z){+(;OW7tS4tpb@BXtU7$j$
zL7-F7Kl<B=Rjkp@W5sdt{*GY80kYyS-IP*T-R@*l(MR|zpg{4(%zt91Myy&n@Y>Yz
z&e7duQPYVmjpF&7A{R)QP_~YHB;)}<KB)IzZG<~eQ}xsBF!T(v;zQBDL?FZkQd=NK
zr}Z(AuKmhHbJq=*`S>^pE3iHSqR0S5xG(e)cA`M#%BlLQ^@pxl19W)G&?2}_oV=RQ
zuvTxoe!B2$!s9jiu(z`7uKRJC?};nRskP6d&G&8nbfx=br}q%sgJST;!sC(^%efwi
z33ebRh-gW7T6DmYmqxni&Mdizll9}aBeN8%%zQE48^+Y{3ZFboep)1AWN6YlPMlad
zQAC|FXtuQJGm7fzg}Mm3I+!>HpH5cZ4GAw^Rdr*mIXH72Jij}va3h;D*7LZ*bo8rO
zzp%eZMdkFn7kwh!&wGA+tNk2TwG^>Kz6J4JZvILQ%Mzh6fE$pLla2f;`s*j`Wa6P?
z>&Od!hB5zPIHnU^vMQncgwXQIL8Fz$rCur0dh|}+LfO}|uGVAXp6I2kDhu|-72-yE
zNAGvJO)7e!&2A5mW;q9s2bokigW-e6=Vu-0dJEq%uco@N)kX-2<x+}0F7Xt`NrHO5
zjH*=wyaSO1Zsa2+diJ-=6NWn&<<gPi-whOb5=8C)rWLkWFyCdC@^3U~lvNDh=ybyM
z7lL2F)h9W`Mai6_8ZpL9-=jS7T^|QK-^(Kgzt_&H<*~AL1wDeV%=;mZFXfI*{F7S~
z(Ldi0c|mg{J9{3qwIcb>U{^<M{<;JFPyeJ-SX^D!ViNQkyjWN(1AWAc2xW1lN3_^p
zk@H0w!BdukrC)B>g;Wf(VR$A$88Ra|PGMbs+p-37txO-4eQhCZ0PaS!fDdfA-*K?t
zB$T&neb^i1>4(Ig@fx|_+ag_MlqT=IYKed|VIt00@SMKDc?kneofZFx3c;hMSU2(D
zTljV{18F(_1Ag7)QTaU{TTL@_f&4epVH)Q|!vbV`_A?@DHn{|<Gi!$-&v=3!c6nSE
zLIP}fY||xV{HZE%*J#1+c~|S>x_8QQs`FXpnc>OYub9TB>8z-7+@{?o9^Yib15fUQ
zl0ziUAlSQe{criyp)w8M5{8Sv{o_>Dj|5CWhHM2BI8IGLwRg(^bP?pnpUY_4Rz&CU
zPEeUyx*GRVE*N*^1?T!dkByC~GrcE{L6S+l@uZ{&b4(^odPC}hI=)&qmk8^pIfKq=
zwoRzX#p)=c;Z7I=wo})Cx7HBt-5+RJu<kAiJk@u#W>pdPu4;-J&{q%J4rNkwykUAT
zepq@gR%bBL(fk-y=#lCb*55tgybFNDv}+LUR$Q>CCGtClb6c|d*W*@#3z7Ra*S2e=
zY`$Lksce6{=Ej%iGb^cg5ma(=a@m5Ov9iTtq_^81!#Ka)9L~Vzq+XYF<kn4{rUN<O
zI<W>r!%oFj#0<EcR8rBpIM~kdd(t8NirZH^gnIdD`K$K(BWP}C-?V=3b$48l{LMMa
zpp3R(zGaA=nc~sbUJP*ft^q`DayaQeKa^@KP6yo2Zkg;|{9}Tzn$*A>x^+R`$R)_R
z-CVQ5o2oa$AtEyQ@W6lTlk<*V(dm3mAd&y*_P%Zurle_Br^%<{1bu5>K;H|MBM#@1
zo#QEp+J`Jy?{4Qgw==KjlahzX3BUKS%H4dlksX35hD@UIPni??mY!tYYf+!BwRNKY
z(diVPdvnf=q4P7}YJXz2ylZ`I$Zh7Wg=IWIu40_f!?JuEZH%zNZr%_XaBxs6*vm-?
zP2m&1u7J#qv9UdI#f@)49v-?OlR1KnX=9`!e(4s4O4XkUwm{QX>#`37TQzNd91F+I
zloMmhLf^MdFnnbWoodKhbtMd!qg|o}M0*64Jfs$!(W_mnY}EM1h-Oh&Xk<|O<1HFw
zsx%7?Yi6yuiJ0R!czGktOMQcDno7$E6WR0sftq9%ReQPw?<F7Ciic0I2;}r0aw&`|
z_4T{dW~FMRpRxb~QH#Jio{i(r>Ypn|1*?FEQ_IQBXeC2Cd13B-C1L(>vL$>p#JjWA
z;Rc9^Tvs!$T2;#kQppI^@1%KWf(2^C-{;B_-wVnO)B5EF(@NNXzJTlhk2u4;vDmb9
z?;B81{3pDF)TBpLtbc>BzN!4-+qxsbA`f$@;Jb%3KYjX-=T#K#;i*6MVa+`(a3k(~
zdEZrLMN6$4yMV#hb8!B2oyxOR*raPK1UY$4AfaZIXfwnEi|LP9Gi4u$)+ZeXdrHm!
z_B*YKr9JHNdR;qr+!V%@NA$`a-pQ574LGpwvxxIFVlYOA!XbsijWWC@8<4^iu*)|w
zDU?kP8%;9ENhnVLXy|AN@bJ`pZ0J72&sG%P4-1o=(>~M6nr~Z>6Th7yw-Yq$2<62P
zFJPyR`X~=t==rA~O!3fKoz;z_to2snQ|8?*gGW~ZTglGWbyobcI7L#F+~>a51e-lV
zP;?8>DLenfuv*G(7z0ol7Gvk>y03C;NH?EiyBgZUNdvaHL`5O_;*mZ*vOZ`dY9?jw
zD~djnS35i+{l>TnRG`ct>tx0cr60I+N*r7ab0XgrIr>X7O7Lb4)}PIHJLXNi!2uJ6
zU$(HRg*i_5vBIGp&u!6%-W37`-+#~qE!zIl+Cr@h2Vq@Dg0W#Wf?CNT<PQ_@%uVl(
zbddL5GUVx8V<MNRS)JIt*DA>S;*Dp`eiFC9W9L5*lXgc1X~A57iFFfcyI*!!NHyPn
z645P2ul?85c6KPOM`iSVwD?Lx#K(!qwDyxPPY@<mECST$KSnu#BhpJWBCo`KPqz`z
zJnn76Ig#Nj<KW)jo;x`xIyra|uNEDJUnb(+Da<*XVcfxqlXr4ZN07kGihSm)LT!bU
zK?~P&_Fd4^1qu6){D97Gi<FJYvyPvKSOJ)G3;KSZO5I->U^@*t5k3vX{Lnr)9JywX
zl7eLwap$nkb+iebDOG0p)!0YVMIMPX6r=@<I-6s6+~e2ojV83&U(Yh9(bKXK*iXm7
zJ;}2mM0MW&QeC+ay85OfYqCnPY)7zq#$;CYJ23&qkPX$C%3)3?_0QF{b|*pYj$~y8
zo8~3GKk0C9JxhUEg)F;K<jx9DIa2xz+UB+HQy^Q`!x@RpN2>B~wz|!piyMYKhpF1l
z3OEmYuHHhMA2Gxe`OnEi3@yyZj^nU}{ySYV0-{<PQh+kWzxvlbS~9lylRm^2Q?zDY
zNq|)2qrBZ`worVgjJ#zL_I0CT{O*e+2q6@nVzqw3?xS8=6-}ej0pnysioNs+z)cKH
zeAk9Ojz@CR*XufHWK#sWE;q;QE>-!DytKU$QkH+CxjZJI8Ft?JQTL-8+jv#+zU|OO
zz;4y>UHiJt?LV7s%zkGqX>6}9U<lRf92IY0<!TQ*W#}UuW9og`qcO7`&|&M)A^MTO
zGOY2=3_gCsY*)2=E)5yRwhA>QNGw0-;wk5;=B{9dNW4(R=tZg@H(plze}diWjPLFM
zq-+2_;97K6IsXdSGai4!X)4L%Wyv+cYu`I>^1V0I@1V2x@zZsW)T?1Eb|Q`R6Uk#O
zKR!M)R3ZxJ&Wt%X0;~A+ybCb?Z+?|J!A<Tx^nD3_Eqo`1$WXBluDwCLxu4lL=DE5P
z+v(qp^@orRIJ9v4)!*mvME}%x*H&&}1)D#4z0|_#GD_eeB+E(&ZC(r<#0Ujyl{1H_
z93n<g3CHMG{?|unWFqQ|)oYLcT8`dP+}dYwptm3x$+x254v^3^o+s?K?rrglZm@*7
zygqw-zw{s`YvzO!{sWqJCu@6buK<hg(z9lkXnkI(I(7ZCvyDC1=6Y4CC|%}GOe%s>
zzS=TzC4emJ;I`_O;tB_`p?bow!QSoGg}PCt3>Sx6SG&Z_rN(9_zDqIGy`ned*?yW8
zp;yY?TdFgCap&H~QIj>Xp2*xK{Kp-gb(p0wqe>6MVyCxs#oKs)Mt~;a(nfkl{!kUW
zP^qr<J*oA@bC&Yp^b@ap(SL10!sINSnN#{e?RN{&h!?B71acMjh+gsaFNpjSc5Rxc
z3SKfEmJ5)J@uUohn<AX9q2a;EtkiFHrkU$?G2IilhY$aFy<nv&%PV823yd9X9OSaL
ze96OA6XfHUp}C%2h96}<Gk2yz`5W?$j7I>9;HxRu52XlF_Gl2BlVH>f5rK+bVTV-5
z>q(4Csw~T9R9C%ay<oke1*<qaiMGRX6U(NU&QT~2F{WaU@L-$k;qS$h7nNI^0jnxK
zM1G(3L|eJOu-^pksYAAIs!Xx={}7yfFV2^ih`KKvSK7nS#|Syn@9tew!}b*(#l(TJ
z)XhhLc|;XKrR84zA^6o->clPY1HcAjEsE$~Tp?>Qsl-O*bee{=f$b5iuIT;77(b_a
zaIYA4Ne-!u%i4zn1CiRs#^h?Z)ck{7)#KwsoO?C8tR>^V`I`n7=06V^3h2hg_yIV|
z<jmXN0f!7D6E0Ubf6f!~2>B_^861J3$6wlL9U)3?E>w>H+XV<6qlpmKK83%-btS2N
zM?~K%WwdRVdtzk$&i-U+R6AevsAAlY4#fg4<mgL>X?3#@x;b;Qq5rS{W&UHA6ktvS
z3}|8`Kdx^wldX3rAVE{!CZ<HG?0)tRlw8|P%%s*=#?)YztLvsVaPvyyAY_qu+Ov@c
zc0V1Mm|;UPf!aJvp^hT*GpvFO|2XUu`x@-2cpb?sG4BF@r7P7OEuQ_+(&S14-%&ya
z1ff?wi0{a{=G2<Gmel@a5{Gk20KZ$uR<&kPM@J`Lw`#_U`+LFPRLzK}DwjV=g?WiB
z#q)9(ShP(EPXnvIUUJ18^~-KKi<%Chg3cBbRMSSw^=v{kK$R}395g`<i|Jxj60~0R
zxGZ7A0$PflpozdhvsJhayVd8Ojr;LwRkrfyd!YLnwSznWl8Ek?3hRnu>fYEWHE&eT
z>N^0pTk&RbXDRft(?n4x()7|Gg@&DhkMB3LknC;W^Xbik(Q?vbP>qM{{t%+=T_d{1
zHS^?%%r3j*7kbyz#}NI;o^;Ke2}Qu9u_%<(E{XSnY!y8SaaZdytR^N_oI<HqUzMxy
z#+pE-TU!b~itO*Ul%5{cy7vhT<a}4AHCGB162l}5d#^@0#}3l~l~Dax*BG9m-aJX@
zuGQXR*4=drR(^_cNhxqAb|M|7i`~_;NjEPZh9QWiCAECfsNmHliXatr7eXNY^;H*9
zZVd+2czVKwLd3n^3XNvmWGU1FJ8B&a$1eBng941UmcC_Y_n4gJe4U=#WvSm{-W{q1
z+_Q|4pn#OER!v4B&k!)DpZ7@tM#zAZ-1-<q{FG7_44QZ!aKzV0?U=+UXJTn5SYCAa
zZopZdbn{sUG5A7_l;mSW_;sh&EJjwgKw!ywPS5uPF$gi&FPb2!=s_A-Z_aOf%JT3X
z%BQd%u;|>&5g@pc<^wY}BaZqF+br2QL$%bXDsWVnv(h71H=#V@!)*7}Xs)@Xy<CU2
z<K2u#l`|<&ss7fiP-jY+B(*0UR6TcAFLOgrG}k%GS~!B*9!mGUqHOS*GoDtSH93;}
z)GgC+d~mi~El_4r897vuy&b$3jry3HmZmF3b1B4JdDAKbF9qk-s(niTOENW`h2R~L
z2Z;5kmzZv94;I^9ts<H&g`o<MxfZWwi^;LiwNoa}_;XI4J6deB(Af0kO1QEuIi(EX
zIde8mic1S8?tSdZ8)x6uK36@RdXrZl;vv8;>!-@&{Q6YE7TS`f=JZ*k79-+X?r`y?
z?I>U)$fYgp0?}^n`BL&X-|^gW(;fN^y?|m@DJJn3JaDK3pBm8yicpvdwuVIzYNaCB
z@Ub<Wq|J~K9B-vZzp_}T=aj;C-nLN`DSA{YJ|rQf*DWDvR-@ru+VG{^&}g>7o;T}A
zMhvg{qmp&_p|@H62RKpiwJ=b;IA=GaY1&da_2h*i7$X{lN+V6?8W}Z7j@2{Zqv1zO
zB&+(r?}jOb<kJ1@zdOleqtc6aNJoHDuJ#h4UPxSOg4+je6I66F7Mz@SQuX(h9;^9s
zBP#jMt?4hU&a8cfsa6SwIZU{UG;36<Gy!Kmvb#;_YAVQT<_0Q{vBMEF&eq)MlUD8K
zaLx9n3oUm;p}WAFlGE{(vC~KN!|Er2>JwGgxP(7uPoUOESwsF;IA>B@4BQBSaLWBk
z11mJbd0NoB=v3^z!mL76tYP=4xr0x-AKMnIbq5_1envHFGp(+NlhfO<QS#{e$#K-Z
zVv%IiwBl{coB7R|Mp(~TVnr4^2tqj1U}dm4=y7`UD}2EOeO<=4!j-mbYcGeVrG^J#
zo!o_-f^E0mVKaga{9~4$od|JG#;bYp?87&}I4lLRy_IcPjK?brROAVIE@$I*bQJOk
zUP<H|>7}RH_Q2wdW%#ASDTRDu7(*10esX?QEuL^^P0XK(zWA==2$y_{p?Cm#BbPRo
z>JyVy&ChwO<eKErsWXeivpa4q7{W9*!&_5fh^dPWp4>?{mQj!?y&*!VSY6n`pka$8
zjtmTTeHdZzE|?l73fk<sc7W^}Tw{=P2XZtC4e+dK)|88kw{6n3L=lj|L)EKeJ=@;*
zqf%l`>%Z2wTa~&0V~E!tO5U30f`(P~qKdXPmyu)}OK;a;9}TJtD&~8sjL@^d>vxs<
zTsR3y+8;{uKu6sQ_J~L8cwjk$;pJE1>H8zF_}VGg7~0&$Uanc8Qn3K|ux+%i^i&kd
zFE<}*CEhgJv@xLAk3BIq$S)PN%U_+qvQw@w)v%n*vzAmzt~;9_tI<S*TsxDtSe|v_
z{*d8+?#oBo0(m9Uw>?fwe3XatsvRT}`MG0%CYXxNq88xoJ%QZBciIve+s|G!ZROV2
zY>>+#gO^e9zU3QZ`0i(fj37H+IiRVz7PcE}w^Q^?7jMbB<CZNONWWR?jvgaa;If;+
z0upWW?hZdztg9(ot}pFRvDm!N3GsJlqM?;R-Hd=~6|eatK5xOZQ0Q0Fs^AUK9sErw
z3{zPu?|$bA*Q|zN7@}zxrs<3UxgN1-*aK!D85qs>rFs#P>~0;_dWB^6JCeHCKE>??
zSrc>_l%c9<W6e$mS>SuYymy1RF_NLOO?`lqw>e!3nUJcEywAu?FGy$GX(P{auAlMA
z?(xb61O?-OF5Q%fIS^=qkaG?ga3L*NBEP)5t))^>O8??WQl;$6*61-rq{!ZvTX24m
zHKlcVBz3UOV@=Cm^i`ASjSO?aUzwE=49YT@MeBFs@gpOI@ANt*QWCi~f4%$>xOWK=
zHuOIqfn{YiYAj%wkx69uVqF!p%YUgIz_QX{oA6}h9e9^3cww@6zM7Gh(SQG}r+Z&#
zc*vSvxbfT87<Di~;VlHHi@c`De)TE7;?BS*_6=0$RBos019fAHtb|WH$h6EY&n92{
zmpaonvPkNDla^M9C#Jpa>CdXZ;+x8U{INN@+NR#-KWa$*GL-`E-uazg#x3NDzILvo
zkZ9UgKh#U;etCl8K7HE_^V}In6}gO~Kn}koWy@tzqO0kCGQ1D=CExl_Mw0;geUSHr
z_ae#uL)q>(6|+MA$ep=}z+hY|SfPi+1tDlllS9R5FWR8L1X?&8Py?Snone638?`tI
z<&Ip(Zr4s&eiN@xot4;y=QIe)Wnm5l3@iCT2sLe(pP1&O7Blg#YF<$mO_XCS`UAEH
z&^w`NY*4Ad$4ILxpmV`L*XtAxIPD#-$6mXJiSD@L<lwEN>R*6R_>w0XYIpa+nx&u7
z0pSWC9XOy24;NGnFE`)j#hUcTtd=F3AptRJhtA;hc(z=$xs|<)qi0UCDnDZBlddh9
zsQ>e1g`ZbQe#8!UL@1bxD7HX{j!H5C-a-ajX&HXJ@%%bSafDt5l+)og>GRx>2iP?L
zuUI`1azN6;wm~j@H$`$)({<mp=DZqkwfwArc=b*xpj){94x=9C1em;GM-~zp+U1PN
zy{NB8*&KNk$<y`E3>F)<C}9vIrsm`d3i9$w0+8W+x*%&o<K;M2JYT!OuC7c9hN9w$
zL=6(w@%O?We;L_Nl18i52Gh|*TM%Te6WtZIk@U+2efTvclD0}zn8qa6TPpfyE%NfH
zbe*^Pq;~0LE#z~%e(w{v_Jnf3c@5J+=#hl(vPf3XI|RLPRbu<_Q*K;zZ4_cY2gn#2
zs=oBc(&`L3*0yeze-`{l06<Mt<GKJeyJ5OKh#FJMh*?cbrjD4WaCRRptQ|kRA8CJH
zBGi*8_7cv0p#{_rgDdqt=(7{S10J+A$O1Mk-I=Ai5E!xg1`Dd#4J%7-(*Y_J@m%?L
zjs5l^@HIiSziHj7Kqx`T2@-lPelIfK#nzJ+{un+fd*;yO6GN!fy#&T7c)0rX<|LW^
ze2Won;Kv5FJ<GZ_5`~O^<N~$>bA65(<*Bd1JH+_>vEr<GrgoLz=#mDT?UPgI$4R!=
z4k6Bed&qQSwEAmY(=X`HwjFqZ{(^%R)SU1AA);e?ZT@q)TecfYhySl=)HTZNjBFXh
zC-BMh;^v!=VfULu^Mpfx9T@;zlk1M{C(p9(`xu$X0u0f$4yiXmk>NXP>rcVVkxc24
z3O*6#Co{kKeAd29r{OO(D|E*@=5#0Z)}Ku}2O3a#Ec=39)<QZ;NNJTrK2?yL^M8To
zU-o$-g?5|{=Zg^x!qrj?+Ol`T4W8?ErHbD4QN2weV-5CPZw9WKJ<GeTp05^2o%`B5
zKqe(@Vltz5a6|~3|N0Wi;(`0A*Rh|eql97R4=W~$5?WL9CU=2Gj%TGe3&OR4wjt-+
ziPugtJh{qH^;1UvDN<0z=Vd*L9GXIuTZGCTd<{MfzHgw&dOr$Q+|mFuC(^W4)T?H^
zt)+>iz4U2y<G|9%;KghwRSo0t$-sGOlNuLm5c*($X(iR2KvxLK0C)s2(D#{%*8W9s
zWKA=z6p{oIgGbSD$FlCQFCCrCm<lM}m_kJ9o+YS;#v1YX$HHnU%mj;wfW`Oa_u<p<
z;0omde!tq%Dl$0WWj@kvn_6`vf@y|yy#vCH=_u32@|);>n74pOZ0zYrEgF8N438YT
zR*_#E?=YdRPZZk6c(^Bq<@EG|CigngQuYm-ZOQOr)ex}&k{4r%#W>4S-juoA0kh#%
z^j>!D`>>3b1e~&fYH#|yw=qX%WAPu0hVjV>&L02V8Ew>IcfrF8*#`%aeFheYE?KDR
z9#hHAZLLfT^$v=Aaq`cyb?PHn?6m%(L--50-=vju@^*0cwg3{}>b_*=u|!1Aph515
zNJt8`WuxzH<(l8!hBWgiPS+71ezxWCqpt6=OZqDeoRIX9#q^={ZsMTr#uy3EAm!qc
zN<R2jpN@_mU=5Iyl9CX*<IInEgg54kHLnJi>_%1j2YKdeN%4k!7bvF*X@Vl<FrMw7
zB7Vde2<pI7W=-6k{^hKb(4DUs8X8L96oK4~yH&(X`Vg?m%0Ta?Xy<FWGwr)<qW@xZ
zA_&{z$C+9cIK^<3yYLIA_qrPhK?;dAeAmV5P?I&yI6sW;nqNH%#hz4_8PbYRbRFU^
zBGmRt!^C|CB+o)ZHfiFVxM~>Fct?_~x>w&u&MR++h8TOoF2M8WIo5k<)YL0Cve-OW
zqsLk9ytpSMgPcd=1{HP7#Puib){nc1l|Pvd6bOb4qe4*j>C_T!rh5NjkCM_-)DTKx
za^*20M^P6!R=0~GzVW+CjsiAm80<WphmO0Lq6Gf4l(e&5)WIONElWQOOUsN^Ua9W*
zVGp~;8P&n^xMcy7_PF!eamv}Cj|y;JL^^(?Nt#O>KkCZaimtn3cekGS0?%9i)-6z1
zxU`Kw-+2$wk3Re-s{1u%tq{8XN$W{9qeTMdzyAs%q7PUwhbw%{kuxErvWzZm+4^b7
z@v3N|(2Sfca}S49ecmkcOv;KZ<cRwBE3@nSe@FQ-Y&fv$U;)!4KoIejnjEW14XxAJ
zb9|Wa(S&VNTLn_>IW);lpYG0*hsRp0qaE1l#Uiqh!<%_LJSM)olGDNpjRFr(Cxy{e
zJOyVFW__+K;@LDO_X=WIxba!_Z8J}pH&#vU`_#G~=m#4i4<V-UQH1m2|A3!I^J)Am
z9<9gOH{JODX8R0ea+sBwoDkxDmySi|=t`uF88pjroplU5r`q(tCQ0Ao0I+Ayq7N=!
z_|)X$M(bZHjLq^-t>Wk2_^JHL$%J{G-O();dg+wLPjM66hAz)4+%7s;p-Qny7)YZd
zD}^+=3(VfN_a0H*YhfdG9;D7bfMj=f*DJT9z3&6+hRGJe0*j9(1L~H_e^13ufuUYc
z7BA`s!xL`E062fuyQ;V#0dk6kA1J%ceii71mSSU6wRE>xke1B{`MF(%ZGZk1XhXwh
z6Ym?gwttSZNmv(JM3{L2yNEdDDQ`WAa5ZpQ^Hj(?Etg5;VB^C>KDcgO*=S#lk*NR(
zGQN$9!Ca;1ajUHxFAh-e%u)$=nKMy-RFJi10l+(3t3w@beZEFyM<(Rdspz_2Ag0=A
z|7Y@a4gT022^b7@tWrb)${gg>6Q2vWi0s3Ik;ChyoC4xB)<(SkZ>z*(Et>G!9Df?s
z`-y?+SN|!EJ4T-MroKSuj1}7efKXPSdR{**uB-}jarr;Sb8+qoohDZSYx%w??LX;Z
zh06EPgw{aqSQb{<j=x(oSqEGU2#1}k@4P`=zi+}J<EI#=`&XG%mdl3R#En(XXp_h8
zS~5J9|0(m7`z<UVHlF)kM?gvLMitLjoSR1L!f)1t+TK6g>|ODrsx&4I#3!rbj!n=9
zHI-BQ$Xq+3oe`{xL{7ga!jOC5LSQX*Tikr92q=-c>~QU^0lZ1i&7ezCkP9A-zy8}^
zL=^ey5H5}th*r;Jb8X@De1A^7qW*l<cvIK5+_BR&7PVQmhweD{Whyk_y=-)SgIBpx
zum1y<PpDhlgr*PQo+NJvZDzk&!#s7f0hbiqeMQ^9<gDIpKJa}qPHAX+jjVif=Do82
z1^}9Ga0>n|kwN{N-NT11wIcNTN+{@e-#$*wsmUsD^$A|MN?g_wJuef2`sYqjE<thL
ztgoKf0$J7A?ZLw*?fORN7Axy<!JdWo#8biWEqevYoI~k%o|NKKA7y>Oh2Z@U81JQ(
zByF;-VXVK#CK!HiLKS8&em|(1V1K<ja!_yE?|ED3(3!J-5oZOt<b+?z^0>kp)%9nL
z0Fk(SBA2<6qd<JG2*U<rtUSM4fnHa?d<wp!aTujDENUudj7wW?wkP?DGx8O!Yi>Bd
zk}RfPeXXsZeVDqQ-U&elCN5-mE|`9WPb;?4jQ|9UCAW>fHz5+5j5VicXPS9<5G=Y*
z>l)-275yy}K{YpLtTdijiMD289O8%qXdLmGE}ROF%4Q3yg(=N}m4fKXv!(IzNp>Ed
z@ZBY?vO|`Cs@QNk%V>g*o}!GhEOIb$1yo&EQDfRd!BhxVtUMa(GK7XYsXTu4AMLjX
z=bUqHo;QA6Hs-qa0MhVTqW5X*pgFFckh@Ic#4mT&F#JnFfc{1iK+uO_&#%iQoGC<2
zQGMv%980y&t|HY`-$Eo8B=AsXd9M|1D{Wq}T_<BwncPRFcU`bZ1p=A&L=hq2feZU~
zS)A~}L=7d>3(A#Y8>5e%3m>}C1wG=&_G$d2dXXaQ^!}o4H4-m0$9S7@NCU4q2%8Be
z1axGmee|qGm-Jz+^KUOGlM+RHsqIVrpI`elh0_hNkT$s}XDdK4nZOf~UoZdM#T;MH
z`#f2RZQdih(%xv+fHdOS4s@29f+!yFx(m+<LRt-e7M|1rACE_XT0O!=(0#cECH+nX
zg3ZpdR#x>6g#IH0R5$YcER=hg&$hbTaVN|n=CJc<b!b0jkXO7ED-<jVjK>&$c;_yN
zRRXDJdk{w&T^eJ28QithQTB^l6XdX}ZyQ$=R?`|nf&v<Am}*x1>{&ElTf`0ho&ZBm
z%X(;~F~B*beLH)!43=dSs)0ZdE;P0g5cgf$D!>uyEqIG{v4_?bL{c;Ei`)&Wn6`63
zicLHZ*G4L5tF8_^KdF-LD%UQ;2cl<|OKlOwh^l()GaFG#u@hSC`M(EeH~?Tj!V2kP
zL@2d5s>iC^oFyiAU))>f-Z1$!fhvWD=H})!4*Z@jBWeFlYJ>pxZaMWpc7PS9=s_dM
z`U>ZD<JYZ*dm^7yln@)@of~=FqI_iXKp-bkQbK>}hfTZ9>@ZIYF)zk<a8}^J%1ghj
zvP=9c3|wk@4d;YQSuUxmZeJDVL7IGCXnf@Ups29@_^P4EjkiOmKSSbhhN#GB$Fdy7
zZ37rVA(RWu5k#Yy?I9z(+Wd5=96=u8*d1@_;*v<2L{85T$@Cp_(I=pTw&jF?xZf^L
zm&T_^sk#+3*7=3Z3r`w?<d9M{r+YtaxJAy|I=b&7ub`0d$6|)?W12k=9w;<j6NY((
zIsZNT`WW4hDga`AFrdqTkDyz_Fc;UJkvoc?&gUPYaV}#3=w;@rvus1t9G2v{pxG~W
z{56gkc%`C8(g>7a9-Rx)1qj9Jj?vCH?0zp`OCO8OwfFs6-zV~gfhzOfa0{`BXjmGs
zt^{sm(EFf+M>-kdE~Fbfl=jH&lXljIhK4;CfyU;dzLX`-DiG;9<kkDYoDItG-xI8s
zD%mjKN$SWnXA_g*)nZ*jmzpO4uy6BQObC&Fh^oqO?EBQdzPJUj6Y%7;Ks5b@d5?h%
zBX8%nD-Uml2-UPyjPvOMiU<G*>$Kyq{Unt1^NFMq%-1RcLWn*C4=}>!T6NW|&@#68
z;cCY9Y1vNf&Cv|1;*K>>%gQ}OeJV}1ag?xG{~9Dw=J^Rv52%sUKZwW?56mgfu@Bju
zkvd`D|4SVnOCB>PUHvKt(Yl$+1d$>U%4v$l;Q>lYfpSm5{LZW7Q!x8iiZg7XqRc>$
zo}LYMCu`Kq>FUnG#sQ(Xg;#?}(a=B6*Gm40H*y}-@XqdY!usW%FQXqP7#+`R5EuJ?
z+@e8VNy+_KP%ede+E#H|NAIV&3`eXAHLOs3YS2d*8Lqkl*)Ua`Yw=d8?GtZuH7+%T
zuab(qc>eu=1g)yH-k6Gzg;W8z((vJhs=?54v<I|{WN*v0x7ykGMESAiMbr#b|9uC1
z*-q%a=ee>S^1oknl}l)Vg2v*j!+3+r$!qRf1+v8TGB1Bzx(zlIn|CDqWgb;s>Rx}D
zaTAQLC-hPuVQc5ZH*WYs5XX^;FFgX<E&RRfl8IExFOB%U=H9qv3l)O{ts|g3mLqFP
z;_T~%mbHX+<p8kU(rjM%&%8sWhAA+nKqSz=xUr8>pxwE8y4yC&+)fvrX3!}KW`h{(
zDZOaYp5a{LQWnEEh*8XiL7$r!mH2y^3i4!q5}WbEJMO?gREqF_ntH}D1;um|>$OF7
z9O+Ez1teg6xG%EC_S3Vo2aYPey7%CDlfvu*TW2o58n^_qiR*@n9(4d)EqB7SevDEA
zOf*4!af8$i1AgzJ6Wm?`QJm$sTs=2&0k_SVUSDvRVs<9L*DTNgmVnSup<zkHx&t^=
z`e0BiKHhv`40bFzV#39fyn@p9)9d?Kg0(Q_YJ~Hx)*DZEYoe^`d%g@+G*7#UlMRe0
zYA2KHp7y^y8Sook1TD^jg5KD;d9VTRfnD=5#Rm^HqT*x~-RS^v6J-Nr_kOrcijUhL
zS)dLC>C5q{<YtKcC^&o|W_?t?JrhBnroW?g8QGcgklQ9+>%oS$Jp~M8*FR4OX!nln
z^gSj0Cx2xBPE!eQ#c(TqhzwLn^3<=-gIGyLI!r5sEQ9Y${W|L-b6TcjHAiK|dugg(
z9&{Pskrdc`dr{B1Muw>Q<}VaYaz_M)ZdWY-flO^-^G{Y)=0-_ti3O&}=<?)~A$?X(
z)&zneYEbO+MMpxNAXt<TSm`0?Be~I?WGp&_BQaI4AQ~R(1QYlx!Ficld0fhF34^<;
zDgr>3r;^Tr91LAWMVzag)k&VpcenQ|#HP~!anrS)%jyJ7bBgnRlkif(rYtjiU2mek
z7i6@{8k<i6cOqqCTJG7oLhDII83|u>#PBGo*z08!<Msxc>M)T^?RqSqcFeD<^SaIr
zczKCh!92!bA`+SqSSkb*9BFD)s^C5b`N>%>Vc~UyHpQijI5iCe;o1E1j&kOk*UI^P
zMXj8Fw`Hz(_s@5)h@=5Y_ML#m`&3Jd-z!m~D33g62-%2-s+UNdbpJ35>CK0gpGC9G
zNh5J9meAs&z|@s$_W6WAN>3U``xiu7f%pkLCdJuTq1=hxYk{!Tb$1i7%17htc`G?V
z?)tSCGX!SQ{m<d`UcCUomxlWV7w8RK3x!aku(=^?OL<uze6Pb^f?&4#C8%sD1>dv%
zAxRaA?GrcdNMg0y+M!JGu}*l9EWnM3jI6US<xc7O$(dCCnr5ZRF~)CH85Yi6jJ7r-
z+&FjpOAB2$C@s<$olX3T$~Y&!p!RN|X|kQLS}s%Am12bwg<%i9XogX>3?En%S#-Ay
z^SJa3BXUBl%?R_7{#7zB_`~Ua;WJ`n|FI^|J12~<Xhb(dUHBrXCQ-$uG)?tOLs0g*
zB~E4ogI1*9({rPE!XRszBHGX>80Ka?f?X>Mw1N`MDY#BjNpDuDp>fVO(MGD#@(zYR
z4~~x!Vf=(eMtZt2kmEpg+8tZ012Dh!)I+3#lAiHkJ7lS!6>Pe^u8Y3A0GF2f1?pVR
ze>!(cmZ!6bvR5t@FBsIEl|KGnL=XY~nKe4*v%hF(fsN$b1mh|A8O^6mUl#5`3PCTN
z5iKjwyFtL|c5o*Pawy;hrGyAwV*p=mq{|z7_kfAB$*HpS*%%!w@et;1lEKkLDJG_C
zn1QlS+A2j0De8b=&x#uk?*{@r{J#6<=WBm={DzW@IVXn{)r9il9iHsP$!VJ}=+K#X
z{0DdhHZk1Fz)K%X=y7lKf)6A|aClZpbYh?l)eqvh@x>8d3%*dAMjYHRa^>I=U%5R`
z9_0_iq`Z)La?vO~KsszP0VO82ylcNG5UC|FoRF=PZqH;#n5<Rv?_X0=C*0M>w1PE6
zTV0CXIt#+3h$&s@b~=;Dy(m*F<@bAF&poO7sX*XF%O3K@_@fs(xse%(pw2iZJ}DeN
zY{~ei?PRNj_zxw$Q&Y;V=Xy%rH3WtV73qg-uK%)+4+l`uFRj{1KY?#QUOpNacQu+h
z>}g5<!?5(YPUNzjbh_I6BWrjOWrFL|mxcPy34x7zOYbK%nq|&}c1s9{k{!7xRqOwD
z0lqn-PWM%P`2x%$vRKk3?H{{WPUaioU9%%KXUavq$#T#;KTpBwv*{6ig(4voyp6tE
zx%s;-<f)b6(<^3cdtZJs#jQrgW=9HxB}-J|>JzQYz&r)RvfLRrga<TVxuR^q5ut=#
zX-JH(WJq)OZDsb>PP%?N>DKk)Ig^|hu%@kY!a`%v7@uteSHN^l8L=U;AxDJagf~Hq
zPSllzpSmH_g;M>u8=4?kHseo5yVhu@aMaQpv0HplelUZY*$>L)DA1>Z#tkzZgdbnf
zsBGR<5-15v6;2PH2-$AWH*ys}n=qSDVc;?t$+&UEYJ?JO`4CZs>@=bLTuNPXGqWEk
zd%XtMH`?^8H5Ml5;MOKt&ktFWDq+8{qhL&4qYY}(_)``SU=y_cu-cw;bu?n@>gpmI
zqE>_G`tjrh!EsqoE0p>5xUAb-7t3U(d{z3o7z!YWZ;<hXyY0VX0oMm$a9|0^wXgXq
zincaN-26quH8Psxaw&Yv<x9O)*|;WN^kCm>cdCwzKxV_7nV>%w@dUNB95tDa|3Yl7
z@>)a*^Ax$0@PmFdC8K?Y(y9DF`J3Cp_y_%#-t{ozVEDB!OG{89_DOz$k{?r2Z15Pc
zC+tU5on&ezP1T6jCTWGe`Msla4cdxjGBG7N@y4_)+lpyJID;il6|6(k6IQU*WT<N)
z;M%8Cu<T^f(feo#Iy$<Q#S^9)22A)UDq|Fl6_H2>#8)`Dwb8P}4Vph@obm#h|Bt7y
z49c_V!NuXltw3>?;_mM5?oiyNxVyU)w>}hicc-`&cXxL`cfT{|%rL{BXS3POCYxNF
z<hD6!)sOF%sD~4QKLcMK%`HiBF&u`2k+ke@_mVG~R-JA%C2qkFlsc2UOVNdch>4GH
z{{84p5_E-;9+Ip}u*U{i!xvcCgFLT=o$_O&5KON3dJ!2IX2%2Xu3}!`z|oQopxKHP
zn4FrX9#0X&t*pM<k<-5rfk?jM>lvMRvg3QpFPfr^ml5KLV(%V#HGnNfi3&#jOz4ZR
zh*jgTVEGCk3R-YDBi7-%&z2&WqD%&r9F86=tbk_NaM~BcZobmjpn}ez<rfQ~TQvA!
z0!vUuz9wdD4V0FaPFfpG8w0-V)-+g?U3zhD`DjQ9a;E5_C06elv#{DrqP7PQcFXDv
zz+@CPgs4_MG*^y-dpGt%8Aq_lwBWQN9igNQv-gR1banAq4LX*JhDsvh^geYv0Rgl=
zZ4{0XyyzciFbz~FOoYLOm3do$Mf_Ot<MZ=DwwUEuthV<s$$Fnm-#E7IkExgpDM=V%
z4(jgVp`q^R;vC>8oTtc^w9iA}m+ZUNERKg8OTmQ0IFTY3maTo~s<FOwpD(n2vxen8
z5&H>2W}?>ZOzRbMVSN{_OY8Qt1;Zmy<>H%Dug=l?135Z5I)D9`y!Ev{L4%4Go^&NA
z0*EoNM@DDf^oF_(S3|Q1y2Y&+&0|!xZ!DbOkGH@^iOOV^0}>KaD~&z*cGW7l+T5v4
z_&Z)Cl=pN~SrZ~Fu$NiDw(uS*VP4lF>>95mCP0X~9pBH0TsBu%r+e@b9=tgVPgWPR
z&WN;Ai@=cvCzc`InHo=h!pr{#X48OBfY_Cx&frc1@2e6no)2}hrN_r7ON8t6?fhAc
zR`qIq*<3$ua9&sARgP~YjzaieSuZhX3kZMI&$)*LQ%;aK=f4i7r*F8iO$${FB7d09
zsnH`zL+qQTA1n*(xHS68F7ytFaqLTlGm8Oc-T1bIg}zK;$uWMZf*dxfy_gNdLN2V;
zaxLCTg|nLp)U*r2TK&>1qXkFP*X|uC&E)WDFOQuM48#n&ETVpa-jpGdheVAZUTyQY
z|4ob}ZD=UiWJ>l+DB2!j#$=UcoDjn}!r8tkaC*L`?JHofuW^`=|J=ssNJ2+Rkq4P+
zM|W1ST7n+&;uDYLjiew84lLPAtO#{%S7FFZi0!oBX>5fJ;q{{do5eK%6_f||3*}d|
z!9qV%j3cg2{ddH<{OW4PibuLZ=>AwjZ``N{`&C>ksWZaYK0PB}G*=p(fYW~Q>o3HP
ztW~Ki=@9wN&CR!riCD!1gS$@XBLfu;Wap5aaP&<%p<w0y8rFkwZ8(zu6v9BR3rVg3
z6+<vb=(!A?>u+s?qY;N(aMy=`?bvLnJZ>n~T3qqpw3=}*0G03tB+ke&ti%VOu#)E-
zoh*(&Jaa51D=ehg5uTe%_-lIOGHJ%Z{?OT&TZY6DCMTmC;f2ZZz_YQq|KCV&n!+c1
z)F<&xp2s6@Fc=sZ9#vKyE~BhsX+wWQt?^%au0=l%T(NW<dDF!Oc-uFt{Oq#>x>A{B
z>u>(uuP~cpi6XsED8s4-lSS3l)%Cv%G&5&c96G23#$GGmlwFv0TzS)Z1bA8PAyQNm
zNr4qU7D9W_h;apNNrDZInD8|U0y&!G7$X|G8bp<Puk3w|hI34`NZ4#H`Qptk+B+5&
zgN)yXnEyJive^Y<ZGmdiNx}0dJ7iN$ALDa0yG$%65*S965g>N>opx$l;(T%u=-YCn
zgBNxtS|S_v<d~6xYsX$3;Y#JdCzvQzu#BP%j|;gtF;Zc2T<x>eb72HncNz*`Utg`X
z2S1Af@#b60zKJAPa)}0OZds<FE}1rT`X1SRoZo0`NclcMGP5H-36!X)=!=SWhzFkn
z9j>V5C8rpIgT>6=S9lUA;MVTKX#jHvWS_1Ou$3%CXta|U8N_?c!o{`p0ix06T0)>X
zIzLA$H>iC0V?p1M(=Wq-Ams>?eIopw)vMw{<}SPq-<dCJ2MvtzlKYU5Kin#F1;HRd
zicN%%P!jhhNVFje`6t%KWWKn~wMfKrsZ>oa0kEr_z^-y<lSc0t27*CbTnHv#&l2|c
z_b)Yd9*yaWly`1^Z+vWz62oq|YT_+Bv4|F=vM|y(j}?I6A#V{=MFH52?$r!11+!m?
z&GCQZOEarApU70-|2rQ9NGEwD2^hTKw`wG`NEg($Wf5KLMgOz57&bl-E3?Q79T+_(
zJX!cOHB07nqWin}y<;kq-NrGSqnvnA=28>R%gd{V0FUPTqK$nh$Jc3gm+7Hn1M_h)
zIA+zDej|BVq*=EAMF8NRFxjxw3RvEgf=+~UY}(EC>nCWL;!N_%8yg!nn-0f6UGEF5
z<^p}y=Ok3eqm75;Lr8px>4pl99BQRADFMrXhJOI&sCk^o=Xp6oBY4Tm#U;f@=m0W1
z4-C+vlVHOYA4OR7YgY<e^>H*zZCJ*<HTkKGVKr9Q2orTr&n`8G*#O1~gOZE_#vQQJ
zYO?dTdzh$FXWS3-YX&B~H7!swV3*5Qt2uC{vZzA89c#5Vy)scn3Vj5s*h*ud8NsZX
zjIUf>6xOrdg@iuxD|<OT5lEIXYhDhIS~NZX>1&ijI^l?_p<wDw9U<Vy+}-~WVoj!7
zg0*}4COPSMa~8RV;)1vme74c)y_}O<I75Byflng-$f1AKBiv<k%;ey%K(6JRR^io=
zTGeL67BER~gM;ye=!ok<Zv<Gw+E=@stX;7pWy(oKRH$APZ!2U3Br$MDxF?b-|G%7X
z*_+sV!QT(0!XoqJFwcM4*)DYk>Ip~+<QdMcq97wBoynWvNPsllG@pBO_@><<qps9W
z>ZV9s*i64Ge(#5k`j7G%lT|;7O+Vlv055XSyXPH@n(O&Kd3oo1q7-@GN~6uHqJ!R+
z(-sxfUTcX@y5Ze<ks()R-U{#F!9-SnSLY8CZ7g6(qLY{#(>vu>IO|*IlYyu~f3_<A
zZnB@v?EYvj5S*5%%Y(rB6e{HdrC*zvZW4$>M>X0kHc=AWbOnw;6GG>T7bJuXiYeqj
zK}88lTq_%iK!0<-*+_;aV*(Vb^0m|3%PT?*KP165_9*SRPPm)w=&EtutLD{W(C{vi
zWI@D*O<oAWv1sJR7t@edknc6PKJ+Y-PDO^pZY9LHskfpVg%1Y5PZSMIvET{Ar|OW&
zVUOu@pUFYux*M#U$)M)O;^s#+Gy;u`>Xi9Yn|;~q+J3OV?ks5I!sjPHCFm4`IIuF>
z$rVp00B^#{8Rv}v)UnlrkPU1F&px&fdZgGX?f2&%gDtSHP!|6^+4$HWFkK$vP-SSF
z-YENEh%;P4DsyQPV?~pg#r}?gSgn;Um8@$Is@8}EYsgmLJD&{w%9<!q%2?CWy9lvn
zX9;c(0}E6)x6>fuWte6RwB}_)8oj^V-`(9+#1Ob3>4XRVmM-$Z3^v?`^Pf_loO-s6
z#t?!D{S$x4EYB)OQ3ee@@*RDS1+6YxZ&RHbiZ(9u@KHVND=V5g2scf>$LODS0>RD%
zNza~d3S^xSVf(2TgEvdGF^=tWotZSa{MZ5h6^=G$JnA<4*<m;xrg{byQZ_VoHa*y1
z${u*ce&P(du+(aqEM9>p>o3v0QMIGR8Q6UhIP-&C<WaHzw9XOGy6AT~GEdrXm`wX+
zM+KjJDL1zQwOTRqSsbCc#`P_ZU<kogvn?^kH|Dtqe+yrwb|8O)!|y_CKEwBy7$fP1
z%uOXmsJ;;KYPpVC3R@zV`(%2OgpkxE*E<JF9!Et>t4bg^vU2w%_pB;mf;<0qi7YbY
zk=cSqL_%Wb<LhuvpEEW>m+qlj9-d?GG-o8NA<E~{M^sY^1}o1PLI^WXTR~3yEEz_Y
z|Brv7gA1ZUz?+g^sTR@~?Z+3LfUF5)f%vV?l(3A*aH_vc?!!u5Cc8ticaM*ppGh*1
z-XmKsxXJ#Y2NFi&6#F0%;`eOBWLVpuFp*+~YR}((6-gq|qsEFNI849+7j!vK*?$Xj
z+v!Q>9029`@Uc&Xwg2){(5bqeW(8l1>fxZs$jD+*M#~77Ao@xUAvmrK@wYs3UU?v)
z0`a8WNA)`f3&DonA|%M9W}xS$bjWdou{J2szLtF(D!?&^rH3P&VMCzrq3v~Y)_Nm}
zdId|Vj@fl5(A*Wo9cDt5kd%xRBa1#av&x2vQzE|${><?T7wnbB?1E3BR>1BzA-%P-
zwtC^ljZSm+=k<BfMi{)A>1(H}_yxUBMs-9s1`krQ)PMl!57x(!Jv&f$!J@VVa=jQz
zzSq7EJKBaPCMFI^N?-@%B}y0<JpC7Cak3G<g$aQj==ysNh?;%0(!>=N@t5i6rZPbV
zq0J;eoiIqgl}a(2xC&Wd%U1$EhcvP?X7nP&CYVwnOWfuUJ}$pUCligBi7XDr?jOdU
zHME-TGBd$_umU4!Czr*<Tu6J$O4)QKnUqa-Q}10Mx3EOZhQF=_!4z82L$lL;t6YDf
zTYI8PfM`q~pl<cx1d+FxYE2ItfZy&PWAQmvubSxdi#fFp!idPRBx%<h$EBFhT>saf
zLMcd0N(4BPh`|E}Y1$BC+*lKB4YQY4NRVbdX2TUnoU=?C7@0M3r3^bAg1En|-5eVx
zeNW{U^&#`KD5ifTX>8E=wcI5ukq4y>pUpJhxqh2-D{w$}sY}?jpNL<-8qR*;`#>Fn
zMeT|!K3i|(Gmo(WvH{H|6U1O8tdve}&JWu?>p7B{F2R`ptza0cE&XC{l?g=H8nt;4
z;hxx6<<t-0Q1+<2o>S7P-L!&VG9m&r4+UI$`a>$es7XV9QQV><c`6%s;=`l@TWdJQ
z5Te7%s*i{uaEcHk%@KUBC`F=gi8ZU*rRkN?VQuvnIfQV>&<W6$?J@2OoH(bx5ZQ((
zWHLCK@F%+*dEMip($b57+(L9DqKN}n8+fEkYQ8x`@7zR1>Fa#)G=%a4?#}w#K-oF7
zL@B7Trf-9sJkBZ8g>_snIPAHeaiypb-qTeV^ZX*=20EG1GZ1UYd}Ac|egwUFg*dc!
z?7@*n5wO>-;a0g|lmVm#TQDJW6T3a4J?_*=q{@wp|7|^T;YjE+LPFyQGC8kKJ^w8J
zT6L>oj3YrkUe~4+PDs@T-#NL8kHwuf*;BFhI&p+hZZj>te%{CWD*&Y~*<t%e0je8H
z3@n&VIu|N;puex5vg5}n#?}rPj1obn4^A(Ub42w_M1hJEjBq{##hMkiMGpyXY|_}l
zH^o{zykRGq`Dz|lpXovtL9d)<?!S(Fj3r_01ITg@yPQ+h6EX$-TMwj0M2cv;NK$_P
z4F-d(j#(%f&{)Kz(0VB(sJlpvCyp6Subh7f`F_E5O~lO>-Y!ZQEG0#)f+Q<JBvu&c
zbvvthQU9$VXu}|ZV1HY3y|f~YXWo`}PiisYYQ=*?-*f)QAPRr$l>FIK&H#B$`=pG`
z@U#a%>Q$*Dj<4E6&^r`07LUhQAtl<$Bg0Xc2R);7jUuGSDZ56!;Anb_mYxl}sB_~$
zd6=2K5N0-EUvG=63(yMsBbp<(17?<<&K}=0BLap+@F~%{FOEub`5uTZC>~zYp&Zt|
zhjdA#Q9pSJc=np?$U=k)n8qF7-3#EgGm#51)qY!{|JazuQ6{4sLYuS@SJDY+2i(1!
zz+t~Q$l*XnbOl}nk@%Kp8)2BQm|vlMLvNu|RDKpmrl4;=*3u!2H6@Vhea@S@!~Ww=
zMW9N3j5FF;3=wfy$*&hB+UW_AeT;8nv`{~7QWUKirnMsE3F7-T>MyXh+bW>-3Zo<U
zmyt-Wr8HmR%S~jFX!!^M<O#F?b`Xf=BQw~>OdG{&K)q>JIw4p_6FXc_B{jHdS<aCA
zw7*gcz@i;_R+wTZ^*{B`Ew}9iWHC2yY|g%`Gt>av!fpw^KsV{62So+mksS_?DFR0~
z*2fg16u{g0wr36M*eDlo;Z{pO(c5vt5-~ziGy8htoT49$Wh77k1XTbA8!7}f$V5EX
zbS|TeOhWFu^Kxm8McBEqs#g|&%HrT`z7G*T$aS~04t<28tcnm-vqbStX;wZoaXQTm
zsN|+0&7A$EH7tE~A{K4$(t7p8aO=VQULWOzSQp9d6=cnWMBkIS0w?=DY`#VY;*1M9
z&CXb7{<%A|Niy2OrFHt&4oo8+x)9xUIsBim0;v<g-iW5r4-d8t>NCM_vI{@$sXr04
zS;3|6ng9jPP0r(>L0V~i*$vnjI@6w$X#lga?mr}lKtY{XosP3hKM_0~Is8ZZwgkB;
zC=9mgt1_h3NF6M`aDwgH279FlLQOFT-DJwCO8S^GZdf3O(~;Kme9$i|DC}HG`G{}n
zO#?BR`|nvmAmg47t)+^`T_=Q`&!jB`U6vBG7l7Pj?SD5R;i3h84UHPsbJ93!!;e0=
z06;S4pc#mY(pU&_xN_q!l<>Lm=D^GTvYjbIHtsxISZkaO#%*aRD&R8%5;FrN_E!QE
z1t^GMF;HR{A_4tHn?8@i+8AQpM4EudWQ{}|cO@3BX>GkM*8cC`5_h=>L3&1lmzua_
zQAtnM|Jk!PJaObc#~s6~qu0Y)sQ0e~5O(ttzJps^4?-$HLfI2{h~Pv}{7Tzs5{-5+
z)waa-haU4-@#Tn^ZT~M!OZIzWy5$PsOJ(XPmrO%a3Sp{>=i~d&7bs7!M_lZ$YGI)-
zeyJ+3laLR=1hrDVL;z1CIdQ;=IftW!3)M2Gssq^(tOV8Q&cuGf?KkPQq34>E7!bk*
zcofGMMQ{W#94%GesQMJ2iZwChqdyM_>(Ox@_K490{aEXJIB|h!%%hhTfVjc`iMxnP
zmqAiH8~JxWuiHcGYDn4YN1lfAn3L^HZCcZS+|TWw^i0<{_OTS15(WS0!dOrb3Z|b5
zBb-Av!@h`W2{d|i(Thn1uG^%$1VSg-0ghZffCbrD51SRPB~tu>ffBA+qGh8E%=I!5
zu;V%RA#wYxP$SnzDhGgvic$h$EO9hqDcIZ_^?j5~tb(H4bVWQxUc-oW&T^zHxR<$0
z%l{GU6;FVMyAek9P$zW!jRcuveksxr$>mC6=a$PQs&L=`Bj5shrT3p`6@<{lafQAB
zMY4<!@bavHTjH}qH*d*YL5M&i)7ldRL>PlyJOB=qxiYd1p$b-3BDM@^&q^g+R2qwn
zVF(xPL`<{!{E$@e8w6vO7W!}Bv-_YYA))+;&5QFJp{lv;sFC%>vj`2pCgQ}Q8F&Dv
zb@<<wqYyG76Q?8yZwFCZR`zEq6v#unF(a<_M4SL`_CWw0erh8KA)3(i2c;aIq#rCi
zH=dq!f3*rG(29E$R*bh&dxUDM1}Ux50)gN9MmWObqFywts;FwPzjXbsbq#nDS^Ai}
zsK(q)fC8qZ`ZpyJ_#ySPk)MX7unkX4sJ$M~Uh&XLV;K=JBj6nXRHTMzkktL`k-;xe
z6$?#g=B8wSBYC}WKv?u-aKl1nO<RZ!7yggVE+`C94c7R_ckv@+wy#IjwU*vIay|v*
zJ^Nb-gD?Pi5+@EQufVvBY+ozCQEV|mhT?Z#IUn%xmdJ!u6Z~L3nTCI?NBo=g=Pw#}
zvCIc}nF;2gA7vJ$#|k`LC!P$5!$Lm`vk}%56#%SQ4Up;yneEUPxX0HiBs><^e7u>+
zqx;RFnLyPkvtMM)q^ZEggLR#T`%9YzIHy0*YDo#rz$d-C;Cc8kTIQfCi%{GUex7>#
zsCj~rk~O*4+Gkzt1!4)FFMwp*61widu!UO7Fyq)^b0}>y=S5+o83WiTG^)QGkp72=
z$kDV!K7s!407h42AfW<=*dBGf6{cdQ0rJ+fTR$MD;to2E8o<?5|NSPOE>+xcpK%M^
zhV5J`eT{MD-R-_VQDeD4n-E~_p2SgU33!tdfi62y-03@XgUK=ZUF_B-W_j5E)iwXk
z5T2uOY9~$%*gu0LrBPnQe7YV2!YI&;E2bOJb4u>Xm*1#qmT+Qr8kh=2Trh-?sW1$l
z@1;wxezqdWTbPvtcot^j1!SP`kA{Fx80z+VQ-TPbC~bvA{j8KODZMse*TQ8h{z)JJ
zkU*y`=xh-_gspuKbM_H!y*G5jA>FTPHVvn?%mhCW_-&-?$Wf^_33<@iC`t&)z!|G$
zZfiFK0Terd5T}A<v<idc>^DPSWEDVAV*k|70t&CC;Z13!UNO%e|CEhjz?utOR=p#H
z26(W@Fu_lfuVj}4yj?(~BoMYVf=orlm~|45O&A?p3N_00ZKZ7^)Z!wLaG1Kf#&PDJ
z|FksD1Pq5xkZre^CPaf?9<K(sW0M6WJ9*J;QONx7w22`&!q$9b-ZOJF3TFoPx(&n-
zn9nwxMg`fsR~pC%w-nc-V!!=TixHgw0-9qc*Bdvyq7?K<{z&X>9`}>=pVSi1@K@q|
zKtJWyRL+R<QuuZj@3ynM<0}U4@-+L;@zKM5XwDk9Ss3AfKClI}xWkR8)!*7I`W!)S
zC^9r?t$a7LB2`z$b1XUAf!j}N)+g|cS04>Z)O>x^kNHn9P7n3zckn;S18vGV)xLyO
z=eS|Fx-~1-xBZm#0gs6YWc!Zl5eSZ0AB^*wVPK5FJ_bMyc!eqG2WAK7ehZ&MbcE49
z2axW_hOLJ(7oRikt-E9HS|}e+frlWLQarxJSJpaw^N{w$wb(6fWEOc=^6&hKCz#}5
z?GFDztX)`MpVO@z-KqrkO}&EQC<mJjOVT;BQqxB^n4x-r3keD+PeZIpH@udum5I_&
z44Cb>Ir~sAC!c-BKl-;lF5o#-zOCQ#Artcd@%KGP@HwcO`h`Noi+Sy9SR!N=u-mhU
z=93B$@0@fyo$n`37DMWZc?2nx&)_*nL0ZdS+wk5v)8mP@(ll8RIxI>PYIrpgzb{QB
z<8qPc0vk0qXxzT2VEepJPcD(}VW;<pugFyi(c|P@asSrh77f!1B6my~nf*YXofg1x
zIYa>d?5|xgpRT5RrZYcpy9Myu-_uqPeLvK!qh9@=^ab8Qinl$YkJyx|$r`2F`O#aL
zS71@?iEjaLzn5j5MuzP6DS8%(D?aHEw=X}E*CkxfSxov@wB;J?&ZppsU_qFHcuGI1
z6Zmt@PBLifhU>ZASJ>6_M}N#vK(N1*7nxjT_Ch~uVj#p!%g{Xdx*9V7AT}$aE^G-T
zdvkquDAT67!*s<XVL)RX+J_W{6wTUrpM1n&^xc-l_VIHlOxOHaEBAPgHtbE@mCWYt
zc81MsJ!L%>l|+&7*(8FNKzqXlKODJ+B3p~z%Yxz?Ln|&F=0$G7;-2#n#vx_eJ=mGR
zVar6Oyn<M>N*|v=EET0uc~ymWUr7c1&@{#gGySSjjDz`Dv=o-V_|?&QL^gS>dZHu3
zn>?h4u*MD<6>Ar62}&n`_rG)SW^fsre|+}r@A`K7;%(k*ejar^q*m+B;;K+)ZA%Ki
zqvdtK*83de8Ge%k{igd{;ablZWt!4y8XTS&Q=8WZ(cXx&9}Q=qv0?PMGRW`WG|Z80
zX6?x9?Q(9d+rHA6#CD7WWe||%HbOX+#GPsUl5wnOTt}Qzjt|0wV?vr+t#K>zo@3`6
zG;muT!&z@g-F)`<d!7F1f0YQuyolS}Fs5>+t7X}P5Y}{Y0-(C=mjxO)jHHc8<BjeH
z&V>dDU=2V<59;b*G~81Jh7-rfAkmxqA$zsQc@iYoPAymSx+@-|*GBYHd2{#N^Fr|E
zp6KUCZ)xZ2!w}z8eE?igPLBeV1F;eM;BJf~<CUG>gHsYs+1yu-M6g`lcL9yr*_;HO
zK&;I$bPsTY6*6}o$rGihW8b;uzSbbbs6cV99DMd)+Z0~t&;03U*9O-+nw0i!2b8C?
z1nm{MT7X^nc<B5jdW}EB1J}CkV0SY)MPKwg#WbY;vP<19bL^aw6GkYkJ3-9}_Gzzk
za3J{J`N?~;x%q-jH)nmMix~y|AkdyZwc$%;_;hl3OEs0<kg9@>ZLEyh_Mjv4|8fBW
znYV`FE_%1aspAqXV1tNAOG5Zj^!R&@P9@Tbj=y#}c+bYUH5SR!%HK1Wu-egGL3GHa
zZVB+_&}7r%jH;)R>J5L1AU2WgI4@f5T($ReI-_8G;&!`Snz-6xQkm?s6?jeMeeUdj
z(w}<tox7-aN$+}|wN#J%v!WgJ1n~>`m&XIy6ik5FH4**+=ZuB)Fo370+HPAT3Q&YB
zJ%oLpB2Bh`oa9AtB^Gz>@7<B3yx)=hkL1w1A)|tvyjF?lRPc@Ky*3o5`ls<OqwV)~
zyHi{Xt#;(E=jNL2%X9E2U)CBVAHJvEC9=)E7PAgU7NTJWD>=$`6`68>gl!{j+*Y+R
z-^^lnrO-a;jr=J_v$gSK_O;$r?YLVsOv=d4jX@v@s;u7p_L?_m`1x5cb`AX}Z=(K@
z-`n>KHRPZ#{()OhrN3gP2Ee&`ObtTsVL%RJ+cU@K?&n?Pk&!=SA*GENbX2X2Dc{pH
z<eJkW!N33ZJn2o=xNA^|`ho*n?7@In`SaE?V&Aj>{2Sf5r6%u6g9_bMH!Vmhw{Ohj
zdz^(7k#zD(-Y6DTRG8tNybRhKT#D7t52eop_X(Hk*p9t}bjR~Ai?uGN3MMmJ@`u+0
zdr;kXLz*BW-<ui2fDQgmTkm&{lZ*IH#A|2(Q(Jyj^w#g*(xuKF*p|p8X>91U(!l)(
z6rnfm+(2)&wl`gl`dk+o%Gl~{w(a9>K5}!r1vv;j(F-^Y19fyuk75m4bUck6YAdrp
z!m^2L>CvL&ha&AFjPG@%WEU9!{Qp&;tG#dTHxRpzQn=7zuHE&zc5&%rrn2k7y&l3J
zQ|(0dRS~qmX?E?YN8(j=1nTp;C!a|huvK;dy)|y#FJE;(uKO=ls6!gQUngyL55ze{
zEk1VBsrmrn@9@Us8GYMa6;k%Vmdt~T+p+iG3UZwQ&CGM#p~E>id;Bw^@r~P&>c_K<
z*7kV~bw~bmjNb}Z=a>FjioV;)$?^Q}S`A8cT#d+2BJfi(I(}0NgjBU;!agqe?VA!j
z>~PNQQ8K(M^Kl&PU-xO=3KfkzP!(v1WRe9k89e54(VmQTl%88vWEjyDTX-ehpBUTE
z_xTqMJt5N#y|{fx1ms*iYkxlqI5Jkh2Wz%h9qI(=d?wwSyxX0gwr|@4{x#R&$9Q<I
zQ$1B3Rum0lZa;V&y+d_ostCfBOkK3_jSqaUY*C`+HY-sFtJkW0bK^>x=QUrvs)fSM
zI+0&`{N{7*-(5w1!jUg72M{(x*d)K;##@euC3iGTbc3Fx@GYi$BSPjDuxG0JW)<8T
zlj-Gu;WMQQCR6!x$)5;)%fcJ`Pw-MVK-(8T1l5lY-Gy=4E%NiW`9tKb*v8?YPL{EV
zaVFf1ouS0Z)+YwL^I&1EHd(R=Y%(Bu{XR{fnY9Z_*+J~BPzC?(uP|j^Hk3H{NF)AU
z<o>00JvxAC(r};+?vcUyO)w!|`ug8?S8l$|Z`#UXUc;k8ft&7{zU|e9w;py?-%P-E
zWf1Xlnm>0LYLeEVk|v-XON5d6-6ValuxJSXlL=?um#r;mBN=E#m9;XG22=1>6X)zy
zC-oqfHeQREL6)Jn?b8dl)&pjqW1%7=NEnOle!jHdc~rcL&T07Q^KiD-Z?tJ73f&B3
z<a@k+K9LDH9S-*+LHNHq*mJ(PJ<fO6!x%hBcKf8%Zwex8VO+_?IV$cxR9R8xFu%C-
z@H$>S!)~FVU0FE1xIAn6-!1;A=5Iuhp;5`ed__6m?IjZYv)JXLcrap-%T_$ADvS1=
zLT-EIy(w=gH{!weoTN=4YF&4?;a+A|p>I*4>2IV;R6bKOa*9AEr7v|3Z47ou-mOJp
z@)#V`uWc&tqzllhJ2Ye4v3M=E-X{cLNaqr0_H|lcbq%){Hy&Py;UNB-cGo6aHR!gx
z$jA=0yrS`a;r-2h-G~9)&QFlYw~VpAu=4emMKhJM%fa$#-C!TMk@sckZ=|0u@kBOW
zZ8I`EuL5(&R&lvpql%9oDMWm4{9T_{kN<86HU#_L3Qf9SG`?i^Pqp&Q?H0enmx^%`
z3*gM-wf$49iYz62Z6vc8fVk56i@`#XV->1blO*eRMRNp$QC78lM9|+eC+Z50eUy8Y
z=S99po!4R;`<*aa2czMIoI6S{O*zMMZl@Ej=8l)p(AsNeSRtL+_4lTAjqma~i%u94
zYms>hjz_HFqqL*`!z3SV*O!G>Fu;pMbT3?Y_+DPXQq_68v*E{+X5nf0V)IH>abXJ3
zt;6wQ?d!vZcNCGp4dlh^N3+W-@;U45a)b5*v9(10FADzlMdTgb9R(lqn5HIJ+wl_Z
zZrD2f73sT`5iADO)m!8KAmAjms<xUq)lti+j$r#gK$vBub-OuM`ro@$IoWqTnA>+<
zJjd7*QlKd|_!R%S<=c3R<8&I<&nvan^&ZpV*yyVL=qaa65Xd}OM&ZY!29Za_yZqd=
zn&h>@jm6rcRQ|^N%mVR&)NABW$oaY-zy78Dg?q7Kr6CQd1WTSv#^-Ymkj(W6A>zA%
zBz!p*4Q1UmmFT6%xrcHSwxVB7%U!o9UrPIlv5AlJyXsZ8(3XLf(NkbW{7%PKk{kNZ
zm<J}6%xTjw>z={^y!~jZFf-FZMU%wSvUpBOv)L}zC7{xA>#pbWdOw!uD-7Fnb1hLs
znigyB2CF}@9iEamZ-R-Lz{XoLRsmr|Yj%`X&CU<_moh0EUA8~IfMC!J4^gZ0+fpiu
z?X0R<JF}L0)jfRBda>r1qKV$}i0TX<%NCm#GtCi{14*-{oL|PRa#y<3!~I@RQTSZ_
z-9ES9SyH9vJJa+?neh9YlhUFpqL;4aoeJ>^xge3v*9II9B0H*9pY|^cNh%Tu_Q7a4
z_rvD?P_cZEH+N~h*4z5+OM4akTwa=*iGBC@fX%qxB)jgsOMi`5-4&Tr#EWx8Wcv#G
z37AHwQycq{96n#tvvwMzTUt(5pWUlIMm>^iXvaAQ#jewl8XVZS6uK#k7&(_s^*K0K
z)-ZFXQ8<CmNFxM@d)V%Ktk-!)|5&WeZy}fircO=q_7<;4ZU)y$nmez4w%^zXuT_UV
zcQS^bXNm-OB;!Ar{Ll87wRitE-XV0|O}*?*9c1|UpbPyc`Xn)MbuN%~6jp+vk4@3W
z5VdY$IyBC-WYe13!2@`()K>@s1}jBe>g0lHRNkbr58pX1722OXH<e^k%R%~Ua9+h*
zp`3MA<SiFbr$wClE*MkG_j)exEB6N~Q3ef3fGwMn+>{sh0dHT-C2TP<+SZVyrS1Zo
zO#vWpfHpM@Q$zsPmV(iJ9M^;iUMKYhm_2OENnJUM;d68KP%^))tzy$CO`G_nV$R{y
zh$-L0-7a8~iEgh<Q4Zttco<YNQnYii^dMw_xPdgxfr2huc-SorpR^y1R1~e^SEwub
zY?_p)!5O!EKDHi~_CD=fc6^qbXaRpR6=xcmKaU}`!k258E;SkY%u9L@;?7J<v(-E0
zk9{*u?nOf<eoX^6iY!k1g6?MjUY^mMo=3ko;_A0^O-%hM`cJanBOA&6tyF}R7=7dG
zP$t8dWq;3w3H&jw9#1|7;MrR9V4ZzT7{SrB7H9tw?Twk(3!}63((fVg=war(vZ);C
z=9fP5m;CpT!u8$9Z;!o5$){^m!AT+kuZWRj>7t`Ar{A!g(I6<kw+z{e#q=DzBLdlM
z=LUG~Q$rWcwMke2z?q3oBHnU9H#k~lXh7U0LjzZ~U@=E%FoY25Rw(shoBNjGQ{d56
z($RqpBTi$ko{)(`1KPwmz2>M|EvagIJNfftsxuDoD0_?Vvw-tCP-|1Fx5E94g~soL
z(}3rGNj3gHt(n^<J96D&ncqmvy5&%JWKM_%`TdY&QqYf(Sg}VPfBQJKUZ`FT2nlx+
zZ1?4<KTuIsWG>e)ed4h;DUGzTY+x2@%#Dzy*5CCEZbui<p@hkE<X!A{@Ff-SjW6pJ
zZ<bUAcSn2`vEuUhCSAQ&9DNs+0(E>W)!_DN`=_46@@{Ez8T)z>@`Q;&h#?d{{mdz7
zoHgEbb8<Rq%cdq0@&LB5jq@i0(LWwX%4Vos!uh)4QEwr&W1$BLE(+XlhKd^MiJPcf
zE0ZOcP9>XRN1?4M{Q*Mo5(5*m6vB);r2_pFI#orgfUf`MCCT^W&w+B4=OlY#IYWDt
z{;E43-hv$y%nJ<9Mtx-{un2BK@0Z$>p|0McbbCELAKk54IFgzq&<+_qMsO_PU1I<^
z19g)#>lG&)T>xjtOLs>18$$Q2Ns$JMicAu}H1OACzdTyWxd9(==&A56*~Hm83FCMC
z?OA~@U!y;x_v1M|KEEG1Q18Q3_gu04oLkXvgGJr<(l3yf_h=07ym#Pbu0;r*k|3gd
zqZ^7@02XdgkE#MEw*Q_Aua*x13PCRsq5)x!YVPyHf1%d?cn@-~C`DA$w#2v=t8sdl
zcsT1AZ+*EbUv6}1UTUyUX6IwGZ4`x9qUB<DOZt57>K@B4an+2dh|N~KkYiY@stCP}
zOpUM&B+vhmqtEuE07xYYS&tP!L<G~TJ5RbZ?0(PTPg~AT^2l6amQViJ@O$xoU2Zd@
zo$CI81}hQbZWW1h<(P1_&cyhwSo1k8fK15y2LJ}RoOf!x-QFrP738D!n5o`-(q(9r
zA6Fcn-s&tTZIQ9o5{;^SmU+-rsOOl1OEB)elYM)ExW{RkBAvUv`O^IL2)Wky9L8p1
zD^o@?e;z+XLxN^-`0|bG_pqX7GY33Jhev<@w%*ozlToL;z?lFZNys;lAA5~*b8!aX
z`7zi;s_qe?o<Y>uwO?Jhf4EF#2C`Q+$<>32z?;nA)LO=D_Zqv!Tx_KsuB$wI&(P~U
zi{t{`hIn!g#-DJ86^RZ9jxn+Yyn)Ilr=cOm*IkU=lefRWM$K7C4gVl4x&wU_sX-wk
zk<MGHyND=b?lL6Ih@#8Il>qI?T&R9go53_B-Mym&<tDr3p|D20!RelaTDJ)uvgPCf
zj`OCmT02f;0{#J5!RJ5-b=CXHeAb+`jBNd@*4P1T0On9G38*oDAmvucbQ4Cnx?zgA
z;(+Q#3=n!>&iY*Q+`ebDt<}!lH__#2G6P~27Cx@=rbIhz{^3X8{(C*Wsli)5y(y5=
zAJ!ZNX6_%krFU#|r8GdMJ+MZRTA>+Q6*{aD>>Hq?)#d9`mm+G2U?}R(Vjvq)t5}>3
zoq{kHBUTJZ(YPDfA@@omT}~#>IQkOo3rUXAxs(>0f==@bYncLQ6h`zh<!}6rUA<GG
zYGJ*u>awtLlLOrljMfT>0#d3Gjrg|_Wu{H)*`o7-480g<)*!*(e@pjoa?*cq+?_fo
zoPaz2Fv5WeGp1|*8KUCS{>Mwk!;IVGj`;IoSrIc(CM9Fu)Xdxcap=%T7|)k)HVMc`
z_FI7Mg>f^g%@Zj<pQRf=iLSB4B&&ejfV_j`ic9vt-0Wan-dx?(X=ft{M>UyboER-g
z*@<fx5ar3r{j$?};Ayj?F@;}?Z})I5C2AruaiyTZJfLRR>yf$eFFEt9SK<mAt_nt|
zhp78nk#tet$u}AaXy7Jm%)>u1eDSnsd(UAd?Y>nOxNO3!x#o#Sj2Jj?lRA7WVB+Og
z5157y%&4`ft;aDG_m~U0?)~PCvc(Mm>)Q7g^h;npoE-mFz3lFpXZE;i*Sx`t-G|Ec
zuCVNVDLkS4O>NE%NQqCE#pydF3cv|4#`)On-X-z^ER&AyPl+OJcpw&?B6>fJ)b`wh
z@P8WG&Hx2)U~RIv`BPvo^$Ptqb_D~nZbg;$Dto@{BUSr7+r(gRzU^RT0&S<#`dMLf
zx2fU<*Hk;{n@G|ks~EWx35dJkYP>3(y;6jGhBUH%Y5%M1sEHj55Tp@2i@e9&yk6)Y
zU`ks-5h|K#KnGzOKCK+mv<;qY(KbFn+a%8>5s-C(X;ec;feCYek)AsMxKAbEqW(Y@
z264R-bzYx8=sg$U#ul^wR8YJvo%;0d^2$nWU>V6FnC+}Mf$6<y6h=jjJGId@ODc8)
zGO1+}^F*%^_QQjHgIhN}&+&Av5`kq?{=-@nvbmYdg$J)D`uWW}AcG<puO@*USGMms
zER@>**Q{*kVOU!_OA?Gp-D2b9N8RtS{`mU5zZ_WDGZiS{AOv2H<CO?}DCo8ETk0So
zz8xlL97~1J_nl})O{Bm>S*>8x_cWq9@;d52Zwp-tT{Kqv*dZVR{T0XddlDhn9y=Yp
z=T~8>2y197-&ayS-*k-O0Po#z(u?ER1phn^Yin>x4AX<xgtGSi(SKKd=H7<0VVXKt
zqF%4-?w&D;cJJF_V?v*<%X{WSl}J;7l?eQJ%h$N$C=ybgfK>weo@iqiGW87yK3sSI
z-E{w=PDT}AEOCZyn4;fDa>j{WZEUUU_w$<*FV0l)FnnXUGrxAaHtD+mI~c*VzyrhN
zK&<P1A+Nc~7RL%Cj~i>A!T0gk6rbCvrA;SA$NjWTz^dsuf$R5EnYN)wh;N{*Sj}<9
zse0x^f&5exhcVu%vRauf9L?YA_u1;xq-0!q*dmC*9QRFWRH)SJDH*Mdfd?_#iOk@n
zmZ)VB-rFD7ShU8er|P=YIS2qU4{i_<po@l>MudEi)VgR`ipOBdmNWj{I;s8Q{ib4V
zvj8v5i{a#X)%5^l;alLBXnxZNn4)1JVoZ1pt!9(YD0697p*r0$ra;4rjjO)Hb(2Sm
zSDo*15=B-}@dD4(riVk{TDwJ}`g&YovqKH)T@NnqJC0ZxvcH$B=&F0-e^jNE`9wwt
z6+l3t_f98GEL6bh1RR=TNS6gwgV}p-RPsE@6dfC-sJt!m=Sf1BIg<=?4AxEN*F%9D
z=;_(`W3d)~EAeRf_7+x1UMKv-3g_eVzn+7fZ{OO)Z(8|;gmAi9T6)^8R>0_cZjI~F
z*j-?0K!~|6$NOHR1_0&axw$o$O@8Qnx)$rF;%z_U@l$68Dc>F350+DQnF0pX6(Q&n
zAv7rPuFG9dgZ*+Xx}7$A>bBhQ%U392rR#tZNEmQqw_Baj^RH}nkyu;L%ZO^u=(ckY
zi%8XT5EV17Op5&N>45c6tHT8jo}BHaQyF`iePd=L4&KRnh1E_}Pnw@*8F?nSFzS|P
z!JoEVybrpz)J@+hDmb4YBlAp8VKNG%{420t%06qY4Zf*`1|VhT7L6(7r*>p5eU_MF
zIHu*IC7a7l<)uFYNNrz&$H}UX*=xM@UT)%JzwmIJU0g4d5;-XU=0^ecX)8tT4^fnb
z$M@;eN^v7>Q3wttFwE1hy?YT@TW&zQ`J37y94UzH*EDjC#9V1h)foTghjm<rjV_Yj
z3}e8zZPj|$=9?1oxImSXsG7-$a>M<>m)!8fXVx7Zua6Fh)ju`p;H2LWQ&qqqF@F@x
z@)kjR2tfJW_Xp`J0ryyBuG`p`zm{x`j`lbBz_;*9_Hd<jvCe)d47hYgalwGBwtE<%
zxz)X^K#ZH^SPMMG;fIAY%sJ?4YN@}MydzJUyK-iTCg0>(>Ptjt=%Z?{S%IwP+C~j4
zwoD4At3Ti@&*S4SmjTDIiaCRVL=qUUx$#6#P<~8fHaX}2aZcw;L_2u;&y4Qku=bi~
za)=>Z`M@clZKaMWy#z7>5zCNzy5YR_7#r>cy2sn`umy<dOL!E&#qh8$2HD!U?U0NQ
zCkG*9&oX6KmigDC`@rWbZeg6iM1@<W?~09+gn;7HF|_zWz8n)?S8iBnA?u*=Xth~+
z;{DqM(rm~{H3zS!+VKB^^2K2QjzIv35-<3^^js!Sc#VZKYkM7P4bBnpLD^AMENls$
z8*lLkJYF3bVj;*-Tz`!9_1|3(b=r#0>sg_+Y_x5{cok$`gT8|RIGIRa$)f@(JIenz
zkO*b)eI9R8K9@Cb<M;0Zz>fCc@=Yq{<z;j^!)dtQ>Cyl*p=c4i%J#WQAY6(3<O?Wt
zUc`qA>^S6oY?vhl)&V6G%3>a*aQ?+sqkDFLm%fMkxd;0%>vRLQP5`z@4N7mpiM;#T
z4@rjPiH6bt4G2LUAg#@iw#Yk+f-|k>+YEiM5mNsmm=pGQ=%0;w{}s?)#z`RfW8Cw|
z0;TZ}@r1Q7T%Zu(yTH-nr}8+ZHm818Y2(i^eLcd<zV?cSl8+CtpO<9iRcKfurDbE!
zzYV~a0MCQokSJviR*~`B6BHOnsPYCcE=9?s#2j!A^xZ^}sod#f1gSl-Ql~Okls%Wr
zpxu|1y%l7Z?g&OZr-GCm#>m>gb-HV3LvJ7PlC6pSnN@@qAx?x7B@PwCMVEe>V?zAJ
z*0%|&cvD;tvRl@38!@|vlza%s)3fyvaj5;uChKFfT#fJqVmAUox8%&g*WqYCpzl+`
z*)ur20FMcexgH1q-Hwh`*@Db6DODcm-g|~0A$+>^HWv}Pg93UqOL~S;Fj2Q)3!aqK
z(`s}EQdH_g>?p+T7hY9vN@N9TKdVvU)TA3IRN#N5NcHznBQ%jPBSFs9G06nchuV7A
zrl~mZ&U4=Edv{~nUqvt@$y;e}%3Oyk1&Csf57bz$pa9nqvqYG(0K}S<)o7Oz-OtaP
zQk3hD?)QL)AYM$G@1+;j@rSP-Rne!<PgQtP_NCK)t(>Q!L2YWitx5@+QQDWf^Su@q
zR!iDu)1ppQm}WT{gpy%>l%ZlWko~AQVUboDTE&qhNOEIhQjp6qg!i}A{@`h5&sC?m
z0VB#r31OU~mfYe(>hj5!D_E6;jYck<46gyQV_5=^^HZJ<KI@m6iv~{m2uO2uA*h9A
zHWQ(~8l6g(!C(+@YF677ZFq4oTZNR6sl(t;>L&URbr!|lqA06Oh;mj&KPiC(G99cm
zE2B&-l`1`)QP3)*+2Vu#^KhOYA6>5#W_pemTUobEIsYb$r}=ly6RteBVr^RD^+E1B
zkQYn0(6RHCk78UN(cu?HPtZe<u9Rm!irP|Zu@W^<p)3uW1Da_tv$GH0xkkD203Rv<
zDN%2=F;pFHzt(r^%I}t3#Gbxx(*YeP$n(aM$IO6w#$PHlv&V?fKDj2fQmE8Q;3>sj
zc(G<W07iMvxc)lmSSe(j0LxM1b8TCEsC(Hp98f!2eqo$M#JNN&AN;RYu^)fn@C)2R
z3MT<q-DdY$(%9Zbj<=50a#=oIgG{Nm2robX#NHk`(5wTP3h@71ZPQF@BMv=5aU6kI
z%N&KXFV%l5Hhx5drdUNOlSy(Ek|(|cU8FqxmcA*WM%_3Ubv4^B5B)=yPsX1znE0te
zMM!asj=4$B$-BU)0$o6xU)-5T6mcyRivt__qr?xHMjgOEqkd+zZML|Xe(>hC3)b0B
zv|-^c_`;FMOib#-hmsDOpfzg^lv_I*NJQJXt6~|<HPqN43_CgE!_KiW$4rNp9O8T2
zMM`>(RIh7LV?`Ih$zryn>506PuG#M(Tw!bxgGB{!I)}t_j#J8u&HyE<75l{Ci{Ptc
zSpZy=A*1N>N-x-5c&fcFVg}EBMbk#uY8$4;Gx+yen({ZLG-&oa>-OL47|C*IcXs86
zpT3*@KlFjVbH}c2J2dT82qjF!6)=pR?^j+g=)MP?C~Kz}qt#n<;Gs!WdZ$q;_3P=N
zi%-;qZ|_wt!8Ey+3F4VBKmj4)r1GykivUAV*}&>l?n_3u%_~Ezq@p;Zj9F(BTS9TM
zYIYvq)Zf3ZR`A@>x`>dVyO#=cfl<|^+{47FL+RhFskgti;8YF!|D3ftL{+c3P{8dy
z5`Gv^_YwbuQb?eP6i*3-uF)UV1b?MTpk0@Mdc#xYTV-lzLlQ@D?381XAR-J(*RV@{
z^!@BQlXYla$0fwI&#*d=x_rfq5@$JfHS2Wq^2$6D2m0&UvdjL~yZfa?rxw&vtU6af
zO#6+HC8T@PaUSVzz-tdu(60w6h!`J1pDu1YQ39QcZqK6thr@ftllxV(M-|gawy_FH
zVCZ>y-<AD5*Z|T1-X;=be+<sPe8UF_-pwvw2G(oYA#D!4%{2cd#9r~|iI6Cg7?K<Q
z*=@U!Q>(zzmPbeo3$)YbLJN<;=w*^8^f+qocqVX|jL+dG$hiLw8883S7B*?Th4vh%
zK`#bd6U9o$fkzpM=K2#H%OpSN(E!GnYNw~rvxsV2vGI12-W~S%dHzXBXd~WynM#4F
z2TW-~q9~9@l|B_7r~+b%S=X4Y(J$#L06x|r1pU2U`^G+3k0JcDbq~Q4Vw1{nJe(pC
z-V^A-hv50vLzOkA(IiXa#E;$2bmdDlR;MJhy@V_RSC~j0#umwitRh1<HpDW1_1nx?
zmjjJTgbtVNK&-Z+=2F;Gz9|WNO(FzZTtrzw@JH^W?@s62=lQygt)7+d@b#t3K@30P
zCSxSQ>M40svbc5|0-gR#VOhwMjQW^(1U!^}f>B@>js8j$yf8F<jglpWL4z-(x_YU)
zaL}v<{UbJUzHIuLM1sEaGP#0J^KkmL-qd*Z*c`S6pA(0|j{H#M#D{<b{*=dLMuz32
zL+<J4>E??Lj>L8&e=tlQ@X^*F0T`pj6FAP@a~iNsP#6eWHkQ155IWbsFVPJ9tWt5{
z!-Q+}()1a7JS~b0Cf8##{CO|$jY9hILY=Q2kApE^7-#Dh+@Mtsq|%ELB(XJmzKUCB
zjHyD0J+kkz2hSY^f@n2~yFcTJ&Va6aM$%YdQ7%=9x)}_*f5$bTKwcw8l*1I~s7o}h
zY*fbl3Ksq2M9}>u1yS=6lfP~N3=H{5T1;52r|uf*J_r@ZCZ;wE{1j*ovZ_XD7oEjc
zsus17rZKlZZ`#J&o&(tldvt!hFSH5HGfUv=em}iBFRQ4DvQDs0z6KSyo8X8Zn=#>@
z)tHw2Tk)pZ@I~a~?eBBk#G_4g1RDkA(RV1z-=3P&<^&dBo`ikVZDjvTmu&fyK}n#W
zDF^Ojp%-@}y=7{v-D4CJDR6I*=l1dBt9bUBF_YCU4c!&5S*dirBahMd;!ND==w4O(
zzz$E7D)aqTTcf^wFNzy09s8$Yu7$BxZt9s#!ulVHeVGiMO7piKPGwAPw3$Y-kVVSU
z%1v~Wh#IJY)UV%gNOvYj%Do|ne^kl8yTb;@Qv{Oq?3lm>V$q>pOO*^xi*%4TH+Fe(
zL=HmhFtyzK^Zv|oT^MTCf~ArnM_-U{X=0zZo-1{mo13>oen4pxg$=_I;F9xq5QKe2
zW|_tgcmKAmvnfv7T3%^Yy>p#x;om3dw=esAt9rOfhNu4-OB^^wl7tWb(o(PC#A-Nd
zwv{pDa4N>v!zL@w7tEFj@uZNG4;k+dwo!k7AV!MzelIC_>9eIz)M2rC<gj>vyJlS}
z0n&>Dn&kvAAv(NorPo%1pQ`gMa4w8gFx2OcvGDtcwt~1Brt}{cITs3jNF01N<NN0&
z{)=8`(BcgKONA_hB8n!P>roy`7Y0pN-a`sg?PnMYB~HhVo>KGIu|$c2_?JvnM6_6T
zkK=(gNpV(3LkqMIL^wL~e>zUm=(8{l=+l7|v7%H7eY4TVV7S+85e3*sy|c&-?0u_$
z%NOna7r09F(|?^x5S$Y<b-VX`<>uN!MnPufV)`@PD~gDOII}sY$dg*Uabqtdq-mqB
zkjFcr`T0uwwzn4#S$$&HEJQ;pANt>H48$>BS0<j#g8CA~?<GA*#I&!od_7;I<avVG
zG9ZAco>eHe+Qg%OAxl?B=Pa4%xndaw_&Nm%90Xr=(BZs034C99)&oM%{CXBdo-M=J
z%Mk8Z`BxU3F}VpjC$kUdAI$YQ`|#YVl^O(sR~U)0h>H%_Mzv1^x`*jZDS>8mv_0Z<
z^<3i+cp()S;dW`{gxHZww%4;yj|P~Gm&<S5Qb}$r*W5xu;B@a?_z*C)auB9H!ujbf
zZx-mHNqBbgXqv8daZVLkj&{1bx_>uU9VB2S*9(HfaR_kt{~Rexz=R*498m&pfC9+S
zxmpb;Y@A{8W`gJq<@5gi^Da#@U3FpQv^s}DfJ|3skoWly=Pf)w_-2t*ATk)8Amv0+
zwz70zrwsTS-EIup^$)~FH47<n^oL!d7lhk^U7})&R^56|dqdz8G@UH_b&{1jzS@ki
zD=R@rK6!dHistP7I&P`sFYv6lbK{Itto2Oihc~SyY7AcmujFyU{<EpLEyP(nL#{HW
zF{L)rhB#o(hAgffPcVwbjsE+mR<GI=Bc05v^_{9kE-61iHc3P0xZeUX91YP_YbcNm
zC#)9HNXpcz)d~TZX-I3BOSz2w%a0$f;()r0Fa6n0>+cWG;A0sn2=2dgeVAU}5Z2Xw
zNuxjXVV+_IYzWcj|LN{Jn3_PCC?G`;BPBp6(jr7dB!n6%q6w&g^o|fxC`u79bg7~V
z94(##N)<(vqluJ&g%%*398Ezw2}O!1gixdjm-~Lk_kO|d&d%G}nceq(^IIPsEI+d=
z4;X<0mY@HF(3i&dWN_ao8nuY>4{sH*Zr#(>(KYBeAKx!gsF>k1mIQ3=)$Xf_K5pE&
z<ueD`Z;SX{yxT!GHgmo@@-aF*eci3aiB|5!GGEu9WO<9cOCM{uH4)*Dbj+;(A>%*h
z_*M6-3&z7IBr36NtZdvbT<0H&JEeAIPjWqp?HZvKH7P4Ry3KEf6QJ2VA!=JfqB)5h
z98(jE9T>CL_S9(d$0@(5ayeDAKfz{tfjhz!Y(8ZlA$Lp_G3k72F??3!U6lO@R$NuI
zzM+ofQQ$Gt%}geS27CycZ5HgJcS*~Eo>R+nGPVKkBOg`slN7N&I8xAWR$k1U!4bx7
z%EdD19CxJS2?@X>yztUAJ1rcX(9iu!mg=G`Psok;XFn}T;pDH|hk$t=lYh4meynAG
zk1>~8w4+QzgC~r`b3laG!+w#4SIe5i7}a(b5w(|+6n2LEbl9D8Pq!pE<T2VEMCtW)
z<&@wyuBsu|L$J09hN;INxb+IY7)VJLn{YSOgXr)DWVE#NlT=_@E`2=C!B0B>Y{R8c
zpkLDew)P8~^f2o(6Q^{&ETRxv)xH}TT4O<-p9M-*?lv(F#(m%XZK8Rd`jU3o%uNiP
zzt+<+W0s*{)VDMcyScSF_+=RV+0yQ;WaRfD`-6><qjT{ypB`+lWFtE18_UHVh-i@4
z{>h8CbCe2ISf|;M9Sqj_3t}I#E!+b>yLw5TO^85GiXA!&XSzp>#Li{GV-I`Eu41<I
z(`xSq#S^Ymf7rq#WFH7`Z&ZBC^-NV$%woeTVF)8B>i{=54?Lol39t5fjzX*r9pnn$
zYjvq0)GY7^_BQg#3IwDhvBZuO7pkyL2{@r1AyO2q=l=W?f8Gk8lAltLo5j}*NVkQP
zwmzSz=FQ*;WGOw{D4pxg6GkF&oSqMl*t!o!gBKDBr%L|I7JH=VFS`=6MrX`ig~U5-
z#kPdyfnD5QYnaOtE}aU7luPKrm84Q2SP!F~UuGLu(vMaHg_u*Cf1l;{>|z<fo7JYW
ztKt^G)(y@3fon>`x#O#Y)XtFn$R?YY=4B4g>?+0hW|~)4He-wMW!>Xl(Aw16{38AS
zp&u%xKBazYD{4RsQ^;{1-@K5K%I8;BhHd`p2W0r3pus}AeG*jMH6vlT^_!4+JlN~k
z#0>~Mou(LgX1UFqtA`g*-OlDB3Bu5zcVoD_Ix}Yi+AST@bykMm!enlCYFNqDP6(RW
zd#7oGFG1i&X(!(R4iaQ=1cZZ0hk{10v*+yKyt+NtTB-Qv%=!gp2u2(78QI0LS*1RK
z937YeGUc0o+6PGLy>|L*Yjy$S-i=kLyQ3H3?Z$BNz2*I|HmC2-_N;WDr@p5Lrr$<A
z$K80dAdvo5M&MScXf^jnD=<41q&}x{wcAih8U@`H3oadup4tzhOsbJ+b@=7Z8Eh=i
zD0(Znke5HPDmpa^GBQ9ZuWbto?V{-V$vsa;4<!H2>n&+$6=P```rRmvcC`{+Kda>x
z!J3?xx8quCK$qP5h6Y`{{K1?hW8`6!)w1`+`sMWDLd3ws)zLvEs#Pfzm>P+ZW-um-
zWlcr1{-CqnNXrjy^?4Zflr0vW_ssoha<M4FKdyJmXR+8HaCy=(pU)>jDjA8sx2Ta1
z!DdmQ#37qsZ+-yCv^t7c0tJW4m|@8<N0Kcb-?rj<|3!x^DNq!S+PnFJ+!!|5KD<6{
z82r@n&Svvcj65Ldn;7FGZBa2Ik!NT1nnqiYI6DHQTK#@R#OR=vw%Z@KNi@p*@I9<?
zwO&m&4RPQ0T4(C78&yu_J8_qQKYM>F&@?*AqrIH8{+o^qv+$_xCf`ra3)MC-$wzVX
z@AU$QyQb*g!fGz137%ZmbHS1p{6&UD2OBjfj&Z5?UE^Ck{3%E~1w!0;mSQ$e*h8Bz
z?iedolNS??f)y<YS@X1=F0fb?;$wN>D|LL@uj6-RnU(=xPG^NaIy7Lg`{v2h`@D2|
zrY9AbP@jz|zNDT5KEB<xsCJy^uVJX#n1uRuPv$PMKV)wb{>i@9zSIWRco{ee4d8~}
z(0zs!JOCoCyETdPgPkVZ3S{v{hb8W=<BbYrXF_D-^vkKt;`AGqd*c@}li?!ls0CJT
z==CvgA?EwQ$GYy*$6|zN4V_676XU<>)7z`_b8C^t{|hD6$qUTcq94Q@R%QI!YqlO!
zd+6$k^IH(}RnMOpf?H?3TC9G8FKeuQQ_l-xyQmYQ_-RM@s0@nqLU-{hVRzV@D<|ah
zeK}=}>Xu09V7igX<lqnS_;WvB!=JvZi3D_<bK3#IS?JB(F=t@wFA~iblk!cgb!`Yj
zbcYm}3k1b%TCUz@9Af0-SoL);tETKAZ$&#%4^c{tAq2B`eH>NRjq>3<yGmV%SeEN=
zVSUh}YOg&0q@q_hld4xbn!yLX#NPu?RKV>@o2d_=NLo9uWnD4ToB>5~(wA=6K(+D%
zTw}VfvHX~qu@%kq@VCvhas6N!8g+fgSn?cWB1ege=8l0EJWJ9H>STp54`qKpokPy-
zjGBC_p<euYNMgi1P63OT*e_q{LH;qT*e7v^_pmS8zp~!J-|<tHCP%e6t6n(A7f!_O
z@hrj%HWsoM1JrXYz8<*EN<MngAXEcHxN{e(&b~tCw`=qQRfe))cMNpPu`0>$E2w?*
zBT}QW*SSAPr4cC<ddLnKyW<o89ceW>Jm}aIKYO?|q7Yp|WV6no1;|T3mXwFb&6miJ
zjjC-mHPU#X!_Wu#!uoWbY^Q7&H&;9^syWxS=f3QNldtT`&V(bK-aERF_r2ve6fopF
z5GL0Sx!^LO<0s8c=1IWTyJXy-qA}B%G=WA_k(Q;0AVNj4t>P3YO^`O==3nDNq)&Zu
zrr&<0k>Ab+W_u3NZ=dLxb5d4*ixy&jqz5aIgQFlUWHy1CpF9|lhdZI=QYc_G%YrH8
ze4jx02~v`~Pjgts`^Dy9dyoh_T)0|*q@i72T3jg*n9}%cUz?<5av(=u6np~4CYc%n
z8<dqTUvW(<h@}mh-ZO($x3T@?Fp1uvC1rKYDqhB4NY8(8uVb#xdlq#}8Y|xe1i*(Z
z7Au)=+JL5Y_b;2wSJ`r{Spz6opcEOXUeH(~_}%+!jIw)-umtB4EwaMKR10Ei^8bc;
a`Th9vB?i;$bdMny2WF;LCRHfxy?+5(W|L+B

literal 0
HcmV?d00001

diff --git a/assets/scriptish16.png b/assets/scriptish16.png
new file mode 100755
index 0000000000000000000000000000000000000000..cd8b9e30cd7b39d30a04c2b05ec3c2fc742b4cea
GIT binary patch
literal 371
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~wj^(N7l!{J
zxM1({$v_d#0*}aI1_r*vAk26?e?<yVkiEpy*OmP?vz!Qz;*K32=YT?=JzX3_EKXm&
zV(aB%D8l;Sy!-|s7Zz^w1+C4}8?N|yOS5`QALP}zme0GHUHWw9nv{f=jhh5@<-bL7
za3vRa3#6$D=00=q$h&v)r0sXr#A_S-#TLKl|F899)=~YXtlX{di(jaJtPu-OmJo|J
zF}&XLb<5Tr?#taaw0O%TNb~<!{4u4+J=6D7Z2Q#INY7J7f^YSW_8g4rDfenJwK!VY
zIVG(k?7_N4?MpM4+!e4s6ze*TIp=EBs*Ux%t20|{?>wqJqj)a5x%bks{2OadtTBJb
zb12EJ=6HGQgY+x!nD74iwA|u|>z{*PIg?IbtZ%(5Y;*2h_aEk_Th@y%C+5Ziz0ct3
L>gTe~DWM4fc2bs+

literal 0
HcmV?d00001

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index 004eea11..40c54605 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -24,7 +24,7 @@
   </menupopup>
   <menu id="scriptish_general_menu"
       class="menu-iconic"
-      image="chrome://scriptish/skin/icon_16.png">
+      image="chrome://scriptish/skin/scriptish16.png">
     <menupopup id="scriptish-tools-menupop">
       <menuitem id="scriptish-tools-enabled-item" type="checkbox"/>
       <menuseparator/>
@@ -58,11 +58,11 @@
   <popup id="contentAreaContextMenu">
     <menuitem id="scriptish-context-menu-install"
         class="menuitem-iconic"
-        image="chrome://scriptish/skin/icon_16.png"
+        image="chrome://scriptish/skin/scriptish16.png"
         insertbefore="context-openlink"/>
     <menuitem id="scriptish-context-menu-viewsource"
         class="menuitem-iconic"
-        image="chrome://scriptish/skin/icon_16.png"
+        image="chrome://scriptish/skin/scriptish16.png"
         insertbefore="context-openlink"/>
     <menuseparator id="scriptish-context-menu-viewsource-sep"
         insertbefore="context-openlink"/>
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 70aa20c5..aa003dae 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -182,7 +182,7 @@ Scriptish_BrowserUI.showInstallBanner = function(browser) {
   var notification = notificationBox.appendNotification(
     greeting,
     "install-userscript",
-    "chrome://scriptish/skin/icon_16.png",
+    "chrome://scriptish/skin/scriptish16.png",
     notificationBox.PRIORITY_WARNING_MEDIUM,
     [{label: Scriptish_stringBundle("greeting.btn"),
       accessKey: Scriptish_stringBundle("greeting.btn.ak"),
diff --git a/extension/install.rdf b/extension/install.rdf
index bc8355e3..ad40304c 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -24,7 +24,8 @@
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:homepageURL>http://github.com/erikvold/scriptish</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
-    <em:iconURL>chrome://scriptish/skin/icon_medium.png</em:iconURL>
+    <em:iconURL>chrome://scriptish/skin/scriptish32.png</em:iconURL>
+    <em:icon64URL>chrome://scriptish/skin/scriptish64.png</em:icon64URL>
 
     <em:contributor>Aaron Boodman; http://youngpup.net/</em:contributor>
     <em:contributor>Anthony Lieuallen; http://arantius.com/</em:contributor>
diff --git a/extension/modules/content/browser.js b/extension/modules/content/browser.js
index 009aee3b..02366da2 100644
--- a/extension/modules/content/browser.js
+++ b/extension/modules/content/browser.js
@@ -6,12 +6,10 @@ Cu.import("resource://scriptish/logging.js");
 Cu.import("resource://scriptish/scriptish.js");
 Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
-const ICON_16_ON = "chrome://scriptish/skin/icon_16.png";
-const ICON_16_OFF = "chrome://scriptish/skin/icon_16_disabled.png";
-const ICON_24_ON = "chrome://scriptish/skin/icon_24.png";
-const ICON_24_OFF = "chrome://scriptish/skin/icon_24_disabled.png";
-const ICON_32_ON = "chrome://scriptish/skin/icon_medium.png";
-const ICON_32_OFF = "chrome://scriptish/skin/icon_32_disabled.png";
+const ICON_16_ON = "chrome://scriptish/skin/scriptish16.png";
+const ICON_16_OFF = "chrome://scriptish/skin/scriptish16_disabled.png";
+const ICON_24_ON = "chrome://scriptish/skin/scriptish24.png";
+const ICON_24_OFF = "chrome://scriptish/skin/scriptish24_disabled.png";
 
 function Scriptish_BrowserUIM(aWin, aBrowserUI) {
   this.$ = function(aID) aWin.document.getElementById(aID);
diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index 5cd94c65..ccfd12ca 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -8,7 +8,7 @@ function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
     // if Growl is not installed or disabled on OSX, then this will error
     try {
       Services.as.showAlertNotification(
-        aIconURL || "chrome://scriptish/skin/icon_medium.png",
+        aIconURL || "chrome://scriptish/skin/scriptish32.png",
         aTitle || "Scriptish", aMsg+"", !!callback, "", callback || null);
     } catch (e) {}
   }, 0);
diff --git a/extension/skin/browser.css b/extension/skin/browser.css
index 3841ec06..22d4ed9f 100644
--- a/extension/skin/browser.css
+++ b/extension/skin/browser.css
@@ -1,20 +1,16 @@
 #scriptish-button {
 	-moz-box-orient: horizontal;
-	list-style-image: url("chrome://scriptish/skin/icon_24.png");
-	-moz-image-region: rect(0, 24px, 24px, 0);
+	list-style-image: url("chrome://scriptish/skin/scriptish24.png");
 }
 
 toolbar[iconsize="small"] #scriptish-button {
-	list-style-image: url("chrome://scriptish/skin/icon_16.png");
-	-moz-image-region: rect(0, 16px, 16px, 0);
+	list-style-image: url("chrome://scriptish/skin/scriptish16.png");
 }
 
 #scriptish-button[scriptish-disabled] {
-	list-style-image: url("chrome://scriptish/skin/icon_24_disabled.png");
+	list-style-image: url("chrome://scriptish/skin/scriptish24_disabled.png");
 }
 
 toolbar[iconsize="small"] #scriptish-button[scriptish-disabled] {
-	list-style-image: url("chrome://scriptish/skin/icon_16_disabled.png");
+	list-style-image: url("chrome://scriptish/skin/scriptish16_disabled.png");
 }
-
-#gm-status {width: 16px;}
diff --git a/extension/skin/icon_16.png b/extension/skin/icon_16.png
deleted file mode 100644
index a5e74c06a251a3c52b143d473781579021c54b30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijSl0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(rfA
zHKHUqKdq!Zu_%=xATcwqM9<GPM4`-B&s5LUv+K_TprR?BE{-7;x28_s$lL57z@o2E
zAjrqTp>dEgHGtu$MS+7p3yWT}Q4GUF_VXTlz6f2)I_ougPTHaFO?*O6q%U0Ao5*YX
zI?v$cvE7_if)U>tC8K7CeV3g6*5JmTUF%;LHb$D?lYPkE+p*^Ml*cQq-=Ev?;@ocL
zH@iOOaRX)EDgyNh=j{6Uj%)sp{QI9*zOp)D?y<C!nXS<B=<W$$xPk6t@O1TaS?83{
F1OPjra#;WX

diff --git a/extension/skin/icon_16_disabled.png b/extension/skin/icon_16_disabled.png
deleted file mode 100644
index 8910c829e2b4db7dba1c41491991f502615d78c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 257
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;%C9V-A
z!TD(=<%vb93;~Imc_n&&t|1C##(JiDrk-7Y9sm_h_H=O!skpWD;zHgQ2Z7c^mL?@X
z1%W9AO-33GNq!11SRECoI5M6PE#80Q$)ue&YTWuikDS}*$r1gu#A5@~n?IipvQ6Ev
zJGsf@j_-@3PB(HBG8R7CtzTc5)X?>Q-`|3xOcQrlKXTBW_NL#vmw9o7+Q*uMQu?od
zGd_1c_(W&<*XB#b{a>DNtG)66cd+f}JMEGUN|y1<{<;6$-Ri#>=sX5bS3j3^P6<r_
DUutJV

diff --git a/extension/skin/icon_24.png b/extension/skin/icon_24.png
deleted file mode 100644
index ca4abb281da9c56816041c1bebbace346382fbce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjvpiiKLn>}1CrGe1i>_e!n6L29
zpD9f7Xp@-2Js;++1qE^)!Wj$1_#6%{c4Xd~aDb6Fm{sV?sR^%|&pYHeH$`y==|=D$
zu{8<cW><9hBhwMNVvQJI#DZB)K$`W7!(RW~tpy3py$)HcTbWrigqCcJvbfNYrUc|R
zvt$@L0A(4p4p?=B?3RssF)<`&a!|;BwXHkkSidkcBz0IGefdij<a`ECS3j3^P6<r_
DPAy2`

diff --git a/extension/skin/icon_24_disabled.png b/extension/skin/icon_24_disabled.png
deleted file mode 100644
index a888e328a793151451f6a187612f263c6d2d5952..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjb39!fLn>}1CrGe1i>_e!n6L29
zpD9f7Xp@-2Js;++1qE^)!Wj$1_#6%{c4Xd~aDb6Fm{sV?sR^%|&pYHeH$`y==|=D$
zu{8<cW><9hBhwLCa3a}znF^!W3RXo6o^%CA8TA*9Rr5uhJvJR-lWN?-^P}IrM`J;Q
zEAz^lJr2yXIy0U%vt$@LY_?z!O_1H<<*KD3c2!0FVxWUP14ALJ`_Gj7m$ZQHWbkzL
Kb6Mw<&;$VNW<?nQ

diff --git a/extension/skin/icon_32_disabled.png b/extension/skin/icon_32_disabled.png
deleted file mode 100644
index 0f29e287142dde996e25e6ae77e634b9add5645e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 418
zcmV;T0bTxyP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004LNkl<Zc-qBR
zJ8r`;3{~n(K?nCHF3>$1J8JJxA3;a(4UC?^NAVE^6zH5Ov*%2%4M+e(B;ivdHUtRR
zfc*Hx&m(Nixz&qLi_ePQnH$zA2cP35ui7CV8cbP(a2vw1DHt5aP3b=rzCDaPDy1LB
zP2JxXCII86I@!VmAlzDsK#exwe-N-}s+>{@MBJb>1qrv84)#hq0OK}FWyr$4cNch)
za_T1(*P~mDnafz?AL!V4FnG%XjPY9=-4i*U5mg*An$Z!^NtpF_M#3SW(psKK@N{;^
z&ODRnJtHhOV-NO=B_#}`+4%cvUr3o#83G_MBe^-9fZ@XXYMaG>Bz#&1Nn-sK0>|i_
zK*h3m(QF0*%cdx>z(-bs3c=STU`i9nErCHw&;q0K*CwopFa>D}#=>K`W!d$T4s;np
z^a?2F8~f(&ACw#^wrpWJDgDzUmQk(zW4d1I^AUf?-!T&}i$BqTzrYq#%aX+KDgXcg
M07*qoM6N<$f;z;rkpKVy

diff --git a/extension/skin/icon_medium.png b/extension/skin/icon_medium.png
deleted file mode 100644
index 4afc8c289b0a2389b480e35b53a2ae43c81c0ccc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 344
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G1_3@Hu0Wb35M?jJ4b;G2666=mAYkASkWkRjKY#uH^Y`C>
zRahzqlv?cR;uunKtM}qr&O-qLt`DXED0j1K9^^~nEL)%&(IlI}zN~pl0_U^`+6VcV
z90LMBwK$)MWjPXAn_hO<BXY7$wI}x#e?`qbM|gCi581dJ+7r@pGl$c7ZAW9|{s!;L
z#AT+baoS9BsxL)2H}4UC_F|f)`l&OQ`ix$C%$z;V;P7OF&-{sg!ij!+8tQe@WD}p|
rAL8LZBvZR;A8&W@lOyu?-*eS6s(mhek+Qp-4diuCS3j3^P6<r_PoQjH

diff --git a/extension/skin/scriptish16.png b/extension/skin/scriptish16.png
new file mode 100755
index 0000000000000000000000000000000000000000..09d5b78c4aef9bdbfaea54368a9f2d2be0eb33cd
GIT binary patch
literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=Dh+L6~vJ#O${~LG}_)Usv|q%yJ?;iaU0AoC69;mbgZg1m~xflqVLYG6W=M=9TFA
zxrQi|8S9zqS(sZl!~zxV_jGX#vG7k$IKYzUurS@>kGz+Aa$s}#i~S$9k}cR)?eSj4
z$eO_>B9P5+=A^>&@+Ka}ivjB!ZoG)#zndVkTzNOsF*Zpi<^blvGYYpGq!t)HcT`K-
zEUIfWVJ~M=^FiYk_0Jh!p8vtqXcf(}>O8|yh6QdL99<+BwoBe+eGs5_Nucb>h0U#2
zx;-q+CWT9RH|=@YrM@viMIoc1Sx8#ufH1oq+otaqgawbX{b2OH!|m&%usreb{KiKL
fJfDSZco`T@GrGx0dmb_cdWFH$)z4*}Q$iB}CcSX@

literal 0
HcmV?d00001

diff --git a/extension/skin/scriptish16_disabled.png b/extension/skin/scriptish16_disabled.png
new file mode 100755
index 0000000000000000000000000000000000000000..1362b0c4730251adcc2b032c6fc94c4384d2b576
GIT binary patch
literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=Dh+K$tP>S|=w^kiEpy*OmP?vz!Qz;*K32=YT?zC9V-A!TD(=<%vb93;~Imc_n&&
zt|1C##(JiD7UtFsu|P!^JY5_^Ec}xb4zT1oEKGO!Bk$#&9M~NGV*f|2WDB-cd%RaM
zvSzS}2xK#yIjQixyorbLV!--_8!saG?<R;WSKiHZj7^e>Ie<CvjKb{(sRf459o3RH
zi|X1;*vpyJe9(AB{d2~b=XcEMQ`Qk+V=!&vbvo`Ks^1Xy*ZsH$+o4znzSI)+<jXw5
z&8$mwrwF#4XDHxtSS)mx;mHbzk8D1|o7hss55_#`Qr~#sZ{K;=4@Vl$Ig~T@HMlI%
x%Tar1#9}G-r(w?C3rAQ^vETTR9`llcVYyr6@!sV(JAi&;@O1TaS?83{1OOtyd#?Zh

literal 0
HcmV?d00001

diff --git a/extension/skin/scriptish24.png b/extension/skin/scriptish24.png
new file mode 100755
index 0000000000000000000000000000000000000000..ac9378bcecb3695238143a68fcfdd45009aee332
GIT binary patch
literal 364
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6;>1s;*b
z3=Dh+K$tP>S|=w^kiEpy*OmP?vz!Qz;*K32=YT?zC9V-A!TD(=<%vb93;~Imc_n&&
zt|1C##(JiD7UtFsu|P%FJY5_^JiL<=Bv_plS?)CS)vz7;zp%t)tL)$V6;lmmn0fbm
z=W=sh(9u{hjdg<pBdfpq2_XSqUM&G>+1C@Z481NW{AN1F7RkgM!0oxIIZf;e!`wo-
zCrUZ%+`9RnB(QAkWIDg#p)J2h{jqdTlL(gu%cKNStu)p;^R`~JsBIFtcw`oD82e{N
zi>U&VK5v%XNZ>Awl;9N0n3Tl0DQXtWWbJupS|%P`z{xa4vXkw@ndbgRnVKbOMzf+H
zu$Nqn%SdCcl$HL+Bf_2-F+p%Hdk5d~z}66MMh0^qH<{Flb3X%p$l&Sf=d#Wzp$PyE
C&2;Yo

literal 0
HcmV?d00001

diff --git a/extension/skin/scriptish24_disabled.png b/extension/skin/scriptish24_disabled.png
new file mode 100755
index 0000000000000000000000000000000000000000..2d036fbe15b19feadb55be72a690f696b7153761
GIT binary patch
literal 378
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6;>1s;*b
z3=DkxL735kHCP2G$X?><>&kwcSx$sUamNmib3h@<64!{5;QX|b^2DN4hJeJ(yb?V>
z*ARs=V?9$n3v=s+SfHXOo-U3d9^T0b60FXOEO#3EYS@naUsz(YRrc@wim8S&%)I-(
zbGf-L=x8jM#=1d)k=0-QgpdF)ua<zc?CXhHhF%vGels0oi)3OB;P%|qoF;aKVQ!(^
z6Q!JWZr%J(5?D5NGM!)W(3an${+OtV#iOPQ?gqAIU8my?!f_09f62=#M|xZkn!$fy
zC5x@c21!0)WwS-O3%L$|h-C0{ys*S;73+yO7f!Vq3s0~q{qBg6-|^_A&xZ}mkFb9@
z(|pe1J7Zsmn#4&9T?Wqwn_8xXJYf&nBR=b<!&3pXKQkxQI9%vn%(X&_iQ%wN<ngrA
S?)E_cGI+ZBxvX<aXaWFZkbgA*

literal 0
HcmV?d00001

diff --git a/extension/skin/scriptish32.png b/extension/skin/scriptish32.png
new file mode 100755
index 0000000000000000000000000000000000000000..a3a9b57ddc1ea374ce7d7f9d8dd713ae3b0e149d
GIT binary patch
literal 1612
zcmV-S2DABzP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!T<mc!T}X1N`L?W02y>eSaefwW^{L9a%BKeVQFr3
zE>1;MAa*k@H7+$tiu~XJ00odqL_t(oN1c~@OjB1J$4^_hlt*uErNr5av{q=Pv}-%b
zLL3_#Q)WaZWF|6o_^LzMP<&8c8ib)6Zj#}A4djs_iq6L$GufP(;(Kn+G4K^6j;SM#
zO+|c6xBJ^UrMF^f@AcZ`mqWPcobTuSUiVxP68h632^~YfE;q@OABrE2>Feuz{Gj7O
zHTo7E5W1D%`O+lmB>DsTlB`q);sP-sC+fFF=n>K)wcrf}Ef|B$Xd!y+5oN{6n2k+~
zpY#2qkc4lF|L1R_Sw6)Hz}x5u^0m1ZQQ{c!xS+8?E2l0<`ys!g;9f#{!bUt-EF46S
zlxPO(7zB}nx{w_Wb!|8jNklr4O)*8WG;&Gg*ZMMjuch7s>4oV`>%}%8cId?SFd`u`
zQ#b%wp+hPvgUSoZ3%TzB$v|h&D<~&qM#vsjuBt~<p#fuq5$s>tU1s{i1U1duJOBhD
zbNTFQ;Q&!ciBFdh_C}aPmL<FFHyk)5qiRNZ07jROW{#dY?mGSDs~yn&_f2rF%U{n4
z5D*(+Ri-IdM$Cz*Rm@kkggL^xrHiCYkTVDZiUOWw|G-4Vf0N1>vQ`eJ?IsTZ4g+(x
z{T$r9-2-?3x#zOn@}=3F0F;%QMwihb$`|<+8|VRQ6$K+Uj(``NEgoSu1cpijyt_QJ
z35!<L?X5r1a`ssFTXQBRa)&^RUI<+h%5b@vJd+ekK=Zi<th=p)gjs;NnmAITV?BaV
zNQ6Tv;>`j1LOExgLrX)Say2XHJ=&UWfJ<>Qub}q?)qARXpB~6Vp!iq;)@FR_-8j>^
z%v}kxWLcJAfbi+z?-Lh$Ah0mPHnd_W*ml|Y#Rq_?GE`;H2B1YU94`~;RDtHeM5>7D
z2XKqi<+NaN;vsdGx|SD!PNCx>3L|a>7X$;Ehfbl<C`pu!tH3Qz6;oi@fwO!UcDq0u
zxoqS?UI6t{b=gyIxNO9*;$+m<=miV2pt>U61zv#g+2J{Z>fU{N`5HO5cr*42hv`f7
zcTptbE<JIySQDHZ{Agh2i=6!-Fw_|a1MrBtfOhtqVV!}&d8Od>0zIAHEGckjz5|`a
zFPNPnB_YDa-NGz@x!O#cQ5-J-o+PExsjVmj-9YikrktU4XsXmt18|+(OPB?)H`yW3
z5;&0`z-tCQo=%NxjN=FJCrtjoqu-QMl@7rGVuLu|+Jrmaz_Ro9z%z&wfZ_9pmkI{J
zA<>y@%+CklJ~``w$lOT&W;BRUi}a=~Cg!<3;02&7)bTeX0<g8Yy5#VWE$52X7ncS`
z2Ns)ay*xm|F)$21LSSvMLVQ&`lUbk1m_Ee^z%csNdj4jVQ?_{VpLd?zTsp2@f$BXq
zkh5hmlTwia#u6hKD~({OwScY32DTkGuxzt{@e?B?Rwgozh6PO3fep;D))UO_`@P_-
z&1XmjkZOoo8`I0#jPyzRajhL~kJ)RJuaRup-gzDlo;n13zuO1<4(*4dXOF@4o*SO)
z7Q3#!^8y&k3=CU}u~o6884dB9h$U64k8p_#eO6Mpnjs!?d8yF?(VL@5Gcx)G_;6Es
zyAYAyhkd}BuXV4jO8QS)ECq=Zch=?jl}^lpUiAxLOSLV#+TAtCmACHQab2Z<`{Q@$
z=<0+ES1v)@<@50C#di3){TDd?(@8jdy2UlNUTTBRYgge$PdDUkaWeQ*?uj@7Frp;?
zy#RmpPIgRbB(eMJ?k(u*zUC4;eeMi2?%)3J#xFNt{H$)nzO|b^s#;dQB6q4IElvHh
z`X$LINfdVNFp*ZImc`0U_Eh_XnYlBwR;<aZoHRf68)>riI&SR@ddKwvtL1J+_{KUc
ze%Q3R&UxGCteD#{e%6G7u-LF<oIG;jUCh0LyoR+X9Gk}19{&Tg7bxF8$fNoI0000<
KMNUMnLSTZ}+4GYC

literal 0
HcmV?d00001

diff --git a/extension/skin/scriptish64.png b/extension/skin/scriptish64.png
new file mode 100755
index 0000000000000000000000000000000000000000..a6958be20f47a369d6ad28f989bf005f8535db86
GIT binary patch
literal 3612
zcmV+%4&(8OP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGi!T<mc!T}X1N`L?W02y>eSaefwW^{L9a%BKeVQFr3
zE>1;MAa*k@H7+$tiu~XJ01aSCL_t(|Ud>wxSd`ToJ~Is4z%UCVGk`b?Ff79|fVtc@
zo~vF9QOimt_nRiAX$mT+fNTmXDz53xjmq6J%Uj)YdCcq5eaeN()HK5#LqRAjm~-xT
zer9ZhS$^gp=5c(^GycQ*&wt+cTh4dB^Zh*J?vDz2As&k2d-3(&a_=x6pGWTBynmXs
zki+OQ`orDRanJKK$loK@V~l*5{G)EuyVYwKXt8RAiYP0UL{cUpo>`s*JqPf0DAhd^
za@SMTNbHs5l@~H8q*k>|MdTH7;#J^9P!6)*o=3GvgJkZSUgthXgHrv{{c2=IG9t(m
z*amG$#_K?g24!^a#N08u8bzSKsDYQmV+Y(!!fOlxue)Q4o%@V<v=U|6P;*=APk$eV
zFc2`vC6iMlZx~D9lCe5G$Uo3An|5xCfLTC5PxK>FBfkzmkKUj`e7H9pzF+f<^!!rw
zg!-<cyW%=rSHSQ7PL1jGO?}XZ9VQ?HHNa$hbm*BH6b$zag%xIPz%v2oJ)%9D`;F>{
z_Z|F%ocZBf^38XrNa6Bg>>J~I2uSel(Ab<hN1*;_Bx+$z!W*#ur=WC)&(t6(08Z!Y
z_!XkQqLa$;%0D9)L}J4h15wRX;USqXkW**RFyJj)VPz3DtrCahyR<_Tz|TNNRwN8Y
zORYXz1*)q-eR$!#68}{Hqlz(#`w@i^*idC4DZ5ktYP(X1JXLNy`t|X4;3*NOzCS|}
z(+qb(3&bwP=x{JCdXd+kcStx*_?yo>AL}bZ7C62bG=>>Vjf4RBDWpaD!Y73XgGK~3
zY4fx=abqIxzN<UwzPq(O1RjXcuhx@+69(b7lDE8mvuK(T#(v!4oI9ffKa#JLXUH##
z=Zo8uFaw;Q0i6O9IE4D4ChxJ{SY9M2!Ii;8u}nb%7X=d0d=c?4@h3?;+eqG|1?t&q
zu=OIl1QaZt*9-(d)fxC4j~N2dzXnYS$_uit1#|_lw>-k%qzk1ad3SO<=~Hb8el?hE
z-Mh^y0cS6sBUfv$lf~;RFc6U7c(Po2r~#-NNdRn5Xk);3%YAzI?2`<VToI2JW8VT_
zhd^x+p{P{YBtSk~Zan<ek%#R6Ld``|TmK7b{Nq=qm8>ppfw{@Kz-zr%g*+ILYLo~d
zpNEzWD*l#FPoMpgbjej&hRi4)FUF#2A}lTxGpg$`$HQshW<o+%1luOyC3(w<Q~zTK
zIQP>9a=W4K0dO+`vliyu<Q5o3AP<3Fa9BJ*e5=cdF2>Nwp*U=I7!EB7CCWvxt1Fk-
z-{?3{ach$Ip65-d<fAt0!2Xl0sy{UW#aIRT;=c#T&o{1+d%rie15ZhqQatrAXXy){
z5PnUalV7nP5zJ+|!Ra7y{%k&xEtV18CLKxMW!>i6t^%QxLNToMEqTlGTP7F2aevw7
zN__0}aeSw#{s9>yrjK03nE+UxD&(bd&gyJU+SE*_*N@*CZ&T83ft#<@xoWzJnh$14
z|B0bR!}UwieWT~UQ8eYVw|A|tjej;_9CrdVXmC)L4Nu-dNt;RF<?@(3fiu9(1Vqk{
zq><hzn*i0wlc(i*awh=1XwcZ8W~!!+mMu1a7ZwXiR8<s6oSmxM(ty}iv6O&W+ySx}
zLHw-vjDM*=CjzL{gO@AqIyPHit^J-@l}KR8UB+Vi+`GU^utvF5=`;bJd7dP4V?>AT
z+%6%o7l0k%cJAodi~s>nNO1^z0%(+HYQBZOB<?*uNr4GF)hstaZT=4{)Dbq*=iWz+
zVnU{eV23tt0h|&bDix8$ZHdkSw?&u*3F0*IPu#(=89|La6yp^2cB8vC;Kd8X#IOT4
zGR{ig(S1Nf;LyPPs2fD7?)XTblOCq(+)fMH05?m%Q^A|a2_7FzH#-V<;772*SwU6W
z5doAWm#e)EZRnQWjQ|13t|LGVNk$DyVgd{e8p0$iOdnWsCJ1K>A10uU^l7N9f7gb?
z+X+t4*=B=)h>{4Z0j|j?!$4hRLu7|kb5&Sbs3ZY10tlqHE}`y_>!Tkv>cxMR|Cb|d
z1D>7-gufmBm(4p1md$-8LSk1i!H{dt6eI&Bn<CalkaiK@L`ZbTqIp0-8X5tqEE@h=
zv3tc*1%QX>jtu}8^)b9-Ah1^{<!%CyK86fyy?24P^|hX!-VBFiCrxEpA%N!o4BNru
zy9gNTadxB-LA;=fI{_LL5;`Z8T{hQ>>PK#f>|F2wG{v%65bc-hx8D^6h!j&5O&tw%
zs3}O{s5^P53sk=?NS4>q!P0Zw34jq~FUr2~%!f03dt2PL(uWOBY*mbN(q{?qA<0|0
zr_0M-njjeBb0&cw#eYRIS7JNdwc_|><+6@R-$kHPwu4EST1aMyk*;8z34lQYq#4p$
zo8c}Hz|V!8fQbmY>_u;aeLWk;=L+B!pe+ed&r;J^z`&gV7y-7Ih4Ojw_F6zek3@~0
zk9qDEWr;8)!LP`VB=2Bh`&_`=0BuQtu1rT$V*_1601V_GkQPwwU(_b~k%|69dPs?@
zk(X$ksF4y7wkpiA^qmFI0=SukxHWN<fY)3@03Ahx)S`4zwMUjmt0qi`)*J0+9-u-z
z$tcNreh#0+zZYkp0B68=0Jxcer1z2tFM{XdQ(({p$g!58r_s-Fu=FXA5@Kc;&Ib+#
zlm<9<ejOpe3E&I?+gh7%FJBh~Lo9VjI!L-jwMOMS>2m~634omC0hZI}-p%hxzlww{
z39cc)1>h+G@}ctc+>x;yK@caHk+c<#tn4j+Y}DUH;3)yhampre(C#UY0*5m$em$Jz
za3R1M@FsgV+r8y?*wio@47n#WMAzKdm9dW$0pa=KG%t|EQi(ZsgOZb|g;CgP4REpa
zsV2lMiE&-6p+kB!s28N7T9|CFEi<s^13H0##Px}8tTxr4VNj-Kv`YXb#uf=3CBTmD
zoBcrYmSp0Y=sDk^@Yr?`#0Yr*%zdR~^_DeXJwEh_9I&r=a5Al1P7NxBT%6<FUuO`o
zHHE}h#$rv5ruiXf2&DS|-QPvQkPh+E$EO!vzFC85mBpQ3>&g3{e_$M)J?1A#qI4Z(
zhpS^MV_JPcXPW^4)-Ts%U5?H;sB{o6-cVxP^ucCh)buFh0|HDM1qof(1Vj4%`st@H
zR2$88HkRMl@7%;yAHIV}Wsk=C=k+*nNFWZI7KUS%#*pN#R(6IR)B?jM1JRZ0Nchxn
zoK`RZ&t5eL?>+btzInHnsrsn@?H=j#dS9IM4#XkUG%U<XF<QYrGX(XuFYGz6x7iwa
zYrlb(kX`?IALmxgCIcp><LF`0IA~Z9hVm7n&DY}Sif9tQE*{hDEhQ*<TQZ@WmxO;M
zkm$wHM3bw*VVPmL$CMs;WWgw0wyqq1aeP0%eXo7N6Mg>T4HZ~BSBu+%r$mHihBiQE
zh(j<0B_`QrGwRubx781{gd9D63~$}H4OeVjN@g#aL!e}ZOw7x~nfaM`TIqBQ<!fZ~
zo+^Cg<k1Jxb@bdTx37_|1G*X+O|#-i)iczzDALKy5Y*VmJrj52R{d?O)mDxs=Z?QG
zTE7^pW~i_=@btIH5-6EbL)OBn50sz3wQViq^d805@OvXk9-7i>`!<$Q(<xCur||ph
z{r6m}yYWbZrvf>C<^)lWRhpy^zGOT264;O>ybHc$V>Hper6J04s9@2e(M}N{HAug#
zYr6Z$60l%x8J1*Aa9~*=2`COAK6ySwkRu?xnecuRJ*}dRzOJK3Go2y;%E?w9{^m%h
z5zuhIkyvZCDm>eo;iSUJ&1edoOJ)N|b29_C{7!+oL8m_O+DgWoFSj^r{}f1F<6Uy|
zPA$1|>l(Rq^)k8e^F>0dw!gb@mQ<hnj%nsve)ILW=f7wEPW#dRm#$rA?x*9>icd2^
z>vwIya4>5d{7jP;Bsfce7V!j;f{oih*}=*Y-u<<K+^D-nE?=)<3YEXL0B7$72Ks8t
zv2RY0&yVcKAMO8`?Edrvvh&}&$oug9@&0{e|Ivel7C@gqTg{L~$@#J761jY%hK$Y`
zgZYEucz&u0tXc9DJZ&_28-WU(QUFtoF9Kh1V&CCUteV0v_wF!-$v<2=Z}k-wI^nOY
zPm%-24&m(|?<AEQR~Yk`6x^LMZ))|3H%IR6GosJ(@TbGGA)FowZ+P_wv+Hdt#-J7G
zNjwejaW9?MK$$@{KK$v3g4E%u8(x|;^w9X630G#7=QgjbT7?&`U4+vi;1Z?@F&Ymh
zK}j$ZFoAjfZld!9v~F}{!dT&FMJtPOUE>`_t!r*xCEx$}!$Y7?!kbxpKHrPW)|BH3
zxv$<!e`VmY#I(e<vLx9wFP--bupak>ri3)Q7q<y9sd)No94*y<jIZU75hsWjhW75d
z59V3}DG(zX0KkVcuiw={pRSyr$K=*DXi|7;#Pu2FGjYZGC1k<sGLluAjfYMi*3x^(
z-_8dn1-=UsoD6+aV1ho}AL_&i^gvY2yh2Ac={acKoEXK<EouO!hLZsexE~FA5n3;}
imeRu!*FMPoqx~N#%PdnM^l3l<0000<MNUMnLSTZ%+rA_K

literal 0
HcmV?d00001


From 702a8b03a6fee455e19d9de7de145a01aad81ad8 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 16 Apr 2011 21:22:29 -0700
Subject: [PATCH 022/829] <em:contributor>Slowpoke</em:contributor>

---
 LICENSE.txt           | 4 +---
 extension/install.rdf | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 91f4f2f9..f56769ab 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -14,9 +14,7 @@ see the LICENSE.mpl file.  All such code is located in the content/third-party/
 directory, and all such files contain the appropriate licensing disclaimers
 and notifications.
 
-The icon used is taken from the PICOL icon library http://www.picol.org/icon_library.php
-This library is released under the Creative Commons-License BY-SA
-http://creativecommons.org/licenses/by-sa/3.0/
+The icon used was created by Slowpoke for Scriptish.
 
 The uso_medium.png icon contained within Scriptish is the property of
 UserScripts.org http://userscripts.org and is being used with their consent
diff --git a/extension/install.rdf b/extension/install.rdf
index ad40304c..8f7b8702 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -49,6 +49,7 @@
     <em:contributor>Ori Avtallon</em:contributor>
     <em:contributor>Pak Kei (logo); http://arkidect.com/</em:contributor>
     <em:contributor>Sergio Abreu; http://sitedosergio.sitesbr.net/</em:contributor>
+    <em:contributor>Slowpoke</em:contributor>
     <em:contributor>Tommi Rautava/</em:contributor>
     <em:contributor>Nils Maier</em:contributor>
     <em:contributor>Melih Bilgil; http://picol.org</em:contributor>

From 25fb0de66b02728602053e2eac0224fa5d664dbf Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 17 Apr 2011 12:00:16 -0700
Subject: [PATCH 023/829] <em:maxVersion>6.*</em:maxVersion> for Firefox

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 8f7b8702..50fe9d42 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -65,7 +65,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0b5pre</em:minVersion>
-        <em:maxVersion>4.*</em:maxVersion>
+        <em:maxVersion>6.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- SeaMonkey -->

From dc0768c7c487a45a702521421d7aa289627995e8 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 17 Apr 2011 17:46:09 -0700
Subject: [PATCH 024/829] bug fix: no scripts were displayed in EM when
 scriptish (script execution) is disabled during startup and never enabled

---
 extension/content/js/addonstab.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 7416ec79..6952a5ab 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -8,6 +8,7 @@ Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 Cu.import("resource://scriptish/utils/Scriptish_ExtendedStringBundle.js");
 Cu.import("resource://scriptish/utils/Scriptish_openInEditor.js");
 Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js");
+Cu.import("resource://scriptish/addonprovider.js");
 
 var Scriptish_bundle = new Scriptish_ExtendedStringBundle(gStrings.ext);
 Scriptish_bundle.strings["header-userscript"] = Scriptish_stringBundle("userscripts");

From 4a52fe7cf9806a1620ed27ba95f1f0e029782d7c Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 17 Apr 2011 17:49:22 -0700
Subject: [PATCH 025/829] minor changes:

- Moving most of the UI related code out of Script and in to the addonprovider.js.
- using a broadcaster to change the "enabled" menuitems which is updated by the Scriptish service when the "scriptish-enabled" event is observed.
- Scriptish service is the only "install-userscript" observer now.
- notify that a script is modified only after dependencies are obtained
---
 extension/components/scriptish.js      | 15 ++++++
 extension/content/browser.xul          |  3 +-
 extension/content/js/browser.js        | 44 +++--------------
 extension/content/js/options.js        |  2 +-
 extension/content/js/script-options.js |  5 +-
 extension/modules/addonprovider.js     | 67 +++++++++++++++++++++++++-
 extension/modules/config/config.js     | 19 +++-----
 extension/modules/content/browser.js   | 17 ++-----
 extension/modules/script/script.js     | 47 +++++-------------
 extension/modules/scriptish.js         | 22 +++++++--
 10 files changed, 136 insertions(+), 105 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 838225fb..1374077a 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -44,6 +44,8 @@ function ScriptishService() {
 
   Services.obs.addObserver(this, "content-document-global-created", false);
   Services.obs.addObserver(this, "inner-window-destroyed", false);
+  Services.obs.addObserver(this, "install-userscript", false);
+  Services.obs.addObserver(this, "scriptish-enabled", false);
 }
 
 ScriptishService.prototype = {
@@ -65,6 +67,19 @@ ScriptishService.prototype = {
       case "inner-window-destroyed":
         this.innerWinDestroyed(aSubject.QueryInterface(Components.interfaces.nsISupportsPRUint64).data);
         break;
+      case "install-userscript":
+        let win = Scriptish.getMostRecentWindow();
+        if (win) win.Scriptish_BrowserUI.installCurrentScript();
+        break;
+      case "scriptish-enabled":
+        aData = Instances.json.decode(aData);
+        let bWins = Scriptish.getWindows();
+        let on = aData.enabling;
+        while (bWins.hasMoreElements()) {
+          let bWin = bWins.getNext();
+          bWin.Scriptish_BrowserUI.statusCasterEle.setAttribute("checked", on.toString());
+        }
+        break;
     }
   },
 
diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index 40c54605..4b13e1cf 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -26,7 +26,8 @@
       class="menu-iconic"
       image="chrome://scriptish/skin/scriptish16.png">
     <menupopup id="scriptish-tools-menupop">
-      <menuitem id="scriptish-tools-enabled-item" type="checkbox"/>
+      <menuitem id="scriptish-tools-enabled-item"
+          observes="scriptish-tb-enabled-brd" type="checkbox"/>
       <menuseparator/>
       <menuitem id="scriptish-tools-show-us"/>
       <menuitem id="scriptish-tools-new"/>
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index aa52a27a..0feb8c83 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -26,17 +26,9 @@ Scriptish_BrowserUI.QueryInterface = tools.XPCOMUtils.generateQI([
     Ci.nsISupports, Ci.nsISupportsWeakReference, Ci.nsIWebProgressListener]);
 
 Scriptish_BrowserUI.tbBtnSetup = function() {
-  var statusEnabledItem = $("scriptish-tb-enabled-brd");
   $("scriptish-button-brd").setAttribute(
       "onclick", "Scriptish_BrowserUIM.onIconClick(event)");
 
-  statusEnabledItem.setAttribute("label",
-      Scriptish_stringBundle("statusbar.enabled"));
-  statusEnabledItem.setAttribute("accesskey",
-      Scriptish_stringBundle("statusbar.enabled.ak"));
-  statusEnabledItem.setAttribute("oncommand",
-      "Scriptish_BrowserUIM.onToggleStatus()");
-
   $("scriptish-tb-no-scripts-brd").setAttribute(
       "label", Scriptish_stringBundle("statusbar.noScripts"));
 
@@ -85,7 +77,6 @@ Scriptish_BrowserUI.chromeLoad = function(e) {
   this.tbBtnSetup();
 
   // get all required DOM elements
-  this.toolsMenuEnabledItem = $("scriptish-tools-enabled-item");
   this.contextItemInstall = $("scriptish-context-menu-install");
   this.contextItemVS = $("scriptish-context-menu-viewsource");
 
@@ -93,17 +84,14 @@ Scriptish_BrowserUI.chromeLoad = function(e) {
   tmEle.setAttribute("label", Scriptish_stringBundle("menu.title"));
   tmEle.setAttribute("accesskey", Scriptish_stringBundle("menu.title.ak"));
 
-  var tmStatusEle = $('scriptish-tools-enabled-item');
-  tmStatusEle.setAttribute("label", Scriptish_stringBundle("statusbar.enabled"));
-  tmStatusEle.setAttribute("accesskey", Scriptish_stringBundle("statusbar.enabled.ak"));
-
-  $("scriptish-tools-menupop").addEventListener("popupshowing", function(aEvt) {
-    // set the enabled/disabled state
-    Scriptish_BrowserUI.toolsMenuEnabledItem.setAttribute(
-        "checked", Scriptish.enabled);
-  }, false);
-
-  this.toolsMenuEnabledItem.addEventListener("command", function() { Scriptish_BrowserUIM.onToggleStatus() }, false);
+  var statusEnabledItem = this.statusCasterEle = $("scriptish-tb-enabled-brd");
+  statusEnabledItem.setAttribute("label",
+      Scriptish_stringBundle("statusbar.enabled"));
+  statusEnabledItem.setAttribute("accesskey",
+      Scriptish_stringBundle("statusbar.enabled.ak"));
+  statusEnabledItem.setAttribute("oncommand",
+      "Scriptish_BrowserUIM.onToggleStatus()");
+  statusEnabledItem.setAttribute("checked", Scriptish.enabled);
 
   var tmCmdsEle = $("scriptish-tools-commands");
   tmCmdsEle.setAttribute("label", Scriptish_stringBundle("menu.commands"));
@@ -200,17 +188,6 @@ Scriptish_BrowserUI.showScriptView = function(aSD, aURL) {
   gBrowser.selectedTab = gBrowser.addTab(aURL);
 }
 
-/**
- * Implements nsIObserve.observe. Right now we're only observing our own
- * install-userscript, which happens when the install bar is clicked.
- */
-Scriptish_BrowserUI.observe = function(subject, topic, data) {
-  if (topic == "install-userscript")
-    if (window == Services.ww.activeWindow) this.installCurrentScript();
-  else
-    throw new Error("Unexpected topic received: {" + topic + "}");
-};
-
 // Handles the install button getting clicked.
 Scriptish_BrowserUI.installCurrentScript = function() {
   this.scriptDownloader_.installScript();
@@ -342,11 +319,6 @@ function Scriptish_showPopup(aEvent) {
   var popup = aEvent.target;
   var tail = $("scriptish-tb-no-scripts-sep");
 
-  // set the enabled/disabled state
-  var statusEnabledItem = $("scriptish-tb-enabled-item");
-  statusEnabledItem && statusEnabledItem.setAttribute(
-      "checked", Scriptish.enabled);
-
   // remove all the scripts from the list
   for (var i = popup.childNodes.length - 1; i >= 0; i--) {
     var node = popup.childNodes[i];
diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index b96e418b..cb7f111d 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -64,5 +64,5 @@ function doSave() {
       !!$("check-copydownloadURL").checked);
 
   Scriptish.config.excludes = $("excludes").value.match(/.+/g);
-  Scriptish.notify(null, "scriptish-preferences-change", {saved: true});
+  Scriptish.notify(null, "scriptish-preferences-change", true);
 }
diff --git a/extension/content/js/script-options.js b/extension/content/js/script-options.js
index 0fccf746..d307f8f7 100644
--- a/extension/content/js/script-options.js
+++ b/extension/content/js/script-options.js
@@ -40,10 +40,7 @@ function doSave() {
   if (script.getUserIncStr() != postInc || script.getUserIncStr("exclude") != postExc) {
     script.user_includes = postInc.match(/.+/g);
     script.user_excludes = postExc.match(/.+/g);
-    Scriptish.notify(script, "scriptish-script-user-prefs-change", {saved: true});
-
-    // display modified notification
-    script.modificationProcess(true);
+    Scriptish.notify(script, "scriptish-script-user-prefs-change", true);
   }
 
   script.includesDisabled = $("disableScriptIncludes").checked;
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index e9d120ff..121e7f49 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -1,6 +1,61 @@
 var EXPORTED_SYMBOLS = [];
+Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/scriptish.js");
-Components.utils.import("resource://gre/modules/AddonManager.jsm");
+Components.utils.import("resource://scriptish/logging.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_notification.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+
+const Scriptish_ScriptProvider = {
+  observe: function(aSubject, aTopic, aData) {
+    aData = JSON.parse(aData);
+    let script = Scriptish.config.getScriptById(aData.id);
+    switch(aTopic){
+    case "scriptish-script-installed":
+      AddonManagerPrivate.callInstallListeners(
+          "onExternalInstall", null, script, null, false);
+
+      // notification that install is complete
+      var msg = "'" + script.name;
+      if (script.version) msg += " " + script.version;
+      msg += "' " + Scriptish_stringBundle("statusbar.installed");
+      Scriptish_notification(msg, null, null, function() Scriptish.openManager());
+      break;
+    case "scriptish-script-edit-enabling":
+      AddonManagerPrivate.callAddonListeners(
+          aData.enabling ? "onEnabling" : "onDisabling", script, false);
+      break;
+    case "scriptish-script-edit-enabled":
+      AddonManagerPrivate.callAddonListeners(
+          aData.enabling ? "onEnabled" : "onDisabled", script);
+      break;
+    case "scriptish-script-modified":
+    case "scriptish-script-updated":
+      if (aData.reloadUI) {
+        AddonManagerPrivate.callAddonListeners("onUninstalled", this);
+        AddonManagerPrivate.callInstallListeners(
+            "onExternalInstall", null, this, null, false);
+      }
+
+      // notification
+      var msg = "'" + script.name;
+      if (script.version) msg += " " + script.version;
+      msg += "' " + (("scriptish-script-updated" == aTopic)
+          ? Scriptish_stringBundle("statusbar.updated")
+          : Scriptish_stringBundle("statusbar.modified"));
+      Scriptish_notification(msg, null, null, function() Scriptish.openManager());
+      break;
+    case "scriptish-script-uninstalling":
+      AddonManagerPrivate.callAddonListeners("onUninstalling", script, false);
+      break;
+    case "scriptish-script-uninstalled":
+      AddonManagerPrivate.callAddonListeners("onUninstalled", script);
+      break;
+    }
+  },
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver])
+};
+
+
 
 AddonManagerPrivate.registerProvider({
   getAddonByID: function(aId, aCallback) {
@@ -11,3 +66,13 @@ AddonManagerPrivate.registerProvider({
     else aCallback(Scriptish.config.scripts);
   }
 });
+[
+  "scriptish-script-installed",
+  "scriptish-script-edit-enabling",
+  "scriptish-script-edit-enabled",
+  "scriptish-script-modified",
+  "scriptish-script-updated",
+  "scriptish-script-uninstalling",
+  "scriptish-script-uninstalled"
+].forEach(function(i)(
+    Services.obs.addObserver(Scriptish_ScriptProvider, i, false)));
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 9245f6b5..9444c1da 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -58,6 +58,8 @@ function Config(aBaseDir) {
     "scriptish-script-user-prefs-change",
     "scriptish-script-updated",
     "scriptish-script-uninstalled",
+    "scriptish-script-uninstall-canceled",
+    "scriptish-script-removed",
     "scriptish-preferences-change",
     "scriptish-config-saved"
   ].forEach(function(i) Services.obs.addObserver(self, i, false));
@@ -68,13 +70,17 @@ Config.prototype = {
   observe: function(aSubject, aTopic, aData) {
     var data = JSON.parse(aData || "{}");
     switch(aTopic) {
+    case "scriptish-script-user-prefs-change":
+      Scriptish.notify(
+          aSubject, "scriptish-script-modified", {saved:false, reloadUI:false});
     case "scriptish-script-installed":
     case "scriptish-script-modified":
     case "scriptish-script-edit-enabled":
     case "scriptish-script-updated":
     case "scriptish-script-uninstalled":
+    case "scriptish-script-uninstall-canceled":
+    case "scriptish-script-removed":
     case "scriptish-preferences-change":
-    case "scriptish-script-user-prefs-change":
       if (data.saved) Scriptish.notify(null, "scriptish-config-saved", null);
       break;
     case "scriptish-config-saved":
@@ -266,17 +272,8 @@ Config.prototype = {
     } else {
       aNewScript.installProcess();
       this.addScript(aNewScript);
-      AddonManagerPrivate.callInstallListeners(
-          "onExternalInstall", null, aNewScript, null, false);
 
-      // notification that install is complete
-      var msg = "'" + aNewScript.name;
-      if (aNewScript.version) msg += " " + aNewScript.version;
-      msg += "' " + Scriptish_stringBundle("statusbar.installed");
-      Scriptish_notification(msg, null, null, function() Scriptish.openManager());
-
-      Scriptish.notify(
-          aNewScript, "scriptish-script-installed", {saved:true});
+      Scriptish.notify(aNewScript, "scriptish-script-installed", true);
     }
     this.sortScripts();
   },
diff --git a/extension/modules/content/browser.js b/extension/modules/content/browser.js
index 02366da2..47664459 100644
--- a/extension/modules/content/browser.js
+++ b/extension/modules/content/browser.js
@@ -15,9 +15,6 @@ function Scriptish_BrowserUIM(aWin, aBrowserUI) {
   this.$ = function(aID) aWin.document.getElementById(aID);
   this._win = aWin;
   this._browserUI = aBrowserUI;
-
-  // listen for clicks on the install bar
-  Services.obs.addObserver(aBrowserUI, "install-userscript", true);
 }
 Scriptish_BrowserUIM.prototype = {
   onIconClick: function(aEvt) {
@@ -34,9 +31,7 @@ Scriptish_BrowserUIM.prototype = {
         break;
     }
   },
-  onToggleStatus: function() {
-    Scriptish.enabled = !Scriptish.enabled;
-  },
+  onToggleStatus: function() Scriptish.enabled = !Scriptish.enabled,
   refreshStatus: function() {
     var tbImg = this.$("scriptish-button-brd");
     var menu = this.$("scriptish_general_menu");
@@ -55,12 +50,10 @@ Scriptish_BrowserUIM.prototype = {
         this._win, aURL, null, "chrome,dependent,centerscreen,resizable,dialog",
         null);
   },
-  newUserScript: function() {
-    this.openChromeWindow("chrome://scriptish/content/newscript.xul");
-  },
-  openOptionsWin: function() {
-    this.openChromeWindow("chrome://scriptish/content/options.xul");
-  },
+  newUserScript: function() (
+    this.openChromeWindow("chrome://scriptish/content/newscript.xul")),
+  openOptionsWin: function() (
+    this.openChromeWindow("chrome://scriptish/content/options.xul")),
   showUserscriptList: function() {
     Cu.import("resource://scriptish/addonprovider.js");
     timeout(Scriptish.openManager);
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 6d013fe2..fe0a4ebe 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -12,7 +12,6 @@ Cu.import("resource://scriptish/utils/Scriptish_getUriFromFile.js");
 Cu.import("resource://scriptish/utils/Scriptish_getContents.js");
 Cu.import("resource://scriptish/utils/Scriptish_getTLDURL.js");
 Cu.import("resource://scriptish/utils/Scriptish_convert2RegExp.js");
-Cu.import("resource://scriptish/utils/Scriptish_notification.js");
 Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 Cu.import("resource://scriptish/script/scriptinstaller.js");
 Cu.import("resource://scriptish/script/scripticon.js");
@@ -147,17 +146,14 @@ Script.prototype = {
     val = !!val;
     if (val === this.userDisabled) return val;
 
-    AddonManagerPrivate.callAddonListeners(
-        val ? "onEnabling" : "onDisabling", this, false);
+    var enabling = !val;
+    Scriptish.notify(this, "scriptish-script-edit-enabling", {enabling: enabling});
 
     Scriptish.notify(this, "scriptish-script-edit-enabled", {
-      enabled: (this._enabled = !val),
+      enabling: (this._enabled = enabling),
       saved: true
     });
 
-    AddonManagerPrivate.callAddonListeners(
-        val ? "onEnabled" : "onDisabled", this);
-
     return val;
   },
 
@@ -256,15 +252,15 @@ Script.prototype = {
     aCallback.call(this, false, AddonManager.UPDATE_STATUS_DOWNLOAD_ERROR)),
 
   uninstall: function() {
-    AddonManagerPrivate.callAddonListeners("onUninstalling", this, false);
+    Scriptish.notify(this, "scriptish-script-uninstalling");
     this.needsUninstall = true;
     this.pendingOperations = AddonManager.PENDING_UNINSTALL;
-    AddonManagerPrivate.callAddonListeners("onUninstalled", this);
+    Scriptish.notify(this, "scriptish-script-uninstalled");
   },
   uninstallProcess: function() {
     this.removeSettings();
     this.removeFiles();
-    Scriptish.notify(this, "scriptish-script-uninstalled", {saved: false});
+    Scriptish.notify(this, "scriptish-script-removed");
   },
   removeSettings: function() {
     if (Scriptish_prefRoot.getValue("uninstallPreferences")) {
@@ -434,7 +430,7 @@ Script.prototype = {
   get runAt() this["_run-at"] || defaultRunAt,
   useDelayedInjectors: function() {
     this.delayInjection = false;
-    this.updateHelper();
+    Scriptish.notify(this, "scriptish-script-modified", {saved: false, reloadUI: true});
     for (let [, injector] in Iterator(this.delayedInjectors)) injector(this);
     this.delayedInjectors = [];
   },
@@ -587,14 +583,8 @@ Script.prototype = {
   replaceScriptWith: function(aNewScript) {
     this.removeFiles();
     this.updateFromNewScript(aNewScript.installProcess());
-
-    // notification that update is complete
-    var msg = "'" + this.name;
-    if (this.version) msg += " " + this.version;
-    msg += "' " + Scriptish_stringBundle("statusbar.updated");
-    Scriptish_notification(msg, null, null, function() Scriptish.openManager());
-    this.updateHelper();
-    Scriptish.notify(this, "scriptish-script-updated", {saved: true});
+    Scriptish.notify(
+        this, "scriptish-script-updated", {saved: true, reloadUI: true});
   },
   updateFromNewScript: function(newScript, scriptInjector) {
     var tools = {};
@@ -662,8 +652,9 @@ Script.prototype = {
         Cu.import("resource://scriptish/config/configdownloader.js", tools);
         // Redownload dependencies.
         tools.Scriptish_configDownloader.refetchDependencies(this);
+      } else {
+        Scriptish.notify(this, "scriptish-script-modified", {saved: false, reloadUI: true});
       }
-      this.modificationProcess();
     }
     if (oldPriority != newPriority) this._config.sortScripts();
   },
@@ -822,22 +813,6 @@ Script.prototype = {
     this._modified = this._file.lastModifiedTime;
     this._dependhash = tools.Scriptish_cryptoHash(this._rawMeta);
     return this;
-  },
-
-  updateHelper: function () {
-    AddonManagerPrivate.callAddonListeners("onUninstalled", this);
-    AddonManagerPrivate.callInstallListeners(
-        "onExternalInstall", null, this, null, false);
-  },
-  modificationProcess: function(noReload) {
-    // notification that modification is complete
-    var msg = "'" + this.name;
-    if (this.version) msg += " " + this.version;
-    msg += "' " + Scriptish_stringBundle("statusbar.modified");
-    Scriptish_notification(msg, null, null, function() Scriptish.openManager());
-
-    if (!noReload) this.updateHelper();
-    Scriptish.notify(this, "scriptish-script-modified", {saved: false});
   }
 };
 
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 95a09a7f..9c200d21 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -4,11 +4,25 @@ Components.utils.import("resource://scriptish/prefmanager.js");
 
 const Scriptish = {
   notify: function(aSubject, aTopic, aData) {
-    Services.obs.notifyObservers(aSubject, aTopic, JSON.stringify(aData));
+    if (true === aData) {
+      aData = {saved: true};
+    } else if (null !== aData) {
+      if (!aData) {
+        aData = {saved: false};
+      } else if (!aData.saved) {
+        aData.saved = false;
+      }
+    }
+    if (aData && aSubject) aData.id = aSubject.id;
+    Services.obs.notifyObservers(null, aTopic, JSON.stringify(aData));
   },
   get config() Services.scriptish.config,
   get enabled() Scriptish_prefRoot.getValue("enabled", true),
-  set enabled(aVal) Scriptish_prefRoot.setValue("enabled", !!aVal),
+  set enabled(aVal) {
+    let val = !!aVal;
+    this.notify(null, "scriptish-enabled", {enabling: val});
+    Scriptish_prefRoot.setValue("enabled", val)
+  },
   openManager: function Scriptish_openManager() {
     var browserWin = Services.wm.getMostRecentWindow("navigator:browser");
     if (browserWin.BrowserOpenAddonsMgr)
@@ -41,5 +55,7 @@ const Scriptish = {
         return Scriptish_prefRoot.getValue('unmhtIsGreaseable');
     }
     return false;
-  }
+  },
+  getMostRecentWindow: function() Service.wm.getMostRecentWindow("navigator:browser"),
+  getWindows: function() Services.wm.getEnumerator("navigator:browser")
 }

From 4bec326a2a215649864c4ee7eae7cdfdda41896e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 18 Apr 2011 17:38:29 -0700
Subject: [PATCH 026/829] Closes #273 when extensions.scriptish.enabled was
 changed in about:config then icons were not updated

Note: also caching Scriptish's status so that it doesn't need to be checked in prefs every time that a script is inspected for injection.
---
 extension/components/scriptish.js |  1 +
 extension/content/js/browser.js   |  6 +-----
 extension/modules/scriptish.js    | 19 +++++++++++++++----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 1374077a..31cf3caa 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -78,6 +78,7 @@ ScriptishService.prototype = {
         while (bWins.hasMoreElements()) {
           let bWin = bWins.getNext();
           bWin.Scriptish_BrowserUI.statusCasterEle.setAttribute("checked", on.toString());
+          bWin.Scriptish_BrowserUIM.refreshStatus();
         }
         break;
     }
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 0feb8c83..24783c73 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -118,11 +118,7 @@ Scriptish_BrowserUI.chromeLoad = function(e) {
   this.contextItemVS.setAttribute("accesskey", Scriptish_stringBundle("menu.show.ak"));
   this.contextItemVS.addEventListener("command", function(aEvt) {
     Scriptish_BrowserUI.viewContextItemClicked(aEvt);
-  }, false)
-
-  // update visual status when enabled state changes
-  this.statusWatcher = Scriptish_BrowserUIM.refreshStatus.bind(Scriptish_BrowserUIM);
-  Scriptish_prefRoot.watch("enabled", this.statusWatcher);
+  }, false);
 
   // hook on to context menu popup event
   $("contentAreaContextMenu").addEventListener(
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 9c200d21..7b24e8cb 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -2,6 +2,15 @@ var EXPORTED_SYMBOLS = ["Scriptish"];
 Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/prefmanager.js");
 
+function setStatus() (enabled = Scriptish_prefRoot.getValue("enabled", true));
+function notifyStatusChg(aVal) (
+    Scriptish.notify(null, "scriptish-enabled", {enabling: aVal}));
+var ignoreEnable = false, enabled = setStatus();
+Scriptish_prefRoot.watch("enabled", function() {
+  if (ignoreEnable) return ignoreEnable = false;
+  notifyStatusChg(setStatus());
+});
+
 const Scriptish = {
   notify: function(aSubject, aTopic, aData) {
     if (true === aData) {
@@ -17,11 +26,12 @@ const Scriptish = {
     Services.obs.notifyObservers(null, aTopic, JSON.stringify(aData));
   },
   get config() Services.scriptish.config,
-  get enabled() Scriptish_prefRoot.getValue("enabled", true),
+  get enabled() enabled,
   set enabled(aVal) {
-    let val = !!aVal;
-    this.notify(null, "scriptish-enabled", {enabling: val});
-    Scriptish_prefRoot.setValue("enabled", val)
+    ignoreEnable = true;
+    enabled = !!aVal;
+    notifyStatusChg(enabled);
+    Scriptish_prefRoot.setValue("enabled", enabled);
   },
   openManager: function Scriptish_openManager() {
     var browserWin = Services.wm.getMostRecentWindow("navigator:browser");
@@ -59,3 +69,4 @@ const Scriptish = {
   getMostRecentWindow: function() Service.wm.getMostRecentWindow("navigator:browser"),
   getWindows: function() Services.wm.getEnumerator("navigator:browser")
 }
+

From 7c36e6a044ff7d41898ceb44ebf978b6d15853c9 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 4 Apr 2011 21:24:40 -0500
Subject: [PATCH 027/829] Capture httpChannel errors... typically thrown when
 we have a valid but inaccessible dependency.

---
 extension/locale/en-US/scriptish.properties  |  1 +
 extension/modules/script/scriptdownloader.js | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 1a14a26f..35fc85e1 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -72,6 +72,7 @@ newscript.name=Name
 newscript.namespace=Namespace
 newscript.noID=Please provide a valid ID for your script.
 newscript.noName=Please provide a name for your script.
+nothing.timedOut=nothing (timed out)
 openFolder=Open Folder
 openFolder.ak=O
 saving=Saving
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index b3fef53b..7b407abd 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -233,7 +233,13 @@ ScriptDownloader.prototype.handleDependencyDownloadComplete =
   let errMsgStart = Scriptish_stringBundle("error.dependency.loading") + ": " +
       dep.urlToDownload + "\n";
   if (httpChannel) {
-    if (httpChannel.requestSucceeded) {
+    try {
+      var reqSucceeded = httpChannel.requestSucceeded
+          && (httpChannel.responseStatus == 200 || httpChannel.responseStatus == 0);
+    } catch(e) {
+      var reqSucceeded = false;
+    }
+    if (reqSucceeded) {
       if (this.updateScript) {
         dep._script = this.script;
         dep.updateScript = true;
@@ -251,8 +257,14 @@ ScriptDownloader.prototype.handleDependencyDownloadComplete =
       dep.setDownloadedFile(file, channel.contentType, channel.contentCharset ? channel.contentCharset : null);
       this.downloadNextDependency();
     } else {
+      try {
+        var responseStatus = httpChannel.responseStatus + ": "
+            + httpChannel.responseStatusText;
+      } catch(e) {
+        var responseStatus = Scriptish_stringBundle("nothing.timedOut");
+      }
       let errMsg = Scriptish_stringBundle("error.dependency.serverReturned") + ": "
-          + httpChannel.responseStatus + ": " + httpChannel.responseStatusText;
+          + responseStatus;
 
       if (dep instanceof ScriptIcon) {
         file.remove(false);

From 393114be5497d33cd4f22f153fd9cc55b9699dd9 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 5 Apr 2011 07:55:33 -0500
Subject: [PATCH 028/829] Shouldn't need to check response codes if
 'requestSucceeded' exists.

---
 extension/modules/script/scriptdownloader.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 7b407abd..528de3e6 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -226,7 +226,7 @@ ScriptDownloader.prototype.handleDependencyDownloadComplete =
       checkCert(channel, !Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
     }
     catch (e) {
-      return  this.errorInstallDependency(dep, "Invalid dependency SSL certificate");
+      return this.errorInstallDependency(dep, "Invalid dependency SSL certificate");
     }
   }
 
@@ -234,8 +234,7 @@ ScriptDownloader.prototype.handleDependencyDownloadComplete =
       dep.urlToDownload + "\n";
   if (httpChannel) {
     try {
-      var reqSucceeded = httpChannel.requestSucceeded
-          && (httpChannel.responseStatus == 200 || httpChannel.responseStatus == 0);
+      var reqSucceeded = httpChannel.requestSucceeded;
     } catch(e) {
       var reqSucceeded = false;
     }

From 16be96e0fab7fff9d730a05cb6a63573f7516715 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 18 Apr 2011 20:19:30 -0500
Subject: [PATCH 029/829] Remember a script's auto update preference.

---
 extension/modules/script/script.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index fe0a4ebe..af64ce6d 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -26,6 +26,7 @@ const JSVersions = ['1.6', '1.7', '1.8', '1.8.1'];
 const maxJSVer = JSVersions[2];
 const runAtValues = ["document-start", "document-end", "document-idle", "window-load"];
 const defaultRunAt = runAtValues[1];
+const defaultAutoUpdateState = AddonManager.AUTOUPDATE_DISABLE;
 const usoURLChk = /^https?:\/\/userscripts\.org\/scripts\/[^\d]+(\d+)/i;
 
 function noUpdateFound(aListener, aReason) {
@@ -61,6 +62,7 @@ function Script(config) {
   this._namespace = "";
   this._prefroot = null;
   this._author = null;
+  this._applyBackgroundUpdates = defaultAutoUpdateState;
   this._contributors = [];
   this._description = null;
   this._version = null;
@@ -127,7 +129,13 @@ Script.prototype = {
   },
   appDisabled: false,
   scope: AddonManager.SCOPE_PROFILE,
-  applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE,
+  get applyBackgroundUpdates() this._applyBackgroundUpdates,
+  set applyBackgroundUpdates(aVal) {
+    this._applyBackgroundUpdates = aVal;
+    Scriptish.notify(null, "scriptish-script-user-prefs-change", {
+      saved: true
+    });
+  },
   operationsRequiringRestart: AddonManager.OP_NEEDS_RESTART_NONE,
   get isActive() !this.userDisabled,
   pendingOperations: AddonManager.PENDING_NONE,
@@ -606,6 +614,7 @@ Script.prototype = {
     this._screenshots = newScript._screenshots;
     this._homepageURL = newScript.homepageURL;
     this._updateURL = newScript._updateURL;
+    this._applyBackgroundUpdates = newScript._applyBackgroundUpdates;
     this.supportURL = newScript.supportURL;
     this._name = newScript._name;
     this._namespace = newScript._namespace;
@@ -779,6 +788,8 @@ Script.prototype = {
       scriptNode.setAttribute("downloadURL", this._downloadURL);
     if (this._updateURL)
       scriptNode.setAttribute("updateURL", this._updateURL);
+    if (this._applyBackgroundUpdates != defaultAutoUpdateState)
+      scriptNode.setAttribute("applyBackgroundUpdates", this._applyBackgroundUpdates);
     if (this.supportURL)
         scriptNode.setAttribute("supportURL", this.supportURL);
     if (this.averageRating)
@@ -946,6 +957,10 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript) {
           if (uri.scheme == "https" || uri.scheme == "http")
             script._updateURL = uri.spec;
           break;
+        case "applybackgroundupdates":
+          script._applyBackgroundUpdates =
+              parseInt(value, 10) || defaultAutoUpdateState;
+          continue;
         case "injectframes":
           if (value != "0") continue;
           script["_noframes"] = true;
@@ -1124,6 +1139,9 @@ Script.load = function load(aConfig, aNode) {
   script._downloadURL = aNode.getAttribute("downloadURL")
       || aNode.getAttribute("installurl") || null;
   script._updateURL = aNode.getAttribute("updateURL") || null;
+  script._applyBackgroundUpdates =
+      parseInt(aNode.getAttribute("applyBackgroundUpdates"), 10)
+      || defaultAutoUpdateState;
   script._homepageURL = aNode.getAttribute("homepageURL")
       || aNode.getAttribute("homepage") || null;
   if (aNode.getAttribute("supportURL"))

From 3808dcb1dabd4d8e0f62ab996c09b0642ce45208 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 28 Apr 2011 09:00:47 -0500
Subject: [PATCH 030/829] Using 'scriptish-script-prefs-change' when notifying
 about a script's applyBackgroundUpdates option changing.

---
 extension/modules/config/config.js | 2 ++
 extension/modules/script/script.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 9444c1da..5eccfd55 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -56,6 +56,7 @@ function Config(aBaseDir) {
     "scriptish-script-modified",
     "scriptish-script-edit-enabled",
     "scriptish-script-user-prefs-change",
+    "scriptish-script-prefs-change",
     "scriptish-script-updated",
     "scriptish-script-uninstalled",
     "scriptish-script-uninstall-canceled",
@@ -73,6 +74,7 @@ Config.prototype = {
     case "scriptish-script-user-prefs-change":
       Scriptish.notify(
           aSubject, "scriptish-script-modified", {saved:false, reloadUI:false});
+    case "scriptish-script-prefs-change":
     case "scriptish-script-installed":
     case "scriptish-script-modified":
     case "scriptish-script-edit-enabled":
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index af64ce6d..dc5c8811 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -132,7 +132,7 @@ Script.prototype = {
   get applyBackgroundUpdates() this._applyBackgroundUpdates,
   set applyBackgroundUpdates(aVal) {
     this._applyBackgroundUpdates = aVal;
-    Scriptish.notify(null, "scriptish-script-user-prefs-change", {
+    Scriptish.notify(null, "scriptish-script-prefs-change", {
       saved: true
     });
   },

From e4a05b33bc633dc01a69514e6ceecf5153bd04fd Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 6 May 2011 09:59:52 -0700
Subject: [PATCH 031/829] Asynchronously read & save the config file, also
 saving the config as JSON now.

---
 extension/components/scriptish.js             |  92 +++---
 extension/content/js/addonstab.js             |   6 +-
 extension/content/js/browser.js               |   6 +-
 extension/content/js/newscript.js             |  34 +--
 extension/content/js/options.js               |   6 +-
 extension/content/js/script-options.js        |  34 +--
 extension/modules/addonprovider.js            |  14 +-
 extension/modules/config/config.js            | 167 +++++------
 extension/modules/script/script.js            | 261 ++++++++----------
 extension/modules/script/scriptdownloader.js  | 126 +++++----
 extension/modules/scriptish.js                |  36 ++-
 .../modules/utils/Scriptish_getWriteStream.js |   8 +-
 12 files changed, 411 insertions(+), 379 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 31cf3caa..7530ee76 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -85,17 +85,6 @@ ScriptishService.prototype = {
   },
 
   get filename() filename,
-  _scriptFoldername: "scriptish_scripts",
-
-  _config: null,
-  get config() {
-    if (!this._config) {
-      var tools = {};
-      Cu.import("resource://scriptish/config/config.js", tools);
-      this._config = new tools.Config(this._scriptFoldername);
-    }
-    return this._config;
-  },
 
   innerWinDestroyed: function(aWinID) {
     let window = windows[aWinID];
@@ -133,7 +122,7 @@ ScriptishService.prototype = {
 
     // check if there are any modified scripts
     if (tools.Scriptish_prefRoot.getValue("enableScriptRefreshing"))
-      this.config.updateModifiedScripts(function(script) {
+      Scriptish.getConfig(function(config) config.updateModifiedScripts(function(script) {
         if (shouldNotRun()
             || !isScriptRunnable(script, href, safeWin === safeWin.top))
           return;
@@ -165,7 +154,7 @@ ScriptishService.prototype = {
           break;
         }
         inject();
-      });
+      }));
 
     // if the focused tab's window is loading, then attach menuCommander
     if (safeWin === gBrowser.selectedBrowser.contentWindow) {
@@ -176,40 +165,40 @@ ScriptishService.prototype = {
     }
 
     // find matching scripts
-    let scripts = this.initScripts(href, safeWin);
-
-    if (scripts["document-end"].length || scripts["document-idle"].length) {
-      safeWin.addEventListener("DOMContentLoaded", function() {
-        if (shouldNotRun()) return;
-
-        // inject @run-at document-idle scripts
-        if (scripts["document-idle"].length)
-          self.timer.setTimeout(function() {
-            if (shouldNotRun()) return;
-            self.injectScripts(
-                scripts["document-idle"], href, currentInnerWindowID, safeWin, chromeWin);
-          }, 0);
-
-        // inject @run-at document-end scripts
-        self.injectScripts(scripts["document-end"], href, currentInnerWindowID, safeWin, chromeWin);
-      }, true);
-    }
+    this.initScripts(href, safeWin, function(scripts) {
+      if (scripts["document-end"].length || scripts["document-idle"].length) {
+        safeWin.addEventListener("DOMContentLoaded", function() {
+          if (shouldNotRun()) return;
 
-    if (scripts["window-load"].length) {
-      safeWin.addEventListener("load", function() {
-        if (shouldNotRun()) return;
-        // inject @run-at window-load scripts
-        self.injectScripts(scripts["window-load"], href, currentInnerWindowID, safeWin, chromeWin);
-      }, true);
-    }
+          // inject @run-at document-idle scripts
+          if (scripts["document-idle"].length)
+            self.timer.setTimeout(function() {
+              if (shouldNotRun()) return;
+              self.injectScripts(
+                  scripts["document-idle"], href, currentInnerWindowID, safeWin, chromeWin);
+            }, 0);
+
+          // inject @run-at document-end scripts
+          self.injectScripts(scripts["document-end"], href, currentInnerWindowID, safeWin, chromeWin);
+        }, true);
+      }
 
-    // inject @run-at document-start scripts
-    self.injectScripts(scripts["document-start"], href, currentInnerWindowID, safeWin, chromeWin);
+      if (scripts["window-load"].length) {
+        safeWin.addEventListener("load", function() {
+          if (shouldNotRun()) return;
+          // inject @run-at window-load scripts
+          self.injectScripts(scripts["window-load"], href, currentInnerWindowID, safeWin, chromeWin);
+        }, true);
+      }
+
+      // inject @run-at document-start scripts
+      self.injectScripts(scripts["document-start"], href, currentInnerWindowID, safeWin, chromeWin);
 
-    windows[currentInnerWindowID].unloaders.push(function() {
-      winClosed = true;
-      delete windows[currentInnerWindowID];
-      self.docUnload(currentInnerWindowID, gmBrowserUI);
+      windows[currentInnerWindowID].unloaders.push(function() {
+        winClosed = true;
+        delete windows[currentInnerWindowID];
+        self.docUnload(currentInnerWindowID, gmBrowserUI);
+      });
     });
   },
 
@@ -274,7 +263,7 @@ ScriptishService.prototype = {
     return file.parent.equals(tmpDir) && file.leafName != "newscript.user.js";
   },
 
-  initScripts: function(url, wrappedContentWin) {
+  initScripts: function(url, wrappedContentWin, aCallback) {
     let scripts = {
       "document-start": [],
       "document-end": [],
@@ -283,12 +272,15 @@ ScriptishService.prototype = {
     };
 
     let isTopWin = wrappedContentWin === wrappedContentWin.top;
-    this.config.getMatchingScripts(function(script) {
-      let chk = isScriptRunnable(script, url, isTopWin);
-      if (chk) scripts[script.runAt].push(script);
-      return chk;
+    Scriptish.getConfig(function(config) {
+      config.getMatchingScripts(function(script) {
+        let chk = isScriptRunnable(script, url, isTopWin);
+        if (chk) scripts[script.runAt].push(script);
+        return chk;
+      });
+
+      aCallback(scripts);
     });
-    return scripts;
   },
 
   injectScripts: function(scripts, url, winID, wrappedContentWin, chromeWin) {
diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 6952a5ab..cda13961 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -74,7 +74,9 @@ window.addEventListener("load", function() {
     let de = document.documentElement;
     if ("addons://list/userscript" == gViewController.currentViewId) {
       de.className += ' scriptish';
-      $("scriptish-list-empty").collapsed = !!Scriptish.config.scripts.length;
+      Scriptish.getConfig(function(config) {
+        $("scriptish-list-empty").collapsed = !!config.scripts.length;
+      });
     } else {
       de.className = de.className.replace(/ scriptish/g, '');
       $("scriptish-list-empty").collapsed = true;
@@ -98,7 +100,7 @@ window.addEventListener("load", function() {
   window.addEventListener("unload", function() {
     if (needToRemoveObserver)
       Services.obs.removeObserver(installObserver, "scriptish-script-installed");
-    Scriptish.config.uninstallScripts();
+    Scriptish.getConfig(function(config) config.uninstallScripts());
   }, false);
 }, false);
 
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 24783c73..d0dfb7f0 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -290,7 +290,7 @@ function Scriptish_popupClicked(aEvt) {
   }
 }
 
-function Scriptish_showPopup(aEvent) {
+function Scriptish_showPopup(aEvent) Scriptish.getConfig(function(config) {
   var $ = function(aID) document.getElementById(aID);
   Scriptish_BrowserUI.reattachMenuCmds();
 
@@ -298,7 +298,7 @@ function Scriptish_showPopup(aEvent) {
     function testMatchURLs(script) {
       return urls.some(function(url) script.matchesURL(url));
     }
-    return Scriptish.config.getMatchingScripts(testMatchURLs);
+    return config.getMatchingScripts(testMatchURLs);
   }
 
   function appendScriptToPopup(script) {
@@ -348,4 +348,4 @@ function Scriptish_showPopup(aEvent) {
 
   $("scriptish-tb-no-scripts").collapsed =
       !!(runsFramed.length + runsOnTop.length);
-}
+})
diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 940d790c..7fe81c09 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -41,28 +41,28 @@ function doInstall() {
   foStream.write(script, script.length);
   foStream.close();
 
-  var config = Scriptish.config;
+  Scriptish.getConfig(function(config) {
+    // create a script object with parsed metadata,
+    script = config.parse(script);
 
-  // create a script object with parsed metadata,
-  script = config.parse(script);
+    // make sure entered details will not ruin an existing file
+    if (config.installIsUpdate(script)) {
+      var overwrite = confirm(Scriptish_stringBundle("newscript.exists"));
+      if (!overwrite) return false;
+    }
 
-  // make sure entered details will not ruin an existing file
-  if (config.installIsUpdate(script)) {
-    var overwrite = confirm(Scriptish_stringBundle("newscript.exists"));
-    if (!overwrite) return false;
-  }
-
-  // finish making the script object ready to install
-  script.setDownloadedFile(tempFile);
+    // finish making the script object ready to install
+    script.setDownloadedFile(tempFile);
 
-  // install this script
-  config.install(script);
+    // install this script
+    config.install(script);
 
-  // and fire up the editor!
-  tools.Scriptish_openInEditor(script, window);
+    // and fire up the editor!
+    tools.Scriptish_openInEditor(script, window);
 
-  // persist namespace value
-  Scriptish_prefRoot.setValue("newscript_namespace", script.namespace);
+    // persist namespace value
+    Scriptish_prefRoot.setValue("newscript_namespace", script.namespace);
+  })
 
   return true;
 }
diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index cb7f111d..7717e890 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -44,7 +44,8 @@ window.addEventListener("load", function() {
 
   // Setup global excludes
   $("excludes-caption").setAttribute("label", Scriptish_stringBundle("options.excludes"));
-  $("excludes").value = Scriptish.config.excludes.join("\n");
+  Scriptish.getConfig(function(config) (
+      $("excludes").value = config.excludes.join("\n")));
 }, false);
 
 function Scriptish_getEditor() {
@@ -63,6 +64,7 @@ function doSave() {
   Scriptish_prefRoot.setValue("enableCopyDownloadURL",
       !!$("check-copydownloadURL").checked);
 
-  Scriptish.config.excludes = $("excludes").value.match(/.+/g);
+  Scriptish.getConfig(function(config) (
+      config.excludes = $("excludes").value.match(/.+/g)));
   Scriptish.notify(null, "scriptish-preferences-change", true);
 }
diff --git a/extension/content/js/script-options.js b/extension/content/js/script-options.js
index d307f8f7..a4e6aa94 100644
--- a/extension/content/js/script-options.js
+++ b/extension/content/js/script-options.js
@@ -13,22 +13,24 @@ window.addEventListener("load", function() {
   }
 
   scriptID = scriptID[1];
-  script = Scriptish.config.getScriptById(scriptID);
-
-  let options = Scriptish_stringBundle("options");
-  let dialog = $("scriptish-script-options-dialog");
-  dialog.setAttribute("title", script.name + " - " + options);
-  dialog.setAttribute("ondialogaccept", "return doSave();");
-  $("header").setAttribute("description", options);
-
-  $("includes-label").setAttribute("value", Scriptish_stringBundle("scriptOptions.includes"));
-  $("excludes-label").setAttribute("value", Scriptish_stringBundle("scriptOptions.excludes"));
-  $("includes").value = script.getUserIncStr();
-  $("excludes").value = script.getUserIncStr("exclude");
-
-  let tmp = $("disableScriptIncludes");
-  tmp.setAttribute("label", Scriptish_stringBundle("scriptOptions.disableScriptIncludes"));
-  tmp.checked = script.includesDisabled;
+  Scriptish.getConfig(function(config) {
+    script = config.getScriptById(scriptID);
+
+    let options = Scriptish_stringBundle("options");
+    let dialog = $("scriptish-script-options-dialog");
+    dialog.setAttribute("title", script.name + " - " + options);
+    dialog.setAttribute("ondialogaccept", "return doSave();");
+    $("header").setAttribute("description", options);
+
+    $("includes-label").setAttribute("value", Scriptish_stringBundle("scriptOptions.includes"));
+    $("excludes-label").setAttribute("value", Scriptish_stringBundle("scriptOptions.excludes"));
+    $("includes").value = script.getUserIncStr();
+    $("excludes").value = script.getUserIncStr("exclude");
+
+    let tmp = $("disableScriptIncludes");
+    tmp.setAttribute("label", Scriptish_stringBundle("scriptOptions.disableScriptIncludes"));
+    tmp.checked = script.includesDisabled;
+  });
 
   return true;
 }, false);
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index 121e7f49..c0987877 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -6,9 +6,9 @@ Components.utils.import("resource://scriptish/utils/Scriptish_notification.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
 const Scriptish_ScriptProvider = {
-  observe: function(aSubject, aTopic, aData) {
+  observe: function(aSubject, aTopic, aData) Scriptish.getConfig(function(config) {
     aData = JSON.parse(aData);
-    let script = Scriptish.config.getScriptById(aData.id);
+    let script = config.getScriptById(aData.id);
     switch(aTopic){
     case "scriptish-script-installed":
       AddonManagerPrivate.callInstallListeners(
@@ -51,7 +51,7 @@ const Scriptish_ScriptProvider = {
       AddonManagerPrivate.callAddonListeners("onUninstalled", script);
       break;
     }
-  },
+  }),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver])
 };
 
@@ -59,11 +59,15 @@ const Scriptish_ScriptProvider = {
 
 AddonManagerPrivate.registerProvider({
   getAddonByID: function(aId, aCallback) {
-    aCallback(Scriptish.config.getScriptById(aId));
+    Scriptish.getConfig(function(config) {
+      aCallback(config.getScriptById(aId));
+    });
   },
   getAddonsByTypes: function(aTypes, aCallback) {
     if (aTypes && aTypes.indexOf("userscript") < 0) aCallback([]);
-    else aCallback(Scriptish.config.scripts);
+    else Scriptish.getConfig(function(config) {
+      aCallback(config.scripts);
+    });
   }
 });
 [
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 9444c1da..29b73eef 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -1,9 +1,11 @@
 var EXPORTED_SYMBOLS = ["Config"];
 
-const SCRIPTISH_CONFIG = "scriptish-config.xml";
+const SCRIPTISH_CONFIG_XML = "scriptish-config.xml";
+const SCRIPTISH_CONFIG_JSON = "scriptish-config.json";
 const SCRIPTISH_BLOCKLIST = "scriptish-blocklist.json";
 
 (function(inc) {
+inc("resource:///modules/NetworkHelper.jsm");
 inc("resource://scriptish/constants.js");
 inc("resource://scriptish/logging.js");
 inc("resource://scriptish/prefmanager.js");
@@ -15,32 +17,17 @@ inc("resource://scriptish/utils/Scriptish_notification.js");
 inc("resource://scriptish/utils/Scriptish_stringBundle.js");
 inc("resource://scriptish/utils/Scriptish_convert2RegExp.js");
 inc("resource://scriptish/utils/Scriptish_cryptoHash.js");
-inc("resource://scriptish/third-party/Timer.js");
 inc("resource://scriptish/script/script.js");
 })(Components.utils.import);
 
 function Config(aBaseDir) {
   var self = this;
-  this.timer = new Timer();
   this._observers = [];
-  this._saveTimer = null;
   this._excludes = [];
   this._excludeRegExps = [];
   this._scripts = [];
   this._scriptFoldername = aBaseDir;
 
-  let configFile = this._scriptDir;
-  configFile.append(SCRIPTISH_CONFIG);
-  if (!configFile.exists()) {
-    (configFile = this._scriptDir).append("config.xml");
-    if (!configFile.exists())
-        (configFile = this._scriptDir).append(SCRIPTISH_CONFIG);
-  }
-
-  this._configFile = configFile;
-
-  this._updateSecurely = Scriptish_prefRoot.getValue("update.requireSecured");
-
   this._useBlocklist = Scriptish_prefRoot.getValue("blocklist.enabled");
   this._blocklistURL = Scriptish_prefRoot.getValue("blocklist.url");
   this._blocklist = {};
@@ -48,8 +35,6 @@ function Config(aBaseDir) {
   (this._blocklistFile = this._scriptDir).append(SCRIPTISH_BLOCKLIST);
 
   this._initScriptDir();
-  this._load();
-  (this._configFile = this._scriptDir).append(SCRIPTISH_CONFIG);
 
   [
     "scriptish-script-installed",
@@ -157,31 +142,82 @@ Config.prototype = {
     }
   },
 
-  _load: function() {
-    // load config
+  _loadXML: function(aFile, aCallback) {
+    Scriptish_log("Scriptish Config._loadXML");
     var self = this;
-    var configContents = Scriptish_getContents(this._configFile);
-    var doc = Instances.dp.parseFromString(configContents, "text/xml");
-    var nodes = doc.evaluate("/UserScriptConfig/Script | /UserScriptConfig/Exclude", doc, null, 0, null);
-    var fileModified = false;
-    let excludes = [];
-
-    for (var node; node = nodes.iterateNext();) {
-      switch (node.nodeName) {
-      case "Script":
-        fileModified = Script.load(this, node) || fileModified;
-        break;
-      case "Exclude":
-        excludes.push(node.firstChild.nodeValue.trim());
-        break;
+    NetUtil.asyncFetch(aFile, function(aInputStream, aStatusCode) {
+      if (!Components.isSuccessCode(aStatusCode)) {
+        Scriptish_logError(
+            new Error(Scriptish_stringBundle("error.openingFile") + ": " + aFile.path));
+        return;
       }
-    }
-    this.addExclude(excludes);
 
-    // Watch for the required secure updates pref being modified
-    Scriptish_prefRoot.watch("update.requireSecured", function() {
-      self._updateSecurely = Scriptish_prefRoot.getValue("update.requireSecured");
+      var configContents = NetworkHelper.readAndConvertFromStream(aInputStream, "UTF-8");
+      var doc = Instances.dp.parseFromString(configContents, "text/xml");
+      var nodes = doc.evaluate("/UserScriptConfig/Script | /UserScriptConfig/Exclude", doc, null, 0, null);
+      var fileModified = false;
+      let excludes = [];
+
+      for (var node; node = nodes.iterateNext();) {
+        switch (node.nodeName) {
+        case "Script":
+          fileModified = Script.loadFromXML(self, node) || fileModified;
+          break;
+        case "Exclude":
+          excludes.push(node.firstChild.nodeValue.trim());
+          break;
+        }
+      }
+      self.addExclude(excludes);
+
+      aCallback(fileModified);
     });
+  },
+
+  _loadJSON: function(aFile, aCallback) {
+    Scriptish_log("Scriptish Config._loadJSON");
+    var self = this;
+    NetUtil.asyncFetch(aFile, function(aInputStream, aStatusCode) {
+        if (!Components.isSuccessCode(aStatusCode)) {
+          Scriptish_logError(
+              new Error(Scriptish_stringBundle("error.openingFile") + ": " + aFile.path));
+          return;
+        }
+
+        var config = JSON.parse(NetworkHelper.readAndConvertFromStream(aInputStream, "UTF-8"));
+
+        config.scripts.forEach(function(i) Script.loadFromJSON(self, i));
+        config.excludes.forEach(function(i) self.addExclude(i));
+
+        aCallback(false);
+      });
+  },
+
+  load: function(aCallback) {
+    Scriptish_log("Scriptish Config.load");
+    var self = this;
+
+    function callback(fileModified) {
+      if (fileModified) this._save();
+      aCallback();
+    }
+
+    let (configFile = this._scriptDir) {
+      configFile.append(SCRIPTISH_CONFIG_JSON);
+
+      if (configFile.exists()) {
+        this._loadJSON(configFile, callback);
+      } else {
+        (configFile = this._scriptDir).append(SCRIPTISH_CONFIG_XML);
+
+        if (!configFile.exists())
+          (configFile = this._scriptDir).append("config.xml");
+
+        // load xml config
+        if (configFile.exists()) this._loadXML(configFile, callback);
+        else aCallback();
+      }
+    }
 
     // Listen for the blocklist pref being modified
     Scriptish_prefRoot.watch("blocklist.enabled", function() {
@@ -213,52 +249,29 @@ Config.prototype = {
           timeout(script.updateUSOData.bind(script), i * 100);
       }
     }
-
-    // the delay b4 save here is very important now that config.xml is used when
-    // scriptish-config.xml DNE
-    if (fileModified) this._save();
   },
 
+  toJSON: function() ({
+    excludes: this.excludes,
+    scripts: this.scripts.map(function(script) script.toJSON())
+  }),
+
   _blockScripts: function() {
     var scripts = this._scripts;
     for (var i = scripts.length - 1; ~i; i--) scripts[i].doBlockCheck();
   },
 
-  _save: function(saveNow) {
-    // If we have not explicitly been told to save now, then defer execution
-    // via a timer, to avoid locking up the UI.
-    if (!saveNow) {
-      // Reduce work in the case of many changes near to each other in time.
-      if (this._saveTimer) this.timer.clearTimeout(this._saveTimer);
-      this._saveTimer =
-          this.timer.setTimeout(this._save.bind(this, true), 250);
-      return;
-    }
-    delete this["_saveTimer"];
-
-    var doc = Instances.dp.parseFromString("<UserScriptConfig/>", "text/xml");
-    var scripts = this._scripts;
-    var len = scripts.length;
-    var firstChild = doc.firstChild;
-    let nt = "\n\t";
-    function addNode(str, node) firstChild.appendChild(doc.createTextNode(str))
-        && node && firstChild.appendChild(node);
-
-    // add script info
-    for (var i = 0, script; script = scripts[i]; i++)
-      addNode(nt, script.createXMLNode(doc));
-
-    // add global excludes info
-    for (let [, exclude] in Iterator(this.excludes))
-      addNode(nt, doc.createElement("Exclude"))
-          .appendChild(doc.createTextNode(exclude));
+  _save: function() {
+    // make sure that the configFile is SCRIPTISH_CONFIG_JSON
+    (this._configFile = this._scriptDir).append(SCRIPTISH_CONFIG_JSON);
 
-    addNode("\n");
+    Scriptish_log(Scriptish_stringBundle("saving") + " " + SCRIPTISH_CONFIG_JSON, true);
 
-    Scriptish_log(Scriptish_stringBundle("saving") + " " + SCRIPTISH_CONFIG, true);
-    var configStream = Scriptish_getWriteStream(this._configFile);
-    Instances.ds.serializeToStream(doc, configStream, "utf-8");
-    configStream.close();
+    let converter = Instances.suc;
+    converter.charset = "UTF-8";
+    NetUtil.asyncCopy(
+        converter.convertToInputStream(JSON.stringify(this.toJSON())),
+        Scriptish_getWriteStream(this._configFile, true));
   },
 
   parse: function(source, uri, aUpdateScript) (
@@ -317,8 +330,6 @@ Config.prototype = {
     }
   },
 
-  get updateSecurely() this._updateSecurely,
-
   get excludes() this._excludes.concat(),
   set excludes(excludes) {
     this._excludes = [];
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index fe0a4ebe..efa6c358 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -217,7 +217,7 @@ Script.prototype = {
     req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE; // bypass cache
     // suppress "bad certificate" dialogs and fail on redirects from a bad certificate.
     req.channel.notificationCallbacks =
-        new BadCertHandler(!this._config.updateSecurely || !Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
+        new BadCertHandler(!Scriptish.updateSecurely || !Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
     req.onload = this.checkRemoteVersion.bind(this, req, aCallback);
     req.onerror = this.checkRemoteVersionErr.bind(this, aCallback);
     req.send(null);
@@ -228,11 +228,11 @@ Script.prototype = {
       return aCallback.call(this, false, AddonManager.UPDATE_STATUS_DOWNLOAD_ERROR);
 
     // make sure that the final URI is a https url
-    if (this._config.updateSecurely && "https" != req.channel.URI.scheme)
+    if (Scriptish.updateSecurely && "https" != req.channel.URI.scheme)
       return aCallback.call(this, false, AddonManager.UPDATE_STATUS_SECURITY_ERROR);
 
     // make sure that the final URI's certificate is valid
-    if (this._config.updateSecurely) {
+    if (Scriptish.updateSecurely) {
       try {
         checkCert(req.channel, !Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
       }
@@ -315,7 +315,7 @@ Script.prototype = {
 
     let includes = this._user_includeRegExps.concat(this._includeRegExps);
     let excludes = this._user_excludeRegExps.concat(this._excludeRegExps)
-        .concat(Scriptish.config.excludeRegExps);
+        .concat(this._config.excludeRegExps);
 
     return (includes.some(testI) || this._matches.some(testII))
         && !excludes.some(testI);
@@ -470,10 +470,10 @@ Script.prototype = {
       return null;
     // userscripts.org url?
     if (/^https?:\/\/userscripts\.org\/.*?\.(?:user|meta)\.js$/i.test(url)) {
-      if (this._config.updateSecurely) url = url.replace(/^http:/i, "https:");
+      if (Scriptish.updateSecurely) url = url.replace(/^http:/i, "https:");
       return url.replace(/\.user\.js$/i, ".meta.js");
     }
-    return (!this._config.updateSecurely || /^https:/i.test(url)) ? url : null;
+    return (!Scriptish.updateSecurely || /^https:/i.test(url)) ? url : null;
   },
   get cleanUpdateURL() (this.updateURL+"").replace(/\.meta\.js$/i, ".user.js"),
   get providesUpdatesSecurely() {
@@ -484,7 +484,7 @@ Script.prototype = {
     } catch (e) {
       return false;
     }
-    return !this._config.updateSecurely || "https" == uri.scheme;
+    return !Scriptish.updateSecurely || "https" == uri.scheme;
   },
 
   get _file() {
@@ -659,137 +659,53 @@ Script.prototype = {
     if (oldPriority != newPriority) this._config.sortScripts();
   },
 
-  createXMLNode: function(doc) {
-    var scriptNode = doc.createElement("Script");
-    var len;
-
-    for (var j = 0; j < this.contributors.length; j++) {
-      var contributorNode = doc.createElement("Contributor");
-      contributorNode.appendChild(doc.createTextNode(this.contributors[j]));
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(contributorNode);
-    }
-
-    for (var j = 0; j < this.domains.length; j++) {
-      var node = doc.createElement("Domain");
-      node.appendChild(doc.createTextNode(this.domains[j]));
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(node);
-    }
-
-    for (var j = 0; j < this._includes.length; j++) {
-      var includeNode = doc.createElement("Include");
-      includeNode.appendChild(doc.createTextNode(this._includes[j]));
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(includeNode);
-    }
-
-    for (var j = 0; j < this._excludes.length; j++) {
-      var excludeNode = doc.createElement("Exclude");
-      excludeNode.appendChild(doc.createTextNode(this._excludes[j]));
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(excludeNode);
-    }
-
-    for (var j = 0; j < this._matches.length; j++) {
-      var matchNode = doc.createElement("Match");
-      matchNode.appendChild(doc.createTextNode(this._matches[j].pattern));
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(matchNode);
-    }
-
-    for (let [, include] in Iterator(this._user_includes)) {
-      let node = doc.createElement("UserInclude");
-      node.appendChild(doc.createTextNode(include));
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(node);
-    }
-
-    for (let [, exclude] in Iterator(this._user_excludes)) {
-      let node = doc.createElement("UserExclude");
-      node.appendChild(doc.createTextNode(exclude));
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(node);
-    }
-
-    len = this._screenshots.length;
-    for (var j = 0; j < len; j++) {
-      var screenshotNode = doc.createElement("Screenshot");
-      var screenshot = this._screenshots[j];
-      screenshotNode.appendChild(doc.createTextNode(screenshot.url));
-      if (screenshot.thumbnailURL)
-        screenshotNode.setAttribute("thumb", screenshot.thumbnailURL);
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(screenshotNode);
-    }
-
-    for (var j = 0; j < this._requires.length; j++) {
-      var req = this._requires[j];
-      var resourceNode = doc.createElement("Require");
-      resourceNode.setAttribute("filename", req._filename);
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(resourceNode);
-    }
-
-    for (var j = 0; j < this._resources.length; j++) {
-      var imp = this._resources[j];
-      var resourceNode = doc.createElement("Resource");
-
-      resourceNode.setAttribute("name", imp._name);
-      resourceNode.setAttribute("filename", imp._filename);
-      resourceNode.setAttribute("mimetype", imp._mimetype);
-      if (imp._charset) {
-        resourceNode.setAttribute("charset", imp._charset);
-      }
-
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(resourceNode);
-    }
-
-    if (this._noframes) {
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(doc.createElement("Noframes"));
-    }
-
-    scriptNode.appendChild(doc.createTextNode("\n\t"));
-
-    scriptNode.setAttribute("filename", this._filename);
-    scriptNode.setAttribute("id", this.id);
-    scriptNode.setAttribute("name", this.name);
-    scriptNode.setAttribute("namespace", this.namespace);
-    scriptNode.setAttribute("author", this._author);
-    scriptNode.setAttribute("blocklistState", this.blocklistState);
-    scriptNode.setAttribute("description", this._description);
-    scriptNode.setAttribute("version", this._version);
-    scriptNode.setAttribute("delay", this._delay);
-    scriptNode.setAttribute("priority", this.priority);
-    scriptNode.setAttribute("icon", this.icon.filename);
-    scriptNode.setAttribute("icon64", this.icon64.filename);
-    scriptNode.setAttribute("enabled", this._enabled);
-    scriptNode.setAttribute("basedir", this._basedir);
-    scriptNode.setAttribute("modified", this._modified);
-    scriptNode.setAttribute("dependhash", this._dependhash);
-    if (this._jsversion) scriptNode.setAttribute("jsversion", this._jsversion);
-    if (this["_run-at"]) scriptNode.setAttribute("run-at", this["_run-at"]);
-    if (this.includesDisabled) scriptNode.setAttribute("includesDisabled", true);
-
-    if (this.homepageURL)
-      scriptNode.setAttribute("homepageURL", this.homepageURL);
-    if (this._downloadURL)
-      scriptNode.setAttribute("downloadURL", this._downloadURL);
-    if (this._updateURL)
-      scriptNode.setAttribute("updateURL", this._updateURL);
-    if (this.supportURL)
-        scriptNode.setAttribute("supportURL", this.supportURL);
-    if (this.averageRating)
-      scriptNode.setAttribute("averageRating", this.averageRating);
-    if (this.reviewCount)
-      scriptNode.setAttribute("reviewCount", this.reviewCount);
-    if (this.totalDownloads)
-      scriptNode.setAttribute("totalDownloads", this.totalDownloads);
-
-    return scriptNode;
-  },
+  toJSON: function() ({
+    contributors: this._contributors,
+    domains: this.domains,
+    includes: this._includes,
+    excludes: this._excludes,
+    matches: this._matches.map(function(match) match.pattern),
+    user_includes: this._user_includes,
+    user_excludes: this._user_excludes,
+    screenshots: this._screenshots.map(function(screenshot) ({
+      url: screenshot.url,
+      thumbnailURL: screenshot.thumbnailURL
+    })),
+    requires: this._requires.map(function(req) req._filename),
+    resources: this._resources.map(function(res) ({
+      name: res._name,
+      filename: res._filename,
+      mimetype: res._mimetype,
+      charset: res._charset
+    })),
+    noframes: this._noframes,
+    filename: this._filename,
+    id: this.id,
+    name: this.name,
+    namespace: this.namespace,
+    author: this._author,
+    blocklistState: this.blocklistState,
+    description: this._description,
+    version: this._version,
+    delay: this._delay,
+    priority: this.priority,
+    icon: this.icon.filename,
+    icon64: this.icon64.filename,
+    enabled: this._enabled,
+    basedir: this._basedir,
+    modified: this._modified,
+    dependhash: this._dependhash,
+    jsversion: this._jsversion,
+    "run-at": this["_run-at"],
+    includesDisabled: this.includesDisabled,
+    homepageURL: this.homepageURL,
+    downloadURL: this._downloadURL,
+    updateURL: this._updateURL,
+    supportURL: this.supportURL,
+    averageRating: this.averageRating,
+    reviewCount: this.reviewCount,
+    totalDownloads: this.totalDownloads
+  }),
 
   // TODO: DRY
   installProcess: function() {
@@ -1114,7 +1030,74 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript) {
   return script;
 };
 
-Script.load = function load(aConfig, aNode) {
+Script.loadFromJSON = function(aConfig, aSkeleton) {
+  var script = new Script(aConfig);
+
+  script._filename = aSkeleton.filename;
+  script._basedir = aSkeleton.basedir;
+  script._downloadURL = aSkeleton.downloadURL;
+  script._updateURL = aSkeleton.updateURL;
+  script._homepageURL = aSkeleton.homepageURL;
+  script.supportURL = aSkeleton.supportURL;
+  script.jsversion = aSkeleton.jsversion;
+  script["_run-at"] = aSkeleton["run-at"];
+  script.includesDisabled = aSkeleton.includesDisabled;
+
+  if (!script.fileExists()) {
+    script.uninstallProcess();
+    return true;
+  }
+
+  script._modified = aSkeleton.modified;
+  script._dependhash = aSkeleton.dependhash;
+  script._version = aSkeleton.version;
+  script._noframes = aSkeleton.noframes;
+
+  script.domains = aSkeleton.domains;
+  aSkeleton.contributors.forEach(script.addContributor.bind(script));
+  aSkeleton.includes.forEach(script.addInclude.bind(script));
+  aSkeleton.excludes.forEach(script.addExclude.bind(script));
+  aSkeleton.user_includes.forEach(script.addInclude.bind(script, true));
+  aSkeleton.user_excludes.forEach(script.addExclude.bind(script, true));
+  aSkeleton.matches.forEach(function(i) script._matches.push(new MatchPattern(i)));
+  aSkeleton.requires.forEach(function(i) {
+    var scriptRequire = new ScriptRequire(script);
+    scriptRequire._filename = i;
+    script._requires.push(scriptRequire);
+  });
+  aSkeleton.resources.forEach(function(i) {
+    var scriptResource = new ScriptResource(script);
+    scriptResource._name = i.name;
+    scriptResource._filename = i.filename;
+    scriptResource._mimetype = i.mimetype;
+    scriptResource._charset = i.charset;
+    script._resources.push(scriptResource);
+  });
+  aSkeleton.screenshots.forEach(function(i) {
+    script._screenshots.push(new AddonManagerPrivate.AddonScreenshot(
+        i.url, i.thumbnailURL));
+  });
+
+  script.id = aSkeleton.id;
+  script._name = aSkeleton.name;
+  script._namespace = aSkeleton.namespace;
+  script.author = aSkeleton.author;
+  script._description = aSkeleton.description;
+  script.icon.fileURL = aSkeleton.icon;
+  script.icon64.fileURL = aSkeleton.icon64;
+  script.blocklistState = aSkeleton.blocklistState;
+  script.enabled = aSkeleton.enabled;
+  script.delay = aSkeleton.delay;
+  script.priority = aSkeleton.priority;
+  script.averageRating = aSkeleton.averageRating;
+  script.reviewCount = aSkeleton.reviewCount;
+  script.totalDownloads = aSkeleton.totalDownloads;
+
+  aConfig.addScript(script);
+  return false;
+}
+
+Script.loadFromXML = function(aConfig, aNode) {
   var script = new Script(aConfig);
   var fileModified = false;
   let tmp;
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index b3fef53b..0bab9f15 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -33,7 +33,7 @@ ScriptDownloader.prototype.startViewScript = function() {
 }
 ScriptDownloader.prototype.startUpdateScript = function(aScriptInstaller) {
   this.type = "update";
-  this.secure = Scriptish.config.updateSecurely;
+  this.secure = Scriptish.updateSecurely;
   this.scriptInstaller = aScriptInstaller;
   this.startDownload();
   return this;
@@ -68,74 +68,80 @@ ScriptDownloader.prototype.chkContentTypeB4DL = function() {
   if (this.contentWin) this.contentWin.location.href = this.uri_.spec;
 }
 ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
+  Scriptish_log("Scriptish ScriptDownloader.handleScriptDownloadComplete");
   let req = this.req_;
-  try {
-    // If loading from file, status might be zero on success
-    if (req.status != 200 && req.status != 0) {
-      Scriptish_alert(Scriptish_stringBundle("error.script.loading") + ":\n" +
-      req.status + ": " + req.statusText);
-      return;
-    }
-
-    if (this.secure) {
-      // make sure that the final URI is a https url
-      if ("https" != req.channel.URI.scheme)
-        return this.handleErr();
+  let self = this;
 
-      // make sure that the final URI's certificate is valid
-      try {
-        checkCert(req.channel, !Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
-      }
-      catch (e) {
-        return this.handleErr();
+  Scriptish.getConfig(function(config) {
+    try {
+      // If loading from file, status might be zero on success
+      if (req.status != 200 && req.status != 0) {
+        Scriptish_alert(Scriptish_stringBundle("error.script.loading") + ":\n" +
+        req.status + ": " + req.statusText);
+        return;
       }
-    }
-
-    if (this.scriptInstaller) {
-      // make sure that the new version is greater than the old version
-      var remoteVersion = Script.parseVersion(req.responseText);
-      if (!remoteVersion || Services.vc.compare(this.scriptInstaller._script.version, remoteVersion) >= 0)
-        return this.handleErr();
-    }
-
-    var source = req.responseText;
-    this.script = Scriptish.config.parse(source, this.uri_);
 
-    var file = Services.dirsvc.get("TmpD", Ci.nsILocalFile);
-    var base = this.script.name.replace(/[^A-Z0-9_]/gi, "").toLowerCase();
-    file.append(base + ".user.js");
-    file.createUnique(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0640);
-    this.tempFiles_.push(file);
+      if (self.secure) {
+        // make sure that the final URI is a https url
+        if ("https" != req.channel.URI.scheme)
+          return self.handleErr();
 
-    var converter = Instances.suc;
-    converter.charset = "UTF-8";
-    source = converter.ConvertFromUnicode(source);
-
-    var ws = Scriptish_getWriteStream(file);
-    ws.write(source, source.length);
-    ws.close();
+        // make sure that the final URI's certificate is valid
+        try {
+          checkCert(req.channel, !Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
+        }
+        catch (e) {
+          return self.handleErr();
+        }
+      }
 
-    this.script.setDownloadedFile(file);
+      if (self.scriptInstaller) {
+        // make sure that the new version is greater than the old version
+        var remoteVersion = Script.parseVersion(req.responseText);
+        if (!remoteVersion || Services.vc.compare(self.scriptInstaller._script.version, remoteVersion) >= 0)
+          return self.handleErr();
+      }
 
-    timeout(this.fetchDependencies.bind(this));
+      var source = req.responseText;
+      self.script = config.parse(source, self.uri_);
+
+      var file = Services.dirsvc.get("TmpD", Ci.nsILocalFile);
+      var base = self.script.name.replace(/[^A-Z0-9_]/gi, "").toLowerCase();
+      file.append(base + ".user.js");
+      file.createUnique(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0640);
+      self.tempFiles_.push(file);
+
+      var converter = Instances.suc;
+      converter.charset = "UTF-8";
+      source = converter.ConvertFromUnicode(source);
+
+      var ws = Scriptish_getWriteStream(file);
+      ws.write(source, source.length);
+      ws.close();
+
+      self.script.setDownloadedFile(file);
+
+      timeout(self.fetchDependencies.bind(self));
+
+      switch (self.type) {
+        case "install":
+          self._callback = function() {
+            self.showInstallDialog();
+            delete self._callback;
+          }
+          break;
+        case "view":
+          self.showScriptView();
+          break;
+      }
 
-    switch (this.type) {
-      case "install":
-        this._callback = function() {
-          this.showInstallDialog();
-          delete this._callback;
-        }
-        break;
-      case "view":
-        this.showScriptView();
-        break;
+    } catch (e) {
+      Scriptish_alert(Scriptish_stringBundle("error.script.installing") + ": " + e);
+      throw e;
     }
-
-  } catch (e) {
-    Scriptish_alert(Scriptish_stringBundle("error.script.installing") + ": " + e);
-    throw e;
-  }
+  });
 }
+
 ScriptDownloader.prototype.fetchDependencies = function() {
   Scriptish_log("Fetching Dependencies");
 
@@ -313,7 +319,7 @@ ScriptDownloader.prototype.installScript = function() {
     this.scriptInstaller.changed("InstallEnded");
   } else if (this.dependenciesLoaded_) {
     var script = this.script;
-    Scriptish.config.install(script);
+    Scriptish.getConfig(function(config) config.install(script));
   } else {
     this.installOnCompletion_ = true;
   }
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 7b24e8cb..08c3a027 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -1,6 +1,8 @@
 var EXPORTED_SYMBOLS = ["Scriptish"];
-Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/prefmanager.js");
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+Cu.import("resource://scriptish/prefmanager.js");
+Cu.import("resource://scriptish/logging.js");
 
 function setStatus() (enabled = Scriptish_prefRoot.getValue("enabled", true));
 function notifyStatusChg(aVal) (
@@ -11,7 +13,10 @@ Scriptish_prefRoot.watch("enabled", function() {
   notifyStatusChg(setStatus());
 });
 
+var global = this;
+
 const Scriptish = {
+  updateSecurely: Scriptish_prefRoot.getValue("update.requireSecured"),
   notify: function(aSubject, aTopic, aData) {
     if (true === aData) {
       aData = {saved: true};
@@ -25,7 +30,28 @@ const Scriptish = {
     if (aData && aSubject) aData.id = aSubject.id;
     Services.obs.notifyObservers(null, aTopic, JSON.stringify(aData));
   },
-  get config() Services.scriptish.config,
+  getConfig: function(aCallback) {
+    Scriptish_log("Scriptish.getConfig");
+    if (global.config) {
+      Scriptish_log("Scriptish.getConfig 1");
+      aCallback(global.config);
+    } else if (!global.configQueue) {
+      Scriptish_log("Scriptish.getConfig 2");
+      global.configQueue = [aCallback];
+      var tools = {};
+      Cu.import("resource://scriptish/config/config.js", tools);
+      let cf = new tools.Config("scriptish_scripts");
+      cf.load(function() {
+        Scriptish_log("Scriptish config loaded");
+        global.config = cf;
+        global.configQueue.forEach(function(f) f(cf));
+        delete global["configQueue"];
+      });
+    } else {
+      Scriptish_log("Scriptish.getConfig 3");
+      global.configQueue.push(aCallback);
+    }
+  },
   get enabled() enabled,
   set enabled(aVal) {
     ignoreEnable = true;
@@ -70,3 +96,7 @@ const Scriptish = {
   getWindows: function() Services.wm.getEnumerator("navigator:browser")
 }
 
+// Watch for the required secure updates pref being modified
+Scriptish_prefRoot.watch("update.requireSecured", function() {
+  Scriptish.updateSecurely = Scriptish_prefRoot.getValue("update.requireSecured");
+});
diff --git a/extension/modules/utils/Scriptish_getWriteStream.js b/extension/modules/utils/Scriptish_getWriteStream.js
index 09e716c5..006b2711 100644
--- a/extension/modules/utils/Scriptish_getWriteStream.js
+++ b/extension/modules/utils/Scriptish_getWriteStream.js
@@ -1,8 +1,8 @@
 var EXPORTED_SYMBOLS = ["Scriptish_getWriteStream"];
 Components.utils.import("resource://scriptish/constants.js");
 
-const Scriptish_getWriteStream = function(aFile) {
-  var stream = Instances.fos;
-  stream.init(aFile, 0x02 | 0x08 | 0x20, 420, -1);
-  return stream;
+const Scriptish_getWriteStream = function(aFile, aAsync) {
+  var fos = Instances.fos;
+  fos.init(aFile, 0x02 | 0x08 | 0x20, 420, (aAsync) ? fos.DEFER_OPEN : -1);
+  return fos;
 }

From 57049dae23bc86c491fae4b229f3238a441d9356 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 6 May 2011 15:46:41 -0500
Subject: [PATCH 032/829] Closes #287 Prefix log messages with '[Scriptish]'.
 (cherry picked from commit 17d344990c574828c5dfd239f33a6990571f9fc1)

---
 extension/modules/logging.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/logging.js b/extension/modules/logging.js
index f1175278..21cbe3c5 100644
--- a/extension/modules/logging.js
+++ b/extension/modules/logging.js
@@ -20,5 +20,5 @@ function Scriptish_logError(aErr, opt_warn, fileName, lineNumber) {
 function Scriptish_log(aMsg, aForce) {
   if (!aForce && !Scriptish_prefRoot.getValue("logChrome", false)) return;
   // make sure msg is a string, and remove NULL bytes which truncate it
-  Services.console.logStringMessage((aMsg + '').replace("\0","","g"));
+  Services.console.logStringMessage(("[Scriptish] " + aMsg).replace("\0","","g"));
 }

From 27ac9bb447da2157edff275f7558704daedb3d90 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 6 May 2011 14:58:54 -0700
Subject: [PATCH 033/829] async read blocklist

---
 extension/modules/config/config.js            | 48 +++++++---------
 .../modules/utils/Scriptish_getContents.js    | 56 ++++++++++++-------
 2 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 29b73eef..ef6517b9 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -5,7 +5,6 @@ const SCRIPTISH_CONFIG_JSON = "scriptish-config.json";
 const SCRIPTISH_BLOCKLIST = "scriptish-blocklist.json";
 
 (function(inc) {
-inc("resource:///modules/NetworkHelper.jsm");
 inc("resource://scriptish/constants.js");
 inc("resource://scriptish/logging.js");
 inc("resource://scriptish/prefmanager.js");
@@ -131,29 +130,26 @@ Config.prototype = {
   },
 
   _loadBlocklist: function() {
-    if (this._blocklistFile.exists()) {
-      let blockListContents = Scriptish_getContents(this._blocklistFile);
-      let blocklist = Instances.json.decode(blockListContents);
-      this._blocklist = blocklist;
-      this._blocklistHash = Scriptish_cryptoHash(blockListContents);
-
-      // block scripts
-      this._blockScripts();
+    var file = this._blocklistFile;
+    if (file.exists()) {
+      let self = this;
+      Scriptish_getContents(file, 0, function(str) {
+        self._blocklist = Instances.json.decode(str);
+        self._blocklistHash = Scriptish_cryptoHash(str);
+
+        // block scripts
+        self._blockScripts();
+      });
     }
   },
 
   _loadXML: function(aFile, aCallback) {
     Scriptish_log("Scriptish Config._loadXML");
     var self = this;
-    NetUtil.asyncFetch(aFile, function(aInputStream, aStatusCode) {
-      if (!Components.isSuccessCode(aStatusCode)) {
-        Scriptish_logError(
-            new Error(Scriptish_stringBundle("error.openingFile") + ": " + aFile.path));
-        return;
-      }
 
-      var configContents = NetworkHelper.readAndConvertFromStream(aInputStream, "UTF-8");
-      var doc = Instances.dp.parseFromString(configContents, "text/xml");
+    Scriptish_getContents(aFile, 0, function(str) {
+      if (!str) return;
+      var doc = Instances.dp.parseFromString(str, "text/xml");
       var nodes = doc.evaluate("/UserScriptConfig/Script | /UserScriptConfig/Exclude", doc, null, 0, null);
       var fileModified = false;
       let excludes = [];
@@ -177,20 +173,16 @@ Config.prototype = {
   _loadJSON: function(aFile, aCallback) {
     Scriptish_log("Scriptish Config._loadJSON");
     var self = this;
-    NetUtil.asyncFetch(aFile, function(aInputStream, aStatusCode) {
-        if (!Components.isSuccessCode(aStatusCode)) {
-          Scriptish_logError(
-              new Error(Scriptish_stringBundle("error.openingFile") + ": " + aFile.path));
-          return;
-        }
 
-        var config = JSON.parse(NetworkHelper.readAndConvertFromStream(aInputStream, "UTF-8"));
+    Scriptish_getContents(aFile, 0, function(str) {
+      if (!str) return;
+      var config = JSON.parse(str);
 
-        config.scripts.forEach(function(i) Script.loadFromJSON(self, i));
-        config.excludes.forEach(function(i) self.addExclude(i));
+      config.scripts.forEach(function(i) Script.loadFromJSON(self, i));
+      config.excludes.forEach(function(i) self.addExclude(i));
 
-        aCallback(false);
-      });
+      aCallback(false);
+    });
   },
 
   load: function(aCallback) {
diff --git a/extension/modules/utils/Scriptish_getContents.js b/extension/modules/utils/Scriptish_getContents.js
index 7a108dc2..e94c7de0 100644
--- a/extension/modules/utils/Scriptish_getContents.js
+++ b/extension/modules/utils/Scriptish_getContents.js
@@ -1,32 +1,46 @@
 var EXPORTED_SYMBOLS = ["Scriptish_getContents"];
+Components.utils.import("resource:///modules/NetworkHelper.jsm");
 Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/logging.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_getUriFromFile.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
-function Scriptish_getContents(file, charset) {
-  if (!charset) charset = "UTF-8";
-  var scriptableStream = Services.sis;
-  var unicodeConverter = Instances.suc;
-  unicodeConverter.charset = charset;
+function Scriptish_getContents(aFile, aCharset, aCallback) {
+  if (!aCharset) aCharset = "UTF-8";
 
-  var channel = Services.io.newChannelFromURI(Scriptish_getUriFromFile(file));
-  try {
-    var input = channel.open();
-  } catch (e) {
-    Scriptish_logError(
-        new Error(Scriptish_stringBundle("error.openingFile") + ": " + file.path));
-    return "";
-  }
+  if (aCallback) {
+    NetUtil.asyncFetch(aFile, function(aInputStream, aStatusCode) {
+        if (!Components.isSuccessCode(aStatusCode)) {
+          Scriptish_logError(
+              new Error(Scriptish_stringBundle("error.openingFile") + ": " + aFile.path));
+          return aCallback("");
+        }
+
+        aCallback(NetworkHelper.readAndConvertFromStream(aInputStream, aCharset));
+    });
+  } else {
+    var scriptableStream = Services.sis;
+    var unicodeConverter = Instances.suc;
+    unicodeConverter.charset = aCharset;
+
+    var channel = Services.io.newChannelFromURI(Scriptish_getUriFromFile(aFile));
+    try {
+      var input = channel.open();
+    } catch (e) {
+      Scriptish_logError(
+          new Error(Scriptish_stringBundle("error.openingFile") + ": " + aFile.path));
+      return "";
+    }
 
-  scriptableStream.init(input);
-  var str = scriptableStream.read(input.available());
-  scriptableStream.close();
-  input.close();
+    scriptableStream.init(input);
+    var str = scriptableStream.read(input.available());
+    scriptableStream.close();
+    input.close();
 
-  try {
-    return unicodeConverter.ConvertToUnicode(str);
-  } catch (e) {
-    return str;
+    try {
+      return unicodeConverter.ConvertToUnicode(str);
+    } catch (e) {
+      return str;
+    }
   }
 }

From d0d92b514e62e747f6ad426066a4537fd0fdf578 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 6 May 2011 16:33:06 -0700
Subject: [PATCH 034/829] async write the blocklist

---
 extension/modules/config/config.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index ef6517b9..894f2c7b 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -116,9 +116,12 @@ Config.prototype = {
       let file = self._blocklistFile;
 
       // write blocklist
-      var BLStream = Scriptish_getWriteStream(file);
-      BLStream.write(json, json.length);
-      BLStream.close();
+      let converter = Instances.suc;
+      converter.charset = "UTF-8";
+      NetUtil.asyncCopy(
+          converter.convertToInputStream(json),
+          Scriptish_getWriteStream(file, true));
+
       Scriptish_log("Updated Scriptish blocklist " + SCRIPTISH_BLOCKLIST, true);
 
       self._blocklist = blocklist;

From 9dc9d8c0fd26c0247afa2422c158d0839e6d0503 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 6 May 2011 16:50:06 -0700
Subject: [PATCH 035/829] async get script contents when updating a modified
 script

---
 extension/modules/config/config.js           | 14 ++++++++++----
 extension/modules/script/script.js           |  1 +
 extension/modules/script/scriptdependency.js |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 894f2c7b..3ace9c7f 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -354,6 +354,7 @@ Config.prototype = {
   },
 
   updateModifiedScripts: function(scriptInjector) {
+    var self = this;
     let hasChanged = false;
     for (let [, script] in Iterator(this._scripts)) {
       if (script.delayInjection) {
@@ -361,12 +362,17 @@ Config.prototype = {
         continue;
       }
       if (!script.isModified()) continue;
+
       hasChanged = true;
-      let parsedScript = this.parse(
-          script.textContent,
-          script._downloadURL && NetUtil.newURI(script._downloadURL), script);
-      script.updateFromNewScript(parsedScript, scriptInjector);
+
+      script.getTextContent(function(content) {
+        let parsedScript = self.parse(
+            content,
+            script._downloadURL && NetUtil.newURI(script._downloadURL), script);
+        script.updateFromNewScript(parsedScript, scriptInjector);
+      });
     }
+
     if (hasChanged) this._save();
   },
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver])
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index efa6c358..d3cee8f4 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -504,6 +504,7 @@ Script.prototype = {
 
   get fileURL() Scriptish_getUriFromFile(this._file).spec,
   get textContent() Scriptish_getContents(this._file),
+  getTextContent: function(aCallback) Scriptish_getContents(this._file, 0, aCallback),
 
   get size() {
     var size = this._file.fileSize;
diff --git a/extension/modules/script/scriptdependency.js b/extension/modules/script/scriptdependency.js
index 83b6255b..768e2018 100644
--- a/extension/modules/script/scriptdependency.js
+++ b/extension/modules/script/scriptdependency.js
@@ -27,6 +27,7 @@ ScriptDependency.prototype = {
   get tempFile() this._tempFile,
   get fileURL() Scriptish_getUriFromFile(this._file).spec,
   get textContent() Scriptish_getContents(this._file),
+  getTextContent: function(aCallback) Scriptish_getContents(this._file, 0, aCallback),
 
   get downloadURL() this._downloadURL,
   get downloadURLFilename() {

From 1ddcc9d8733c86ea896db1bdd1259d6a5b0ed90f Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 7 May 2011 17:08:56 -0500
Subject: [PATCH 036/829] Save the new SCRIPTISH_CONFIG_JSON when we're done
 loading the old XML config

---
 extension/modules/config/config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 941dfc36..98769dd3 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -171,7 +171,8 @@ Config.prototype = {
       }
       self.addExclude(excludes);
 
-      aCallback(fileModified);
+      // Return true so we create SCRIPTISH_CONFIG_JSON
+      aCallback(true);
     });
   },
 

From 10cdf07d837c7162a64c4ec4e64522a740d1fc00 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 7 May 2011 17:10:52 -0500
Subject: [PATCH 037/829] minor fix: use 'self' rather than 'this' in the
 Config.load callback

---
 extension/modules/config/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 98769dd3..2b0e7b01 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -196,7 +196,7 @@ Config.prototype = {
     var self = this;
 
     function callback(fileModified) {
-      if (fileModified) this._save();
+      if (fileModified) self._save();
       aCallback();
     }
 

From 0bbbe88d0ec0112bb6fddd327a75d7c64190c62d Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 8 May 2011 09:12:32 -0500
Subject: [PATCH 038/829] Only allow one Config _save at a time.

---
 extension/modules/config/config.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 2b0e7b01..b1a5a723 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -260,6 +260,13 @@ Config.prototype = {
   },
 
   _save: function() {
+    var self = this;
+
+    if (this._isSaving)
+      return (this._pendingSave = true);
+
+    this._isSaving = true;
+
     // make sure that the configFile is SCRIPTISH_CONFIG_JSON
     (this._configFile = this._scriptDir).append(SCRIPTISH_CONFIG_JSON);
 
@@ -269,7 +276,14 @@ Config.prototype = {
     converter.charset = "UTF-8";
     NetUtil.asyncCopy(
         converter.convertToInputStream(JSON.stringify(this.toJSON())),
-        Scriptish_getWriteStream(this._configFile, true));
+        Scriptish_getWriteStream(this._configFile, true),
+        function() {
+          delete self["_isSaving"];
+          if (self._pendingSave) {
+            delete self["_pendingSave"];
+            self._save();
+          }
+        });
   },
 
   parse: function(source, uri, aUpdateScript) (

From 2549dc4498bdfd3effcacf22727b2ec53f404062 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 8 May 2011 14:33:43 -0500
Subject: [PATCH 039/829] bug fix: loading includes/excludes from JSON

---
 extension/modules/script/script.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 46582bbf..c831beae 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1070,10 +1070,10 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
 
   script.domains = aSkeleton.domains;
   aSkeleton.contributors.forEach(script.addContributor.bind(script));
-  aSkeleton.includes.forEach(script.addInclude.bind(script));
-  aSkeleton.excludes.forEach(script.addExclude.bind(script));
-  aSkeleton.user_includes.forEach(script.addInclude.bind(script, true));
-  aSkeleton.user_excludes.forEach(script.addExclude.bind(script, true));
+  aSkeleton.includes.forEach(function(i) script.addInclude(i));
+  aSkeleton.excludes.forEach(function(i) script.addExclude(i));
+  aSkeleton.user_includes.forEach(function(i) script.addInclude(i, true));
+  aSkeleton.user_excludes.forEach(function(i) script.addExclude(i, true));
   aSkeleton.matches.forEach(function(i) script._matches.push(new MatchPattern(i)));
   aSkeleton.requires.forEach(function(i) {
     var scriptRequire = new ScriptRequire(script);

From c988b2c092e6993cc7866ff5afea769fd5ca119b Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 9 May 2011 11:30:40 -0500
Subject: [PATCH 040/829] bug fix: don't trigger an unnecessary config save
 when setting a script's enabled state during a load from JSON

---
 extension/modules/script/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index c831beae..06aa6303 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1101,7 +1101,7 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
   script.icon.fileURL = aSkeleton.icon;
   script.icon64.fileURL = aSkeleton.icon64;
   script.blocklistState = aSkeleton.blocklistState;
-  script.enabled = aSkeleton.enabled;
+  script._enabled = aSkeleton.enabled;
   script.delay = aSkeleton.delay;
   script.priority = aSkeleton.priority;
   script.averageRating = aSkeleton.averageRating;

From 50385491dce174c8c641db3836547c58bb97fff6 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 8 May 2011 15:22:37 -0500
Subject: [PATCH 041/829] Closes #284 sort script list in the toolbar button
 popup

---
 extension/content/js/browser.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index d0dfb7f0..99b57656 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -298,7 +298,11 @@ function Scriptish_showPopup(aEvent) Scriptish.getConfig(function(config) {
     function testMatchURLs(script) {
       return urls.some(function(url) script.matchesURL(url));
     }
-    return config.getMatchingScripts(testMatchURLs);
+
+    return config.getMatchingScripts(testMatchURLs).sort(function(a,b) {
+      a = a.name.toLocaleLowerCase(), b = b.name.toLocaleLowerCase();
+      return a.localeCompare(b);
+    });
   }
 
   function appendScriptToPopup(script) {

From 82fd5b5edc17482b3a754c0c2236347affbba070 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 10 May 2011 09:00:06 -0700
Subject: [PATCH 042/829] typo: scripts-options.xul -> script-options.xul

---
 extension/chrome.manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 284125ec..b93bd4e4 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -14,7 +14,7 @@ overlay    chrome://mozapps/content/extensions/extensions.xul chrome://scriptish
 
 overlay    chrome://scriptish/content/install.xul chrome://scriptish/content/closewindow.xul
 overlay    chrome://scriptish/content/options.xul chrome://scriptish/content/closewindow.xul
-overlay    chrome://scriptish/content/scripts-options.xul chrome://scriptish/content/closewindow.xul
+overlay    chrome://scriptish/content/script-options.xul chrome://scriptish/content/closewindow.xul
 overlay    chrome://scriptish/content/newscript.xul chrome://scriptish/content/closewindow.xul
 
 locale     scriptish  en-US  locale/en-US/

From 2735e9c78942bba417b33a2f433dc8d196e81cb3 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 10 May 2011 09:49:16 -0700
Subject: [PATCH 043/829] Explicitly overlaying closewindow.xul onto
 script-options.xul because the query string used for script-options.xul meant
 that the replaced method would not apply

---
 extension/chrome.manifest              | 1 -
 extension/content/js/script-options.js | 4 ++--
 extension/content/script-options.xul   | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index b93bd4e4..ea96c8c6 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -14,7 +14,6 @@ overlay    chrome://mozapps/content/extensions/extensions.xul chrome://scriptish
 
 overlay    chrome://scriptish/content/install.xul chrome://scriptish/content/closewindow.xul
 overlay    chrome://scriptish/content/options.xul chrome://scriptish/content/closewindow.xul
-overlay    chrome://scriptish/content/script-options.xul chrome://scriptish/content/closewindow.xul
 overlay    chrome://scriptish/content/newscript.xul chrome://scriptish/content/closewindow.xul
 
 locale     scriptish  en-US  locale/en-US/
diff --git a/extension/content/js/script-options.js b/extension/content/js/script-options.js
index a4e6aa94..5077aad3 100644
--- a/extension/content/js/script-options.js
+++ b/extension/content/js/script-options.js
@@ -8,8 +8,8 @@ var script;
 window.addEventListener("load", function() {
   var scriptID = window.location.search.match(/[\?&]id=([^&,]+)/i);
   if (!scriptID) {
-    window.close();
-    throw new Error("Script ID is not defined!");
+    //window.close();
+    //throw new Error("Script ID is not defined!");
   }
 
   scriptID = scriptID[1];
diff --git a/extension/content/script-options.xul b/extension/content/script-options.xul
index 10b43a83..b92551e7 100644
--- a/extension/content/script-options.xul
+++ b/extension/content/script-options.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xul-overlay href="chrome://scriptish/content/closewindow.xul"?>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     buttons="accept"
     id="scriptish-script-options-dialog"

From 91ebcec5826f19230986d837dc24549d0895f7e9 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 11 May 2011 14:51:44 -0700
Subject: [PATCH 044/829] bug fix: get the most recent navigator:browser window
 when the install button is clicked in the view user script source install
 banner

---
 extension/components/scriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 7530ee76..089350e8 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -68,7 +68,7 @@ ScriptishService.prototype = {
         this.innerWinDestroyed(aSubject.QueryInterface(Components.interfaces.nsISupportsPRUint64).data);
         break;
       case "install-userscript":
-        let win = Scriptish.getMostRecentWindow();
+        let win = Scriptish.getMostRecentWindow("navigator:browser");
         if (win) win.Scriptish_BrowserUI.installCurrentScript();
         break;
       case "scriptish-enabled":

From 46d4c70bee6310301b8429d0e3cd0a9f8fce66ed Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 11 May 2011 14:54:06 -0700
Subject: [PATCH 045/829] aWin argument for Scriptish_installUri is now
 optional (for Greasefire or w/e other addon that wants to use it)

---
 extension/modules/utils/Scriptish_installUri.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension/modules/utils/Scriptish_installUri.js b/extension/modules/utils/Scriptish_installUri.js
index 6ff254ef..7614a48f 100644
--- a/extension/modules/utils/Scriptish_installUri.js
+++ b/extension/modules/utils/Scriptish_installUri.js
@@ -3,6 +3,8 @@ Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/config/configdownloader.js");
 
 function Scriptish_installUri(aURI, aWin) {
+  if (!aWin) aWin = Services.wm.getMostRecentWindow("navigator:browser");
+
   // docs for nsicontentpolicy say we're not supposed to block, so short timer.
   timeout(function() Scriptish_configDownloader.startInstall(aURI, aWin));
 }

From 16bdf144da14dc9cf856a62068d9b4a1caf27c4e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 12 May 2011 00:16:18 -0700
Subject: [PATCH 046/829] adding the GM_setClipboard function to
 GM_API.prototype instead of creating one for each GM_API instance.

---
 extension/modules/api.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 86d074ba..770465ef 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -131,13 +131,6 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
     return getStorage().listValues.apply(getStorage(), arguments);
   }
 
-  this.GM_setClipboard = function GM_setClipboard() {
-    if (!GM_apiLeakCheck("GM_setClipboard")) return;
-    var tools = {};
-    Cu.import("resource://scriptish/api/GM_setClipboard.js", tools);
-    tools.GM_setClipboard.apply(null, arguments);
-  }
-
   this.GM_getResourceURL = function GM_getResourceURL() {
     if (!GM_apiLeakCheck("GM_getResourceURL")) return;
     return getResources().getResourceURL.apply(getResources(), arguments)
@@ -252,5 +245,13 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
   this.GM_updatingEnabled = true;
 }
 
+GM_API.prototype.GM_setClipboard = function GM_setClipboard() {
+  if (!GM_apiLeakCheck("GM_setClipboard")) return;
+  var tools = {};
+  Cu.import("resource://scriptish/api/GM_setClipboard.js", tools);
+  tools.GM_setClipboard.apply(null, arguments);
+}
+
+
 function getWindowForBrowser(browser) browser.docShell
     .QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindow);

From 0c78d3685022986a303d50c3cda27f35f0fead69 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 16 May 2011 21:59:08 -0500
Subject: [PATCH 047/829] Closes #295 keep a reference to the modified script
 when updating asynchronously (cherry picked from commit
 844d3257a7a2f2f7049b4f6c312518ee6789e63a)

---
 extension/modules/config/config.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index b1a5a723..670c933c 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -382,11 +382,12 @@ Config.prototype = {
 
       hasChanged = true;
 
-      script.getTextContent(function(content) {
+      let theScript = script;
+      theScript.getTextContent(function(content) {
         let parsedScript = self.parse(
             content,
-            script._downloadURL && NetUtil.newURI(script._downloadURL), script);
-        script.updateFromNewScript(parsedScript, scriptInjector);
+            theScript._downloadURL && NetUtil.newURI(theScript._downloadURL), theScript);
+        theScript.updateFromNewScript(parsedScript, scriptInjector);
       });
     }
 

From 7e69d8c6a68bb05515b3ce3a2867862c3eb75822 Mon Sep 17 00:00:00 2001
From: KOLANICH <kolan_n@mail.ru>
Date: Fri, 8 Apr 2011 08:14:33 -0700
Subject: [PATCH 048/829] Closes #257 Update Russian translation

---
 extension/locale/ru-RU/scriptish.properties | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index cd19a932..f9464525 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -33,6 +33,10 @@ options.alsoUninstallPrefs=Удалять также ассоциированн
 options.changeEditor=Изменить редактор
 options.editor=Редактор
 options.useDownloadURL=Используйте URL для загрузки в качестве запасного URL для обновления (если он не определен)?
+options.excludes=Глобальные исключения
+options.addonManager=Менеджер Дополнений
+options.enableCopyDownloadURL=Включить копирование URL для загрузки
+options.requireSecured=Разрешить обновления скриптов только по протоколу HTTPS
 statusbar.enabled=Включено
 statusbar.installed=успешно установлен
 statusbar.modified=изменен
@@ -52,12 +56,12 @@ error.charset=Неверная кодировка.
 error.dependency.loading=Не могу загрузить зависимость
 error.dependency.local=Исключение безопасности: запрещено вызывать локальные пути
 error.dependency.serverReturned=Ошибка! Сервер вернул 
-error.hash.algorithm=Неверный аргоритм хеширования.
+error.hash.algorithm=Неверный алгоритм хеширования.
 error.icon.dataURL=Неверный URL для  @icon
 error.icon.URL=Неверный URL для @icon
 error.isInvalidValue= - неверное значение
-error.matchPattern.rules.file=File scheme @match pattern does not conform to pattern rules
-error.matchPattern.rules=@match pattern does not conform to pattern rules
+error.matchPattern.rules.file=Шаблон @match схемы file:// не соответствует правилам
+error.matchPattern.rules=шаблон @match не соответствует правилам
 error.notSupported.Firefox=не поддерживается в этой версии Огненного Лиса
 error.openingFile=Не могу открыть файл
 error.pattern.parsing=Шаблон не парсится
@@ -67,3 +71,6 @@ error.resource.syntax=Неправильный синтаксис в обьяв
 error.retrieving=Failed to retrieve
 error.script.installing=Ошибка при установке юзерскрипта
 error.script.loading=Ошибка при загрузке юзерскрипта
+scriptOptions.includes=Пользовательские включения:
+scriptOptions.excludes=Пользовательские исключения:
+scriptOptions.disableScriptIncludes=Отключить прописанные в скрипте включения, использовать только эти.

From d8c9d892f1c2ca83b0e01cb52f13de62e2f64747 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 21 May 2011 19:58:26 -0500
Subject: [PATCH 049/829] If supported, register the 'userscript' AddonType and
 remove the old category.

---
 extension/modules/addonprovider.js | 12 ++++++++++--
 extension/skin/addonstab.css       |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index c0987877..a0f0c258 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -55,7 +55,15 @@ const Scriptish_ScriptProvider = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver])
 };
 
-
+var types = null;
+if (AddonManagerPrivate.AddonType) {
+  types = [new AddonManagerPrivate.AddonType(
+      "userscript",
+      "chrome://scriptish/locale/scriptish.properties",
+      "userscripts",
+      AddonManagerPrivate.VIEW_TYPE_LIST,
+      7000)];
+}
 
 AddonManagerPrivate.registerProvider({
   getAddonByID: function(aId, aCallback) {
@@ -69,7 +77,7 @@ AddonManagerPrivate.registerProvider({
       aCallback(config.scripts);
     });
   }
-});
+}, types);
 [
   "scriptish-script-installed",
   "scriptish-script-edit-enabling",
diff --git a/extension/skin/addonstab.css b/extension/skin/addonstab.css
index f8dad149..76d7c75c 100644
--- a/extension/skin/addonstab.css
+++ b/extension/skin/addonstab.css
@@ -1,4 +1,4 @@
-#category-userscripts > .category-icon{
+#category-userscript > .category-icon {
   list-style-image: url("chrome://scriptish/skin/third-party/uso_medium.png");
 }
 .addon[type="userscript"] .control-container {

From d59c1319c60468e74478d4933579351cbf729f69 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 22 May 2011 18:23:48 -0700
Subject: [PATCH 050/829]  AddonManagerPrivate.VIEW_TYPE_LIST -> 
 AddonManager.VIEW_TYPE_LIST

---
 extension/modules/addonprovider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index a0f0c258..e7f1bff2 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -61,7 +61,7 @@ if (AddonManagerPrivate.AddonType) {
       "userscript",
       "chrome://scriptish/locale/scriptish.properties",
       "userscripts",
-      AddonManagerPrivate.VIEW_TYPE_LIST,
+      AddonManager.VIEW_TYPE_LIST,
       7000)];
 }
 

From 5aab2a20dac9b12de3f3745392d97162ef6059a7 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 22 May 2011 18:25:04 -0700
Subject: [PATCH 051/829] remove the rishlistitem from the about:addons overlay
 when AddonManagerPrivate.AddonType exists

---
 extension/content/addonstab.xul   | 2 +-
 extension/content/js/addonstab.js | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/extension/content/addonstab.xul b/extension/content/addonstab.xul
index c77e1dc3..21debdbc 100644
--- a/extension/content/addonstab.xul
+++ b/extension/content/addonstab.xul
@@ -31,7 +31,7 @@
   </menupopup>
 
   <richlistbox id="categories">
-    <richlistitem id="category-userscripts"
+    <richlistitem id="category-scriptish"
         class="category"
         insertafter="category-plugins"
         value="addons://list/userscript">
diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index cda13961..1b4eab4e 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -62,8 +62,13 @@ window.addEventListener("load", function() {
     }
   })();
 
-  $("category-userscripts").setAttribute(
-      "name", Scriptish_stringBundle("userscripts"));
+  var category = $("category-scriptish");
+  if (AddonManagerPrivate.AddonType) {
+    category.parentNode.removeChild(category);
+  } else {
+    category.setAttribute("id", "category-userscript");
+    category.setAttribute("name", Scriptish_stringBundle("userscripts"));
+  }
 
   $("scriptish-get-scripts-btn").addEventListener("command", function() {
     var gBrowser = Services.wm.getMostRecentWindow("navigator:browser").gBrowser;

From cd2115d4c18eeb116d698d043d1e91f3e3887f46 Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Wed, 20 Apr 2011 16:26:40 -0400
Subject: [PATCH 052/829] Closes #288 Remove 'restart now' link for uninstalled
 scripts.

---
 extension/skin/addonstab.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extension/skin/addonstab.css b/extension/skin/addonstab.css
index 76d7c75c..d3f18ed2 100644
--- a/extension/skin/addonstab.css
+++ b/extension/skin/addonstab.css
@@ -11,3 +11,8 @@ page.scriptish #addon-list-empty, #user-scripts-list-empty{
 page.scriptish #user-script-list-empty {
   display: -moz-box;
 }
+
+/* Hide the 'restart now' link for user scripts. */
+page.scriptish #addon-list button[command=cmd_restartApp] {
+  display: none;
+}

From 8cc2cb224d56aadd5bc7a81bc4630ec0ee2ca8f5 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 17 May 2011 12:00:05 -0500
Subject: [PATCH 053/829] Adding an 'about:scriptish' page.

---
 extension/chrome.manifest              |   3 +
 extension/components/aboutScriptish.js |  23 +++++
 extension/content/aboutScriptish.html  | 132 +++++++++++++++++++++++++
 3 files changed, 158 insertions(+)
 create mode 100644 extension/components/aboutScriptish.js
 create mode 100644 extension/content/aboutScriptish.html

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index ea96c8c6..274e9f07 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -2,6 +2,9 @@ component {ca39e060-88ab-11df-a4ee-0800200c9a66} components/scriptish.js
 contract  @scriptish.erikvold.com/scriptish-service;1 {ca39e060-88ab-11df-a4ee-0800200c9a66}
 category  content-policy @scriptish.erikvold.com/scriptish-service;1 @scriptish.erikvold.com/scriptish-service;1
 
+component {5f28a810-8094-11e0-b278-0800200c9a66} components/aboutScriptish.js
+contract @mozilla.org/network/protocol/about;1?what=scriptish {5f28a810-8094-11e0-b278-0800200c9a66}
+
 content    scriptish    content/
 resource   scriptish    modules/
 skin       scriptish    classic/1.0 skin/
diff --git a/extension/components/aboutScriptish.js b/extension/components/aboutScriptish.js
new file mode 100644
index 00000000..9d18b8bb
--- /dev/null
+++ b/extension/components/aboutScriptish.js
@@ -0,0 +1,23 @@
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+
+function AboutScriptish() {}
+AboutScriptish.prototype = {
+  classDescription: "about:scriptish",
+  contractID: "@mozilla.org/network/protocol/about;1?what=scriptish",
+  classID: Components.ID("{5f28a810-8094-11e0-b278-0800200c9a66}"),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
+
+  getURIFlags: function(aURI) {
+    return Ci.nsIAboutModule.ALLOW_SCRIPT;
+  },
+
+  newChannel: function(aURI) {
+    let channel = Services.io.newChannel(
+        "chrome://scriptish/content/aboutScriptish.html", null, null);
+    channel.originalURI = aURI;
+    return channel;
+  }
+};
+
+var NSGetFactory = XPCOMUtils.generateNSGetFactory([AboutScriptish]);
diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
new file mode 100644
index 00000000..3cf2afb0
--- /dev/null
+++ b/extension/content/aboutScriptish.html
@@ -0,0 +1,132 @@
+<!doctype html>
+<head>
+  <title>About: Scriptish</title>
+  <style type="text/css">
+    body { background-color: #333; font-family: Arial, Helvetica, sans-serif; }
+
+    h1, h2, h3 {
+      margin: 0;
+      padding: 0;
+      font-family: "Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace!important;
+    }
+
+    section { margin-bottom: 40px; }
+
+    header { margin-bottom: 20px; }
+    header.primary { border-bottom: 2px solid #bada55; }
+    header.primary img { margin-bottom: -5px; }
+    header.primary h1 { display:inline; }
+    header.secondary { border-bottom: 1px dotted #ccc; }
+
+    ul { margin-top: 5px; padding-left: 15px; }
+
+    p { margin: 0; padding: 0; }
+
+    a { color: #00f; text-decoration: none; }
+    a:hover { color: #09f; }
+
+    #container {
+      margin: 0 auto;
+      padding: 10px;
+      width: 70%;
+      background-color: #fff;
+      border: 2px solid #000;
+      border-radius: 15px;
+    }
+
+    .twoCol { -moz-column-count: 2; }
+  </style>
+</head>
+
+<body>
+  <div id="container">
+    <header class="primary">
+      <img src="chrome://scriptish/skin/scriptish32.png" />
+      <h1>About:Scriptish</h1>
+    </header>
+
+    <div id="main" role="main">
+      <section id="about">
+        <header class="secondary">
+          <h2>About</h2>
+        </header>
+        <p>Welcome to Scriptish!  Scriptish is a fork of Greasemonkey, the popular Firefox extension
+        for running user scripts. Greasemonkey has long supported Firefox 1.5, and only recently
+        decided to raise the minimum supported version of Firefox to 3.0. Plenty of legacy code
+        still exists, however, and it has reached the point where Greasemonkey needs a complete
+        reorganization. But unfortunately, development of Greasemonkey is incredibly slow for bug
+        fixes, let alone code base refactoring or the addition of features. This is why I decided to
+        fork Greasemonkey and start something new. &mdash; <a href="https://github.com/erikvold">@erikvold</a></p>
+      </section>
+
+      <section id="learn">
+        <header class="secondary">
+          <h2>Learn</h2>
+        </header>
+        <p>Check out the <a href="https://github.com/erikvold/scriptish/wiki">Scriptish wiki</a>
+        to learn about Scriptish and how to use it.</p>
+      </section>
+
+      <section id="helpout">
+        <header class="secondary">
+          <h2>Help Out</h2>
+        </header>
+        <p>There are many ways you can help out with Scriptish:</p>
+        <ul>
+          <li><a href="https://github.com/erikvold/scriptish/issues">Report a bug</a></li>
+          <li><a href="https://github.com/erikvold/scriptish/issues">Request a feature</a></li>
+          <li>Like coding?  <a href="https://github.com/erikvold/scriptish">Fork us!</a></li>
+        </ul>
+      </section>
+
+      <section id="contributors">
+        <header class="secondary">
+          <h2>Contributors</h2>
+        </header>
+        <div class="twoCol">
+          <h3>Creator:</h3>
+          <ul>
+            <li>Erik Vold &mdash; <a href="http://erikvold.com/">http://erikvold.com/</a></li>
+          </ul>
+
+          <h3>Contributors:</h3>
+          <ul>
+            <li>Aaron Boodman &mdash; <a href="http://youngpup.net/">http://youngpup.net/</a></li>
+            <li>Anthony Lieuallen &mdash; <a href="http://arantius.com/">http://arantius.com/</a></li>
+            <li>Chris Feldmann &mdash; <a href="http://axlotl.net/">http://axlotl.net/</a></li>
+            <li>David Schontzler &mdash; <a href="http://stilleye.com/">http://stilleye.com/</a></li>
+            <li>Gareth Andrew &mdash; <a href="http://freegarethandrew.org/">http://freegarethandrew.org/</a></li>
+            <li>Greg Parris &mdash; <a href="http://phob.net/">http://phob.net/</a></li>
+            <li>Hisateru Tanaka</li>
+            <li>Jeremy Dunck &mdash; <a href="http://dunck.us/anabasis/">http://dunck.us/anabasis/</a></li>
+            <li>Jesper Kristensen &mdash; <a href="mailto:mail@jesperkristensen.dk">mail@jesperkristensen.dk</a></li>
+            <li>Johan Sundstr�m &mdash; <a href="http://ecmanaut.blogspot.com/">http://ecmanaut.blogspot.com/</a></li>
+            <li>JP Sugarbroad</li>
+            <li>Juan Pablo Guereca Alonso</li>
+            <li>Manpreet Singh</li>
+            <li>Mark Pilgrim &mdash; <a href="http://diveintomark.org/">http://diveintomark.org/</a></li>
+            <li>Marti Martz</li>
+            <li>Matthew Gray &mdash; <a href="http://mkgray.com:8000/">http://mkgray.com:8000/</a></li>
+            <li>Matthias Bauer &mdash; <a href="http://moeffju.net/">http://moeffju.net/</a></li>
+            <li>Mike Medley &mdash; <a href="http://sizzlemctwizzle.com/">http://sizzlemctwizzle.com/</a></li>
+            <li>Nikolas Coukouma &mdash; <a href="http://atrus.org/">http://atrus.org/</a></li>
+            <li>Ori Avtallon</li>
+            <li>Pak Kei (logo) &mdash; <a href="http://arkidect.com/">http://arkidect.com/</a></li>
+            <li>Sergio Abreu &mdash; <a href="http://sitedosergio.sitesbr.net/">http://sitedosergio.sitesbr.net/</a></li>
+            <li>Slowpoke</li>
+            <li>Tommi Rautava</li>
+            <li>Nils Maier</li>
+            <li>Melih Bilgil &mdash; <a href="http://picol.org">http://picol.org/</a></li>
+            <li>John J. Barton</li>
+          </ul>
+
+          <h3>Translators:</h3>
+          <ul>
+            <li>nishikawasasaki (kohsei yamamoto)</li>
+          </ul>
+        </div>
+      </section>
+    </div>
+  </div> <!--! end of #container -->
+</body>
+</html>

From 1a84c55aae898cbfa134b13085a7c58e1cc4ad1e Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 18 May 2011 18:22:34 -0500
Subject: [PATCH 054/829] Add a placeholder for running tests through
 'about:scriptish?test'.

---
 extension/content/aboutScriptish.html | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 3cf2afb0..d944a744 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -34,6 +34,10 @@
       border-radius: 15px;
     }
 
+    #test {
+      display: none;
+    }
+
     .twoCol { -moz-column-count: 2; }
   </style>
 </head>
@@ -127,6 +131,23 @@ <h3>Translators:</h3>
         </div>
       </section>
     </div>
+    <div id="test">
+      <section>
+        <header class="secondary">
+          <h2>Testing</h2>
+        </header>
+        <p>There are currently no tests to run.</p>
+      </section>
+    </div>
   </div> <!--! end of #container -->
+
+  <script type="text/javascript">
+    function $(aID) document.getElementById(aID);
+    var doTest = window.location.href.split("?")[1] == "test";
+    if (doTest) {
+      $("main").style.display = "none";
+      $("test").style.display = "inherit";
+    }
+  </script>
 </body>
 </html>

From b92dc0b2b15ea9af088ca8658864bf90a9bf6d39 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 22 May 2011 20:03:19 -0500
Subject: [PATCH 055/829] Adding QUnit testing for 'about:scriptish?test'.

---
 extension/content/aboutScriptish.html      |   28 +-
 extension/content/test/jquery-1.6.1.min.js |   18 +
 extension/content/test/qunit.css           |  225 +++
 extension/content/test/qunit.js            | 1448 ++++++++++++++++++++
 extension/content/test/runTests.js         |  108 ++
 5 files changed, 1816 insertions(+), 11 deletions(-)
 create mode 100644 extension/content/test/jquery-1.6.1.min.js
 create mode 100644 extension/content/test/qunit.css
 create mode 100644 extension/content/test/qunit.js
 create mode 100644 extension/content/test/runTests.js

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index d944a744..0959aa93 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -40,6 +40,19 @@
 
     .twoCol { -moz-column-count: 2; }
   </style>
+  <link rel='stylesheet' href='chrome://scriptish/content/test/qunit.css' type='text/css' media='screen' />
+  <script type="text/javascript" src="chrome://scriptish/content/test/jquery-1.6.1.min.js"></script>
+  <script type="text/javascript" src="chrome://scriptish/content/test/qunit.js"></script>
+  <script type="text/javascript" src="chrome://scriptish/content/test/runTests.js"></script>
+  <script type="text/javascript">
+    $(function() {
+      var doTest = window.location.href.split("?")[1] == "test";
+      if (!doTest) return;
+      $("#main").hide();
+      $("#test").show();
+      runTests();
+    });
+  </script>
 </head>
 
 <body>
@@ -134,20 +147,13 @@ <h3>Translators:</h3>
     <div id="test">
       <section>
         <header class="secondary">
-          <h2>Testing</h2>
+          <h2 id="qunit-header2">Testing Scriptish</h2>
+          <h3 id="qunit-banner"></h3>
+          <h4 id="qunit-userAgent"></h4>
         </header>
-        <p>There are currently no tests to run.</p>
+        <ol id="qunit-tests"></ol>
       </section>
     </div>
   </div> <!--! end of #container -->
-
-  <script type="text/javascript">
-    function $(aID) document.getElementById(aID);
-    var doTest = window.location.href.split("?")[1] == "test";
-    if (doTest) {
-      $("main").style.display = "none";
-      $("test").style.display = "inherit";
-    }
-  </script>
 </body>
 </html>
diff --git a/extension/content/test/jquery-1.6.1.min.js b/extension/content/test/jquery-1.6.1.min.js
new file mode 100644
index 00000000..b2ac1747
--- /dev/null
+++ b/extension/content/test/jquery-1.6.1.min.js
@@ -0,0 +1,18 @@
+/*!
+ * jQuery JavaScript Library v1.6.1
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu May 12 15:04:36 2011 -0400
+ */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!cj[a]){var b=f("<"+a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),c.body.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write("<!doctype><html><body></body></html>");b=cl.createElement(a),cl.body.appendChild(b),d=f.css(b,"display"),c.body.removeChild(ck)}cj[a]=d}return cj[a]}function cu(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function ct(){cq=b}function cs(){setTimeout(ct,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bF.test(a)?d(a,e):b_(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bU,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bQ),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bD(a,b,c){var d=b==="width"?bx:by,e=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return e;f.each(d,function(){c||(e-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?e+=parseFloat(f.css(a,"margin"+this))||0:e-=parseFloat(f.css(a,"border"+this+"Width"))||0});return e}function bn(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bm(a){f.nodeName(a,"input")?bl(a):a.getElementsByTagName&&f.grep(a.getElementsByTagName("input"),bl)}function bl(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bk(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bj(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bi(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bh(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function X(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(S.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function W(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function O(a,b){return(a&&a!=="*"?a+".":"")+b.replace(A,"`").replace(B,"&")}function N(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(y,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function L(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function F(){return!0}function E(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function H(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(H,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=d.userAgent,x,y,z,A=Object.prototype.toString,B=Object.prototype.hasOwnProperty,C=Array.prototype.push,D=Array.prototype.slice,E=String.prototype.trim,F=Array.prototype.indexOf,G={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.1",length:0,size:function(){return this.length},toArray:function(){return D.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?C.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(D.apply(this,arguments),"slice",D.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:C,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;y.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!y){y=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",z,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",z),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&H()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):G[A.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!B.call(a,"constructor")&&!B.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||B.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:E?function(a){return a==null?"":E.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?C.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(F)return F.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=D.call(arguments,2),g=function(){return a.apply(c,f.concat(D.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){G["[object "+b+"]"]=b.toLowerCase()}),x=e.uaMatch(w),x.browser&&(e.browser[x.browser]=!0,e.browser.version=x.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?z=function(){c.removeEventListener("DOMContentLoaded",z,!1),e.ready()}:c.attachEvent&&(z=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",z),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};f=c.createElement("select"),g=f.appendChild(c.createElement("option")),h=a.getElementsByTagName("input")[0],j={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},h.checked=!0,j.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,j.optDisabled=!g.disabled;try{delete a.test}catch(s){j.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function b(){j.noCloneEvent=!1,a.detachEvent("onclick",b)}),a.cloneNode(!0).fireEvent("onclick")),h=c.createElement("input"),h.value="t",h.setAttribute("type","radio"),j.radioValue=h.value==="t",h.setAttribute("checked","checked"),a.appendChild(h),k=c.createDocumentFragment(),k.appendChild(a.firstChild),j.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",l=c.createElement("body"),m={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"};for(q in m)l.style[q]=m[q];l.appendChild(a),b.insertBefore(l,b.firstChild),j.appendChecked=h.checked,j.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,j.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",j.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",n=a.getElementsByTagName("td"),r=n[0].offsetHeight===0,n[0].style.display="",n[1].style.display="none",j.reliableHiddenOffsets=r&&n[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(i=c.createElement("div"),i.style.width="0",i.style.marginRight="0",a.appendChild(i),j.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(i,null)||{marginRight:0}).marginRight,10)||0)===0),l.innerHTML="",b.removeChild(l);if(a.attachEvent)for(q in{submit:1,change:1,focusin:1})p="on"+q,r=p in a,r||(a.setAttribute(p,"return;"),r=typeof a[p]=="function"),j[q+"Bubbles"]=r;return j}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.addClass(a.call(this,b,c.attr("class")||""))});if(a&&typeof a=="string"){var b=(a||"").split(o);for(var c=0,d=this.length;c<d;c++){var e=this[c];if(e.nodeType===1)if(!e.className)e.className=a;else{var g=" "+e.className+" ",h=e.className;for(var i=0,j=b.length;i<j;i++)g.indexOf(" "+b[i]+" ")<0&&(h+=" "+b[i]);e.className=f.trim(h)}}}return this},removeClass:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a=="string"||a===b){var c=(a||"").split(o);for(var d=0,e=this.length;d<e;d++){var g=this[d];if(g.nodeType===1&&g.className)if(a){var h=(" "+g.className+" ").replace(n," ");for(var i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){var d=f(this);d.toggleClass(a.call(this,c,d.attr("class"),b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;return(e.value||"").replace(p,"")}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);c=j&&f.attrFix[c]||c,i=f.attrHooks[c],i||(!t.test(c)||typeof d!="boolean"&&d!==b&&d.toLowerCase()!==c.toLowerCase()?v&&(f.nodeName(a,"form")||u.test(c))&&(i=v):i=w);if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j)return i.get(a,c);h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);c=i&&f.propFix[c]||c,h=f.propHooks[c];return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return a[f.propFix[c]||c]?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=b),a.setAttribute(c,c.toLowerCase()));return c}},f.attrHooks.value={get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return a.value},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=Object.prototype.hasOwnProperty,y=/\.(.*)$/,z=/^(?:textarea|input|select)$/i,A=/\./g,B=/ /g,C=/[^\w\s.|`]/g,D=function(a){return a.replace(C,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=E;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=E);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),D).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem
+)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,O(a.origType,a.selector),f.extend({},a,{handler:N,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,O(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?F:E):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=F;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=F;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=F,this.stopPropagation()},isDefaultPrevented:E,isPropagationStopped:E,isImmediatePropagationStopped:E};var G=function(a){var b=a.relatedTarget;a.type=a.data;try{if(b&&b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&f.event.handle.apply(this,arguments)}catch(d){}},H=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?H:G,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?H:G)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&L("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&L("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var I,J=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},K=function(c){var d=c.target,e,g;if(!!z.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=J(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:K,beforedeactivate:K,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&K.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&K.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",J(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in I)f.event.add(this,c+".specialChange",I[c]);return z.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return z.test(this.nodeName)}},I=f.event.special.change.filters,I.focus=I.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var M={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||E,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=y.exec(h),k="",j&&(k=j[0],h=h.replace(y,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,M[h]?(a.push(M[h]+k),h=h+k):h=(M[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+O(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+O(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var P=/Until$/,Q=/^(?:parents|prevUntil|prevAll)/,R=/,/,S=/^.[^:#\[\.,]*$/,T=Array.prototype.slice,U=f.expr.match.POS,V={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(X(this,a,!1),"not",a)},filter:function(a){return this.pushStack(X(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=U.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=U.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(W(c[0])||W(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=T.call(arguments);P.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!V[a]?f.unique(e):e,(this.length>1||R.test(d))&&Q.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var Y=/ jQuery\d+="(?:\d+|null)"/g,Z=/^\s+/,$=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,_=/<([\w:]+)/,ba=/<tbody/i,bb=/<|&#?\w+;/,bc=/<(?:script|object|embed|option|style)/i,bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Y,""):null;if(typeof a=="string"&&!bc.test(a)&&(f.support.leadingWhitespace||!Z.test(a))&&!bg[(_.exec(a)||["",""])[1].toLowerCase()]){a=a.replace($,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bh(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bn)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bc.test(a[0])&&(f.support.checkClone||!bd.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bj(a,d),e=bk(a),g=bk(d);for(h=0;e[h];++h)bj(e[h],g[h])}if(b){bi(a,d);if(c){e=bk(a),g=bk(d);for(h=0;e[h];++h)bi(e[h],g[h])}}return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||
+b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!bb.test(k))k=b.createTextNode(k);else{k=k.replace($,"<$1></$2>");var l=(_.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=ba.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Z.test(k)&&o.insertBefore(b.createTextNode(Z.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bm(k[i]);else bm(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bo=/alpha\([^)]*\)/i,bp=/opacity=([^)]*)/,bq=/-([a-z])/ig,br=/([A-Z]|^ms)/g,bs=/^-?\d+(?:px)?$/i,bt=/^-?\d/,bu=/^[+\-]=/,bv=/[^+\-\.\de]+/g,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB,bC=function(a,b){return b.toUpperCase()};f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0,widows:!0,orphans:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bu.test(d)&&(d=+d.replace(bv,"")+parseFloat(f.css(a,c))),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bq,bC)}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){a.offsetWidth!==0?e=bD(a,b,d):f.swap(a,bw,function(){e=bD(a,b,d)});if(e<=0){e=bz(a,b,b),e==="0px"&&bB&&(e=bB(a,b,b));if(e!=null)return e===""||e==="auto"?"0px":e}if(e<0||e==null){e=a.style[b];return e===""||e==="auto"?"0px":e}return typeof e=="string"?e:e+"px"}},set:function(a,b){if(!bs.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bp.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bo.test(g)?g.replace(bo,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,c){var d,e,g;c=c.replace(br,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bs.test(d)&&bt.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bE=/%20/g,bF=/\[\]$/,bG=/\r?\n/g,bH=/#.*$/,bI=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bJ=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bK=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bL=/^(?:GET|HEAD)$/,bM=/^\/\//,bN=/\?/,bO=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bP=/^(?:select|textarea)/i,bQ=/\s+/,bR=/([?&])_=[^&]*/,bS=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bT=f.fn.load,bU={},bV={},bW,bX;try{bW=e.href}catch(bY){bW=c.createElement("a"),bW.href="",bW=bW.href}bX=bS.exec(bW.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bT)return bT.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bO,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bP.test(this.nodeName)||bJ.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bG,"\r\n")}}):{name:b.name,value:c.replace(bG,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bW,isLocal:bK.test(bX[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bZ(bU),ajaxTransport:bZ(bV),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?ca(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=cb(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bI.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bH,"").replace(bM,bX[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bQ),d.crossDomain==null&&(r=bS.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bX[1]&&r[2]==bX[2]&&(r[3]||(r[1]==="http:"?80:443))==(bX[3]||(bX[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bU,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bL.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bN.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bR,"$1_="+x);d.url=y+(y===d.url?(bN.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bV,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bE,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq,cr=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cv(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cm.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=cn.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this),f.isFunction(d.old)&&d.old.call(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cq||cs(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!co&&(cr?(co=1,g=function(){co&&(cr(g),e.tick())},cr(g)):co=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cq||cs(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){return this[0]?parseFloat(f.css(this[0],d,"padding")):null},f.fn["outer"+c]=function(a){return this[0]?parseFloat(f.css(this[0],d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/extension/content/test/qunit.css b/extension/content/test/qunit.css
new file mode 100644
index 00000000..48fd0956
--- /dev/null
+++ b/extension/content/test/qunit.css
@@ -0,0 +1,225 @@
+/**
+ * QUnit - A JavaScript Unit Testing Framework
+ *
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2011 John Resig, J�rn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * or GPL (GPL-LICENSE.txt) licenses.
+ */
+
+/** Font Family and Sizes */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
+	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
+}
+
+#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
+#qunit-tests { font-size: smaller; }
+
+
+/** Resets */
+
+#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
+	margin: 0;
+	padding: 0;
+}
+
+
+/** Header */
+
+#qunit-header, #qunit-header2 {
+	padding: 0.5em 0 0.5em 1em;
+
+	color: #8699a4;
+	background-color: #0d3349;
+
+	font-size: 1.5em;
+	line-height: 1em;
+	font-weight: normal;
+
+	border-radius: 15px 15px 0 0;
+	-moz-border-radius: 15px 15px 0 0;
+	-webkit-border-top-right-radius: 15px;
+	-webkit-border-top-left-radius: 15px;
+}
+
+#qunit-header a {
+	text-decoration: none;
+	color: #c2ccd1;
+}
+
+#qunit-header a:hover,
+#qunit-header a:focus {
+	color: #fff;
+}
+
+#qunit-banner {
+	height: 5px;
+}
+
+#qunit-testrunner-toolbar {
+	padding: 0.5em 0 0.5em 2em;
+	color: #5E740B;
+	background-color: #eee;
+}
+
+#qunit-userAgent {
+	padding: 0.5em 0 0.5em 2.5em;
+	background-color: #2b81af;
+	color: #fff;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+
+
+/** Tests: Pass/Fail */
+
+#qunit-tests {
+	list-style-position: inside;
+}
+
+#qunit-tests li {
+	padding: 0.4em 0.5em 0.4em 2.5em;
+	border-bottom: 1px solid #fff;
+	list-style-position: inside;
+}
+
+#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running  {
+	display: none;
+}
+
+#qunit-tests li strong {
+	cursor: pointer;
+}
+
+#qunit-tests li a {
+	padding: 0.5em;
+	color: #c2ccd1;
+	text-decoration: none;
+}
+#qunit-tests li a:hover,
+#qunit-tests li a:focus {
+	color: #000;
+}
+
+#qunit-tests ol {
+	margin-top: 0.5em;
+	padding: 0.5em;
+
+	background-color: #fff;
+
+	border-radius: 15px;
+	-moz-border-radius: 15px;
+	-webkit-border-radius: 15px;
+
+	box-shadow: inset 0px 2px 13px #999;
+	-moz-box-shadow: inset 0px 2px 13px #999;
+	-webkit-box-shadow: inset 0px 2px 13px #999;
+}
+
+#qunit-tests table {
+	border-collapse: collapse;
+	margin-top: .2em;
+}
+
+#qunit-tests th {
+	text-align: right;
+	vertical-align: top;
+	padding: 0 .5em 0 0;
+}
+
+#qunit-tests td {
+	vertical-align: top;
+}
+
+#qunit-tests pre {
+	margin: 0;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+#qunit-tests del {
+	background-color: #e0f2be;
+	color: #374e0c;
+	text-decoration: none;
+}
+
+#qunit-tests ins {
+	background-color: #ffcaca;
+	color: #500;
+	text-decoration: none;
+}
+
+/*** Test Counts */
+
+#qunit-tests b.counts                       { color: black; }
+#qunit-tests b.passed                       { color: #5E740B; }
+#qunit-tests b.failed                       { color: #710909; }
+
+#qunit-tests li li {
+	margin: 0.5em;
+	padding: 0.4em 0.5em 0.4em 0.5em;
+	background-color: #fff;
+	border-bottom: none;
+	list-style-position: inside;
+}
+
+/*** Passing Styles */
+
+#qunit-tests li li.pass {
+	color: #5E740B;
+	background-color: #fff;
+	border-left: 26px solid #C6E746;
+}
+
+#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
+#qunit-tests .pass .test-name               { color: #366097; }
+
+#qunit-tests .pass .test-actual,
+#qunit-tests .pass .test-expected           { color: #999999; }
+
+#qunit-banner.qunit-pass                    { background-color: #C6E746; }
+
+/*** Failing Styles */
+
+#qunit-tests li li.fail {
+	color: #710909;
+	background-color: #fff;
+	border-left: 26px solid #EE5757;
+}
+
+#qunit-tests > li:last-child {
+	border-radius: 0 0 15px 15px;
+	-moz-border-radius: 0 0 15px 15px;
+	-webkit-border-bottom-right-radius: 15px;
+	-webkit-border-bottom-left-radius: 15px;
+}
+
+#qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
+#qunit-tests .fail .test-name,
+#qunit-tests .fail .module-name             { color: #000000; }
+
+#qunit-tests .fail .test-actual             { color: #EE5757; }
+#qunit-tests .fail .test-expected           { color: green;   }
+
+#qunit-banner.qunit-fail                    { background-color: #EE5757; }
+
+
+/** Result */
+
+#qunit-testresult {
+	padding: 0.5em 0.5em 0.5em 2.5em;
+
+	color: #2b81af;
+	background-color: #D2E0E6;
+
+	border-bottom: 1px solid white;
+}
+
+/** Fixture */
+
+#qunit-fixture {
+	position: absolute;
+	top: -10000px;
+	left: -10000px;
+}
diff --git a/extension/content/test/qunit.js b/extension/content/test/qunit.js
new file mode 100644
index 00000000..c1a658fa
--- /dev/null
+++ b/extension/content/test/qunit.js
@@ -0,0 +1,1448 @@
+/**
+ * QUnit - A JavaScript Unit Testing Framework
+ *
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2011 John Resig, J�rn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * or GPL (GPL-LICENSE.txt) licenses.
+ */
+
+(function(window) {
+
+var defined = {
+	setTimeout: typeof window.setTimeout !== "undefined",
+	sessionStorage: (function() {
+		try {
+			return !!sessionStorage.getItem;
+		} catch(e){
+			return false;
+		}
+  })()
+};
+
+var testId = 0;
+
+var Test = function(name, testName, expected, testEnvironmentArg, async, callback) {
+	this.name = name;
+	this.testName = testName;
+	this.expected = expected;
+	this.testEnvironmentArg = testEnvironmentArg;
+	this.async = async;
+	this.callback = callback;
+	this.assertions = [];
+};
+Test.prototype = {
+	init: function() {
+		var tests = id("qunit-tests");
+		if (tests) {
+			var b = document.createElement("strong");
+				b.innerHTML = "Running " + this.name;
+			var li = document.createElement("li");
+				li.appendChild( b );
+				li.className = "running";
+				li.id = this.id = "test-output" + testId++;
+			tests.appendChild( li );
+		}
+	},
+	setup: function() {
+		if (this.module != config.previousModule) {
+			if ( config.previousModule ) {
+				QUnit.moduleDone( {
+					name: config.previousModule,
+					failed: config.moduleStats.bad,
+					passed: config.moduleStats.all - config.moduleStats.bad,
+					total: config.moduleStats.all
+				} );
+			}
+			config.previousModule = this.module;
+			config.moduleStats = { all: 0, bad: 0 };
+			QUnit.moduleStart( {
+				name: this.module
+			} );
+		}
+
+		config.current = this;
+		this.testEnvironment = extend({
+			setup: function() {},
+			teardown: function() {}
+		}, this.moduleTestEnvironment);
+		if (this.testEnvironmentArg) {
+			extend(this.testEnvironment, this.testEnvironmentArg);
+		}
+
+		QUnit.testStart( {
+			name: this.testName
+		} );
+
+		// allow utility functions to access the current test environment
+		// TODO why??
+		QUnit.current_testEnvironment = this.testEnvironment;
+
+		try {
+			if ( !config.pollution ) {
+				saveGlobal();
+			}
+
+			this.testEnvironment.setup.call(this.testEnvironment);
+		} catch(e) {
+			QUnit.ok( false, "Setup failed on " + this.testName + ": " + e.message );
+		}
+	},
+	run: function() {
+		if ( this.async ) {
+			QUnit.stop();
+		}
+
+		if ( config.notrycatch ) {
+			this.callback.call(this.testEnvironment);
+			return;
+		}
+		try {
+			this.callback.call(this.testEnvironment);
+		} catch(e) {
+			fail("Test " + this.testName + " died, exception and test follows", e, this.callback);
+			QUnit.ok( false, "Died on test #" + (this.assertions.length + 1) + ": " + e.message + " - " + QUnit.jsDump.parse(e) );
+			// else next test will carry the responsibility
+			saveGlobal();
+
+			// Restart the tests if they're blocking
+			if ( config.blocking ) {
+				start();
+			}
+		}
+	},
+	teardown: function() {
+		try {
+			this.testEnvironment.teardown.call(this.testEnvironment);
+			checkPollution();
+		} catch(e) {
+			QUnit.ok( false, "Teardown failed on " + this.testName + ": " + e.message );
+		}
+	},
+	finish: function() {
+		if ( this.expected && this.expected != this.assertions.length ) {
+			QUnit.ok( false, "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run" );
+		}
+
+		var good = 0, bad = 0,
+			tests = id("qunit-tests");
+
+		config.stats.all += this.assertions.length;
+		config.moduleStats.all += this.assertions.length;
+
+		if ( tests ) {
+			var ol  = document.createElement("ol");
+
+			for ( var i = 0; i < this.assertions.length; i++ ) {
+				var assertion = this.assertions[i];
+
+				var li = document.createElement("li");
+				li.className = assertion.result ? "pass" : "fail";
+				li.innerHTML = assertion.message || (assertion.result ? "okay" : "failed");
+				ol.appendChild( li );
+
+				if ( assertion.result ) {
+					good++;
+				} else {
+					bad++;
+					config.stats.bad++;
+					config.moduleStats.bad++;
+				}
+			}
+
+			// store result when possible
+			if ( QUnit.config.reorder && defined.sessionStorage ) {
+				if (bad) {
+					sessionStorage.setItem("qunit-" + this.module + "-" + this.testName, bad);
+				} else {
+					sessionStorage.removeItem("qunit-" + this.module + "-" + this.testName);
+				}
+			}
+
+			if (bad == 0) {
+				ol.style.display = "none";
+			}
+
+			var b = document.createElement("strong");
+			b.innerHTML = this.name + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
+
+			var a = document.createElement("a");
+			a.innerHTML = "Rerun";
+			a.href = QUnit.url({ filter: getText([b]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+
+			addEvent(b, "click", function() {
+				var next = b.nextSibling.nextSibling,
+					display = next.style.display;
+				next.style.display = display === "none" ? "block" : "none";
+			});
+
+			addEvent(b, "dblclick", function(e) {
+				var target = e && e.target ? e.target : window.event.srcElement;
+				if ( target.nodeName.toLowerCase() == "span" || target.nodeName.toLowerCase() == "b" ) {
+					target = target.parentNode;
+				}
+				if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
+					window.location = QUnit.url({ filter: getText([target]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+				}
+			});
+
+			var li = id(this.id);
+			li.className = bad ? "fail" : "pass";
+			li.removeChild( li.firstChild );
+			li.appendChild( b );
+			li.appendChild( a );
+			li.appendChild( ol );
+
+		} else {
+			for ( var i = 0; i < this.assertions.length; i++ ) {
+				if ( !this.assertions[i].result ) {
+					bad++;
+					config.stats.bad++;
+					config.moduleStats.bad++;
+				}
+			}
+		}
+
+		try {
+			QUnit.reset();
+		} catch(e) {
+			fail("reset() failed, following Test " + this.testName + ", exception and reset fn follows", e, QUnit.reset);
+		}
+
+		QUnit.testDone( {
+			name: this.testName,
+			failed: bad,
+			passed: this.assertions.length - bad,
+			total: this.assertions.length
+		} );
+	},
+
+	queue: function() {
+		var test = this;
+		synchronize(function() {
+			test.init();
+		});
+		function run() {
+			// each of these can by async
+			synchronize(function() {
+				test.setup();
+			});
+			synchronize(function() {
+				test.run();
+			});
+			synchronize(function() {
+				test.teardown();
+			});
+			synchronize(function() {
+				test.finish();
+			});
+		}
+		// defer when previous test run passed, if storage is available
+		var bad = QUnit.config.reorder && defined.sessionStorage && +sessionStorage.getItem("qunit-" + this.module + "-" + this.testName);
+		if (bad) {
+			run();
+		} else {
+			synchronize(run);
+		};
+	}
+
+};
+
+var QUnit = {
+
+	// call on start of module test to prepend name to all tests
+	module: function(name, testEnvironment) {
+		config.currentModule = name;
+		config.currentModuleTestEnviroment = testEnvironment;
+	},
+
+	asyncTest: function(testName, expected, callback) {
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = 0;
+		}
+
+		QUnit.test(testName, expected, callback, true);
+	},
+
+	test: function(testName, expected, callback, async) {
+		var name = '<span class="test-name">' + testName + '</span>', testEnvironmentArg;
+
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = null;
+		}
+		// is 2nd argument a testEnvironment?
+		if ( expected && typeof expected === 'object') {
+			testEnvironmentArg =  expected;
+			expected = null;
+		}
+
+		if ( config.currentModule ) {
+			name = '<span class="module-name">' + config.currentModule + "</span>: " + name;
+		}
+
+		if ( !validTest(config.currentModule + ": " + testName) ) {
+			return;
+		}
+
+		var test = new Test(name, testName, expected, testEnvironmentArg, async, callback);
+		test.module = config.currentModule;
+		test.moduleTestEnvironment = config.currentModuleTestEnviroment;
+		test.queue();
+	},
+
+	/**
+	 * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	 */
+	expect: function(asserts) {
+		config.current.expected = asserts;
+	},
+
+	/**
+	 * Asserts true.
+	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+	 */
+	ok: function(a, msg) {
+		a = !!a;
+		var details = {
+			result: a,
+			message: msg
+		};
+		msg = escapeHtml(msg);
+		QUnit.log(details);
+		config.current.assertions.push({
+			result: a,
+			message: msg
+		});
+	},
+
+	/**
+	 * Checks that the first two arguments are equal, with an optional message.
+	 * Prints out both actual and expected values.
+	 *
+	 * Prefered to ok( actual == expected, message )
+	 *
+	 * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
+	 *
+	 * @param Object actual
+	 * @param Object expected
+	 * @param String message (optional)
+	 */
+	equal: function(actual, expected, message) {
+		QUnit.push(expected == actual, actual, expected, message);
+	},
+
+	notEqual: function(actual, expected, message) {
+		QUnit.push(expected != actual, actual, expected, message);
+	},
+
+	deepEqual: function(actual, expected, message) {
+		QUnit.push(QUnit.equiv(actual, expected), actual, expected, message);
+	},
+
+	notDeepEqual: function(actual, expected, message) {
+		QUnit.push(!QUnit.equiv(actual, expected), actual, expected, message);
+	},
+
+	strictEqual: function(actual, expected, message) {
+		QUnit.push(expected === actual, actual, expected, message);
+	},
+
+	notStrictEqual: function(actual, expected, message) {
+		QUnit.push(expected !== actual, actual, expected, message);
+	},
+
+	raises: function(block, expected, message) {
+		var actual, ok = false;
+
+		if (typeof expected === 'string') {
+			message = expected;
+			expected = null;
+		}
+
+		try {
+			block();
+		} catch (e) {
+			actual = e;
+		}
+
+		if (actual) {
+			// we don't want to validate thrown error
+			if (!expected) {
+				ok = true;
+			// expected is a regexp
+			} else if (QUnit.objectType(expected) === "regexp") {
+				ok = expected.test(actual);
+			// expected is a constructor
+			} else if (actual instanceof expected) {
+				ok = true;
+			// expected is a validation function which returns true is validation passed
+			} else if (expected.call({}, actual) === true) {
+				ok = true;
+			}
+		}
+
+		QUnit.ok(ok, message);
+	},
+
+	start: function() {
+		config.semaphore--;
+		if (config.semaphore > 0) {
+			// don't start until equal number of stop-calls
+			return;
+		}
+		if (config.semaphore < 0) {
+			// ignore if start is called more often then stop
+			config.semaphore = 0;
+		}
+		// A slight delay, to avoid any current callbacks
+		if ( defined.setTimeout ) {
+			window.setTimeout(function() {
+				if ( config.timeout ) {
+					clearTimeout(config.timeout);
+				}
+
+				config.blocking = false;
+				process();
+			}, 13);
+		} else {
+			config.blocking = false;
+			process();
+		}
+	},
+
+	stop: function(timeout) {
+		config.semaphore++;
+		config.blocking = true;
+
+		if ( timeout && defined.setTimeout ) {
+			clearTimeout(config.timeout);
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				QUnit.start();
+			}, timeout);
+		}
+	}
+};
+
+// Backwards compatibility, deprecated
+QUnit.equals = QUnit.equal;
+QUnit.same = QUnit.deepEqual;
+
+// Maintain internal state
+var config = {
+	// The queue of tests to run
+	queue: [],
+
+	// block until document ready
+	blocking: true,
+
+	// by default, run previously failed tests first
+	// very useful in combination with "Hide passed tests" checked
+	reorder: true,
+
+	noglobals: false,
+	notrycatch: false
+};
+
+// Load paramaters
+(function() {
+	var location = window.location || { search: "", protocol: "file:" },
+		params = location.search.slice( 1 ).split( "&" ),
+		length = params.length,
+		urlParams = {},
+		current;
+
+	if ( params[ 0 ] ) {
+		for ( var i = 0; i < length; i++ ) {
+			current = params[ i ].split( "=" );
+			current[ 0 ] = decodeURIComponent( current[ 0 ] );
+			// allow just a key to turn on a flag, e.g., test.html?noglobals
+			current[ 1 ] = current[ 1 ] ? decodeURIComponent( current[ 1 ] ) : true;
+			urlParams[ current[ 0 ] ] = current[ 1 ];
+			if ( current[ 0 ] in config ) {
+				config[ current[ 0 ] ] = current[ 1 ];
+			}
+		}
+	}
+
+	QUnit.urlParams = urlParams;
+	config.filter = urlParams.filter;
+
+	// Figure out if we're running the tests from a server or not
+	QUnit.isLocal = !!(location.protocol === 'file:');
+})();
+
+// Expose the API as global variables, unless an 'exports'
+// object exists, in that case we assume we're in CommonJS
+if ( typeof exports === "undefined" || typeof require === "undefined" ) {
+	extend(window, QUnit);
+	window.QUnit = QUnit;
+} else {
+	extend(exports, QUnit);
+	exports.QUnit = QUnit;
+}
+
+// define these after exposing globals to keep them in these QUnit namespace only
+extend(QUnit, {
+	config: config,
+
+	// Initialize the configuration options
+	init: function() {
+		extend(config, {
+			stats: { all: 0, bad: 0 },
+			moduleStats: { all: 0, bad: 0 },
+			started: +new Date,
+			updateRate: 1000,
+			blocking: false,
+			autostart: true,
+			autorun: false,
+			filter: "",
+			queue: [],
+			semaphore: 0
+		});
+
+		var tests = id( "qunit-tests" ),
+			banner = id( "qunit-banner" ),
+			result = id( "qunit-testresult" );
+
+		if ( tests ) {
+			tests.innerHTML = "";
+		}
+
+		if ( banner ) {
+			banner.className = "";
+		}
+
+		if ( result ) {
+			result.parentNode.removeChild( result );
+		}
+
+		if ( tests ) {
+			result = document.createElement( "p" );
+			result.id = "qunit-testresult";
+			result.className = "result";
+			tests.parentNode.insertBefore( result, tests );
+			result.innerHTML = 'Running...<br/>&nbsp;';
+		}
+	},
+
+	/**
+	 * Resets the test setup. Useful for tests that modify the DOM.
+	 *
+	 * If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
+	 */
+	reset: function() {
+		if ( window.jQuery ) {
+			jQuery( "#qunit-fixture" ).html( config.fixture );
+		} else {
+			var main = id( 'qunit-fixture' );
+			if ( main ) {
+				main.innerHTML = config.fixture;
+			}
+		}
+	},
+
+	/**
+	 * Trigger an event on an element.
+	 *
+	 * @example triggerEvent( document.body, "click" );
+	 *
+	 * @param DOMElement elem
+	 * @param String type
+	 */
+	triggerEvent: function( elem, type, event ) {
+		if ( document.createEvent ) {
+			event = document.createEvent("MouseEvents");
+			event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+				0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			elem.dispatchEvent( event );
+
+		} else if ( elem.fireEvent ) {
+			elem.fireEvent("on"+type);
+		}
+	},
+
+	// Safe object type checking
+	is: function( type, obj ) {
+		return QUnit.objectType( obj ) == type;
+	},
+
+	objectType: function( obj ) {
+		if (typeof obj === "undefined") {
+				return "undefined";
+
+		// consider: typeof null === object
+		}
+		if (obj === null) {
+				return "null";
+		}
+
+		var type = Object.prototype.toString.call( obj )
+			.match(/^\[object\s(.*)\]$/)[1] || '';
+
+		switch (type) {
+				case 'Number':
+						if (isNaN(obj)) {
+								return "nan";
+						} else {
+								return "number";
+						}
+				case 'String':
+				case 'Boolean':
+				case 'Array':
+				case 'Date':
+				case 'RegExp':
+				case 'Function':
+						return type.toLowerCase();
+		}
+		if (typeof obj === "object") {
+				return "object";
+		}
+		return undefined;
+	},
+
+	push: function(result, actual, expected, message) {
+		var details = {
+			result: result,
+			message: message,
+			actual: actual,
+			expected: expected
+		};
+
+		message = escapeHtml(message) || (result ? "okay" : "failed");
+		message = '<span class="test-message">' + message + "</span>";
+		expected = escapeHtml(QUnit.jsDump.parse(expected));
+		actual = escapeHtml(QUnit.jsDump.parse(actual));
+		var output = message + '<table><tr class="test-expected"><th>Expected: </th><td><pre>' + expected + '</pre></td></tr>';
+		if (actual != expected) {
+			output += '<tr class="test-actual"><th>Result: </th><td><pre>' + actual + '</pre></td></tr>';
+			output += '<tr class="test-diff"><th>Diff: </th><td><pre>' + QUnit.diff(expected, actual) +'</pre></td></tr>';
+		}
+		if (!result) {
+			var source = sourceFromStacktrace();
+			if (source) {
+				details.source = source;
+				output += '<tr class="test-source"><th>Source: </th><td><pre>' + source +'</pre></td></tr>';
+			}
+		}
+		output += "</table>";
+
+		QUnit.log(details);
+
+		config.current.assertions.push({
+			result: !!result,
+			message: output
+		});
+	},
+
+	url: function( params ) {
+		params = extend( extend( {}, QUnit.urlParams ), params );
+		var querystring = "?",
+			key;
+		for ( key in params ) {
+			querystring += encodeURIComponent( key ) + "=" +
+				encodeURIComponent( params[ key ] ) + "&";
+		}
+		return window.location.pathname + querystring.slice( 0, -1 );
+	},
+
+	// Logging callbacks; all receive a single argument with the listed properties
+	// run test/logs.html for any related changes
+	begin: function() {},
+	// done: { failed, passed, total, runtime }
+	done: function() {},
+	// log: { result, actual, expected, message }
+	log: function() {},
+	// testStart: { name }
+	testStart: function() {},
+	// testDone: { name, failed, passed, total }
+	testDone: function() {},
+	// moduleStart: { name }
+	moduleStart: function() {},
+	// moduleDone: { name, failed, passed, total }
+	moduleDone: function() {}
+});
+
+if ( typeof document === "undefined" || document.readyState === "complete" ) {
+	config.autorun = true;
+}
+
+addEvent(window, "load", function() {
+	QUnit.begin({});
+
+	// Initialize the config, saving the execution queue
+	var oldconfig = extend({}, config);
+	QUnit.init();
+	extend(config, oldconfig);
+
+	config.blocking = false;
+
+	var userAgent = id("qunit-userAgent");
+	if ( userAgent ) {
+		userAgent.innerHTML = navigator.userAgent;
+	}
+	var banner = id("qunit-header");
+	if ( banner ) {
+		banner.innerHTML = '<a href="' + QUnit.url({ filter: undefined }) + '"> ' + banner.innerHTML + '</a> ' +
+			'<label><input name="noglobals" type="checkbox"' + ( config.noglobals ? ' checked="checked"' : '' ) + '>noglobals</label>' +
+			'<label><input name="notrycatch" type="checkbox"' + ( config.notrycatch ? ' checked="checked"' : '' ) + '>notrycatch</label>';
+		addEvent( banner, "change", function( event ) {
+			var params = {};
+			params[ event.target.name ] = event.target.checked ? true : undefined;
+			window.location = QUnit.url( params );
+		});
+	}
+
+	var toolbar = id("qunit-testrunner-toolbar");
+	if ( toolbar ) {
+		var filter = document.createElement("input");
+		filter.type = "checkbox";
+		filter.id = "qunit-filter-pass";
+		addEvent( filter, "click", function() {
+			var ol = document.getElementById("qunit-tests");
+			if ( filter.checked ) {
+				ol.className = ol.className + " hidepass";
+			} else {
+				var tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " ";
+				ol.className = tmp.replace(/ hidepass /, " ");
+			}
+			if ( defined.sessionStorage ) {
+				if (filter.checked) {
+					sessionStorage.setItem("qunit-filter-passed-tests",  "true");
+				} else {
+					sessionStorage.removeItem("qunit-filter-passed-tests");
+				}
+			}
+		});
+		if ( defined.sessionStorage && sessionStorage.getItem("qunit-filter-passed-tests") ) {
+			filter.checked = true;
+			var ol = document.getElementById("qunit-tests");
+			ol.className = ol.className + " hidepass";
+		}
+		toolbar.appendChild( filter );
+
+		var label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-pass");
+		label.innerHTML = "Hide passed tests";
+		toolbar.appendChild( label );
+	}
+
+	var main = id('qunit-fixture');
+	if ( main ) {
+		config.fixture = main.innerHTML;
+	}
+
+	if (config.autostart) {
+		QUnit.start();
+	}
+});
+
+function done() {
+	config.autorun = true;
+
+	// Log the last module results
+	if ( config.currentModule ) {
+		QUnit.moduleDone( {
+			name: config.currentModule,
+			failed: config.moduleStats.bad,
+			passed: config.moduleStats.all - config.moduleStats.bad,
+			total: config.moduleStats.all
+		} );
+	}
+
+	var banner = id("qunit-banner"),
+		tests = id("qunit-tests"),
+		runtime = +new Date - config.started,
+		passed = config.stats.all - config.stats.bad,
+		html = [
+			'Tests completed in ',
+			runtime,
+			' milliseconds.<br/>',
+			'<span class="passed">',
+			passed,
+			'</span> tests of <span class="total">',
+			config.stats.all,
+			'</span> passed, <span class="failed">',
+			config.stats.bad,
+			'</span> failed.'
+		].join('');
+
+	if ( banner ) {
+		banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+	}
+
+	if ( tests ) {
+		id( "qunit-testresult" ).innerHTML = html;
+	}
+
+	if ( typeof document !== "undefined" && document.title ) {
+		// show ? for good, ? for bad suite result in title
+		// use escape sequences in case file gets loaded with non-utf-8-charset
+		document.title = (config.stats.bad ? "\u2716" : "\u2714") + " " + document.title;
+	}
+
+	QUnit.done( {
+		failed: config.stats.bad,
+		passed: passed,
+		total: config.stats.all,
+		runtime: runtime
+	} );
+}
+
+function validTest( name ) {
+	var filter = config.filter,
+		run = false;
+
+	if ( !filter ) {
+		return true;
+	}
+
+	var not = filter.charAt( 0 ) === "!";
+	if ( not ) {
+		filter = filter.slice( 1 );
+	}
+
+	if ( name.indexOf( filter ) !== -1 ) {
+		return !not;
+	}
+
+	if ( not ) {
+		run = true;
+	}
+
+	return run;
+}
+
+// so far supports only Firefox, Chrome and Opera (buggy)
+// could be extended in the future to use something like https://github.com/csnover/TraceKit
+function sourceFromStacktrace() {
+	try {
+		throw new Error();
+	} catch ( e ) {
+		if (e.stacktrace) {
+			// Opera
+			return e.stacktrace.split("\n")[6];
+		} else if (e.stack) {
+			// Firefox, Chrome
+			return e.stack.split("\n")[4];
+		}
+	}
+}
+
+function escapeHtml(s) {
+	if (!s) {
+		return "";
+	}
+	s = s + "";
+	return s.replace(/[\&"<>\\]/g, function(s) {
+		switch(s) {
+			case "&": return "&amp;";
+			case "\\": return "\\\\";
+			case '"': return '\"';
+			case "<": return "&lt;";
+			case ">": return "&gt;";
+			default: return s;
+		}
+	});
+}
+
+function synchronize( callback ) {
+	config.queue.push( callback );
+
+	if ( config.autorun && !config.blocking ) {
+		process();
+	}
+}
+
+function process() {
+	var start = (new Date()).getTime();
+
+	while ( config.queue.length && !config.blocking ) {
+		if ( config.updateRate <= 0 || (((new Date()).getTime() - start) < config.updateRate) ) {
+			config.queue.shift()();
+		} else {
+			window.setTimeout( process, 13 );
+			break;
+		}
+	}
+  if (!config.blocking && !config.queue.length) {
+    done();
+  }
+}
+
+function saveGlobal() {
+	config.pollution = [];
+
+	if ( config.noglobals ) {
+		for ( var key in window ) {
+			config.pollution.push( key );
+		}
+	}
+}
+
+function checkPollution( name ) {
+	var old = config.pollution;
+	saveGlobal();
+
+	var newGlobals = diff( config.pollution, old );
+	if ( newGlobals.length > 0 ) {
+		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+	}
+
+	var deletedGlobals = diff( old, config.pollution );
+	if ( deletedGlobals.length > 0 ) {
+		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+	}
+}
+
+// returns a new Array with the elements that are in a but not in b
+function diff( a, b ) {
+	var result = a.slice();
+	for ( var i = 0; i < result.length; i++ ) {
+		for ( var j = 0; j < b.length; j++ ) {
+			if ( result[i] === b[j] ) {
+				result.splice(i, 1);
+				i--;
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+function fail(message, exception, callback) {
+	if ( typeof console !== "undefined" && console.error && console.warn ) {
+		console.error(message);
+		console.error(exception);
+		console.warn(callback.toString());
+
+	} else if ( window.opera && opera.postError ) {
+		opera.postError(message, exception, callback.toString);
+	}
+}
+
+function extend(a, b) {
+	for ( var prop in b ) {
+		if ( b[prop] === undefined ) {
+			delete a[prop];
+		} else {
+			a[prop] = b[prop];
+		}
+	}
+
+	return a;
+}
+
+function addEvent(elem, type, fn) {
+	if ( elem.addEventListener ) {
+		elem.addEventListener( type, fn, false );
+	} else if ( elem.attachEvent ) {
+		elem.attachEvent( "on" + type, fn );
+	} else {
+		fn();
+	}
+}
+
+function id(name) {
+	return !!(typeof document !== "undefined" && document && document.getElementById) &&
+		document.getElementById( name );
+}
+
+// Test for equality any JavaScript type.
+// Discussions and reference: http://philrathe.com/articles/equiv
+// Test suites: http://philrathe.com/tests/equiv
+// Author: Philippe Rath� <prathe@gmail.com>
+QUnit.equiv = function () {
+
+    var innerEquiv; // the real equiv function
+    var callers = []; // stack to decide between skip/abort functions
+    var parents = []; // stack to avoiding loops from circular referencing
+
+    // Call the o related callback with the given arguments.
+    function bindCallbacks(o, callbacks, args) {
+        var prop = QUnit.objectType(o);
+        if (prop) {
+            if (QUnit.objectType(callbacks[prop]) === "function") {
+                return callbacks[prop].apply(callbacks, args);
+            } else {
+                return callbacks[prop]; // or undefined
+            }
+        }
+    }
+
+    var callbacks = function () {
+
+        // for string, boolean, number and null
+        function useStrictEquality(b, a) {
+            if (b instanceof a.constructor || a instanceof b.constructor) {
+                // to catch short annotaion VS 'new' annotation of a declaration
+                // e.g. var i = 1;
+                //      var j = new Number(1);
+                return a == b;
+            } else {
+                return a === b;
+            }
+        }
+
+        return {
+            "string": useStrictEquality,
+            "boolean": useStrictEquality,
+            "number": useStrictEquality,
+            "null": useStrictEquality,
+            "undefined": useStrictEquality,
+
+            "nan": function (b) {
+                return isNaN(b);
+            },
+
+            "date": function (b, a) {
+                return QUnit.objectType(b) === "date" && a.valueOf() === b.valueOf();
+            },
+
+            "regexp": function (b, a) {
+                return QUnit.objectType(b) === "regexp" &&
+                    a.source === b.source && // the regex itself
+                    a.global === b.global && // and its modifers (gmi) ...
+                    a.ignoreCase === b.ignoreCase &&
+                    a.multiline === b.multiline;
+            },
+
+            // - skip when the property is a method of an instance (OOP)
+            // - abort otherwise,
+            //   initial === would have catch identical references anyway
+            "function": function () {
+                var caller = callers[callers.length - 1];
+                return caller !== Object &&
+                        typeof caller !== "undefined";
+            },
+
+            "array": function (b, a) {
+                var i, j, loop;
+                var len;
+
+                // b could be an object literal here
+                if ( ! (QUnit.objectType(b) === "array")) {
+                    return false;
+                }
+
+                len = a.length;
+                if (len !== b.length) { // safe and faster
+                    return false;
+                }
+
+                //track reference to avoid circular references
+                parents.push(a);
+                for (i = 0; i < len; i++) {
+                    loop = false;
+                    for(j=0;j<parents.length;j++){
+                        if(parents[j] === a[i]){
+                            loop = true;//dont rewalk array
+                        }
+                    }
+                    if (!loop && ! innerEquiv(a[i], b[i])) {
+                        parents.pop();
+                        return false;
+                    }
+                }
+                parents.pop();
+                return true;
+            },
+
+            "object": function (b, a) {
+                var i, j, loop;
+                var eq = true; // unless we can proove it
+                var aProperties = [], bProperties = []; // collection of strings
+
+                // comparing constructors is more strict than using instanceof
+                if ( a.constructor !== b.constructor) {
+                    return false;
+                }
+
+                // stack constructor before traversing properties
+                callers.push(a.constructor);
+                //track reference to avoid circular references
+                parents.push(a);
+
+                for (i in a) { // be strict: don't ensures hasOwnProperty and go deep
+                    loop = false;
+                    for(j=0;j<parents.length;j++){
+                        if(parents[j] === a[i])
+                            loop = true; //don't go down the same path twice
+                    }
+                    aProperties.push(i); // collect a's properties
+
+                    if (!loop && ! innerEquiv(a[i], b[i])) {
+                        eq = false;
+                        break;
+                    }
+                }
+
+                callers.pop(); // unstack, we are done
+                parents.pop();
+
+                for (i in b) {
+                    bProperties.push(i); // collect b's properties
+                }
+
+                // Ensures identical properties name
+                return eq && innerEquiv(aProperties.sort(), bProperties.sort());
+            }
+        };
+    }();
+
+    innerEquiv = function () { // can take multiple arguments
+        var args = Array.prototype.slice.apply(arguments);
+        if (args.length < 2) {
+            return true; // end transition
+        }
+
+        return (function (a, b) {
+            if (a === b) {
+                return true; // catch the most you can
+            } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || QUnit.objectType(a) !== QUnit.objectType(b)) {
+                return false; // don't lose time with error prone cases
+            } else {
+                return bindCallbacks(a, callbacks, [b, a]);
+            }
+
+        // apply transition with (1..n) arguments
+        })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length -1));
+    };
+
+    return innerEquiv;
+
+}();
+
+/**
+ * jsDump
+ * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+ * Date: 5/15/2008
+ * @projectDescription Advanced and extensible data dumping for Javascript.
+ * @version 1.0.0
+ * @author Ariel Flesler
+ * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
+ */
+QUnit.jsDump = (function() {
+	function quote( str ) {
+		return '"' + str.toString().replace(/"/g, '\\"') + '"';
+	};
+	function literal( o ) {
+		return o + '';
+	};
+	function join( pre, arr, post ) {
+		var s = jsDump.separator(),
+			base = jsDump.indent(),
+			inner = jsDump.indent(1);
+		if ( arr.join )
+			arr = arr.join( ',' + s + inner );
+		if ( !arr )
+			return pre + post;
+		return [ pre, inner + arr, base + post ].join(s);
+	};
+	function array( arr ) {
+		var i = arr.length,	ret = Array(i);
+		this.up();
+		while ( i-- )
+			ret[i] = this.parse( arr[i] );
+		this.down();
+		return join( '[', ret, ']' );
+	};
+
+	var reName = /^function (\w+)/;
+
+	var jsDump = {
+		parse:function( obj, type ) { //type is used mostly internally, you can fix a (custom)type in advance
+			var	parser = this.parsers[ type || this.typeOf(obj) ];
+			type = typeof parser;
+
+			return type == 'function' ? parser.call( this, obj ) :
+				   type == 'string' ? parser :
+				   this.parsers.error;
+		},
+		typeOf:function( obj ) {
+			var type;
+			if ( obj === null ) {
+				type = "null";
+			} else if (typeof obj === "undefined") {
+				type = "undefined";
+			} else if (QUnit.is("RegExp", obj)) {
+				type = "regexp";
+			} else if (QUnit.is("Date", obj)) {
+				type = "date";
+			} else if (QUnit.is("Function", obj)) {
+				type = "function";
+			} else if (typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined") {
+				type = "window";
+			} else if (obj.nodeType === 9) {
+				type = "document";
+			} else if (obj.nodeType) {
+				type = "node";
+			} else if (typeof obj === "object" && typeof obj.length === "number" && obj.length >= 0) {
+				type = "array";
+			} else {
+				type = typeof obj;
+			}
+			return type;
+		},
+		separator:function() {
+			return this.multiline ?	this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
+		},
+		indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
+			if ( !this.multiline )
+				return '';
+			var chr = this.indentChar;
+			if ( this.HTML )
+				chr = chr.replace(/\t/g,'   ').replace(/ /g,'&nbsp;');
+			return Array( this._depth_ + (extra||0) ).join(chr);
+		},
+		up:function( a ) {
+			this._depth_ += a || 1;
+		},
+		down:function( a ) {
+			this._depth_ -= a || 1;
+		},
+		setParser:function( name, parser ) {
+			this.parsers[name] = parser;
+		},
+		// The next 3 are exposed so you can use them
+		quote:quote,
+		literal:literal,
+		join:join,
+		//
+		_depth_: 1,
+		// This is the list of parsers, to modify them, use jsDump.setParser
+		parsers:{
+			window: '[Window]',
+			document: '[Document]',
+			error:'[ERROR]', //when no parser is found, shouldn't happen
+			unknown: '[Unknown]',
+			'null':'null',
+			'undefined':'undefined',
+			'function':function( fn ) {
+				var ret = 'function',
+					name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE
+				if ( name )
+					ret += ' ' + name;
+				ret += '(';
+
+				ret = [ ret, QUnit.jsDump.parse( fn, 'functionArgs' ), '){'].join('');
+				return join( ret, QUnit.jsDump.parse(fn,'functionCode'), '}' );
+			},
+			array: array,
+			nodelist: array,
+			arguments: array,
+			object:function( map ) {
+				var ret = [ ];
+				QUnit.jsDump.up();
+				for ( var key in map )
+					ret.push( QUnit.jsDump.parse(key,'key') + ': ' + QUnit.jsDump.parse(map[key]) );
+				QUnit.jsDump.down();
+				return join( '{', ret, '}' );
+			},
+			node:function( node ) {
+				var open = QUnit.jsDump.HTML ? '&lt;' : '<',
+					close = QUnit.jsDump.HTML ? '&gt;' : '>';
+
+				var tag = node.nodeName.toLowerCase(),
+					ret = open + tag;
+
+				for ( var a in QUnit.jsDump.DOMAttrs ) {
+					var val = node[QUnit.jsDump.DOMAttrs[a]];
+					if ( val )
+						ret += ' ' + a + '=' + QUnit.jsDump.parse( val, 'attribute' );
+				}
+				return ret + close + open + '/' + tag + close;
+			},
+			functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
+				var l = fn.length;
+				if ( !l ) return '';
+
+				var args = Array(l);
+				while ( l-- )
+					args[l] = String.fromCharCode(97+l);//97 is 'a'
+				return ' ' + args.join(', ') + ' ';
+			},
+			key:quote, //object calls it internally, the key part of an item in a map
+			functionCode:'[code]', //function calls it internally, it's the content of the function
+			attribute:quote, //node calls it internally, it's an html attribute value
+			string:quote,
+			date:quote,
+			regexp:literal, //regex
+			number:literal,
+			'boolean':literal
+		},
+		DOMAttrs:{//attributes to dump from nodes, name=>realName
+			id:'id',
+			name:'name',
+			'class':'className'
+		},
+		HTML:false,//if true, entities are escaped ( <, >, \t, space and \n )
+		indentChar:'  ',//indentation unit
+		multiline:true //if true, items in a collection, are separated by a \n, else just a space.
+	};
+
+	return jsDump;
+})();
+
+// from Sizzle.js
+function getText( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+/*
+ * Javascript Diff Algorithm
+ *  By John Resig (http://ejohn.org/)
+ *  Modified by Chu Alan "sprite"
+ *
+ * Released under the MIT license.
+ *
+ * More Info:
+ *  http://ejohn.org/projects/javascript-diff-algorithm/
+ *
+ * Usage: QUnit.diff(expected, actual)
+ *
+ * QUnit.diff("the quick brown fox jumped over", "the quick fox jumps over") == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
+ */
+QUnit.diff = (function() {
+	function diff(o, n){
+		var ns = new Object();
+		var os = new Object();
+
+		for (var i = 0; i < n.length; i++) {
+			if (ns[n[i]] == null)
+				ns[n[i]] = {
+					rows: new Array(),
+					o: null
+				};
+			ns[n[i]].rows.push(i);
+		}
+
+		for (var i = 0; i < o.length; i++) {
+			if (os[o[i]] == null)
+				os[o[i]] = {
+					rows: new Array(),
+					n: null
+				};
+			os[o[i]].rows.push(i);
+		}
+
+		for (var i in ns) {
+			if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) {
+				n[ns[i].rows[0]] = {
+					text: n[ns[i].rows[0]],
+					row: os[i].rows[0]
+				};
+				o[os[i].rows[0]] = {
+					text: o[os[i].rows[0]],
+					row: ns[i].rows[0]
+				};
+			}
+		}
+
+		for (var i = 0; i < n.length - 1; i++) {
+			if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null &&
+			n[i + 1] == o[n[i].row + 1]) {
+				n[i + 1] = {
+					text: n[i + 1],
+					row: n[i].row + 1
+				};
+				o[n[i].row + 1] = {
+					text: o[n[i].row + 1],
+					row: i + 1
+				};
+			}
+		}
+
+		for (var i = n.length - 1; i > 0; i--) {
+			if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null &&
+			n[i - 1] == o[n[i].row - 1]) {
+				n[i - 1] = {
+					text: n[i - 1],
+					row: n[i].row - 1
+				};
+				o[n[i].row - 1] = {
+					text: o[n[i].row - 1],
+					row: i - 1
+				};
+			}
+		}
+
+		return {
+			o: o,
+			n: n
+		};
+	}
+
+	return function(o, n){
+		o = o.replace(/\s+$/, '');
+		n = n.replace(/\s+$/, '');
+		var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
+
+		var str = "";
+
+		var oSpace = o.match(/\s+/g);
+		if (oSpace == null) {
+			oSpace = [" "];
+		}
+		else {
+			oSpace.push(" ");
+		}
+		var nSpace = n.match(/\s+/g);
+		if (nSpace == null) {
+			nSpace = [" "];
+		}
+		else {
+			nSpace.push(" ");
+		}
+
+		if (out.n.length == 0) {
+			for (var i = 0; i < out.o.length; i++) {
+				str += '<del>' + out.o[i] + oSpace[i] + "</del>";
+			}
+		}
+		else {
+			if (out.n[0].text == null) {
+				for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
+					str += '<del>' + out.o[n] + oSpace[n] + "</del>";
+				}
+			}
+
+			for (var i = 0; i < out.n.length; i++) {
+				if (out.n[i].text == null) {
+					str += '<ins>' + out.n[i] + nSpace[i] + "</ins>";
+				}
+				else {
+					var pre = "";
+
+					for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) {
+						pre += '<del>' + out.o[n] + oSpace[n] + "</del>";
+					}
+					str += " " + out.n[i].text + nSpace[i] + pre;
+				}
+			}
+		}
+
+		return str;
+	};
+})();
+
+})(this);
diff --git a/extension/content/test/runTests.js b/extension/content/test/runTests.js
new file mode 100644
index 00000000..ef1e6abb
--- /dev/null
+++ b/extension/content/test/runTests.js
@@ -0,0 +1,108 @@
+function runTests() {
+  const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+  var tools = {};
+
+  /**
+   * MODULE: Scriptish Service
+   */
+  module("Scriptish Service");
+  Cu.import("resource://scriptish/constants.js", tools);
+
+  test("Availability", function() {
+    expect(2);
+    equals(typeof(tools.Services.scriptish), "object", "Scriptish service is available");
+    equals(typeof(tools.Services.scriptish.shouldLoad), "function", "shouldLoad is available");
+  });
+
+  // TODO: generate fake requests to test
+  test("shouldLoad", function() {
+    expect(0);
+  });
+
+
+  /**
+   * MODULE: Scriptish Utilities
+   */
+  module("Scriptish Utilities");
+  Cu.import("resource://scriptish/utils/Scriptish_alert.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_convert2RegExp.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_createUserScriptSource.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_ExtendedStringBundle.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_findError.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getBinaryContents.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getBrowserForContentWindow.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getContents.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getEditor.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getFirebugConsole.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getProfileFile.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getTempFile.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getTLDURL.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getUriFromFile.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getURLsForContentWindow.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getWindowIDs.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_getWriteStream.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_installUri.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_launchApplicationWithDoc.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_memoize.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_notification.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_openInEditor.js", tools);
+  Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js", tools);
+
+  test("Availability", function() {
+    expect(24);
+
+    equals(typeof(tools.Scriptish_alert), "function", "has Scriptish_alert");
+    equals(typeof(tools.Scriptish_convert2RegExp), "function", "has Scriptish_convert2RegExp");
+    equals(typeof(tools.Scriptish_createUserScriptSource), "function", "has Scriptish_createUserScriptSource");
+    equals(typeof(tools.Scriptish_cryptoHash), "function", "has Scriptish_cryptoHash");
+    equals(typeof(tools.Scriptish_ExtendedStringBundle), "function", "has Scriptish_ExtendedStringBundle");
+    equals(typeof(tools.Scriptish_findError), "function", "has Scriptish_findError");
+    equals(typeof(tools.Scriptish_getBinaryContents), "function", "has Scriptish_getBinaryContents");
+    equals(typeof(tools.Scriptish_getBrowserForContentWindow), "function", "has Scriptish_getBrowserForContentWindow");
+    equals(typeof(tools.Scriptish_getContents), "function", "has Scriptish_getContents");
+    equals(typeof(tools.Scriptish_getEditor), "function", "has Scriptish_getEditor");
+    equals(typeof(tools.Scriptish_getFirebugConsole), "function", "has Scriptish_getFirebugConsole");
+    equals(typeof(tools.Scriptish_getProfileFile), "function", "has Scriptish_getProfileFile");
+    equals(typeof(tools.Scriptish_getTempFile), "function", "has Scriptish_getTempFile");
+    equals(typeof(tools.Scriptish_getTLDURL), "function", "has Scriptish_getTLDURL");
+    equals(typeof(tools.Scriptish_getUriFromFile), "function", "has Scriptish_getUriFromFile");
+    equals(typeof(tools.Scriptish_getURLsForContentWindow), "function", "has Scriptish_getURLsForContentWindow");
+    equals(typeof(tools.Scriptish_getWindowIDs), "function", "has Scriptish_getWindowIDs");
+    equals(typeof(tools.Scriptish_getWriteStream), "function", "has Scriptish_getWriteStream");
+    equals(typeof(tools.Scriptish_installUri), "function", "has Scriptish_installUri");
+    equals(typeof(tools.Scriptish_launchApplicationWithDoc), "function", "has Scriptish_launchApplicationWithDoc");
+    equals(typeof(tools.Scriptish_memoize), "function", "has Scriptish_memoize");
+    equals(typeof(tools.Scriptish_notification), "function", "has Scriptish_notification");
+    equals(typeof(tools.Scriptish_openInEditor), "function", "has Scriptish_openInEditor");
+    equals(typeof(tools.Scriptish_stringBundle), "function", "has Scriptish_stringBundle");
+  });
+
+  test("Scriptish_cryptoHash", function() {
+    expect(2);
+
+    var str = "Hello World!";
+    var str_DEF_SHA1 = tools.Scriptish_cryptoHash(str);
+    var str_SHA1 = tools.Scriptish_cryptoHash(str, "SHA1");
+
+    equal(str_DEF_SHA1, "2ef7bde608ce5404e97d5f042f95f89f1c232871", "Default hashing algorithm is SHA1");
+    equal(str_SHA1, "2ef7bde608ce5404e97d5f042f95f89f1c232871", "Specifying an algorithm (SHA1) works");
+  });
+
+
+  /**
+   * MODULE: Scriptish Utilities (third party)
+   */
+  module("Scriptish Utilities (third party)");
+  Cu.import("resource://scriptish/third-party/MatchPattern.js", tools);
+  Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js", tools);
+  Cu.import("resource://scriptish/third-party/Timer.js", tools);
+
+  test("Availability", function() {
+    expect(3);
+
+    equals(typeof(tools.MatchPattern), "function", "has MatchPattern");
+    equals(typeof(tools.MatchPattern), "function", "has Scriptish_openFolder");
+    equals(typeof(tools.Timer), "function", "has Timer");
+  });
+}

From 968824f2e4adae72a197c7bdd41c36f8ea9b3c08 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 22 May 2011 20:18:35 -0500
Subject: [PATCH 056/829] minor tweak: don't style the test div's header

---
 extension/content/aboutScriptish.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 0959aa93..f0d24f9e 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -17,6 +17,7 @@
     header.primary img { margin-bottom: -5px; }
     header.primary h1 { display:inline; }
     header.secondary { border-bottom: 1px dotted #ccc; }
+    #test header { margin-bottom: 0; border: none; }
 
     ul { margin-top: 5px; padding-left: 15px; }
 
@@ -146,7 +147,7 @@ <h3>Translators:</h3>
     </div>
     <div id="test">
       <section>
-        <header class="secondary">
+        <header>
           <h2 id="qunit-header2">Testing Scriptish</h2>
           <h3 id="qunit-banner"></h3>
           <h4 id="qunit-userAgent"></h4>

From de5858783d51008006319fa4953506213f39d222 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 23 May 2011 09:54:31 -0500
Subject: [PATCH 057/829] Use 'about:scriptish' as the landing page after a
 Scriptish installation or upgrade.  Also a couple minor style weaks. (cherry
 picked from commit 27c62126c7660f31fce4cf22eaee408774d9e23e)

---
 extension/chrome.manifest           | 2 +-
 extension/content/js/browser.js     | 2 +-
 extension/content/js/updatecheck.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 274e9f07..bd7da94d 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -3,7 +3,7 @@ contract  @scriptish.erikvold.com/scriptish-service;1 {ca39e060-88ab-11df-a4ee-0
 category  content-policy @scriptish.erikvold.com/scriptish-service;1 @scriptish.erikvold.com/scriptish-service;1
 
 component {5f28a810-8094-11e0-b278-0800200c9a66} components/aboutScriptish.js
-contract @mozilla.org/network/protocol/about;1?what=scriptish {5f28a810-8094-11e0-b278-0800200c9a66}
+contract  @mozilla.org/network/protocol/about;1?what=scriptish {5f28a810-8094-11e0-b278-0800200c9a66}
 
 content    scriptish    content/
 resource   scriptish    modules/
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 99b57656..7766ce91 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -130,7 +130,7 @@ Scriptish_BrowserUI.chromeLoad = function(e) {
   // update enabled icon
   Scriptish_BrowserUIM.refreshStatus();
 
-  // register for notifications from scriptish-service about ui type things
+  // Check if Scriptish has been updated/installed
   gmSvc.updateChk && setTimeout(function() gmSvc.updateChk(), 1000);
 }
 
diff --git a/extension/content/js/updatecheck.js b/extension/content/js/updatecheck.js
index a732c9cb..86bbe1cb 100644
--- a/extension/content/js/updatecheck.js
+++ b/extension/content/js/updatecheck.js
@@ -12,7 +12,7 @@
 
   if (0 >= tools.Services.vc.compare(currentVer, "0.1b5")) {
     var chromeWin = tools.Services.wm.getMostRecentWindow("navigator:browser");
-    chromeWin.gBrowser.addTab("https://github.com/erikvold/scriptish/wiki");
+    chromeWin.gBrowser.addTab("about:scriptish");
 
     // add toolbaritem to add-on bar
     var addToBar = chromeWin.document.getElementById("addon-bar");

From 123aea55f0de7dcd4b3cd28f3eb3c11cfec24780 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 20 May 2011 00:19:05 -0500
Subject: [PATCH 058/829] Adding GM_(enable|disable)MenuCommand

---
 extension/content/js/browser.js    | 10 ++++++++
 extension/modules/api.js           | 15 +++++++++++-
 extension/modules/menucommander.js | 39 ++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 7766ce91..6a71f057 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -146,6 +146,16 @@ Scriptish_BrowserUI.unregisterMenuCommand = function(commandUUID, aWinID) {
   return commander.unregisterMenuCommand(commandUUID);
 }
 
+Scriptish_BrowserUI.enableMenuCommand = function(commandUUID, aWinID) {
+  var commander = this.getCommander(aWinID);
+  return commander.toggleMenuCommand(commandUUID, true);
+}
+
+Scriptish_BrowserUI.disableMenuCommand = function(commandUUID, aWinID) {
+  var commander = this.getCommander(aWinID);
+  return commander.toggleMenuCommand(commandUUID, false);
+}
+
 
 /**
  * Shows the install banner across the top of the tab that is displayed when
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 770465ef..ea314803 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -209,7 +209,8 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
   }
 
   if (aSafeWin !== aSafeWin.top) {
-    this.GM_unregisterMenuCommand = this.GM_registerMenuCommand = DOLITTLE;
+    this.GM_unregisterMenuCommand = this.GM_registerMenuCommand
+        = this.GM_disableMenuCommand = this.GM_enableMenuCommand = DOLITTLE;
   } else {
     this.GM_registerMenuCommand = function GM_registerMenuCommand(
         aCmdName, aCmdFunc, aAccelKey, aAccelModifiers, aAccessKey) {
@@ -231,6 +232,18 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
       menuCmdIDs.splice(i, 1);
       return Scriptish_BrowserUI.unregisterMenuCommand(aUUID, windowID);
     }
+
+    this.GM_enableMenuCommand = function GM_enableMenuCommand(aUUID) {
+      var i = menuCmdIDs.indexOf(aUUID);
+      if (!~i) return false; // check the uuid is for a cmd made by the same script
+      return Scriptish_BrowserUI.enableMenuCommand(aUUID, windowID);
+    }
+
+    this.GM_disableMenuCommand = function GM_disableMenuCommand(aUUID) {
+      var i = menuCmdIDs.indexOf(aUUID);
+      if (!~i) return false; // check the uuid is for a cmd made by the same script
+      return Scriptish_BrowserUI.disableMenuCommand(aUUID, windowID);
+    }
   }
 
   this.GM_cryptoHash = function GM_cryptoHash() {
diff --git a/extension/modules/menucommander.js b/extension/modules/menucommander.js
index eefbf498..06231efb 100644
--- a/extension/modules/menucommander.js
+++ b/extension/modules/menucommander.js
@@ -103,6 +103,45 @@ Scriptish_MenuCommander.prototype.unregisterMenuCommand = function(commandUUID)
   return removedSomething;
 }
 
+Scriptish_MenuCommander.prototype.toggleMenuCommand =
+    function(commandUUID, aEnable) {
+  var found = false;
+
+  // enable/disable key
+  var keys = this.keys;
+  for (var i = keys.length - 1; ~i; i--) {
+    if (commandUUID == keys[i].getAttribute("uuid")) {
+      keys[i].setAttribute("disabled", !aEnable);
+      found = true;
+      break;
+    }
+  }
+
+  // enable/disable tools menu menu item
+  var toolsMenuItems = this.toolsMenuItems;
+  for (var i = toolsMenuItems.length - 1; ~i; i--) {
+    if (commandUUID == toolsMenuItems[i].getAttribute("uuid")) {
+      toolsMenuItems[i].setAttribute("disabled", !aEnable);
+      found = true;
+      break;
+    }
+  }
+
+  // enable/disable toolbar button menu item
+  var menuPopup = this.getTBMenu();
+  if (menuPopup) {
+    let tbMenuItems = this.tbMenuItems;
+    for (var i = tbMenuItems.length - 1; ~i; i--) {
+      if (commandUUID == tbMenuItems[i].getAttribute("uuid")) {
+        tbMenuItems[i].setAttribute("disabled", !aEnable);
+        found = true;
+        break;
+      }
+    }
+  }
+  return found;
+}
+
 Scriptish_MenuCommander.prototype.attach = function() {
   Scriptish_log("> Scriptish_MenuCommander.attach");
 

From 1885e557c42142693a3b1079e7e6c52717da7241 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 20 May 2011 00:45:14 -0500
Subject: [PATCH 059/829] combining common menu command code (unregister,
 enable, disable)

---
 extension/content/js/browser.js    |  6 +-
 extension/modules/menucommander.js | 94 ++++++++++++++----------------
 2 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 6a71f057..4a0abec0 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -143,17 +143,17 @@ Scriptish_BrowserUI.registerMenuCommand = function(menuCommand) {
 
 Scriptish_BrowserUI.unregisterMenuCommand = function(commandUUID, aWinID) {
   var commander = this.getCommander(aWinID);
-  return commander.unregisterMenuCommand(commandUUID);
+  return commander.modifyMenuCommand(commandUUID, "unregister");
 }
 
 Scriptish_BrowserUI.enableMenuCommand = function(commandUUID, aWinID) {
   var commander = this.getCommander(aWinID);
-  return commander.toggleMenuCommand(commandUUID, true);
+  return commander.modifyMenuCommand(commandUUID, "enable");
 }
 
 Scriptish_BrowserUI.disableMenuCommand = function(commandUUID, aWinID) {
   var commander = this.getCommander(aWinID);
-  return commander.toggleMenuCommand(commandUUID, false);
+  return commander.modifyMenuCommand(commandUUID, "disable");
 }
 
 
diff --git a/extension/modules/menucommander.js b/extension/modules/menucommander.js
index 06231efb..25878280 100644
--- a/extension/modules/menucommander.js
+++ b/extension/modules/menucommander.js
@@ -60,85 +60,77 @@ Scriptish_MenuCommander.prototype.registerMenuCommand =
   return commandUUID;
 }
 
-Scriptish_MenuCommander.prototype.unregisterMenuCommand = function(commandUUID) {
-  var removedSomething = false;
-
-  // remove key
-  var keys = this.keys;
-  for (var i = keys.length - 1; ~i; i--) {
-    if (commandUUID == keys[i].getAttribute("uuid")) {
-      this.keyset.removeChild(keys[i]);
-      keys.splice(i, 1);
-      removedSomething = true;
-      break;
-    }
-  }
-
-  // remove tools menu menu item
-  var toolsMenuItems = this.toolsMenuItems;
-  for (var i = toolsMenuItems.length - 1; ~i; i--) {
-    if (commandUUID == toolsMenuItems[i].getAttribute("uuid")) {
-      this.toolsMenuPopup.removeChild(toolsMenuItems[i]);
-      toolsMenuItems.splice(i, 1);
-      removedSomething = true;
-      break;
-    }
-  }
-
-  // remove toolbar button menu item
-  var menuPopup = this.getTBMenu();
-  if (menuPopup) {
-    let tbMenuItems = this.tbMenuItems;
-    for (var i = tbMenuItems.length - 1; ~i; i--) {
-      if (commandUUID == tbMenuItems[i].getAttribute("uuid")) {
-        try {menuPopup.removeChild(tbMenuItems[i]);}
-        catch (e) {} // TB was added but not opened before the user changed pages
-        tbMenuItems.splice(i, 1);
-        removedSomething = true;
-        break;
-      }
-    }
-  }
-
-  return removedSomething;
-}
-
-Scriptish_MenuCommander.prototype.toggleMenuCommand =
-    function(commandUUID, aEnable) {
+Scriptish_MenuCommander.prototype.modifyMenuCommand =
+    function(commandUUID, aAction) {
   var found = false;
 
-  // enable/disable key
+  // modify key
   var keys = this.keys;
   for (var i = keys.length - 1; ~i; i--) {
     if (commandUUID == keys[i].getAttribute("uuid")) {
-      keys[i].setAttribute("disabled", !aEnable);
+      switch (aAction) {
+        case "unregister":
+          this.keyset.removeChild(keys[i]);
+          keys.splice(i, 1);
+          break;
+        case "enable":
+        case "disable":
+          keys[i].setAttribute("disabled", aAction == "disable");
+          break;
+        default:
+          throw new Error("Invalid menu command action");
+      }
       found = true;
       break;
     }
   }
 
-  // enable/disable tools menu menu item
+  // modify tools menu menu item
   var toolsMenuItems = this.toolsMenuItems;
   for (var i = toolsMenuItems.length - 1; ~i; i--) {
     if (commandUUID == toolsMenuItems[i].getAttribute("uuid")) {
-      toolsMenuItems[i].setAttribute("disabled", !aEnable);
+      switch (aAction) {
+        case "unregister":
+          this.toolsMenuPopup.removeChild(toolsMenuItems[i]);
+          toolsMenuItems.splice(i, 1);
+          break;
+        case "enable":
+        case "disable":
+          toolsMenuItems[i].setAttribute("disabled", aAction == "disable");
+          break;
+        default:
+          throw new Error("Invalid menu command action");
+      }
       found = true;
       break;
     }
   }
 
-  // enable/disable toolbar button menu item
+  // modify toolbar button menu item
   var menuPopup = this.getTBMenu();
   if (menuPopup) {
     let tbMenuItems = this.tbMenuItems;
     for (var i = tbMenuItems.length - 1; ~i; i--) {
       if (commandUUID == tbMenuItems[i].getAttribute("uuid")) {
-        tbMenuItems[i].setAttribute("disabled", !aEnable);
+        switch (aAction) {
+          case "unregister":
+            try {menuPopup.removeChild(tbMenuItems[i]);}
+            catch (e) {} // TB was added but not opened before the user changed pages
+            tbMenuItems.splice(i, 1);
+            break;
+          case "enable":
+          case "disable":
+            tbMenuItems[i].setAttribute("disabled", aAction == "disable");
+            break;
+          default:
+            throw new Error("Invalid menu command action");
+        }
         found = true;
         break;
       }
     }
   }
+
   return found;
 }
 

From 7aff4f24ef9a182f15634db783171088326032ea Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 23 May 2011 20:22:36 -0700
Subject: [PATCH 060/829] starting some mozmill tests (just adding a test that
 the toolbar button is installed on first run)

---
 .../tests/testToolbarbutton/testTBBExists.js  | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 tests/mozmill-tests/tests/testToolbarbutton/testTBBExists.js

diff --git a/tests/mozmill-tests/tests/testToolbarbutton/testTBBExists.js b/tests/mozmill-tests/tests/testToolbarbutton/testTBBExists.js
new file mode 100644
index 00000000..e679b327
--- /dev/null
+++ b/tests/mozmill-tests/tests/testToolbarbutton/testTBBExists.js
@@ -0,0 +1,46 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Scriptish mozmill test suite.
+ *
+ * The Initial Developer of the Original Code is Erik Vold.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Erik Vold <erikvvold@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var setupModule = function(module) {
+  module.controller = mozmill.getBrowserController();
+}
+
+// Test that the element with ID 'scriptish-button' can be found.
+var testToolbarButtonExists = function() {
+  controller.waitFor(function() {
+    return (new elementslib.ID(controller.window.document, "scriptish-button")).exists();
+  }, "Scriptish toolbar button should be found", 2000);
+}

From 4eb2a1ab4ac05726bc282802fa9265a7abf71ebf Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 23 May 2011 20:34:19 -0700
Subject: [PATCH 061/829] creating a test.sh script

---
 build.sh | 4 +++-
 test.sh  | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100755 test.sh

diff --git a/build.sh b/build.sh
index 8041e53b..bd778883 100755
--- a/build.sh
+++ b/build.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 # Set up variables
-if [ "amo" = "$1" ] || [ "staging" = "$1" ]; then
+if [ "amo" == "$1" ] || [ "staging" == "$1" ]; then
   # For official builds, use the version in install.rdf.
   VER=`grep -Go 'em:version\>\(.*\)\<' extension/install.rdf | grep -Go '>\(.*\)<' | sed -e 's/[><]*//g'`
+elif [ "test" == "$1" ]; then
+  VER=`echo test`
 else
   # For beta builds, generate a version number.
   VER=`date +"%Y.%m.%d.beta"`
diff --git a/test.sh b/test.sh
new file mode 100755
index 00000000..59365468
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+./build.sh test
+mozmill -t tests/mozmill-tests -a scriptish-test.xpi

From 2c8ce5f08b8211869e338d026e93e2f982120551 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 23 May 2011 22:20:43 -0700
Subject: [PATCH 062/829] Moving about:scriptish css to a separate .css file

---
 extension/content/aboutScriptish.html | 43 ++-------------------------
 extension/skin/aboutScriptish.css     | 38 +++++++++++++++++++++++
 2 files changed, 40 insertions(+), 41 deletions(-)
 create mode 100644 extension/skin/aboutScriptish.css

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index f0d24f9e..2e425334 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -1,47 +1,8 @@
 <!doctype html>
 <head>
   <title>About: Scriptish</title>
-  <style type="text/css">
-    body { background-color: #333; font-family: Arial, Helvetica, sans-serif; }
-
-    h1, h2, h3 {
-      margin: 0;
-      padding: 0;
-      font-family: "Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace!important;
-    }
-
-    section { margin-bottom: 40px; }
-
-    header { margin-bottom: 20px; }
-    header.primary { border-bottom: 2px solid #bada55; }
-    header.primary img { margin-bottom: -5px; }
-    header.primary h1 { display:inline; }
-    header.secondary { border-bottom: 1px dotted #ccc; }
-    #test header { margin-bottom: 0; border: none; }
-
-    ul { margin-top: 5px; padding-left: 15px; }
-
-    p { margin: 0; padding: 0; }
-
-    a { color: #00f; text-decoration: none; }
-    a:hover { color: #09f; }
-
-    #container {
-      margin: 0 auto;
-      padding: 10px;
-      width: 70%;
-      background-color: #fff;
-      border: 2px solid #000;
-      border-radius: 15px;
-    }
-
-    #test {
-      display: none;
-    }
-
-    .twoCol { -moz-column-count: 2; }
-  </style>
-  <link rel='stylesheet' href='chrome://scriptish/content/test/qunit.css' type='text/css' media='screen' />
+  <link rel="stylesheet" href="chrome://scriptish/skin/aboutScriptish.css" type="text/css" media="screen"/>
+  <link rel="stylesheet" href="chrome://scriptish/content/test/qunit.css" type="text/css" media="screen"/>
   <script type="text/javascript" src="chrome://scriptish/content/test/jquery-1.6.1.min.js"></script>
   <script type="text/javascript" src="chrome://scriptish/content/test/qunit.js"></script>
   <script type="text/javascript" src="chrome://scriptish/content/test/runTests.js"></script>
diff --git a/extension/skin/aboutScriptish.css b/extension/skin/aboutScriptish.css
new file mode 100644
index 00000000..d9fe3fa1
--- /dev/null
+++ b/extension/skin/aboutScriptish.css
@@ -0,0 +1,38 @@
+body { background-color: #333; font-family: Arial, Helvetica, sans-serif; }
+
+h1, h2, h3 {
+  margin: 0;
+  padding: 0;
+  font-family: "Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace!important;
+}
+
+section { margin-bottom: 40px; }
+
+header { margin-bottom: 20px; }
+header.primary { border-bottom: 2px solid #bada55; }
+header.primary img { margin-bottom: -5px; }
+header.primary h1 { display:inline; }
+header.secondary { border-bottom: 1px dotted #ccc; }
+#test header { margin-bottom: 0; border: none; }
+
+ul { margin-top: 5px; padding-left: 15px; }
+
+p { margin: 0; padding: 0; }
+
+a { color: #00f; text-decoration: none; }
+a:hover { color: #09f; }
+
+#container {
+  margin: 0 auto;
+  padding: 10px;
+  width: 70%;
+  background-color: #fff;
+  border: 2px solid #000;
+  border-radius: 15px;
+}
+
+#test {
+  display: none;
+}
+
+.twoCol { -moz-column-count: 2; }

From 9fbedb6810849e0587111b1d5fd6b70db8c7068e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 23 May 2011 22:27:50 -0700
Subject: [PATCH 063/829] adding a favicon to about:scriptish

---
 extension/content/aboutScriptish.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 2e425334..60314804 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <head>
   <title>About: Scriptish</title>
+  <link rel="icon" href="chrome://scriptish/skin/scriptish16.png"/>
   <link rel="stylesheet" href="chrome://scriptish/skin/aboutScriptish.css" type="text/css" media="screen"/>
   <link rel="stylesheet" href="chrome://scriptish/content/test/qunit.css" type="text/css" media="screen"/>
   <script type="text/javascript" src="chrome://scriptish/content/test/jquery-1.6.1.min.js"></script>

From f5df49c66015e74c574bf0d3eeaea5b15a697098 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 23 May 2011 23:32:38 -0700
Subject: [PATCH 064/829] moving javascript from aboutScriptish.html to
 aboutScriptish.js

---
 extension/content/aboutScriptish.html  | 10 +---------
 extension/content/js/aboutScriptish.js |  7 +++++++
 2 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 extension/content/js/aboutScriptish.js

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 60314804..99d3eeb5 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -7,15 +7,7 @@
   <script type="text/javascript" src="chrome://scriptish/content/test/jquery-1.6.1.min.js"></script>
   <script type="text/javascript" src="chrome://scriptish/content/test/qunit.js"></script>
   <script type="text/javascript" src="chrome://scriptish/content/test/runTests.js"></script>
-  <script type="text/javascript">
-    $(function() {
-      var doTest = window.location.href.split("?")[1] == "test";
-      if (!doTest) return;
-      $("#main").hide();
-      $("#test").show();
-      runTests();
-    });
-  </script>
+  <script src="chrome://scriptish/content/js/aboutScriptish.js"></script>
 </head>
 
 <body>
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
new file mode 100644
index 00000000..34b2c3a6
--- /dev/null
+++ b/extension/content/js/aboutScriptish.js
@@ -0,0 +1,7 @@
+$(function() {
+  var doTest = window.location.href.split("?")[1] == "test";
+  if (!doTest) return;
+  $("#main").hide();
+  $("#test").show();
+  runTests();
+});

From e577ea3f6771fc7261f3fa6406d9cc1efddc8395 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 23 May 2011 23:35:04 -0700
Subject: [PATCH 065/829] removing unnecessary 'type=text/javascript' attribute
 from about:scriptish <script>s

---
 extension/content/aboutScriptish.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 99d3eeb5..c2f87aef 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -4,9 +4,9 @@
   <link rel="icon" href="chrome://scriptish/skin/scriptish16.png"/>
   <link rel="stylesheet" href="chrome://scriptish/skin/aboutScriptish.css" type="text/css" media="screen"/>
   <link rel="stylesheet" href="chrome://scriptish/content/test/qunit.css" type="text/css" media="screen"/>
-  <script type="text/javascript" src="chrome://scriptish/content/test/jquery-1.6.1.min.js"></script>
-  <script type="text/javascript" src="chrome://scriptish/content/test/qunit.js"></script>
-  <script type="text/javascript" src="chrome://scriptish/content/test/runTests.js"></script>
+  <script src="chrome://scriptish/content/test/jquery-1.6.1.min.js"></script>
+  <script src="chrome://scriptish/content/test/qunit.js"></script>
+  <script src="chrome://scriptish/content/test/runTests.js"></script>
   <script src="chrome://scriptish/content/js/aboutScriptish.js"></script>
 </head>
 

From eacbbdf1391f0910e7d11cf42c292599eac0f806 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 23 May 2011 23:40:32 -0700
Subject: [PATCH 066/829] adding a missing <html> and minor style changes

---
 extension/content/aboutScriptish.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index c2f87aef..edf959a5 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -1,4 +1,5 @@
 <!doctype html>
+<html>
 <head>
   <title>About: Scriptish</title>
   <link rel="icon" href="chrome://scriptish/skin/scriptish16.png"/>
@@ -99,6 +100,7 @@ <h3>Translators:</h3>
         </div>
       </section>
     </div>
+
     <div id="test">
       <section>
         <header>
@@ -109,6 +111,6 @@ <h4 id="qunit-userAgent"></h4>
         <ol id="qunit-tests"></ol>
       </section>
     </div>
-  </div> <!--! end of #container -->
+  </div>
 </body>
 </html>

From e8f216b248866951ff80bae29188e85908c829c7 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 23 May 2011 23:54:29 -0700
Subject: [PATCH 067/829] minor style changes to components/aboutScritpish.js

---
 extension/components/aboutScriptish.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/extension/components/aboutScriptish.js b/extension/components/aboutScriptish.js
index 9d18b8bb..52ff8579 100644
--- a/extension/components/aboutScriptish.js
+++ b/extension/components/aboutScriptish.js
@@ -1,5 +1,4 @@
-const Cu = Components.utils;
-Cu.import("resource://scriptish/constants.js");
+Components.utils.import("resource://scriptish/constants.js");
 
 function AboutScriptish() {}
 AboutScriptish.prototype = {
@@ -8,9 +7,7 @@ AboutScriptish.prototype = {
   classID: Components.ID("{5f28a810-8094-11e0-b278-0800200c9a66}"),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
 
-  getURIFlags: function(aURI) {
-    return Ci.nsIAboutModule.ALLOW_SCRIPT;
-  },
+  getURIFlags: function() Ci.nsIAboutModule.ALLOW_SCRIPT,
 
   newChannel: function(aURI) {
     let channel = Services.io.newChannel(

From 1bdadbd4bddb8bff34b2b2a15ad13b79b71b0040 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 23 May 2011 23:58:05 -0700
Subject: [PATCH 068/829] adding <base href="chrome://scriptish/content"/> to
 aboutScriptish.html

---
 extension/content/aboutScriptish.html | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index edf959a5..f7cf6d55 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -2,19 +2,20 @@
 <html>
 <head>
   <title>About: Scriptish</title>
-  <link rel="icon" href="chrome://scriptish/skin/scriptish16.png"/>
-  <link rel="stylesheet" href="chrome://scriptish/skin/aboutScriptish.css" type="text/css" media="screen"/>
-  <link rel="stylesheet" href="chrome://scriptish/content/test/qunit.css" type="text/css" media="screen"/>
-  <script src="chrome://scriptish/content/test/jquery-1.6.1.min.js"></script>
-  <script src="chrome://scriptish/content/test/qunit.js"></script>
-  <script src="chrome://scriptish/content/test/runTests.js"></script>
-  <script src="chrome://scriptish/content/js/aboutScriptish.js"></script>
+  <base href="chrome://scriptish/content"/>
+  <link rel="icon" href="../skin/scriptish16.png"/>
+  <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
+  <link rel="stylesheet" href="test/qunit.css" type="text/css" media="screen"/>
+  <script src="test/jquery-1.6.1.min.js"></script>
+  <script src="test/qunit.js"></script>
+  <script src="test/runTests.js"></script>
+  <script src="js/aboutScriptish.js"></script>
 </head>
 
 <body>
   <div id="container">
     <header class="primary">
-      <img src="chrome://scriptish/skin/scriptish32.png" />
+      <img src="../skin/scriptish32.png" />
       <h1>About:Scriptish</h1>
     </header>
 

From 35b8a668f6cc1eefa5383c668867f71beda540b4 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 24 May 2011 00:16:24 -0700
Subject: [PATCH 069/829] adding some more space between the top of the content
 on about:scriptish and the top of the <body>

---
 extension/skin/aboutScriptish.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extension/skin/aboutScriptish.css b/extension/skin/aboutScriptish.css
index d9fe3fa1..d098984c 100644
--- a/extension/skin/aboutScriptish.css
+++ b/extension/skin/aboutScriptish.css
@@ -1,4 +1,7 @@
-body { background-color: #333; font-family: Arial, Helvetica, sans-serif; }
+body {
+  background-color: #333;
+  font-family: Arial, Helvetica, sans-serif;
+}
 
 h1, h2, h3 {
   margin: 0;
@@ -23,7 +26,7 @@ a { color: #00f; text-decoration: none; }
 a:hover { color: #09f; }
 
 #container {
-  margin: 0 auto;
+  margin: 2em auto 0;
   padding: 10px;
   width: 70%;
   background-color: #fff;

From 667c94ae0163a3d7810024915a6dea11f4939da8 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 24 May 2011 00:33:30 -0700
Subject: [PATCH 070/829] Closes #310 removing checkmark in page title for
 about:scriptish

---
 extension/content/aboutScriptish.html  |  2 --
 extension/content/js/aboutScriptish.js | 21 ++++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index f7cf6d55..64e30ca7 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -7,8 +7,6 @@
   <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
   <link rel="stylesheet" href="test/qunit.css" type="text/css" media="screen"/>
   <script src="test/jquery-1.6.1.min.js"></script>
-  <script src="test/qunit.js"></script>
-  <script src="test/runTests.js"></script>
   <script src="js/aboutScriptish.js"></script>
 </head>
 
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index 34b2c3a6..aa58ef0e 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -1,7 +1,18 @@
 $(function() {
-  var doTest = window.location.href.split("?")[1] == "test";
-  if (!doTest) return;
-  $("#main").hide();
-  $("#test").show();
-  runTests();
+  if (window.location.href.split("?")[1] == "test") {
+    var include = function(aSrc, aCallback) {
+      var script = document.createElement("script");
+      script.src = aSrc;
+      script.addEventListener("load", aCallback, false);
+      $("head")[0].appendChild(script);
+    }
+
+    include("test/qunit.js", function() {
+      include("test/runTests.js", function() {
+        $("#main").hide();
+        $("#test").show();
+        runTests();
+      });
+    });
+  }
 });

From 06858b493906ad8c635f1e72a4545290bc1303cf Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 24 May 2011 10:15:19 -0500
Subject: [PATCH 071/829] Generate the 'about:scriptish' contributor/translator
 lists from install.rdf.

---
 extension/content/aboutScriptish.html  | 34 ++------------------------
 extension/content/js/aboutScriptish.js | 24 ++++++++++++++++++
 extension/install.rdf                  |  8 +++---
 extension/modules/config/config.js     |  1 -
 4 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 64e30ca7..52e2b25d 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -62,40 +62,10 @@ <h3>Creator:</h3>
           </ul>
 
           <h3>Contributors:</h3>
-          <ul>
-            <li>Aaron Boodman &mdash; <a href="http://youngpup.net/">http://youngpup.net/</a></li>
-            <li>Anthony Lieuallen &mdash; <a href="http://arantius.com/">http://arantius.com/</a></li>
-            <li>Chris Feldmann &mdash; <a href="http://axlotl.net/">http://axlotl.net/</a></li>
-            <li>David Schontzler &mdash; <a href="http://stilleye.com/">http://stilleye.com/</a></li>
-            <li>Gareth Andrew &mdash; <a href="http://freegarethandrew.org/">http://freegarethandrew.org/</a></li>
-            <li>Greg Parris &mdash; <a href="http://phob.net/">http://phob.net/</a></li>
-            <li>Hisateru Tanaka</li>
-            <li>Jeremy Dunck &mdash; <a href="http://dunck.us/anabasis/">http://dunck.us/anabasis/</a></li>
-            <li>Jesper Kristensen &mdash; <a href="mailto:mail@jesperkristensen.dk">mail@jesperkristensen.dk</a></li>
-            <li>Johan Sundstr�m &mdash; <a href="http://ecmanaut.blogspot.com/">http://ecmanaut.blogspot.com/</a></li>
-            <li>JP Sugarbroad</li>
-            <li>Juan Pablo Guereca Alonso</li>
-            <li>Manpreet Singh</li>
-            <li>Mark Pilgrim &mdash; <a href="http://diveintomark.org/">http://diveintomark.org/</a></li>
-            <li>Marti Martz</li>
-            <li>Matthew Gray &mdash; <a href="http://mkgray.com:8000/">http://mkgray.com:8000/</a></li>
-            <li>Matthias Bauer &mdash; <a href="http://moeffju.net/">http://moeffju.net/</a></li>
-            <li>Mike Medley &mdash; <a href="http://sizzlemctwizzle.com/">http://sizzlemctwizzle.com/</a></li>
-            <li>Nikolas Coukouma &mdash; <a href="http://atrus.org/">http://atrus.org/</a></li>
-            <li>Ori Avtallon</li>
-            <li>Pak Kei (logo) &mdash; <a href="http://arkidect.com/">http://arkidect.com/</a></li>
-            <li>Sergio Abreu &mdash; <a href="http://sitedosergio.sitesbr.net/">http://sitedosergio.sitesbr.net/</a></li>
-            <li>Slowpoke</li>
-            <li>Tommi Rautava</li>
-            <li>Nils Maier</li>
-            <li>Melih Bilgil &mdash; <a href="http://picol.org">http://picol.org/</a></li>
-            <li>John J. Barton</li>
-          </ul>
+          <ul id="contlist"></ul>
 
           <h3>Translators:</h3>
-          <ul>
-            <li>nishikawasasaki (kohsei yamamoto)</li>
-          </ul>
+          <ul id="translist"></ul>
         </div>
       </section>
     </div>
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index aa58ef0e..2fc9b1d9 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -1,5 +1,6 @@
 $(function() {
   if (window.location.href.split("?")[1] == "test") {
+    // Run tests
     var include = function(aSrc, aCallback) {
       var script = document.createElement("script");
       script.src = aSrc;
@@ -14,5 +15,28 @@ $(function() {
         runTests();
       });
     });
+    return;
   }
+
+  // Show about:scriptish
+  var tools = {};
+  Components.utils.import("resource://gre/modules/AddonManager.jsm", tools);
+
+  var addPerson = function(aTarget, aPerson) {
+    var person = aPerson.name.split(/; +/);
+    if (person[1]) {
+      person = person[0] + " &mdash; "
+          + "<a href='" + person[1] + "'>"
+          + person[1].replace(/^mailto:/i, "") + "</a>";
+    }
+    aTarget.append("<li>" + person + "</li>");
+  }
+
+  tools.AddonManager.getAddonByID("scriptish@erikvold.com", function(aAddon) {
+    var $contlist = $("#contlist");
+    var $translist = $("#translist");
+
+    $.each(aAddon.contributors, function(i, val) addPerson($contlist, val));
+    $.each(aAddon.translators, function(i, val) addPerson($translist, val));
+  });
 });
diff --git a/extension/install.rdf b/extension/install.rdf
index 50fe9d42..2f0436ab 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -35,7 +35,7 @@
     <em:contributor>Greg Parris; http://phob.net/</em:contributor>
     <em:contributor>Hisateru Tanaka</em:contributor>
     <em:contributor>Jeremy Dunck; http://dunck.us/anabasis/</em:contributor>
-    <em:contributor>Jesper Kristensen; &lt;mail&#64;jesperkristensen.dk&gt;</em:contributor>
+    <em:contributor>Jesper Kristensen; mailto:mail@jesperkristensen.dk</em:contributor>
     <em:contributor>Johan Sundström; http://ecmanaut.blogspot.com/</em:contributor>
     <em:contributor>JP Sugarbroad</em:contributor>
     <em:contributor>Juan Pablo Guereca Alonso</em:contributor>
@@ -50,12 +50,12 @@
     <em:contributor>Pak Kei (logo); http://arkidect.com/</em:contributor>
     <em:contributor>Sergio Abreu; http://sitedosergio.sitesbr.net/</em:contributor>
     <em:contributor>Slowpoke</em:contributor>
-    <em:contributor>Tommi Rautava/</em:contributor>
+    <em:contributor>Tommi Rautava</em:contributor>
     <em:contributor>Nils Maier</em:contributor>
-    <em:contributor>Melih Bilgil; http://picol.org</em:contributor>
+    <em:contributor>Melih Bilgil; http://picol.org/</em:contributor>
     <em:contributor>John J. Barton</em:contributor>
 
-    <em:translator>nishikawasasaki(kohsei yamamoto)</em:translator>
+    <em:translator>nishikawasasaki (kohsei yamamoto)</em:translator>
 
     <em:updateURL>http://github.com/downloads/erikvold/scriptish/update.rdf</em:updateURL>
     <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjEA/hqcsMgPctoWvqJFfjtNcQbfBi1uP3zoWR3PPMRSXnpBJv/5Kb5lJD9HJ+963CFQ3oFvkgO9+oEWisiKBjxhx94Bynl0Ym2sZ1DdEzTsH9kV4HGFLjeYTix5WkQqdoswyM32ebtDSYrFbSqxpBrgHwVLELfFYM1qZsnWpJKwIDAQAB</em:updateKey>
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 670c933c..3a64dedf 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -12,7 +12,6 @@ inc("resource://scriptish/scriptish.js");
 inc("resource://scriptish/utils/Scriptish_getContents.js");
 inc("resource://scriptish/utils/Scriptish_getWriteStream.js");
 inc("resource://scriptish/utils/Scriptish_getProfileFile.js");
-inc("resource://scriptish/utils/Scriptish_notification.js");
 inc("resource://scriptish/utils/Scriptish_stringBundle.js");
 inc("resource://scriptish/utils/Scriptish_convert2RegExp.js");
 inc("resource://scriptish/utils/Scriptish_cryptoHash.js");

From 69ac90587e26ae694bbe56c30b5c20a66ca35f04 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 24 May 2011 12:21:46 -0500
Subject: [PATCH 072/829] Removing use of jQuery.

---
 extension/content/aboutScriptish.html      |  1 -
 extension/content/js/aboutScriptish.js     | 36 +++++++++++++---------
 extension/content/test/jquery-1.6.1.min.js | 18 -----------
 3 files changed, 22 insertions(+), 33 deletions(-)
 delete mode 100644 extension/content/test/jquery-1.6.1.min.js

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 52e2b25d..38c8b867 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -6,7 +6,6 @@
   <link rel="icon" href="../skin/scriptish16.png"/>
   <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
   <link rel="stylesheet" href="test/qunit.css" type="text/css" media="screen"/>
-  <script src="test/jquery-1.6.1.min.js"></script>
   <script src="js/aboutScriptish.js"></script>
 </head>
 
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index 2fc9b1d9..380b36bf 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -1,17 +1,22 @@
-$(function() {
+document.addEventListener("DOMContentLoaded", DOMContentLoaded, false);
+function DOMContentLoaded() {
+  document.removeEventListener("DOMContentLoaded", DOMContentLoaded, false);
+
+  function $(aID) document.getElementById(aID);
+
   if (window.location.href.split("?")[1] == "test") {
     // Run tests
     var include = function(aSrc, aCallback) {
       var script = document.createElement("script");
       script.src = aSrc;
       script.addEventListener("load", aCallback, false);
-      $("head")[0].appendChild(script);
+      document.getElementsByTagName("head")[0].appendChild(script);
     }
 
     include("test/qunit.js", function() {
       include("test/runTests.js", function() {
-        $("#main").hide();
-        $("#test").show();
+        $("main").style.display = "none";
+        $("test").style.display = "inherit";
         runTests();
       });
     });
@@ -23,20 +28,23 @@ $(function() {
   Components.utils.import("resource://gre/modules/AddonManager.jsm", tools);
 
   var addPerson = function(aTarget, aPerson) {
+    var li = document.createElement("li");
     var person = aPerson.name.split(/; +/);
+    li.innerHTML = person[0];
     if (person[1]) {
-      person = person[0] + " &mdash; "
-          + "<a href='" + person[1] + "'>"
-          + person[1].replace(/^mailto:/i, "") + "</a>";
+      var a = document.createElement("a");
+      a.innerHTML = person[1].replace(/^mailto:/i, "");
+      a.setAttribute("href", person[1]);
+      li.innerHTML += " &mdash; ";
+      li.appendChild(a);
     }
-    aTarget.append("<li>" + person + "</li>");
+    aTarget.appendChild(li);
   }
 
   tools.AddonManager.getAddonByID("scriptish@erikvold.com", function(aAddon) {
-    var $contlist = $("#contlist");
-    var $translist = $("#translist");
-
-    $.each(aAddon.contributors, function(i, val) addPerson($contlist, val));
-    $.each(aAddon.translators, function(i, val) addPerson($translist, val));
+    var contlist = $("contlist");
+    var translist = $("translist");
+    aAddon.contributors.forEach(function(val) addPerson(contlist, val));
+    aAddon.translators.forEach(function(val) addPerson(translist, val));
   });
-});
+}
diff --git a/extension/content/test/jquery-1.6.1.min.js b/extension/content/test/jquery-1.6.1.min.js
deleted file mode 100644
index b2ac1747..00000000
--- a/extension/content/test/jquery-1.6.1.min.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.6.1
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu May 12 15:04:36 2011 -0400
- */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!cj[a]){var b=f("<"+a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),c.body.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write("<!doctype><html><body></body></html>");b=cl.createElement(a),cl.body.appendChild(b),d=f.css(b,"display"),c.body.removeChild(ck)}cj[a]=d}return cj[a]}function cu(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function ct(){cq=b}function cs(){setTimeout(ct,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bF.test(a)?d(a,e):b_(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bU,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bQ),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bD(a,b,c){var d=b==="width"?bx:by,e=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return e;f.each(d,function(){c||(e-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?e+=parseFloat(f.css(a,"margin"+this))||0:e-=parseFloat(f.css(a,"border"+this+"Width"))||0});return e}function bn(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bm(a){f.nodeName(a,"input")?bl(a):a.getElementsByTagName&&f.grep(a.getElementsByTagName("input"),bl)}function bl(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bk(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bj(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bi(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bh(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function X(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(S.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function W(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function O(a,b){return(a&&a!=="*"?a+".":"")+b.replace(A,"`").replace(B,"&")}function N(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(y,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function L(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function F(){return!0}function E(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function H(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(H,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=d.userAgent,x,y,z,A=Object.prototype.toString,B=Object.prototype.hasOwnProperty,C=Array.prototype.push,D=Array.prototype.slice,E=String.prototype.trim,F=Array.prototype.indexOf,G={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.1",length:0,size:function(){return this.length},toArray:function(){return D.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?C.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(D.apply(this,arguments),"slice",D.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:C,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;y.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!y){y=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",z,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",z),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&H()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):G[A.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!B.call(a,"constructor")&&!B.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||B.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:E?function(a){return a==null?"":E.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?C.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(F)return F.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=D.call(arguments,2),g=function(){return a.apply(c,f.concat(D.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){G["[object "+b+"]"]=b.toLowerCase()}),x=e.uaMatch(w),x.browser&&(e.browser[x.browser]=!0,e.browser.version=x.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?z=function(){c.removeEventListener("DOMContentLoaded",z,!1),e.ready()}:c.attachEvent&&(z=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",z),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};f=c.createElement("select"),g=f.appendChild(c.createElement("option")),h=a.getElementsByTagName("input")[0],j={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},h.checked=!0,j.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,j.optDisabled=!g.disabled;try{delete a.test}catch(s){j.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function b(){j.noCloneEvent=!1,a.detachEvent("onclick",b)}),a.cloneNode(!0).fireEvent("onclick")),h=c.createElement("input"),h.value="t",h.setAttribute("type","radio"),j.radioValue=h.value==="t",h.setAttribute("checked","checked"),a.appendChild(h),k=c.createDocumentFragment(),k.appendChild(a.firstChild),j.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",l=c.createElement("body"),m={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"};for(q in m)l.style[q]=m[q];l.appendChild(a),b.insertBefore(l,b.firstChild),j.appendChecked=h.checked,j.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,j.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",j.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",n=a.getElementsByTagName("td"),r=n[0].offsetHeight===0,n[0].style.display="",n[1].style.display="none",j.reliableHiddenOffsets=r&&n[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(i=c.createElement("div"),i.style.width="0",i.style.marginRight="0",a.appendChild(i),j.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(i,null)||{marginRight:0}).marginRight,10)||0)===0),l.innerHTML="",b.removeChild(l);if(a.attachEvent)for(q in{submit:1,change:1,focusin:1})p="on"+q,r=p in a,r||(a.setAttribute(p,"return;"),r=typeof a[p]=="function"),j[q+"Bubbles"]=r;return j}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.addClass(a.call(this,b,c.attr("class")||""))});if(a&&typeof a=="string"){var b=(a||"").split(o);for(var c=0,d=this.length;c<d;c++){var e=this[c];if(e.nodeType===1)if(!e.className)e.className=a;else{var g=" "+e.className+" ",h=e.className;for(var i=0,j=b.length;i<j;i++)g.indexOf(" "+b[i]+" ")<0&&(h+=" "+b[i]);e.className=f.trim(h)}}}return this},removeClass:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a=="string"||a===b){var c=(a||"").split(o);for(var d=0,e=this.length;d<e;d++){var g=this[d];if(g.nodeType===1&&g.className)if(a){var h=(" "+g.className+" ").replace(n," ");for(var i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){var d=f(this);d.toggleClass(a.call(this,c,d.attr("class"),b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;return(e.value||"").replace(p,"")}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);c=j&&f.attrFix[c]||c,i=f.attrHooks[c],i||(!t.test(c)||typeof d!="boolean"&&d!==b&&d.toLowerCase()!==c.toLowerCase()?v&&(f.nodeName(a,"form")||u.test(c))&&(i=v):i=w);if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j)return i.get(a,c);h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);c=i&&f.propFix[c]||c,h=f.propHooks[c];return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return a[f.propFix[c]||c]?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=b),a.setAttribute(c,c.toLowerCase()));return c}},f.attrHooks.value={get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return a.value},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=Object.prototype.hasOwnProperty,y=/\.(.*)$/,z=/^(?:textarea|input|select)$/i,A=/\./g,B=/ /g,C=/[^\w\s.|`]/g,D=function(a){return a.replace(C,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=E;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=E);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),D).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem
-)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,O(a.origType,a.selector),f.extend({},a,{handler:N,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,O(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?F:E):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=F;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=F;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=F,this.stopPropagation()},isDefaultPrevented:E,isPropagationStopped:E,isImmediatePropagationStopped:E};var G=function(a){var b=a.relatedTarget;a.type=a.data;try{if(b&&b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&f.event.handle.apply(this,arguments)}catch(d){}},H=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?H:G,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?H:G)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&L("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&L("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var I,J=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},K=function(c){var d=c.target,e,g;if(!!z.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=J(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:K,beforedeactivate:K,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&K.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&K.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",J(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in I)f.event.add(this,c+".specialChange",I[c]);return z.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return z.test(this.nodeName)}},I=f.event.special.change.filters,I.focus=I.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var M={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||E,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=y.exec(h),k="",j&&(k=j[0],h=h.replace(y,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,M[h]?(a.push(M[h]+k),h=h+k):h=(M[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+O(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+O(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var P=/Until$/,Q=/^(?:parents|prevUntil|prevAll)/,R=/,/,S=/^.[^:#\[\.,]*$/,T=Array.prototype.slice,U=f.expr.match.POS,V={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(X(this,a,!1),"not",a)},filter:function(a){return this.pushStack(X(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=U.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=U.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(W(c[0])||W(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=T.call(arguments);P.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!V[a]?f.unique(e):e,(this.length>1||R.test(d))&&Q.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var Y=/ jQuery\d+="(?:\d+|null)"/g,Z=/^\s+/,$=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,_=/<([\w:]+)/,ba=/<tbody/i,bb=/<|&#?\w+;/,bc=/<(?:script|object|embed|option|style)/i,bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Y,""):null;if(typeof a=="string"&&!bc.test(a)&&(f.support.leadingWhitespace||!Z.test(a))&&!bg[(_.exec(a)||["",""])[1].toLowerCase()]){a=a.replace($,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bh(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bn)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bc.test(a[0])&&(f.support.checkClone||!bd.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bj(a,d),e=bk(a),g=bk(d);for(h=0;e[h];++h)bj(e[h],g[h])}if(b){bi(a,d);if(c){e=bk(a),g=bk(d);for(h=0;e[h];++h)bi(e[h],g[h])}}return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||
-b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!bb.test(k))k=b.createTextNode(k);else{k=k.replace($,"<$1></$2>");var l=(_.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=ba.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Z.test(k)&&o.insertBefore(b.createTextNode(Z.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bm(k[i]);else bm(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bo=/alpha\([^)]*\)/i,bp=/opacity=([^)]*)/,bq=/-([a-z])/ig,br=/([A-Z]|^ms)/g,bs=/^-?\d+(?:px)?$/i,bt=/^-?\d/,bu=/^[+\-]=/,bv=/[^+\-\.\de]+/g,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB,bC=function(a,b){return b.toUpperCase()};f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0,widows:!0,orphans:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bu.test(d)&&(d=+d.replace(bv,"")+parseFloat(f.css(a,c))),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bq,bC)}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){a.offsetWidth!==0?e=bD(a,b,d):f.swap(a,bw,function(){e=bD(a,b,d)});if(e<=0){e=bz(a,b,b),e==="0px"&&bB&&(e=bB(a,b,b));if(e!=null)return e===""||e==="auto"?"0px":e}if(e<0||e==null){e=a.style[b];return e===""||e==="auto"?"0px":e}return typeof e=="string"?e:e+"px"}},set:function(a,b){if(!bs.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bp.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bo.test(g)?g.replace(bo,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,c){var d,e,g;c=c.replace(br,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bs.test(d)&&bt.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bE=/%20/g,bF=/\[\]$/,bG=/\r?\n/g,bH=/#.*$/,bI=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bJ=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bK=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bL=/^(?:GET|HEAD)$/,bM=/^\/\//,bN=/\?/,bO=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bP=/^(?:select|textarea)/i,bQ=/\s+/,bR=/([?&])_=[^&]*/,bS=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bT=f.fn.load,bU={},bV={},bW,bX;try{bW=e.href}catch(bY){bW=c.createElement("a"),bW.href="",bW=bW.href}bX=bS.exec(bW.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bT)return bT.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bO,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bP.test(this.nodeName)||bJ.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bG,"\r\n")}}):{name:b.name,value:c.replace(bG,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bW,isLocal:bK.test(bX[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bZ(bU),ajaxTransport:bZ(bV),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?ca(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=cb(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bI.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bH,"").replace(bM,bX[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bQ),d.crossDomain==null&&(r=bS.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bX[1]&&r[2]==bX[2]&&(r[3]||(r[1]==="http:"?80:443))==(bX[3]||(bX[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bU,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bL.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bN.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bR,"$1_="+x);d.url=y+(y===d.url?(bN.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bV,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bE,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq,cr=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cv(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cm.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=cn.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this),f.isFunction(d.old)&&d.old.call(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cq||cs(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!co&&(cr?(co=1,g=function(){co&&(cr(g),e.tick())},cr(g)):co=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cq||cs(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){return this[0]?parseFloat(f.css(this[0],d,"padding")):null},f.fn["outer"+c]=function(a){return this[0]?parseFloat(f.css(this[0],d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file

From 1f8f23c13e2e8a759b78334e1f6827d2d0a1dc92 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 24 May 2011 16:57:00 -0700
Subject: [PATCH 073/829] no longer using jquery on about:scriptish, and only
 using it for about:scriptish?test

---
 extension/content/aboutScriptish.html  |  1 -
 extension/content/js/aboutScriptish.js | 21 +++++++++++++--------
 extension/content/test/runTests.js     |  8 ++++----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 64e30ca7..c1ee0861 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -6,7 +6,6 @@
   <link rel="icon" href="../skin/scriptish16.png"/>
   <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
   <link rel="stylesheet" href="test/qunit.css" type="text/css" media="screen"/>
-  <script src="test/jquery-1.6.1.min.js"></script>
   <script src="js/aboutScriptish.js"></script>
 </head>
 
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index aa58ef0e..7744df43 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -1,18 +1,23 @@
-$(function() {
+const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+
+(function() {
   if (window.location.href.split("?")[1] == "test") {
+    var head = document.documentElement.firstChild;
     var include = function(aSrc, aCallback) {
       var script = document.createElement("script");
       script.src = aSrc;
       script.addEventListener("load", aCallback, false);
-      $("head")[0].appendChild(script);
+      head.appendChild(script);
     }
 
-    include("test/qunit.js", function() {
-      include("test/runTests.js", function() {
-        $("#main").hide();
-        $("#test").show();
-        runTests();
+    include("test/jquery-1.6.1.min.js", function() {
+      include("test/qunit.js", function() {
+        include("test/runTests.js", function() {
+          $("#main").hide();
+          $("#test").show();
+          runTests();
+        });
       });
     });
   }
-});
+})();
diff --git a/extension/content/test/runTests.js b/extension/content/test/runTests.js
index ef1e6abb..05f9aca8 100644
--- a/extension/content/test/runTests.js
+++ b/extension/content/test/runTests.js
@@ -1,17 +1,17 @@
+Cu.import("resource://scriptish/constants.js");
+
 function runTests() {
-  const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
   var tools = {};
 
   /**
    * MODULE: Scriptish Service
    */
   module("Scriptish Service");
-  Cu.import("resource://scriptish/constants.js", tools);
 
   test("Availability", function() {
     expect(2);
-    equals(typeof(tools.Services.scriptish), "object", "Scriptish service is available");
-    equals(typeof(tools.Services.scriptish.shouldLoad), "function", "shouldLoad is available");
+    equals(typeof(Services.scriptish), "object", "Scriptish service is available");
+    equals(typeof(Services.scriptish.shouldLoad), "function", "shouldLoad is available");
   });
 
   // TODO: generate fake requests to test

From 4789fa503eb0e60e0801a4ee55041521551d7088 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 24 May 2011 17:18:58 -0700
Subject: [PATCH 074/829] minor style changes

---
 extension/content/js/aboutScriptish.js | 17 ++++++++---------
 extension/content/test/runTests.js     |  2 --
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index b790e04e..ed9a7f37 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -1,7 +1,10 @@
-const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+
 function $(aID) document.getElementById(aID);
 
 (function() {
+  // Show about:scriptish?test
   if (window.location.href.split("?")[1] == "test") {
     var head = document.documentElement.firstChild;
     var include = function(aSrc, aCallback) {
@@ -22,9 +25,6 @@ function $(aID) document.getElementById(aID);
   }
 
   // Show about:scriptish
-  var tools = {};
-  Components.utils.import("resource://gre/modules/AddonManager.jsm", tools);
-
   var addPerson = function(aTarget, aPerson) {
     var li = document.createElement("li");
     var person = aPerson.name.split(/; +/);
@@ -39,10 +39,9 @@ function $(aID) document.getElementById(aID);
     aTarget.appendChild(li);
   }
 
-  tools.AddonManager.getAddonByID("scriptish@erikvold.com", function(aAddon) {
-    var contlist = $("contlist");
-    var translist = $("translist");
-    aAddon.contributors.forEach(function(val) addPerson(contlist, val));
-    aAddon.translators.forEach(function(val) addPerson(translist, val));
+  AddonManager.getAddonByID("scriptish@erikvold.com", function(aAddon) {
+    function func(val) addPerson(this, val);
+    aAddon.contributors.forEach(func.bind($("contlist")));
+    aAddon.translators.forEach(func.bind($("translist")));
   });
 })();
diff --git a/extension/content/test/runTests.js b/extension/content/test/runTests.js
index 05f9aca8..5f3e7b80 100644
--- a/extension/content/test/runTests.js
+++ b/extension/content/test/runTests.js
@@ -1,5 +1,3 @@
-Cu.import("resource://scriptish/constants.js");
-
 function runTests() {
   var tools = {};
 

From 0249e4c071f25266a5a8f54f1ea3e0bd4188be46 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 24 May 2011 17:49:31 -0700
Subject: [PATCH 075/829] test: the existence of the Tools menu's 'Scriptish'
 menu.

---
 extension/content/test/runTests.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/extension/content/test/runTests.js b/extension/content/test/runTests.js
index 5f3e7b80..cdff6fba 100644
--- a/extension/content/test/runTests.js
+++ b/extension/content/test/runTests.js
@@ -103,4 +103,16 @@ function runTests() {
     equals(typeof(tools.MatchPattern), "function", "has Scriptish_openFolder");
     equals(typeof(tools.Timer), "function", "has Timer");
   });
+
+  test("Tools Menu's 'Scriptish' Menu", function() {
+    expect(3);
+
+    var win = Services.wm.getMostRecentWindow("navigator:browser");
+    function $(aID) win.document.getElementById(aID);
+    var scriptish_menu = $("scriptish_general_menu");
+    var tools_menu = $("menu_ToolsPopup");
+    ok(!!scriptish_menu, "Scriptish menu exists");
+    ok(!!tools_menu, "Tools menu exists");
+    equal(scriptish_menu.parentNode, tools_menu, "The Scriptish menu is a child of the Tools menu");
+  });
 }

From ca170874d5f4f37cca0f27dfb3fb02978c34397a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 24 May 2011 18:25:37 -0700
Subject: [PATCH 076/829] No longer removing unwanted files from the test xpi
 (it's a unnecessary step for the text xpi) & minor echo changes for test.sh
 and build.sh

---
 build.sh | 18 ++++++++++++------
 test.sh  |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index bd778883..34e3a43a 100755
--- a/build.sh
+++ b/build.sh
@@ -13,7 +13,9 @@ fi
 XPI="scriptish-$VER.xpi"
 
 # Copy base structure to a temporary build directory and change to it
-echo "Creating working directory ..."
+if [ "test" != "$1" ]; then
+  echo "Creating working directory ..."
+fi
 rm -rf build
 mkdir build
 cp LICENSE.txt build/
@@ -35,14 +37,18 @@ fi
 (sed -e 's/<!--.*//g' install.rdf > install.rdf.$$ &&
  mv install.rdf.$$ install.rdf)
 
-echo "Cleaning up unwanted files ..."
-find . -depth -name '*~' -exec rm -rf "{}" \;
-find . -depth -name '#*' -exec rm -rf "{}" \;
-find . -depth -name '.DS_Store' -exec rm "{}" \;
+if [ "test" != "$1" ]; then
+  echo "Cleaning up unwanted files ..."
+  find . -depth -name '*~' -exec rm -rf "{}" \;
+  find . -depth -name '#*' -exec rm -rf "{}" \;
+  find . -depth -name '.DS_Store' -exec rm "{}" \;
+fi
 
 echo "Creating $XPI ..."
 zip -qr9XD "../$XPI" *
 
-echo "Cleaning up temporary files ..."
+if [ "test" != "$1" ]; then
+  echo "Cleaning up temporary files ..."
+fi
 cd ..
 rm -rf build
diff --git a/test.sh b/test.sh
index 59365468..ef9e6697 100755
--- a/test.sh
+++ b/test.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 ./build.sh test
+echo "Running mozmill tests..."
 mozmill -t tests/mozmill-tests -a scriptish-test.xpi

From f4bbb59362df965753a025535e0fb3e5929f9dc4 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 24 May 2011 22:57:58 -0500
Subject: [PATCH 077/829] Using the 'friendly' AMO URL in README.txt

---
 README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index e62078f3..a07808e8 100644
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ Requirements
 Links
 ----------
 
-* Addons.Mozilla.Org (AMO): https://addons.mozilla.org/en-US/firefox/addon/231203
+* Addons.Mozilla.Org (AMO): https://addons.mozilla.org/en-US/firefox/addon/scriptish
 * Userscripts:              http://userscripts.org
 * Wiki:                     http://github.com/erikvold/scriptish/wiki
 * Issues:                   http://github.com/erikvold/scriptish/issues

From 17fa6db01034a676c6a50508f65d9cd182aea16d Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 25 May 2011 00:21:04 -0700
Subject: [PATCH 078/829] test: that only one about:scriptish tab is opened on
 first run

---
 .../testAboutScriptishOpenedFR.js             | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishOpenedFR.js

diff --git a/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishOpenedFR.js b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishOpenedFR.js
new file mode 100644
index 00000000..247c99ab
--- /dev/null
+++ b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishOpenedFR.js
@@ -0,0 +1,50 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Scriptish mozmill test suite.
+ *
+ * The Initial Developer of the Original Code is Erik Vold.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Erik Vold <erikvvold@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var tabs = require("../../../../../mozmill-tests/lib/tabs");
+
+var setupModule = function(module) {
+  module.controller = mozmill.getBrowserController();
+}
+
+// Test that the about:scriptish tab is opened on first run
+var testAboutScriptishOpened = function() {
+  var results = tabs.getTabsWithURL("about:scriptish");
+
+  controller.assert(function() {
+    return results.length === 1;
+  }, "Only one about:scriptish tab was opened", 2000);
+}

From 92813cdabaee93cdcb80cc8c333227c6a50ac257 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 25 May 2011 08:55:27 -0700
Subject: [PATCH 079/829] <em:maxVersion>7.*</em:maxVersion> for Firefox

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 2f0436ab..b17153d5 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -65,7 +65,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0b5pre</em:minVersion>
-        <em:maxVersion>6.*</em:maxVersion>
+        <em:maxVersion>7.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- SeaMonkey -->

From 1b1963780780b398b42c7c5689deb573829165a4 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 25 May 2011 20:45:29 -0500
Subject: [PATCH 080/829] Allow URLs without a host if they are GMable.

---
 extension/modules/script/script.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 06aa6303..02f2c9e3 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -299,7 +299,9 @@ Script.prototype = {
     try {
       var host = NetUtil.newURI(aURL).host;
     } catch (e) {
-      return false;
+      // If true, we're allowing a scheme that doesn't have a host.
+      // i.e. "about:scriptish"
+      return Scriptish.isGreasemonkeyable(aURL);
     }
 
     var i = this.domains.length - 1;
@@ -313,7 +315,7 @@ Script.prototype = {
         (regExp.isTLD) ? regExp.test(Scriptish_getTLDURL(aURL)) : regExp.test(aURL));
     function testII(aMatchPattern) aMatchPattern.doMatch(aURL);
 
-    // check if the doamin is ok 
+    // check if the domain is ok
     if (!this.matchesDomain(aURL)) return false;
 
     // check if script @includes/@excludes are disabled

From 8177669ce1ea7674ce53fa3f40ca1f709fe9fcee Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 25 May 2011 20:54:58 -0500
Subject: [PATCH 081/829] Listen for chrome documents being created (i.e.
 'about:scriptish').

---
 extension/components/scriptish.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 089350e8..d3563758 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -42,6 +42,7 @@ function ScriptishService() {
     delete this.updateChk;
   }
 
+  Services.obs.addObserver(this, "chrome-document-global-created", false);
   Services.obs.addObserver(this, "content-document-global-created", false);
   Services.obs.addObserver(this, "inner-window-destroyed", false);
   Services.obs.addObserver(this, "install-userscript", false);
@@ -61,6 +62,7 @@ ScriptishService.prototype = {
 
   observe: function(aSubject, aTopic, aData) {
     switch (aTopic) {
+      case "chrome-document-global-created":
       case "content-document-global-created":
         this.docReady(aSubject, Scriptish_getBrowserForContentWindow(aSubject));
         break;

From e0d82376c7add8214fdcf74241114dc539b3d6b7 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 25 May 2011 19:21:30 -0500
Subject: [PATCH 082/829] Closes #296 On first load don't try to create a
 config file during Config._initScriptDir(), since it will be created when
 Config._save() is called for the first time.

---
 extension/modules/config/config.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 3a64dedf..cb5a0b6d 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -318,17 +318,9 @@ Config.prototype = {
   _initScriptDir: function() {
     // create an empty configuration if none exist.
     var dir = this._scriptDir;
-    if (!dir.exists()) {
-      // create script folder
+    if (!dir.exists())
       dir.create(Ci.nsIFile.DIRECTORY_TYPE, 0755);
 
-      // create config.xml file
-      var configStream = Scriptish_getWriteStream(this._configFile);
-      var xml = "<UserScriptConfig/>";
-      configStream.write(xml, xml.length);
-      configStream.close();
-    }
-
     if (!this._useBlocklist) return;
 
     // Try to fetch a new list if blocklist is enabled and some time has passed

From c55e903261a63a5341a19502e7000f664617116e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 25 May 2011 23:48:23 -0700
Subject: [PATCH 083/829] creating a Config._initBlocklist() method

---
 extension/modules/config/config.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index cb5a0b6d..075ef693 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -33,6 +33,7 @@ function Config(aBaseDir) {
   (this._blocklistFile = this._scriptDir).append(SCRIPTISH_BLOCKLIST);
 
   this._initScriptDir();
+  this._initBlocklist();
 
   [
     "scriptish-script-installed",
@@ -320,7 +321,9 @@ Config.prototype = {
     var dir = this._scriptDir;
     if (!dir.exists())
       dir.create(Ci.nsIFile.DIRECTORY_TYPE, 0755);
+  },
 
+  _initBlocklist: function() {
     if (!this._useBlocklist) return;
 
     // Try to fetch a new list if blocklist is enabled and some time has passed

From c4cae3a409a89ad662a5b4ed349382dbea1a1952 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 26 May 2011 08:24:00 -0700
Subject: [PATCH 084/829] Closes #252 testing timeout

---
 extension/content/test/runTests.js            | 20 +++++
 .../testAboutScriptishOpenedFR.js             |  2 +-
 .../tests/testGeneral/testTimeout.js          | 75 +++++++++++++++++++
 3 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 tests/mozmill-tests/tests/testGeneral/testTimeout.js

diff --git a/extension/content/test/runTests.js b/extension/content/test/runTests.js
index cdff6fba..ffffac89 100644
--- a/extension/content/test/runTests.js
+++ b/extension/content/test/runTests.js
@@ -115,4 +115,24 @@ function runTests() {
     ok(!!tools_menu, "Tools menu exists");
     equal(scriptish_menu.parentNode, tools_menu, "The Scriptish menu is a child of the Tools menu");
   });
+
+  test("Test timeout", function() {
+    expect(1);
+    stop();
+
+    try {
+      var success = false;
+      timeout(function() {
+        ok((success = true), "timeout success");
+        start();
+      });
+      setTimeout(function() {
+        ok(false, "timeout error: timeout");
+        start();
+      }, 500);
+    } catch (e) {
+      ok(false, "timeout error: " + e);
+      start();
+    }
+  });
 }
diff --git a/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishOpenedFR.js b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishOpenedFR.js
index 247c99ab..30545d1b 100644
--- a/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishOpenedFR.js
+++ b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishOpenedFR.js
@@ -46,5 +46,5 @@ var testAboutScriptishOpened = function() {
 
   controller.assert(function() {
     return results.length === 1;
-  }, "Only one about:scriptish tab was opened", 2000);
+  }, "Only one about:scriptish tab was opened");
 }
diff --git a/tests/mozmill-tests/tests/testGeneral/testTimeout.js b/tests/mozmill-tests/tests/testGeneral/testTimeout.js
new file mode 100644
index 00000000..6436b2b4
--- /dev/null
+++ b/tests/mozmill-tests/tests/testGeneral/testTimeout.js
@@ -0,0 +1,75 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Scriptish mozmill test suite.
+ *
+ * The Initial Developer of the Original Code is Erik Vold.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Erik Vold <erikvvold@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+Components.utils.import("resource://scriptish/constants.js");
+
+var setupModule = function(module) {
+  module.controller = mozmill.getBrowserController();
+}
+
+//Test that timeout works
+var testTimeoutExists = function() {
+  controller.assert(
+     function() { return !!timeout; },
+     "Test timeout exists",
+     50);
+}
+
+// Test that timeout works
+var testTimeoutDefault = function() {
+  var success = false;
+  timeout(function() {
+    success = true;
+  });
+
+  controller.waitFor(
+      function() { return success; },
+      "Test timeout works with default",
+      250, 10);
+}
+
+//Test that timeout works
+var testTimeoutWithParam = function() {
+  var success = false;
+  timeout(function() {
+   success = true;
+  }, 50);
+
+  controller.waitFor(
+     function() { return success; },
+     "Test timeout works with a param",
+     250, 10);
+}

From 5fcc3322f7baded4b62125e0f515bc317f4e9639 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 28 May 2011 14:39:00 -0700
Subject: [PATCH 085/829] bug fix: save was occuring too soon when a script was
 modified (introduced in 7aa3b69c951703f3f18f4aa558fd92ac5e95ea72)

---
 extension/modules/config/config.js           | 7 ++-----
 extension/modules/script/script.js           | 4 ++--
 extension/modules/script/scriptdownloader.js | 3 ---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 075ef693..3ffe0e82 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -366,15 +366,14 @@ Config.prototype = {
 
   updateModifiedScripts: function(scriptInjector) {
     var self = this;
-    let hasChanged = false;
+
     for (let [, script] in Iterator(this._scripts)) {
       if (script.delayInjection) {
         script.delayedInjectors.push(scriptInjector);
         continue;
       }
-      if (!script.isModified()) continue;
 
-      hasChanged = true;
+      if (!script.isModified()) continue;
 
       let theScript = script;
       theScript.getTextContent(function(content) {
@@ -384,8 +383,6 @@ Config.prototype = {
         theScript.updateFromNewScript(parsedScript, scriptInjector);
       });
     }
-
-    if (hasChanged) this._save();
   },
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver])
 }
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 06aa6303..a889ec4d 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -438,7 +438,7 @@ Script.prototype = {
   get runAt() this["_run-at"] || defaultRunAt,
   useDelayedInjectors: function() {
     this.delayInjection = false;
-    Scriptish.notify(this, "scriptish-script-modified", {saved: false, reloadUI: true});
+    Scriptish.notify(this, "scriptish-script-modified", {saved: true, reloadUI: true});
     for (let [, injector] in Iterator(this.delayedInjectors)) injector(this);
     this.delayedInjectors = [];
   },
@@ -663,7 +663,7 @@ Script.prototype = {
         // Redownload dependencies.
         tools.Scriptish_configDownloader.refetchDependencies(this);
       } else {
-        Scriptish.notify(this, "scriptish-script-modified", {saved: false, reloadUI: true});
+        Scriptish.notify(this, "scriptish-script-modified", {saved: true, reloadUI: true});
       }
     }
     if (oldPriority != newPriority) this._config.sortScripts();
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 4201d299..c6dba185 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -304,9 +304,6 @@ ScriptDownloader.prototype.finishInstall = function() {
   if (this.updateScript) {
     // Inject the script now that we have the new dependencies
     this.script.useDelayedInjectors();
-
-    // Save new values to config.xml
-    Scriptish.notify(null, "scriptish-config-saved", null);
   } else if (this.installOnCompletion_) {
     this.installScript();
   } else if (this.scriptInstaller) {

From 1839dd64227b2d69ec37cb3700f49c2b64ad4945 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 28 May 2011 14:48:48 -0700
Subject: [PATCH 086/829] bug fix: not loading jsversion from JSON config
 (introduced in 7aa3b69c951703f3f18f4aa558fd92ac5e95ea72)

---
 extension/modules/script/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index a889ec4d..e6e24baa 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1054,7 +1054,7 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
   script._updateURL = aSkeleton.updateURL;
   script._homepageURL = aSkeleton.homepageURL;
   script.supportURL = aSkeleton.supportURL;
-  script.jsversion = aSkeleton.jsversion;
+  script._jsversion = aSkeleton.jsversion;
   script["_run-at"] = aSkeleton["run-at"];
   script.includesDisabled = aSkeleton.includesDisabled;
 

From 69ef5a33aa549e6c25e146395561185fac96343e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 28 May 2011 21:18:55 -0700
Subject: [PATCH 087/829] bug fix: was never updating USO review data because
 loop thru scripts was occuring before scripts array was built, also need to
 save after updating USO data.

---
 extension/modules/config/config.js | 32 +++++++++++++++---------------
 extension/modules/script/script.js |  2 ++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 3ffe0e82..29581a75 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -196,6 +196,22 @@ Config.prototype = {
     var self = this;
 
     function callback(fileModified) {
+      // Try to fetch uso usage data if some time has passed
+      let interval = Scriptish_prefRoot.getValue("update.uso.interval");
+      let lastFetch = Scriptish_prefRoot.getValue("update.uso.lastFetch");
+      let now = Math.ceil(Date.now() / 1E3);
+      if (now - lastFetch >= interval) {
+        Scriptish_prefRoot.setValue("update.uso.lastFetch", now);
+
+        // Fetch uso data
+        let scripts = self._scripts;
+        for (var i = scripts.length - 1; ~i; i--) {
+          let script = scripts[i];
+          if (!script.blocked && script.isUSOScript())
+            timeout(script.updateUSOData.bind(script), i * 100);
+        }
+      }
+
       if (fileModified) self._save();
       aCallback();
     }
@@ -231,22 +247,6 @@ Config.prototype = {
 
     // Load the blocklist
     if (this._useBlocklist) this._loadBlocklist();
-
-    // Try to fetch uso usage data if some time has passed
-    let interval = Scriptish_prefRoot.getValue("update.uso.interval");
-    let lastFetch = Scriptish_prefRoot.getValue("update.uso.lastFetch");
-    let now = Math.ceil(Date.now() / 1E3);
-    if (now - lastFetch >= interval) {
-      Scriptish_prefRoot.setValue("update.uso.lastFetch", now);
-
-      // Fetch uso data
-      let scripts = this._scripts;
-      for (var i = scripts.length - 1; ~i; i--) {
-        let script = scripts[i];
-        if (!script.blocked && script.isUSOScript())
-          timeout(script.updateUSOData.bind(script), i * 100);
-      }
-    }
   },
 
   toJSON: function() ({
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index ae1f61bc..10bba100 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -195,6 +195,8 @@ Script.prototype = {
       script.reviewCount = data["uso:reviews"][0] * 1;
       script.averageRating = data["uso:rating"][0] * 1;
       script.totalDownloads = data["uso:installs"][0] * 1;
+
+      Scriptish.notify(null, "scriptish-config-saved", null);
     }
     req.send(null);
   },

From f174b549ae0cf2ff7c716ec7f7fb08a163edb9d0 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 28 May 2011 22:25:16 -0700
Subject: [PATCH 088/829] Removing the IRC and StatusNet links from the
 README.txt for now

---
 README.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.txt b/README.txt
index a07808e8..b25d50d1 100644
--- a/README.txt
+++ b/README.txt
@@ -17,6 +17,4 @@ Links
 * Wiki:                     http://github.com/erikvold/scriptish/wiki
 * Issues:                   http://github.com/erikvold/scriptish/issues
 * Google Group:             http://groups.google.com/group/scriptish
-* IRC:                      irc://irc.freenode.net/scriptish
-* StatusNet                 http://identi.ca/scriptish
 * Source Code:              http://github.com/erikvold/scriptish

From 48ff5160fa415e33adec84bdc4d161b321159120 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 26 May 2011 19:06:57 -0500
Subject: [PATCH 089/829] Better handle corrupt/missing config files,
 specifically using an intermediate file during config saves.

---
 extension/modules/config/config.js | 74 ++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 24 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 29581a75..3ac85b93 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -25,6 +25,7 @@ function Config(aBaseDir) {
   this._excludeRegExps = [];
   this._scripts = [];
   this._scriptFoldername = aBaseDir;
+  (this._tempFile = this._scriptDir).append(SCRIPTISH_CONFIG_JSON + ".tmp");
 
   this._useBlocklist = Scriptish_prefRoot.getValue("blocklist.enabled");
   this._blocklistURL = Scriptish_prefRoot.getValue("blocklist.url");
@@ -152,17 +153,18 @@ Config.prototype = {
     Scriptish_log("Scriptish Config._loadXML");
     var self = this;
 
+    if (!aFile.exists()) return aCallback(false);
+
     Scriptish_getContents(aFile, 0, function(str) {
-      if (!str) return;
+      if (!str) return aCallback(false);
       var doc = Instances.dp.parseFromString(str, "text/xml");
       var nodes = doc.evaluate("/UserScriptConfig/Script | /UserScriptConfig/Exclude", doc, null, 0, null);
-      var fileModified = false;
       let excludes = [];
 
       for (var node; node = nodes.iterateNext();) {
         switch (node.nodeName) {
         case "Script":
-          fileModified = Script.loadFromXML(self, node) || fileModified;
+          Script.loadFromXML(self, node);
           break;
         case "Exclude":
           excludes.push(node.firstChild.nodeValue.trim());
@@ -171,7 +173,7 @@ Config.prototype = {
       }
       self.addExclude(excludes);
 
-      // Return true so we create SCRIPTISH_CONFIG_JSON
+      // load() will force a JSON save
       aCallback(true);
     });
   },
@@ -179,15 +181,24 @@ Config.prototype = {
   _loadJSON: function(aFile, aCallback) {
     Scriptish_log("Scriptish Config._loadJSON");
     var self = this;
+    var config = {};
 
-    Scriptish_getContents(aFile, 0, function(str) {
-      if (!str) return;
-      var config = JSON.parse(str);
+    if (!aFile.exists()) return aCallback(false);
 
+    Scriptish_getContents(aFile, 0, function(str) {
+      if (!str) return aCallback(false);
+      try {
+        config = JSON.parse(str);
+        if (aFile == self._tempFile)
+          self._tempFile.moveTo(null, SCRIPTISH_CONFIG_JSON);
+      } catch(e) {
+        // Unable to parse the file.
+        Scriptish_log("Unable to load JSON file: " + aFile.leafName);
+        return aCallback(false);
+      }
       config.scripts.forEach(function(i) Script.loadFromJSON(self, i));
       config.excludes.forEach(function(i) self.addExclude(i));
-
-      aCallback(false);
+      aCallback(true);
     });
   },
 
@@ -217,20 +228,31 @@ Config.prototype = {
     }
 
     let (configFile = this._scriptDir) {
+      // Scriptish JSON
       configFile.append(SCRIPTISH_CONFIG_JSON);
-
-      if (configFile.exists()) {
-        this._loadJSON(configFile, callback);
-      } else {
-        (configFile = this._scriptDir).append(SCRIPTISH_CONFIG_XML);
-
-        if (!configFile.exists())
-          (configFile = this._scriptDir).append("config.xml");
-
-        // load xml config
-        if (configFile.exists()) this._loadXML(configFile, callback);
-        else aCallback();
-      }
+      this._loadJSON(configFile, function(aSuccess) {
+        if (aSuccess) return callback();
+
+        // Scriptish JSON tmp
+        self._loadJSON(self._tempFile, function(aSuccess) {
+          if (aSuccess) return callback();
+
+          // Scriptish XML
+          (configFile = self._scriptDir).append(SCRIPTISH_CONFIG_XML);
+          self._loadXML(configFile, function(aSuccess) {
+            // If valid XML, always save to create SCRIPTISH_CONFIG_JSON
+            if (aSuccess) return callback(true);
+
+            // Older XML
+            (configFile = self._scriptDir).append("config.xml");
+            self._loadXML(configFile, function(aSuccess) {
+              // If valid XML, always save to create SCRIPTISH_CONFIG_JSON
+              if (aSuccess) return callback(true);
+              return aCallback();
+            });
+          });
+        });
+      });
     }
 
     // Listen for the blocklist pref being modified
@@ -270,15 +292,19 @@ Config.prototype = {
     // make sure that the configFile is SCRIPTISH_CONFIG_JSON
     (this._configFile = this._scriptDir).append(SCRIPTISH_CONFIG_JSON);
 
-    Scriptish_log(Scriptish_stringBundle("saving") + " " + SCRIPTISH_CONFIG_JSON, true);
+    Scriptish_log(
+        Scriptish_stringBundle("saving") + " " + self._tempFile.leafName, true);
 
     let converter = Instances.suc;
     converter.charset = "UTF-8";
     NetUtil.asyncCopy(
         converter.convertToInputStream(JSON.stringify(this.toJSON())),
-        Scriptish_getWriteStream(this._configFile, true),
+        Scriptish_getWriteStream(this._tempFile, true),
         function() {
           delete self["_isSaving"];
+          Scriptish_log("Moving " + self._tempFile.leafName
+              + " to " + SCRIPTISH_CONFIG_JSON);
+          self._tempFile.moveTo(null, SCRIPTISH_CONFIG_JSON);
           if (self._pendingSave) {
             delete self["_pendingSave"];
             self._save();

From 26a73ffa5a03308834c412ae44333a9e2d054a1e Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 29 May 2011 08:07:59 -0500
Subject: [PATCH 090/829] bug fixes: don't use the same tempFile reference,
 properly compare files

---
 extension/modules/config/config.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 3ac85b93..513539ff 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -25,7 +25,6 @@ function Config(aBaseDir) {
   this._excludeRegExps = [];
   this._scripts = [];
   this._scriptFoldername = aBaseDir;
-  (this._tempFile = this._scriptDir).append(SCRIPTISH_CONFIG_JSON + ".tmp");
 
   this._useBlocklist = Scriptish_prefRoot.getValue("blocklist.enabled");
   this._blocklistURL = Scriptish_prefRoot.getValue("blocklist.url");
@@ -189,8 +188,8 @@ Config.prototype = {
       if (!str) return aCallback(false);
       try {
         config = JSON.parse(str);
-        if (aFile == self._tempFile)
-          self._tempFile.moveTo(null, SCRIPTISH_CONFIG_JSON);
+        if (aFile.equals(self._tempFile))
+          aFile.moveTo(null, SCRIPTISH_CONFIG_JSON);
       } catch(e) {
         // Unable to parse the file.
         Scriptish_log("Unable to load JSON file: " + aFile.leafName);
@@ -289,22 +288,21 @@ Config.prototype = {
 
     this._isSaving = true;
 
-    // make sure that the configFile is SCRIPTISH_CONFIG_JSON
-    (this._configFile = this._scriptDir).append(SCRIPTISH_CONFIG_JSON);
+    let tempFile = self._tempFile;
 
     Scriptish_log(
-        Scriptish_stringBundle("saving") + " " + self._tempFile.leafName, true);
+        Scriptish_stringBundle("saving") + " " + tempFile.leafName, true);
 
     let converter = Instances.suc;
     converter.charset = "UTF-8";
     NetUtil.asyncCopy(
         converter.convertToInputStream(JSON.stringify(this.toJSON())),
-        Scriptish_getWriteStream(this._tempFile, true),
+        Scriptish_getWriteStream(tempFile, true),
         function() {
           delete self["_isSaving"];
-          Scriptish_log("Moving " + self._tempFile.leafName
+          Scriptish_log("Moving " + tempFile.leafName
               + " to " + SCRIPTISH_CONFIG_JSON);
-          self._tempFile.moveTo(null, SCRIPTISH_CONFIG_JSON);
+          tempFile.moveTo(null, SCRIPTISH_CONFIG_JSON);
           if (self._pendingSave) {
             delete self["_pendingSave"];
             self._save();
@@ -342,6 +340,12 @@ Config.prototype = {
 
   get _scriptDir() Scriptish_getProfileFile(this._scriptFoldername),
 
+  get _tempFile() {
+    let tmp = this._scriptDir;
+    tmp.append(SCRIPTISH_CONFIG_JSON + ".tmp");
+    return tmp;
+  },
+
   _initScriptDir: function() {
     // create an empty configuration if none exist.
     var dir = this._scriptDir;

From 7da566bc8b2927aab4b48397b2dfd239648588f0 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 29 May 2011 08:58:40 -0500
Subject: [PATCH 091/829] minor: moving Config getters to the top

---
 extension/modules/config/config.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 513539ff..1ecb0f9a 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -52,6 +52,14 @@ function Config(aBaseDir) {
   Components.utils.import("resource://scriptish/addonprovider.js");
 }
 Config.prototype = {
+  get _scriptDir() Scriptish_getProfileFile(this._scriptFoldername),
+
+  get _tempFile() {
+    let tmp = this._scriptDir;
+    tmp.append(SCRIPTISH_CONFIG_JSON + ".tmp");
+    return tmp;
+  },
+
   observe: function(aSubject, aTopic, aData) {
     var data = JSON.parse(aData || "{}");
     switch(aTopic) {
@@ -338,14 +346,6 @@ Config.prototype = {
     }
   },
 
-  get _scriptDir() Scriptish_getProfileFile(this._scriptFoldername),
-
-  get _tempFile() {
-    let tmp = this._scriptDir;
-    tmp.append(SCRIPTISH_CONFIG_JSON + ".tmp");
-    return tmp;
-  },
-
   _initScriptDir: function() {
     // create an empty configuration if none exist.
     var dir = this._scriptDir;

From cc278a242c3f956525f1b62438777a1c88af1afb Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Wed, 20 Apr 2011 15:16:25 -0400
Subject: [PATCH 092/829] Remove disused GM_log tracing calls.

---
 extension/modules/api/GM_xmlhttpRequester.js | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 3269416d..6bc62fa0 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -23,8 +23,6 @@ function GM_xmlhttpRequester(unsafeContentWin, originUrl, aScript) {
 // can't support mimetype because i think it's only used for forcing
 // text/xml and we can't support that
 GM_xmlhttpRequester.prototype.contentStartRequest = function(details) {
-  Scriptish_log("> GM_xmlhttpRequest.contentStartRequest");
-
   try {
     // Validate and parse the (possibly relative) given URL.
     var uri = NetUtil.newURI(details.url, null, NetUtil.newURI(this.originUrl));
@@ -53,8 +51,6 @@ GM_xmlhttpRequester.prototype.contentStartRequest = function(details) {
       throw new Error(Scriptish_stringBundle("error.api.reqURL.scheme") + ": " + details.url);
   }
 
-  Scriptish_log("< GM_xmlhttpRequest.contentStartRequest");
-
   return {
     abort: function() {
       req.abort();
@@ -66,8 +62,6 @@ GM_xmlhttpRequester.prototype.contentStartRequest = function(details) {
 // that it can access other domains without security warning
 GM_xmlhttpRequester.prototype.chromeStartRequest =
     function(safeUrl, details, req) {
-  Scriptish_log("> GM_xmlhttpRequest.chromeStartRequest");
-
   this.setupRequestEvent(this.unsafeContentWin, req, "onload", details);
   this.setupRequestEvent(this.unsafeContentWin, req, "onerror", details);
   this.setupRequestEvent(
@@ -95,8 +89,6 @@ GM_xmlhttpRequester.prototype.chromeStartRequest =
   var body = details.data ? details.data : null;
   if (details.binary) req.sendAsBinary(body);
   else req.send(body);
-
-  Scriptish_log("< GM_xmlhttpRequest.chromeStartRequest");
 }
 
 // arranges for the specified 'event' on xmlhttprequest 'req' to call the
@@ -104,14 +96,10 @@ GM_xmlhttpRequester.prototype.chromeStartRequest =
 // window's security context.
 GM_xmlhttpRequester.prototype.setupRequestEvent =
     function(unsafeContentWin, req, event, details) {
-  Scriptish_log("> GM_xmlhttpRequester.setupRequestEvent");
-
   var origMimeType = details.overrideMimeType;
 
   if (details[event]) {
     req[event] = function() {
-      Scriptish_log("> GM_xmlhttpRequester -- callback for " + event);
-
       var responseState = {
         // can't support responseXML because security won't
         // let the browser call properties on it
@@ -140,10 +128,6 @@ GM_xmlhttpRequester.prototype.setupRequestEvent =
 
       GM_apiSafeCallback(
           unsafeContentWin, details, details[event], [responseState]);
-
-      Scriptish_log("< GM_xmlhttpRequester -- callback for " + event);
     }
   }
-
-  Scriptish_log("< GM_xmlhttpRequester.setupRequestEvent");
 }

From b35ccd18580a2730632e8b12d166b40e2a299b6a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 29 May 2011 11:28:12 -0700
Subject: [PATCH 093/829] removing logs from Scriptish.getConfig

---
 extension/modules/scriptish.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 08c3a027..5245c762 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -31,12 +31,9 @@ const Scriptish = {
     Services.obs.notifyObservers(null, aTopic, JSON.stringify(aData));
   },
   getConfig: function(aCallback) {
-    Scriptish_log("Scriptish.getConfig");
     if (global.config) {
-      Scriptish_log("Scriptish.getConfig 1");
       aCallback(global.config);
     } else if (!global.configQueue) {
-      Scriptish_log("Scriptish.getConfig 2");
       global.configQueue = [aCallback];
       var tools = {};
       Cu.import("resource://scriptish/config/config.js", tools);
@@ -48,7 +45,6 @@ const Scriptish = {
         delete global["configQueue"];
       });
     } else {
-      Scriptish_log("Scriptish.getConfig 3");
       global.configQueue.push(aCallback);
     }
   },

From e5518fe4844e8432f8311718ab027870dd6a7fc5 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 29 May 2011 11:31:09 -0700
Subject: [PATCH 094/829] removing logs from menucommander.js

---
 extension/modules/menucommander.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/extension/modules/menucommander.js b/extension/modules/menucommander.js
index 25878280..e28ce6d7 100644
--- a/extension/modules/menucommander.js
+++ b/extension/modules/menucommander.js
@@ -135,8 +135,6 @@ Scriptish_MenuCommander.prototype.modifyMenuCommand =
 }
 
 Scriptish_MenuCommander.prototype.attach = function() {
-  Scriptish_log("> Scriptish_MenuCommander.attach");
-
   for (var i = 0; i < this.keys.length; i++)
     this.keyset.appendChild(this.keys[i]);
 
@@ -154,8 +152,6 @@ Scriptish_MenuCommander.prototype.attach = function() {
 }
 
 Scriptish_MenuCommander.prototype.detach = function() {
-  Scriptish_log("> Scriptish_MenuCommander.detach");
-
   for (var i = 0; i < this.keys.length; i++)
     this.keyset.removeChild(this.keys[i]);
 
@@ -181,8 +177,6 @@ Scriptish_MenuCommander.prototype.detach = function() {
 
 Scriptish_MenuCommander.prototype.createMenuItem =
     function(commandUUID, commandName, commandFunc, accessKey) {
-  Scriptish_log("> Scriptish_MenuCommander.createMenuItem");
-
   var menuItem = this.doc.createElement("menuitem");
   menuItem._commandFunc = commandFunc;
   menuItem.setAttribute("uuid", commandUUID);

From 6512b6831da7ff5124b60e1aa88a5eb1e11fa8cd Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 29 May 2011 17:38:52 -0700
Subject: [PATCH 095/829] ignoring .DS_Store files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e44912c7..b84f6673 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ BASE.*
 LOCAL.*
 REMOTE.*
 build
+*.DS_Store
 

From 7e6546353002fc1e639bd0fb08b39fa370b234d6 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 29 May 2011 17:39:55 -0700
Subject: [PATCH 096/829] adding a TODO

---
 extension/modules/scriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 5245c762..82160ede 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -39,7 +39,7 @@ const Scriptish = {
       Cu.import("resource://scriptish/config/config.js", tools);
       let cf = new tools.Config("scriptish_scripts");
       cf.load(function() {
-        Scriptish_log("Scriptish config loaded");
+        Scriptish_log("Scriptish config loaded"); // TODO: force & l10n
         global.config = cf;
         global.configQueue.forEach(function(f) f(cf));
         delete global["configQueue"];

From 4bfcf08c50dd7b8a9444670f60961e6fbbe54a7e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 29 May 2011 17:40:50 -0700
Subject: [PATCH 097/829] - Adding Q - _loadFrom* returns a promise now -
 saving to tmp, saving config, removing tmp; instead of saving to tmp and
 moving tmp

---
 extension/content/js/third-party/q.js |  30 ++++
 extension/modules/config/config.js    | 203 +++++++++++++++-----------
 extension/modules/utils/q.js          |   8 +
 3 files changed, 153 insertions(+), 88 deletions(-)
 create mode 100644 extension/content/js/third-party/q.js
 create mode 100644 extension/modules/utils/q.js

diff --git a/extension/content/js/third-party/q.js b/extension/content/js/third-party/q.js
new file mode 100644
index 00000000..cd4451e6
--- /dev/null
+++ b/extension/content/js/third-party/q.js
@@ -0,0 +1,30 @@
+/*
+Copyright 2009, 2010 Kristopher Michael Kowal. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+
+https://github.com/kriskowal/q/
+*/
+(function(d,f){function k(a){return a}function l(){var a=[],b,c=m(g.prototype);c.promiseSend=function(){var c=Array.prototype.slice.call(arguments);a?a.push(c):n.apply(f,[b].concat(c))};c.valueOf=function(){if(a)return c;return h(b)};var d=function(c){var d;if(a){b=j(c);c=0;for(d=a.length;c<d;++c)n.apply(f,[b].concat(a[c]));a=f;return b}};return{promise:q(c),resolve:d,reject:function(a){return d(e(a))}}}function g(a,b,c){b===f&&(b=function(a){return e("Promise does not support operation: "+a)});var d=
+m(g.prototype);d.promiseSend=function(c,d){var e=Array.prototype.slice.call(arguments,2),e=a[c]?a[c].apply(a,e):b.apply(a,[c].concat(e)),d=d||k;return d(e)};if(c)d.valueOf=c;return q(d)}function o(a){return a&&typeof a.promiseSend==="function"}function u(a){return!o(h(a))&&!r(a)}function r(a){a=h(a);if(a===f||a===null)return!1;return!!a.promiseRejected}function e(a){return g({when:function(b){return b?b(a):e(a)}},function(){return e(a)},function(){var b=m(e.prototype);b.promiseRejected=!0;b.reason=
+a;return b})}function j(a){if(o(a))return a;if(a&&typeof a.then==="function")return g({},function(b){return b!=="when"?Q.when(a,function(a){return Q.ref(a).promiseSend.apply(null,arguments)}):(b=l(),a.then(b.resolve,b.reject),b.promise)});return g({when:function(){return a},get:function(b){if(a===f||a===null)return e("Cannot access property "+b+" of "+a);return a[b]},put:function(b,c){if(a===f||a===null)return e("Cannot set property "+b+" of "+a+" to "+c);return a[b]=c},del:function(b){if(a===f||
+a===null)return e("Cannot delete property "+b+" of "+a);return delete a[b]},post:function(b,c){if(a===f||a===null)return e(""+a+" has no methods");var d=a[b];if(!d)return e("No such method "+b+" on object "+a);if(!d.apply)return e("Property "+b+" on object "+a+" is not a method");return a[b].apply(a,c)},keys:function(){return Object.keys(a)}},f,function(){return a})}function s(a,b,c){function d(a){try{return b?b(a):a}catch(c){return typeof process!=="undefined"?process.emit("uncaughtException",c):
+v(c&&c.stack||c),e(c)}}function f(a){try{return c?c(a):e(a)}catch(b){return v(b&&b.stack||b),e(b)}}var g=l(),h=!1;n(j(a),"when",function(a){h||(h=!0,g.resolve(j(a).promiseSend("when",d,f)))},function(a){h||(h=!0,g.resolve(f(a)))});return g.promise}function i(a){return function(b){var c=Array.prototype.slice.call(arguments,1);return t.apply(f,[b,a].concat(c))}}function t(a,b){var c=l(),d=Array.prototype.slice.call(arguments,2);n.apply(f,[j(a),b,c.resolve].concat(d));return c.promise}function n(a){var b=
+Array.prototype.slice.call(arguments,1);p(function(){a.promiseSend.apply(a,b)})}var p;try{p=require("event-queue").enqueue}catch(x){p=function(a){setTimeout(a,0)}}var q=Object.freeze||k,m=Object.create||function(a){var b=function(){};b.prototype=a;return new b},v=typeof console==="undefined"?k:function(a){console.log(a)};d.enqueue=p;d.defer=l;d.makePromise=g;g.prototype.then=function(a,b){return s(this,a,b)};g.prototype.toSource=function(){return this.toString()};g.prototype.toString=function(){return"[object Promise]"};
+q(g.prototype);d.isPromise=o;d.isResolved=function(a){return!o(h(a.valueOf()))};d.isFulfilled=u;d.isRejected=r;d.reject=e;e.prototype=m(g.prototype,{constructor:{value:e}});d.ref=j;d.def=function(a){return g({isDef:function(){}},function(){var b=Array.prototype.slice.call(arguments);return t.apply(f,[a].concat(b))},function(){return a.valueOf()})};d.when=s;d.asap=function(a,b,c){b=b||k;if(u(a))return h(b(h(a)));else if(r(a))if(a=a.valueOf().reason,c)return c(a);else throw a;else return s(a,b,c)};
+var h=function(a){return a===f||a===null?a:a.valueOf()};d.Method=i;d.send=t;d.get=i("get");d.put=i("put");d.del=i("del");var w=d.post=i("post");d.invoke=function(a,b){var c=Array.prototype.slice.call(arguments,2);return w(a,b,c)};d.keys=i("keys");d.error=function(a){throw a;}})(typeof exports!=="undefined"?exports:Q={});
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 1ecb0f9a..f2954d3e 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -15,6 +15,7 @@ inc("resource://scriptish/utils/Scriptish_getProfileFile.js");
 inc("resource://scriptish/utils/Scriptish_stringBundle.js");
 inc("resource://scriptish/utils/Scriptish_convert2RegExp.js");
 inc("resource://scriptish/utils/Scriptish_cryptoHash.js");
+inc("resource://scriptish/utils/q.js");
 inc("resource://scriptish/script/script.js");
 })(Components.utils.import);
 
@@ -156,77 +157,99 @@ Config.prototype = {
     }
   },
 
-  _loadXML: function(aFile, aCallback) {
+  _loadXML: function(aFile) {
     Scriptish_log("Scriptish Config._loadXML");
     var self = this;
-
-    if (!aFile.exists()) return aCallback(false);
-
-    Scriptish_getContents(aFile, 0, function(str) {
-      if (!str) return aCallback(false);
-      var doc = Instances.dp.parseFromString(str, "text/xml");
-      var nodes = doc.evaluate("/UserScriptConfig/Script | /UserScriptConfig/Exclude", doc, null, 0, null);
-      let excludes = [];
-
-      for (var node; node = nodes.iterateNext();) {
-        switch (node.nodeName) {
-        case "Script":
-          Script.loadFromXML(self, node);
-          break;
-        case "Exclude":
-          excludes.push(node.firstChild.nodeValue.trim());
-          break;
+    var deferred = Q.defer();
+
+    if (aFile.exists()) {
+      Scriptish_getContents(aFile, 0, function(str) {
+        if (!str) return timeout(function() deferred.reject(false));
+
+        var doc = Instances.dp.parseFromString(str, "text/xml");
+        // TODO: deal with unparsable xml
+        var nodes = doc.evaluate("/UserScriptConfig/Script | /UserScriptConfig/Exclude", doc, null, 0, null);
+        let excludes = [];
+
+        for (var node; node = nodes.iterateNext();) {
+          switch (node.nodeName) {
+          case "Script":
+            Script.loadFromXML(self, node);
+            break;
+          case "Exclude":
+            excludes.push(node.firstChild.nodeValue.trim());
+            break;
+          }
         }
-      }
-      self.addExclude(excludes);
+        self.addExclude(excludes);
 
-      // load() will force a JSON save
-      aCallback(true);
-    });
+        deferred.resolve(true); // force a save
+      });
+    } else {
+      timeout(function() deferred.reject(false));
+    }
+
+    return deferred.promise;
   },
 
-  _loadJSON: function(aFile, aCallback) {
+  _loadJSON: function(aFile) {
     Scriptish_log("Scriptish Config._loadJSON");
     var self = this;
     var config = {};
+    var deferred = Q.defer();
 
-    if (!aFile.exists()) return aCallback(false);
+    if (aFile.exists()) {
+      Scriptish_getContents(aFile, 0, function(str) {
+        if (!str) return timeout(function() deferred.reject(false));
 
-    Scriptish_getContents(aFile, 0, function(str) {
-      if (!str) return aCallback(false);
-      try {
-        config = JSON.parse(str);
-        if (aFile.equals(self._tempFile))
-          aFile.moveTo(null, SCRIPTISH_CONFIG_JSON);
-      } catch(e) {
-        // Unable to parse the file.
-        Scriptish_log("Unable to load JSON file: " + aFile.leafName);
-        return aCallback(false);
-      }
-      config.scripts.forEach(function(i) Script.loadFromJSON(self, i));
-      config.excludes.forEach(function(i) self.addExclude(i));
-      aCallback(true);
-    });
+        try {
+          config = JSON.parse(str);
+        } catch(e) {
+          // Unable to parse the file.
+          return deferred.reject(e);
+        }
+
+        // load scripts
+        var fileModified = false, scripts = config.scripts;
+        for (var i = scripts.length - 1; ~i; i--)
+          fileModified = Script.loadFromJSON(self, scripts[i]) || fileModified;
+
+        // load global excludes
+        config.excludes.forEach(function(i) self.addExclude(i));
+
+        deferred.resolve(fileModified);
+      });
+    } else {
+      timeout(function() deferred.reject(false));
+    }
+
+    return deferred.promise;
   },
 
   load: function(aCallback) {
     Scriptish_log("Scriptish Config.load");
     var self = this;
 
+    // called after the config has been loaded
     function callback(fileModified) {
-      // Try to fetch uso usage data if some time has passed
-      let interval = Scriptish_prefRoot.getValue("update.uso.interval");
-      let lastFetch = Scriptish_prefRoot.getValue("update.uso.lastFetch");
-      let now = Math.ceil(Date.now() / 1E3);
-      if (now - lastFetch >= interval) {
-        Scriptish_prefRoot.setValue("update.uso.lastFetch", now);
-
-        // Fetch uso data
-        let scripts = self._scripts;
-        for (var i = scripts.length - 1; ~i; i--) {
-          let script = scripts[i];
-          if (!script.blocked && script.isUSOScript())
-            timeout(script.updateUSOData.bind(script), i * 100);
+      let scripts = self._scripts;
+      let len = scripts.length;
+
+      // Improves first-run startup time to punt this until a script is installed
+      if (len) {
+        // Try to fetch uso usage data if some time has passed
+        let interval = Scriptish_prefRoot.getValue("update.uso.interval");
+        let lastFetch = Scriptish_prefRoot.getValue("update.uso.lastFetch");
+        let now = Math.ceil(Date.now() / 1E3);
+        if (now - lastFetch >= interval) {
+          Scriptish_prefRoot.setValue("update.uso.lastFetch", now);
+
+          // Fetch uso data
+          for (var i = len - 1; ~i; i--) {
+            let script = scripts[i];
+            if (!script.blocked && script.isUSOScript())
+              timeout(script.updateUSOData.bind(script), i * 100);
+          }
         }
       }
 
@@ -234,33 +257,30 @@ Config.prototype = {
       aCallback();
     }
 
-    let (configFile = this._scriptDir) {
-      // Scriptish JSON
-      configFile.append(SCRIPTISH_CONFIG_JSON);
-      this._loadJSON(configFile, function(aSuccess) {
-        if (aSuccess) return callback();
-
-        // Scriptish JSON tmp
-        self._loadJSON(self._tempFile, function(aSuccess) {
-          if (aSuccess) return callback();
-
-          // Scriptish XML
-          (configFile = self._scriptDir).append(SCRIPTISH_CONFIG_XML);
-          self._loadXML(configFile, function(aSuccess) {
-            // If valid XML, always save to create SCRIPTISH_CONFIG_JSON
-            if (aSuccess) return callback(true);
-
-            // Older XML
-            (configFile = self._scriptDir).append("config.xml");
-            self._loadXML(configFile, function(aSuccess) {
-              // If valid XML, always save to create SCRIPTISH_CONFIG_JSON
-              if (aSuccess) return callback(true);
-              return aCallback();
-            });
-          });
+    // Load the config (trying from various sources)
+    var configFile;
+    // source: Scriptish JSON tmp
+    self._loadJSON(self._tempFile).then(function() {
+      callback(true);  // need to force save here
+    }, function(aErr) {
+      if ("boolean" != typeof aErr) {
+        // the tmp file exists but is corrupt, so force save
+        callback = callback.bind(null, true);
+      }
+
+      // source: Scriptish JSON
+      (configFile = self._scriptDir).append(SCRIPTISH_CONFIG_JSON);
+      self._loadJSON(configFile).then(callback, function() {
+        // source: Scriptish XML
+        (configFile = self._scriptDir).append(SCRIPTISH_CONFIG_XML);
+        self._loadXML(configFile).then(callback, function() {
+          // source: Older GM Style XML
+          (configFile = self._scriptDir).append("config.xml");
+          self._loadXML(configFile).then(
+              callback, (function() callback(true)));
         });
       });
-    }
+    });
 
     // Listen for the blocklist pref being modified
     Scriptish_prefRoot.watch("blocklist.enabled", function() {
@@ -298,23 +318,30 @@ Config.prototype = {
 
     let tempFile = self._tempFile;
 
+    // make sure that the configFile is SCRIPTISH_CONFIG_JSON
+    (this._configFile = this._scriptDir).append(SCRIPTISH_CONFIG_JSON);
+
     Scriptish_log(
-        Scriptish_stringBundle("saving") + " " + tempFile.leafName, true);
+        Scriptish_stringBundle("saving") + " " + SCRIPTISH_CONFIG_JSON, true);
 
     let converter = Instances.suc;
     converter.charset = "UTF-8";
+    let json = JSON.stringify(this.toJSON());
     NetUtil.asyncCopy(
-        converter.convertToInputStream(JSON.stringify(this.toJSON())),
+        converter.convertToInputStream(json),
         Scriptish_getWriteStream(tempFile, true),
         function() {
-          delete self["_isSaving"];
-          Scriptish_log("Moving " + tempFile.leafName
-              + " to " + SCRIPTISH_CONFIG_JSON);
-          tempFile.moveTo(null, SCRIPTISH_CONFIG_JSON);
-          if (self._pendingSave) {
-            delete self["_pendingSave"];
-            self._save();
-          }
+          NetUtil.asyncCopy(
+                converter.convertToInputStream(json),
+                Scriptish_getWriteStream(self._configFile, true),
+                function() {
+                  tempFile.remove(true);
+                  delete self["_isSaving"];
+                  if (self._pendingSave) {
+                    delete self["_pendingSave"];
+                    self._save();
+                  }
+                });
         });
   },
 
diff --git a/extension/modules/utils/q.js b/extension/modules/utils/q.js
new file mode 100644
index 00000000..2d04954d
--- /dev/null
+++ b/extension/modules/utils/q.js
@@ -0,0 +1,8 @@
+var EXPORTED_SYMBOLS = ["Q"];
+
+Components.utils.import("resource://scriptish/constants.js");
+
+const setTimeout = timeout;
+
+Services.scriptloader
+    .loadSubScript("chrome://scriptish/content/js/third-party/q.js", this);

From d1e786f27d89f4c1297408b38d64a695e37efd1b Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 29 May 2011 20:32:07 -0500
Subject: [PATCH 098/829] minor fix: Wait until the config has loaded before
 loading the blocklist.

---
 extension/modules/config/config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index f2954d3e..d8141f6f 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -253,6 +253,9 @@ Config.prototype = {
         }
       }
 
+      // Load the blocklist
+      if (self._useBlocklist) self._loadBlocklist();
+
       if (fileModified) self._save();
       aCallback();
     }
@@ -293,9 +296,6 @@ Config.prototype = {
         self._blocklist = {};
       }
     });
-
-    // Load the blocklist
-    if (this._useBlocklist) this._loadBlocklist();
   },
 
   toJSON: function() ({

From 6800caeab16f07bb18d41f71c358131b18cffc79 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 29 May 2011 20:56:54 -0500
Subject: [PATCH 099/829] Closes #321 Detect XML parsing errors. (cherry picked
 from commit 09befa100769fe72fc67d27009edae1340d8f965)

---
 extension/modules/config/config.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index d8141f6f..797944b1 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -167,7 +167,11 @@ Config.prototype = {
         if (!str) return timeout(function() deferred.reject(false));
 
         var doc = Instances.dp.parseFromString(str, "text/xml");
-        // TODO: deal with unparsable xml
+
+        // Stop if there was a parsing error
+        if (doc.documentElement.nodeName == "parsererror")
+          return timeout(function() deferred.reject(false));
+
         var nodes = doc.evaluate("/UserScriptConfig/Script | /UserScriptConfig/Exclude", doc, null, 0, null);
         let excludes = [];
 

From 338906bed5de3368028fa877aaff0479b43e9300 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 30 May 2011 13:16:19 -0700
Subject: [PATCH 100/829] moving QUnit files in to
 /content/js/third-party/qunit/

---
 extension/content/aboutScriptish.html                      | 2 +-
 extension/content/js/aboutScriptish.js                     | 4 ++--
 extension/content/{test => js/third-party/qunit}/qunit.css | 0
 extension/content/{test => js/third-party/qunit}/qunit.js  | 0
 extension/content/{test => tests}/runTests.js              | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename extension/content/{test => js/third-party/qunit}/qunit.css (100%)
 rename extension/content/{test => js/third-party/qunit}/qunit.js (100%)
 rename extension/content/{test => tests}/runTests.js (100%)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 38c8b867..1940b9a6 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -5,7 +5,7 @@
   <base href="chrome://scriptish/content"/>
   <link rel="icon" href="../skin/scriptish16.png"/>
   <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
-  <link rel="stylesheet" href="test/qunit.css" type="text/css" media="screen"/>
+  <link rel="stylesheet" href="js/third-party/qunit/qunit.css" type="text/css" media="screen"/>
   <script src="js/aboutScriptish.js"></script>
 </head>
 
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index ed9a7f37..34c0e701 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -14,8 +14,8 @@ function $(aID) document.getElementById(aID);
       head.appendChild(script);
     }
 
-    include("test/qunit.js", function() {
-      include("test/runTests.js", function() {
+    include("js/third-party/qunit/qunit.js", function() {
+      include("tests/runTests.js", function() {
         $("main").style.display = "none";
         $("test").style.display = "inherit";
         runTests();
diff --git a/extension/content/test/qunit.css b/extension/content/js/third-party/qunit/qunit.css
similarity index 100%
rename from extension/content/test/qunit.css
rename to extension/content/js/third-party/qunit/qunit.css
diff --git a/extension/content/test/qunit.js b/extension/content/js/third-party/qunit/qunit.js
similarity index 100%
rename from extension/content/test/qunit.js
rename to extension/content/js/third-party/qunit/qunit.js
diff --git a/extension/content/test/runTests.js b/extension/content/tests/runTests.js
similarity index 100%
rename from extension/content/test/runTests.js
rename to extension/content/tests/runTests.js

From 397582c6a52898cf7a98727eab4505ed30d83050 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 30 May 2011 18:25:02 -0700
Subject: [PATCH 101/829] moving QUnit tests to separate files

---
 extension/content/js/aboutScriptish.js       |  14 +-
 extension/content/tests/runTests.js          | 139 +------------------
 extension/content/tests/testAvailability.js  |  78 +++++++++++
 extension/content/tests/testCryptoHash.js    |  15 ++
 extension/content/tests/testTimeout.js       |  24 ++++
 extension/content/tests/testToolsMenuItem.js |  16 +++
 6 files changed, 143 insertions(+), 143 deletions(-)
 create mode 100644 extension/content/tests/testAvailability.js
 create mode 100644 extension/content/tests/testCryptoHash.js
 create mode 100644 extension/content/tests/testTimeout.js
 create mode 100644 extension/content/tests/testToolsMenuItem.js

diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index 34c0e701..9b01a0d3 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -2,18 +2,16 @@ const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 
 function $(aID) document.getElementById(aID);
+function include(aSrc, aCallback) {
+    var script = document.createElement("script");
+    script.src = aSrc;
+    script.addEventListener("load", aCallback, false);
+    document.documentElement.firstChild.appendChild(script);
+  }
 
 (function() {
   // Show about:scriptish?test
   if (window.location.href.split("?")[1] == "test") {
-    var head = document.documentElement.firstChild;
-    var include = function(aSrc, aCallback) {
-      var script = document.createElement("script");
-      script.src = aSrc;
-      script.addEventListener("load", aCallback, false);
-      head.appendChild(script);
-    }
-
     include("js/third-party/qunit/qunit.js", function() {
       include("tests/runTests.js", function() {
         $("main").style.display = "none";
diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index ffffac89..c87ba40a 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -1,138 +1,7 @@
 function runTests() {
   var tools = {};
-
-  /**
-   * MODULE: Scriptish Service
-   */
-  module("Scriptish Service");
-
-  test("Availability", function() {
-    expect(2);
-    equals(typeof(Services.scriptish), "object", "Scriptish service is available");
-    equals(typeof(Services.scriptish.shouldLoad), "function", "shouldLoad is available");
-  });
-
-  // TODO: generate fake requests to test
-  test("shouldLoad", function() {
-    expect(0);
-  });
-
-
-  /**
-   * MODULE: Scriptish Utilities
-   */
-  module("Scriptish Utilities");
-  Cu.import("resource://scriptish/utils/Scriptish_alert.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_convert2RegExp.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_createUserScriptSource.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_ExtendedStringBundle.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_findError.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getBinaryContents.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getBrowserForContentWindow.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getContents.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getEditor.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getFirebugConsole.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getProfileFile.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getTempFile.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getTLDURL.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getUriFromFile.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getURLsForContentWindow.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getWindowIDs.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_getWriteStream.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_installUri.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_launchApplicationWithDoc.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_memoize.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_notification.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_openInEditor.js", tools);
-  Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js", tools);
-
-  test("Availability", function() {
-    expect(24);
-
-    equals(typeof(tools.Scriptish_alert), "function", "has Scriptish_alert");
-    equals(typeof(tools.Scriptish_convert2RegExp), "function", "has Scriptish_convert2RegExp");
-    equals(typeof(tools.Scriptish_createUserScriptSource), "function", "has Scriptish_createUserScriptSource");
-    equals(typeof(tools.Scriptish_cryptoHash), "function", "has Scriptish_cryptoHash");
-    equals(typeof(tools.Scriptish_ExtendedStringBundle), "function", "has Scriptish_ExtendedStringBundle");
-    equals(typeof(tools.Scriptish_findError), "function", "has Scriptish_findError");
-    equals(typeof(tools.Scriptish_getBinaryContents), "function", "has Scriptish_getBinaryContents");
-    equals(typeof(tools.Scriptish_getBrowserForContentWindow), "function", "has Scriptish_getBrowserForContentWindow");
-    equals(typeof(tools.Scriptish_getContents), "function", "has Scriptish_getContents");
-    equals(typeof(tools.Scriptish_getEditor), "function", "has Scriptish_getEditor");
-    equals(typeof(tools.Scriptish_getFirebugConsole), "function", "has Scriptish_getFirebugConsole");
-    equals(typeof(tools.Scriptish_getProfileFile), "function", "has Scriptish_getProfileFile");
-    equals(typeof(tools.Scriptish_getTempFile), "function", "has Scriptish_getTempFile");
-    equals(typeof(tools.Scriptish_getTLDURL), "function", "has Scriptish_getTLDURL");
-    equals(typeof(tools.Scriptish_getUriFromFile), "function", "has Scriptish_getUriFromFile");
-    equals(typeof(tools.Scriptish_getURLsForContentWindow), "function", "has Scriptish_getURLsForContentWindow");
-    equals(typeof(tools.Scriptish_getWindowIDs), "function", "has Scriptish_getWindowIDs");
-    equals(typeof(tools.Scriptish_getWriteStream), "function", "has Scriptish_getWriteStream");
-    equals(typeof(tools.Scriptish_installUri), "function", "has Scriptish_installUri");
-    equals(typeof(tools.Scriptish_launchApplicationWithDoc), "function", "has Scriptish_launchApplicationWithDoc");
-    equals(typeof(tools.Scriptish_memoize), "function", "has Scriptish_memoize");
-    equals(typeof(tools.Scriptish_notification), "function", "has Scriptish_notification");
-    equals(typeof(tools.Scriptish_openInEditor), "function", "has Scriptish_openInEditor");
-    equals(typeof(tools.Scriptish_stringBundle), "function", "has Scriptish_stringBundle");
-  });
-
-  test("Scriptish_cryptoHash", function() {
-    expect(2);
-
-    var str = "Hello World!";
-    var str_DEF_SHA1 = tools.Scriptish_cryptoHash(str);
-    var str_SHA1 = tools.Scriptish_cryptoHash(str, "SHA1");
-
-    equal(str_DEF_SHA1, "2ef7bde608ce5404e97d5f042f95f89f1c232871", "Default hashing algorithm is SHA1");
-    equal(str_SHA1, "2ef7bde608ce5404e97d5f042f95f89f1c232871", "Specifying an algorithm (SHA1) works");
-  });
-
-
-  /**
-   * MODULE: Scriptish Utilities (third party)
-   */
-  module("Scriptish Utilities (third party)");
-  Cu.import("resource://scriptish/third-party/MatchPattern.js", tools);
-  Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js", tools);
-  Cu.import("resource://scriptish/third-party/Timer.js", tools);
-
-  test("Availability", function() {
-    expect(3);
-
-    equals(typeof(tools.MatchPattern), "function", "has MatchPattern");
-    equals(typeof(tools.MatchPattern), "function", "has Scriptish_openFolder");
-    equals(typeof(tools.Timer), "function", "has Timer");
-  });
-
-  test("Tools Menu's 'Scriptish' Menu", function() {
-    expect(3);
-
-    var win = Services.wm.getMostRecentWindow("navigator:browser");
-    function $(aID) win.document.getElementById(aID);
-    var scriptish_menu = $("scriptish_general_menu");
-    var tools_menu = $("menu_ToolsPopup");
-    ok(!!scriptish_menu, "Scriptish menu exists");
-    ok(!!tools_menu, "Tools menu exists");
-    equal(scriptish_menu.parentNode, tools_menu, "The Scriptish menu is a child of the Tools menu");
-  });
-
-  test("Test timeout", function() {
-    expect(1);
-    stop();
-
-    try {
-      var success = false;
-      timeout(function() {
-        ok((success = true), "timeout success");
-        start();
-      });
-      setTimeout(function() {
-        ok(false, "timeout error: timeout");
-        start();
-      }, 500);
-    } catch (e) {
-      ok(false, "timeout error: " + e);
-      start();
-    }
-  });
+  include("tests/testAvailability.js");
+  include("tests/testCryptoHash.js");
+  include("tests/testToolsMenuItem.js");
+  include("tests/testTimeout.js");
 }
diff --git a/extension/content/tests/testAvailability.js b/extension/content/tests/testAvailability.js
new file mode 100644
index 00000000..b98d00a8
--- /dev/null
+++ b/extension/content/tests/testAvailability.js
@@ -0,0 +1,78 @@
+
+module("Availability");
+
+var tools = {};
+
+(function(Cu) {
+Cu.import("resource://scriptish/constants.js");
+Cu.import("resource://scriptish/utils/Scriptish_alert.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_convert2RegExp.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_createUserScriptSource.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_ExtendedStringBundle.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_findError.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getBinaryContents.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getBrowserForContentWindow.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getContents.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getEditor.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getFirebugConsole.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getProfileFile.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getTempFile.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getTLDURL.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getUriFromFile.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getURLsForContentWindow.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getWindowIDs.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_getWriteStream.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_installUri.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_launchApplicationWithDoc.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_memoize.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_notification.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_openInEditor.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js", tools);
+Cu.import("resource://scriptish/third-party/MatchPattern.js", tools);
+Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js", tools);
+Cu.import("resource://scriptish/third-party/Timer.js", tools);
+})(Components.utils);
+
+test("Scriptish", function() {
+    expect(2);
+    equals(typeof(Services.scriptish), "object", "Scriptish service is available");
+    equals(typeof(Services.scriptish.shouldLoad), "function", "shouldLoad is available");
+  });
+
+test("Utils", function() {
+  expect(24);
+
+  equals(typeof(tools.Scriptish_alert), "function", "has Scriptish_alert");
+  equals(typeof(tools.Scriptish_convert2RegExp), "function", "has Scriptish_convert2RegExp");
+  equals(typeof(tools.Scriptish_createUserScriptSource), "function", "has Scriptish_createUserScriptSource");
+  equals(typeof(tools.Scriptish_cryptoHash), "function", "has Scriptish_cryptoHash");
+  equals(typeof(tools.Scriptish_ExtendedStringBundle), "function", "has Scriptish_ExtendedStringBundle");
+  equals(typeof(tools.Scriptish_findError), "function", "has Scriptish_findError");
+  equals(typeof(tools.Scriptish_getBinaryContents), "function", "has Scriptish_getBinaryContents");
+  equals(typeof(tools.Scriptish_getBrowserForContentWindow), "function", "has Scriptish_getBrowserForContentWindow");
+  equals(typeof(tools.Scriptish_getContents), "function", "has Scriptish_getContents");
+  equals(typeof(tools.Scriptish_getEditor), "function", "has Scriptish_getEditor");
+  equals(typeof(tools.Scriptish_getFirebugConsole), "function", "has Scriptish_getFirebugConsole");
+  equals(typeof(tools.Scriptish_getProfileFile), "function", "has Scriptish_getProfileFile");
+  equals(typeof(tools.Scriptish_getTempFile), "function", "has Scriptish_getTempFile");
+  equals(typeof(tools.Scriptish_getTLDURL), "function", "has Scriptish_getTLDURL");
+  equals(typeof(tools.Scriptish_getUriFromFile), "function", "has Scriptish_getUriFromFile");
+  equals(typeof(tools.Scriptish_getURLsForContentWindow), "function", "has Scriptish_getURLsForContentWindow");
+  equals(typeof(tools.Scriptish_getWindowIDs), "function", "has Scriptish_getWindowIDs");
+  equals(typeof(tools.Scriptish_getWriteStream), "function", "has Scriptish_getWriteStream");
+  equals(typeof(tools.Scriptish_installUri), "function", "has Scriptish_installUri");
+  equals(typeof(tools.Scriptish_launchApplicationWithDoc), "function", "has Scriptish_launchApplicationWithDoc");
+  equals(typeof(tools.Scriptish_memoize), "function", "has Scriptish_memoize");
+  equals(typeof(tools.Scriptish_notification), "function", "has Scriptish_notification");
+  equals(typeof(tools.Scriptish_openInEditor), "function", "has Scriptish_openInEditor");
+  equals(typeof(tools.Scriptish_stringBundle), "function", "has Scriptish_stringBundle");
+});
+
+test("3rd Party", function() {
+  expect(3);
+
+  equals(typeof(tools.MatchPattern), "function", "has MatchPattern");
+  equals(typeof(tools.MatchPattern), "function", "has Scriptish_openFolder");
+  equals(typeof(tools.Timer), "function", "has Timer");
+});
diff --git a/extension/content/tests/testCryptoHash.js b/extension/content/tests/testCryptoHash.js
new file mode 100644
index 00000000..750c319d
--- /dev/null
+++ b/extension/content/tests/testCryptoHash.js
@@ -0,0 +1,15 @@
+
+Components.utils.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
+
+module("Scriptish_cryptoHash");
+
+test("General", function() {
+  expect(2);
+
+  var str = "Hello World!";
+  var str_DEF_SHA1 = tools.Scriptish_cryptoHash(str);
+  var str_SHA1 = tools.Scriptish_cryptoHash(str, "SHA1");
+
+  equal(str_DEF_SHA1, "2ef7bde608ce5404e97d5f042f95f89f1c232871", "Default hashing algorithm is SHA1");
+  equal(str_SHA1, "2ef7bde608ce5404e97d5f042f95f89f1c232871", "Specifying an algorithm (SHA1) works");
+});
diff --git a/extension/content/tests/testTimeout.js b/extension/content/tests/testTimeout.js
new file mode 100644
index 00000000..0f714cac
--- /dev/null
+++ b/extension/content/tests/testTimeout.js
@@ -0,0 +1,24 @@
+
+Components.utils.import("resource://scriptish/constants.js");
+
+module("Timeout");
+
+test("Default Works", function() {
+  expect(1);
+  stop();
+
+  try {
+    var success = false;
+    timeout(function() {
+      ok((success = true), "timeout success");
+      start();
+    });
+    setTimeout(function() {
+      ok(false, "timeout error: timeout");
+      start();
+    }, 500);
+  } catch (e) {
+    ok(false, "timeout error: " + e);
+    start();
+  }
+});
diff --git a/extension/content/tests/testToolsMenuItem.js b/extension/content/tests/testToolsMenuItem.js
new file mode 100644
index 00000000..cd0d8d5f
--- /dev/null
+++ b/extension/content/tests/testToolsMenuItem.js
@@ -0,0 +1,16 @@
+
+Components.utils.import("resource://scriptish/constants.js");
+
+module("Tools Menuitem");
+
+test("Exists", function() {
+  expect(3);
+
+  var win = Services.wm.getMostRecentWindow("navigator:browser");
+  function $(aID) win.document.getElementById(aID);
+  var scriptish_menu = $("scriptish_general_menu");
+  var tools_menu = $("menu_ToolsPopup");
+  ok(!!scriptish_menu, "Scriptish menu exists");
+  ok(!!tools_menu, "Tools menu exists");
+  equal(scriptish_menu.parentNode, tools_menu, "The Scriptish menu is a child of the Tools menu");
+});

From 935a70ea8774ab362544b0a3a4081f8b11e1cccc Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 30 May 2011 18:52:55 -0700
Subject: [PATCH 102/829] adding a Makefile

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..bc5ebede
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,3 @@
+
+all:
+	sh build.sh amo

From c78aca774f02278de768cbbb28699afc196927c1 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 30 May 2011 20:50:46 -0700
Subject: [PATCH 103/829] Closes #301 mozmill test to run qunit tests

---
 extension/content/tests/endTests.js           |  5 ++
 extension/content/tests/runTests.js           |  1 +
 extension/content/tests/testTimeout.js        |  3 +-
 .../testAboutScriptishTests.js                | 68 +++++++++++++++++++
 4 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 extension/content/tests/endTests.js
 create mode 100644 tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js

diff --git a/extension/content/tests/endTests.js b/extension/content/tests/endTests.js
new file mode 100644
index 00000000..19350385
--- /dev/null
+++ b/extension/content/tests/endTests.js
@@ -0,0 +1,5 @@
+module("END");
+test("End", function() {
+  expect(1);
+  ok(true);
+});
diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index c87ba40a..8f54884e 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -4,4 +4,5 @@ function runTests() {
   include("tests/testCryptoHash.js");
   include("tests/testToolsMenuItem.js");
   include("tests/testTimeout.js");
+  include("tests/endTests.js");
 }
diff --git a/extension/content/tests/testTimeout.js b/extension/content/tests/testTimeout.js
index 0f714cac..265d65c8 100644
--- a/extension/content/tests/testTimeout.js
+++ b/extension/content/tests/testTimeout.js
@@ -3,9 +3,8 @@ Components.utils.import("resource://scriptish/constants.js");
 
 module("Timeout");
 
-test("Default Works", function() {
+asyncTest("Default Works", function() {
   expect(1);
-  stop();
 
   try {
     var success = false;
diff --git a/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js
new file mode 100644
index 00000000..9d82a851
--- /dev/null
+++ b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js
@@ -0,0 +1,68 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Scriptish mozmill test suite.
+ *
+ * The Initial Developer of the Original Code is Erik Vold.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Erik Vold <erikvvold@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var tabs = require("../../../../../mozmill-tests/lib/tabs");
+
+var setupModule = function(module) {
+  module.controller = mozmill.getBrowserController();
+}
+
+var testFailed = false;
+
+var testAboutScriptishTestsRan = function() {
+  // Go to about:scriptish?test and verify the page loaded
+  controller.open("about:scriptish?test");
+  controller.waitForPageLoad();
+  controller.assertNode(
+      new elementslib.ID(controller.tabs.activeTab, "qunit-header2"));
+  var QUnit = controller.tabs.activeTab.defaultView.QUnit;
+  var config = controller.tabs.activeTab.defaultView.QUnit.config;
+
+  controller.waitFor(function() {
+    if (!config.blocking
+        && ("END" == config.currentModule)
+        && ("END" == config.previousModule)) {
+      testFailed = (config.stats.bad > 0);
+      return true;
+    } else {
+      return false;
+    }
+  }, null, 1500);
+}
+
+var testAboutScriptishTestFailed = function() {
+  controller.assert(function() !testFailed);
+}

From 953b74802528d76c7d29f8484385a918eff0f3d3 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 30 May 2011 20:55:16 -0700
Subject: [PATCH 104/829] removing a unused line from the parent commit

---
 .../tests/testAboutScriptish/testAboutScriptishTests.js          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js
index 9d82a851..7b969003 100644
--- a/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js
+++ b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js
@@ -48,7 +48,6 @@ var testAboutScriptishTestsRan = function() {
   controller.waitForPageLoad();
   controller.assertNode(
       new elementslib.ID(controller.tabs.activeTab, "qunit-header2"));
-  var QUnit = controller.tabs.activeTab.defaultView.QUnit;
   var config = controller.tabs.activeTab.defaultView.QUnit.config;
 
   controller.waitFor(function() {

From 57d78879e73668213e501767cd8410cf4e77dbed Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 30 May 2011 21:26:08 -0700
Subject: [PATCH 105/829] Closes #261 Error: safeWin.frameElement is null

---
 extension/components/scriptish.js | 6 +++++-
 extension/modules/scriptish.js    | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index d3563758..621357dd 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -102,7 +102,10 @@ ScriptishService.prototype = {
     windows[currentInnerWindowID] = {unloaders: []};
     let gmBrowserUI = chromeWin.Scriptish_BrowserUI;
     let gBrowser = chromeWin.gBrowser;
-    let href = safeWin.location.href || safeWin.frameElement.src;
+    let href = (safeWin.location.href
+        || (safeWin.frameElement && safeWin.frameElement.src))
+        || "";
+
     // Show the scriptish install banner if the user is navigating to a .user.js
     // file in a top-level tab.  If the file was previously cached it might have
     // been given a number after .user, like gmScript.user-12.js
@@ -111,6 +114,7 @@ ScriptishService.prototype = {
       gmBrowserUI.showInstallBanner(
           gBrowser.getBrowserForDocument(safeWin.document));
     }
+
     if (!Scriptish.isGreasemonkeyable(href)) return;
 
     let unsafeWin = safeWin.wrappedJSObject;
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 82160ede..2f05f5ac 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -63,6 +63,8 @@ const Scriptish = {
       browserWin.toEM("addons://list/userscript");
   },
   isGreasemonkeyable: function Scriptish_isGreasemonkeyable(aURL) {
+    if (!aURL) return false;
+
     // if the url provide is not a valid url, then an error could be thrown
     try {
       var scheme = Services.io.extractScheme(aURL);

From ea82a01b66a2f6271fae32fe79a7ab8db2440b5b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 30 May 2011 21:30:21 -0700
Subject: [PATCH 106/829] removing another unused line from
 c78aca774f02278de768cbbb28699afc196927c1..

---
 .../tests/testAboutScriptish/testAboutScriptishTests.js         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js
index 7b969003..895e6244 100644
--- a/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js
+++ b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js
@@ -34,8 +34,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var tabs = require("../../../../../mozmill-tests/lib/tabs");
-
 var setupModule = function(module) {
   module.controller = mozmill.getBrowserController();
 }

From 91e39c7d6cc41c8f84af819954caf8fee32c9eec Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 30 May 2011 22:47:08 -0700
Subject: [PATCH 107/829] <em:version>0.1.1</em:version>

---
 extension/install.rdf |  2 +-
 update.rdf            | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index b17153d5..93efb651 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -20,7 +20,7 @@
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
-    <em:version>0.1.1b1pre</em:version>
+    <em:version>0.1.1</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:homepageURL>http://github.com/erikvold/scriptish</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
diff --git a/update.rdf b/update.rdf
index 42a27332..bc44386e 100644
--- a/update.rdf
+++ b/update.rdf
@@ -6,14 +6,14 @@
       <RDF:Seq>
         <RDF:li>
           <RDF:Description>
-            <em:version>0.1</em:version>
+            <em:version>0.1.1</em:version>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>4.0b5pre</em:minVersion>
-                <em:maxVersion>4.0.*</em:maxVersion>
+                <em:maxVersion>7.*</em:maxVersion>
                 <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.xpi</em:updateLink>
-                <em:updateHash>sha1:4c580dd3bfa177fcf731bbbc73a4b88433dc5fba</em:updateHash>
+                <em:updateHash>sha1:3f04004e1785cb19de68281788649f5bf88ef838</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
             <em:targetApplication>
@@ -22,7 +22,7 @@
                 <em:minVersion>2.1a3</em:minVersion>
                 <em:maxVersion>2.1.*</em:maxVersion>
                 <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.xpi</em:updateLink>
-                <em:updateHash>sha1:4c580dd3bfa177fcf731bbbc73a4b88433dc5fba</em:updateHash>
+                <em:updateHash>sha1:3f04004e1785cb19de68281788649f5bf88ef838</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
           </RDF:Description>
@@ -30,6 +30,6 @@
       </RDF:Seq>
     </em:updates>
 
-    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBACgVZadk1YLJR3dDyc7XO1512F/vGhd2oWoDXHnxunbHIPlKDamfAyavR78ZQBEVJNqL+xmJfUAB9DnFbON3kLm8pdI/FgnGaR/hXDhrDU/9eeKvWv9oq5ifUBLWmweRB4rSPOeoEEACco76/sdWoWwxodPISUUmdJDf9LZqKWvB</em:signature>
+    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAAPzS8oVq4PiKYgoFiNxBx2ycYzP1XcBU9M1X2oEosvE3T6d1660ooRRRt88dzZOSfGWvq5s9ebD6v5QF7m7/PvxSHzWDY/Sp08kV6oqWz+k7Y+88qg9Nbr0cyqUT3KBE5LOlpgaSiuh4f2ujlyHrsft/p5gThtNgOPfVR72JI3G</em:signature>
   </RDF:Description>
 </RDF:RDF>

From 86bfe09e0348d342c9ce83b4208f15c61e6d95f6 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 30 May 2011 23:09:11 -0700
Subject: [PATCH 108/829] <em:version>0.1.2pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 93efb651..c7df17e2 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -20,7 +20,7 @@
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
-    <em:version>0.1.1</em:version>
+    <em:version>0.1.2pre</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:homepageURL>http://github.com/erikvold/scriptish</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>

From 0398a4966011c11f5b4a964ce059a26fc89bea33 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 31 May 2011 11:58:11 -0700
Subject: [PATCH 109/829] - adding some promise helpers Q.and() and Q.chain() -
 include() in aboutScriptish.js now returns a promise.

---
 extension/content/js/aboutScriptish.js | 19 +++++++++++--------
 extension/content/tests/runTests.js    | 11 ++++++-----
 extension/modules/utils/q.js           | 12 ++++++++++++
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index 9b01a0d3..66598fdc 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -1,23 +1,26 @@
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
+Cu.import("resource://scriptish/utils/q.js");
 
 function $(aID) document.getElementById(aID);
-function include(aSrc, aCallback) {
+function include(aSrc) {
+	var deferred = Q.defer();
     var script = document.createElement("script");
     script.src = aSrc;
-    script.addEventListener("load", aCallback, false);
+    script.addEventListener("load", deferred.resolve, false);
     document.documentElement.firstChild.appendChild(script);
+    return deferred.promise;
   }
 
 (function() {
   // Show about:scriptish?test
   if (window.location.href.split("?")[1] == "test") {
-    include("js/third-party/qunit/qunit.js", function() {
-      include("tests/runTests.js", function() {
-        $("main").style.display = "none";
-        $("test").style.display = "inherit";
-        runTests();
-      });
+    Q.and(
+        include("js/third-party/qunit/qunit.js"),
+        include("tests/runTests.js")).then(function() {
+      $("main").style.display = "none";
+      $("test").style.display = "inherit";
+      runTests();
     });
     return;
   }
diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 8f54884e..b7a01b8b 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -1,8 +1,9 @@
 function runTests() {
   var tools = {};
-  include("tests/testAvailability.js");
-  include("tests/testCryptoHash.js");
-  include("tests/testToolsMenuItem.js");
-  include("tests/testTimeout.js");
-  include("tests/endTests.js");
+  Q.chain(
+    function() include("tests/testAvailability.js"),
+    function() include("tests/testCryptoHash.js"),
+    function() include("tests/testToolsMenuItem.js"),
+    function() include("tests/testTimeout.js"),
+    function() include("tests/endTests.js"));
 }
diff --git a/extension/modules/utils/q.js b/extension/modules/utils/q.js
index 2d04954d..8da34d7d 100644
--- a/extension/modules/utils/q.js
+++ b/extension/modules/utils/q.js
@@ -6,3 +6,15 @@ const setTimeout = timeout;
 
 Services.scriptloader
     .loadSubScript("chrome://scriptish/content/js/third-party/q.js", this);
+
+Q.and = function and() {
+  var promises = Array.prototype.slice.call(arguments);
+  if (!promises.length) return true;
+  return promises.shift().then(function() Q.and.apply(null, promises));
+}
+
+Q.chain = function chain() {
+  var funcs = Array.prototype.slice.call(arguments);
+  if (!funcs.length) return true;
+  return funcs.shift()().then(function() Q.chain.apply(null, funcs));
+}

From e84ac0971fba7a0f889cd25acd661a14e2a4f715 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 31 May 2011 12:22:25 -0700
Subject: [PATCH 110/829] - using https://github.com/erikvold/html

---
 extension/content/aboutScriptish.html         |   1 +
 extension/content/js/aboutScriptish.js        |  38 +++---
 extension/content/js/third-party/html/html.js | 111 ++++++++++++++++++
 3 files changed, 131 insertions(+), 19 deletions(-)
 create mode 100755 extension/content/js/third-party/html/html.js

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 1940b9a6..bb72876d 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -7,6 +7,7 @@
   <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
   <link rel="stylesheet" href="js/third-party/qunit/qunit.css" type="text/css" media="screen"/>
   <script src="js/aboutScriptish.js"></script>
+  <script src="js/third-party/html/html.js"></script>
 </head>
 
 <body>
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index 66598fdc..c90a4705 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -1,16 +1,18 @@
 const Cu = Components.utils;
-Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/utils/q.js");
 
 function $(aID) document.getElementById(aID);
 function include(aSrc) {
-	var deferred = Q.defer();
-    var script = document.createElement("script");
-    script.src = aSrc;
-    script.addEventListener("load", deferred.resolve, false);
-    document.documentElement.firstChild.appendChild(script);
-    return deferred.promise;
-  }
+  var deferred = Q.defer();
+  var script = document.createElement("script");
+  script.src = aSrc;
+  script.addEventListener("load", deferred.resolve, false);
+  document.documentElement.firstChild.appendChild(script);
+  return deferred.promise;
+}
+
+
+Cu.import("resource://scriptish/constants.js");
+Cu.import("resource://scriptish/utils/q.js");
 
 (function() {
   // Show about:scriptish?test
@@ -26,23 +28,21 @@ function include(aSrc) {
   }
 
   // Show about:scriptish
-  var addPerson = function(aTarget, aPerson) {
-    var li = document.createElement("li");
+  var addPerson = function(aPerson) {
     var person = aPerson.name.split(/; +/);
-    li.innerHTML = person[0];
+    var li = html("li", person[0]);
     if (person[1]) {
-      var a = document.createElement("a");
-      a.innerHTML = person[1].replace(/^mailto:/i, "");
-      a.setAttribute("href", person[1]);
+      var a = html("a", {
+        href: person[1]
+      }, person[1].replace(/^mailto:/i, ""));
       li.innerHTML += " &mdash; ";
       li.appendChild(a);
     }
-    aTarget.appendChild(li);
+    this.appendChild(li);
   }
 
   AddonManager.getAddonByID("scriptish@erikvold.com", function(aAddon) {
-    function func(val) addPerson(this, val);
-    aAddon.contributors.forEach(func.bind($("contlist")));
-    aAddon.translators.forEach(func.bind($("translist")));
+    aAddon.contributors.forEach(addPerson.bind($("contlist")));
+    aAddon.translators.forEach(addPerson.bind($("translist")));
   });
 })();
diff --git a/extension/content/js/third-party/html/html.js b/extension/content/js/third-party/html/html.js
new file mode 100755
index 00000000..8092eed4
--- /dev/null
+++ b/extension/content/js/third-party/html/html.js
@@ -0,0 +1,111 @@
+/*
+Copyright (C) 2011 by Erik Vold
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+var html = (function() {
+  var templates = {};
+
+  var bind = function(func) {
+    var slice = Array.prototype.slice,
+        args = slice.call(arguments, 1);
+    return function() {
+      return func.apply({}, args.concat(slice.call(arguments)));
+    };
+  };
+
+  function Element(tagName, attrs) {
+    var ele = document.createElement(tagName);
+    for (var attr in attrs) ele.setAttribute(attr, attrs[attr]);
+    return ele;
+  }
+
+  var observe;
+  if (window.addEventListener)
+    observe = function(ele, type, func) {ele.addEventListener(type, func, false)}
+  else
+    observe = function(ele, type, func) {ele.attachEvent("on" + type, func)}
+
+  function appendChildren(ele, children, startIndex) {
+    for (var i = startIndex || 0, child; child = children[i]; i++) {
+      switch(Object.prototype.toString.call(child)) {
+        case "[object String]":
+          ele.appendChild(document.createTextNode(child));
+          break;
+        case "[object Array]":
+          appendChildren(ele, child);
+          break;
+        default:
+          ele.appendChild(child);
+          break;
+      }
+    }
+    return ele;
+  }
+
+  function html(tagName, attrs) {
+    var ele = event, events = {}, value, eventMatch = /^on(.+)/i;
+
+    if (attrs && (typeof attrs === "string" || typeof attrs.nodeType === "number"))
+      return appendChildren(new Element(tagName), arguments, 1);
+
+    var oldAttrs = attrs;
+    attrs = {};
+    for (var prop in oldAttrs) {
+      if ((event = prop.match(eventMatch)) && typeof oldAttrs[prop] === "function")
+        events[event[1]] = oldAttrs[prop];
+      else
+        attrs[prop] = oldAttrs[prop];
+    }
+
+    var ele = new Element(tagName, attrs);
+    for (var event in events) observe(ele, event, events[event])
+
+    return appendChildren(ele, arguments, 2);
+  };
+  html.register = function html_register(aKey, aFunc) {
+    return templates[aKey] = aFunc;
+  };
+  html.render = function html_render(aKey, aData) {
+    var template = templates[aKey];
+    if (!template)
+      throw new Error("There is no template with the key '" + aKey + "'");
+
+    if ("[object Array]" == Object.prototype.toString.call(aData)) {
+      var rtn = [];
+      for (var i = 0, len = aData.length; i < len; i++)
+        rtn.push(template(aData[i]));
+      return rtn;
+    } else {
+      return template(aData);
+    }
+  };
+  html.exportTags = function html_exportTags(aTags) {
+    if ("[object String]" == Object.prototype.toString.call(aTags))
+      aTags = [aTags];
+
+    var rtn = {};
+    for (var i = 0, tag; tag = aTags[i]; i++)
+      rtn[tag] = bind(html_tag, tag);
+    return rtn;
+  };
+
+  return html;
+})();

From 70f7a701991c2ef24c8b520f23814dc6d545f6d1 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 31 May 2011 20:34:45 -0700
Subject: [PATCH 111/829] test: Scriptish.isGreasemonkeyable()

---
 extension/content/tests/runTests.js     |   1 +
 extension/content/tests/testIsGMable.js | 142 ++++++++++++++++++++++++
 2 files changed, 143 insertions(+)
 create mode 100644 extension/content/tests/testIsGMable.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index b7a01b8b..a29cf037 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -4,6 +4,7 @@ function runTests() {
     function() include("tests/testAvailability.js"),
     function() include("tests/testCryptoHash.js"),
     function() include("tests/testToolsMenuItem.js"),
+    function() include("tests/testIsGMable.js"),
     function() include("tests/testTimeout.js"),
     function() include("tests/endTests.js"));
 }
diff --git a/extension/content/tests/testIsGMable.js b/extension/content/tests/testIsGMable.js
new file mode 100644
index 00000000..91fcb178
--- /dev/null
+++ b/extension/content/tests/testIsGMable.js
@@ -0,0 +1,142 @@
+
+Components.utils.import("resource://scriptish/scriptish.js");
+
+module("Scriptish.isGreasemonkeyable");
+var PREF_BRANCH = Services.prefs.getBranch("extensions.scriptish.");
+
+test("HTTP", function() {
+  expect(4);
+
+  equal(
+      Scriptish.isGreasemonkeyable("http://google.com"),
+      true,
+      "http://google.com should be ok");
+  equal(
+      Scriptish.isGreasemonkeyable("HTTP://"),
+      false,
+      "HTTP:// should not be ok");
+  equal(
+      Scriptish.isGreasemonkeyable("http://"),
+      true,
+      "http:// should be ok");
+  equal(
+      Scriptish.isGreasemonkeyable("http"),
+      false,
+      "http not should be ok");
+});
+
+test("HTTPS", function() {
+  expect(4);
+
+  equal(
+      Scriptish.isGreasemonkeyable("https://google.com"),
+      true,
+      "https://google.com should be ok");
+  equal(
+      Scriptish.isGreasemonkeyable("HTTPS://"),
+      false,
+      "HTTPS:// should not be ok");
+  equal(
+      Scriptish.isGreasemonkeyable("https://"),
+      true,
+      "https:// should be ok");
+  equal(
+      Scriptish.isGreasemonkeyable("https"),
+      false,
+      "https not should be ok");
+});
+
+test("ABOUT", function() {
+  expect(6);
+  try {
+    var aboutIsGMable = PREF_BRANCH.getBoolPref("aboutIsGreaseable");
+  } catch (e) {
+    var aboutIsGMable = false; // default
+  }
+
+  equal(
+      Scriptish.isGreasemonkeyable("about:blank"),
+      true,
+      "about:blank is always ok");
+  equal(
+      Scriptish.isGreasemonkeyable("about:blank?test"),
+      true,
+      "about:blank?test is " + (aboutIsGMable ? "ok" : "not ok"));
+  equal(
+      Scriptish.isGreasemonkeyable("about:home"),
+      aboutIsGMable,
+      "about:home is " + (aboutIsGMable ? "ok" : "not ok"));
+  equal(
+      Scriptish.isGreasemonkeyable("about:"),
+      aboutIsGMable,
+      "about: is ok");
+  equal(
+      Scriptish.isGreasemonkeyable("ABOUT:"),
+      false,
+      "ABOUT: is not ok");
+  equal(
+      Scriptish.isGreasemonkeyable("about"),
+      false,
+      "about is not ok");
+});
+
+test("FILE", function() {
+  expect(5);
+  try {
+    var fileIsGMable = PREF_BRANCH.getBoolPref("fileIsGreaseable");
+  } catch (e) {
+    var fileIsGMable = false; // default
+  }
+
+  equal(
+      Scriptish.isGreasemonkeyable("file://"),
+      fileIsGMable,
+      "file:// is " + (fileIsGMable ? "ok" : "not ok"));
+  equal(
+      Scriptish.isGreasemonkeyable("file:"),
+      fileIsGMable,
+      "file: is " + (fileIsGMable ? "ok" : "not ok"));
+  equal(
+      Scriptish.isGreasemonkeyable("file:///test.html"),
+      fileIsGMable,
+      "file:///test.html is " + (fileIsGMable ? "ok" : "not ok"));
+  equal(
+      Scriptish.isGreasemonkeyable("FILE:"),
+      false,
+      "FILE: is not ok");
+  equal(
+      Scriptish.isGreasemonkeyable("file"),
+      false,
+      "file is not ok");
+});
+
+test("UNMHT", function() {
+  expect(5);
+  try {
+    var unmhtIsGMable = PREF_BRANCH.getBoolPref("unmhtIsGreaseable");
+  } catch (e) {
+    var unmhtIsGMable = false; // default
+  }
+
+  equal(
+      Scriptish.isGreasemonkeyable("unmht://"),
+      unmhtIsGMable,
+      "unmht:// is " + (unmhtIsGMable ? "ok" : "not ok"));
+  equal(
+      Scriptish.isGreasemonkeyable("unmht:"),
+      unmhtIsGMable,
+      "unmht: is " + (unmhtIsGMable ? "ok" : "not ok"));
+  equal(
+      Scriptish.isGreasemonkeyable("unmht:///test.html"),
+      unmhtIsGMable,
+      "unmht:///test.html is " + (unmhtIsGMable ? "ok" : "not ok"));
+  equal(
+      Scriptish.isGreasemonkeyable("UNMHT:"),
+      false,
+      "UNMHT: is not ok");
+  equal(
+      Scriptish.isGreasemonkeyable("unmht"),
+      false,
+      "unmht is not ok");
+});
+

From 578c4de044786948277e40eee2cc1f7fcc1f4d19 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 1 Jun 2011 08:09:03 -0700
Subject: [PATCH 112/829] Closes #324 until
 https://github.com/jquery/qunit/pull/111 is closed

---
 extension/content/js/third-party/qunit/qunit.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/extension/content/js/third-party/qunit/qunit.js b/extension/content/js/third-party/qunit/qunit.js
index c1a658fa..5d72dcc3 100644
--- a/extension/content/js/third-party/qunit/qunit.js
+++ b/extension/content/js/third-party/qunit/qunit.js
@@ -3,7 +3,7 @@
  *
  * http://docs.jquery.com/QUnit
  *
- * Copyright (c) 2011 John Resig, J�rn Zaefferer
+ * Copyright (c) 2011 John Resig, Jörn Zaefferer
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * or GPL (GPL-LICENSE.txt) licenses.
  */
@@ -625,7 +625,7 @@ extend(QUnit, {
 			var source = sourceFromStacktrace();
 			if (source) {
 				details.source = source;
-				output += '<tr class="test-source"><th>Source: </th><td><pre>' + source +'</pre></td></tr>';
+				output += '<tr class="test-source"><th>Source: </th><td><pre>' + escapeHtml(source) + '</pre></td></tr>';
 			}
 		}
 		output += "</table>";
@@ -778,12 +778,6 @@ function done() {
 		id( "qunit-testresult" ).innerHTML = html;
 	}
 
-	if ( typeof document !== "undefined" && document.title ) {
-		// show ? for good, ? for bad suite result in title
-		// use escape sequences in case file gets loaded with non-utf-8-charset
-		document.title = (config.stats.bad ? "\u2716" : "\u2714") + " " + document.title;
-	}
-
 	QUnit.done( {
 		failed: config.stats.bad,
 		passed: passed,
@@ -954,7 +948,7 @@ function id(name) {
 // Test for equality any JavaScript type.
 // Discussions and reference: http://philrathe.com/articles/equiv
 // Test suites: http://philrathe.com/tests/equiv
-// Author: Philippe Rath� <prathe@gmail.com>
+// Author: Philippe Rathé <prathe@gmail.com>
 QUnit.equiv = function () {
 
     var innerEquiv; // the real equiv function

From 5c202d39d0643a116599aadb19ab134c03476e50 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 1 Jun 2011 09:30:56 -0700
Subject: [PATCH 113/829] minor style change to padding in about:scriptish

---
 extension/skin/aboutScriptish.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/skin/aboutScriptish.css b/extension/skin/aboutScriptish.css
index d098984c..87f47b68 100644
--- a/extension/skin/aboutScriptish.css
+++ b/extension/skin/aboutScriptish.css
@@ -27,7 +27,7 @@ a:hover { color: #09f; }
 
 #container {
   margin: 2em auto 0;
-  padding: 10px;
+  padding: 10pt;
   width: 70%;
   background-color: #fff;
   border: 2px solid #000;

From c8008ededd708be58c9ef680c8ce4a6020438a8c Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 1 Jun 2011 12:15:12 -0500
Subject: [PATCH 114/829] Closes #328 timeout test: clear the second timeout if
 the first is called (cherry picked from commit
 0af13cbc5173e488fc7857e5a901f4c0d0a98fec)

---
 extension/content/tests/testTimeout.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/extension/content/tests/testTimeout.js b/extension/content/tests/testTimeout.js
index 265d65c8..b439a319 100644
--- a/extension/content/tests/testTimeout.js
+++ b/extension/content/tests/testTimeout.js
@@ -7,13 +7,14 @@ asyncTest("Default Works", function() {
   expect(1);
 
   try {
-    var success = false;
+    var t2;
     timeout(function() {
-      ok((success = true), "timeout success");
+      if (typeof t2 == "number") clearTimeout(t2);
+      ok(true, "timeout succeeded");
       start();
     });
-    setTimeout(function() {
-      ok(false, "timeout error: timeout");
+    t2 = setTimeout(function() {
+      ok(false, "timeout error: second timeout function called");
       start();
     }, 500);
   } catch (e) {

From 957d90feae4b802a59c3f3bb8430d698a229a950 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 3 Jun 2011 20:05:16 -0700
Subject: [PATCH 115/829] - timeout the callback used with the promises
 returned by Config._load* functions so that possible errors in the function
 don't cause a rejected callback to be called. - adding a Config.loaded flag
 which Config._save() checks b4 saving

---
 extension/modules/config/config.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 797944b1..aa20dae2 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -235,7 +235,10 @@ Config.prototype = {
     var self = this;
 
     // called after the config has been loaded
-    function callback(fileModified) {
+    function callback(fileModified) timeout(function() {
+      // Flag config as loaded
+      self.loaded = true;
+
       let scripts = self._scripts;
       let len = scripts.length;
 
@@ -262,7 +265,7 @@ Config.prototype = {
 
       if (fileModified) self._save();
       aCallback();
-    }
+    });
 
     // Load the config (trying from various sources)
     var configFile;
@@ -289,6 +292,8 @@ Config.prototype = {
       });
     });
 
+    loaded: false,
+
     // Listen for the blocklist pref being modified
     Scriptish_prefRoot.watch("blocklist.enabled", function() {
       self._useBlocklist = Scriptish_prefRoot.getValue("blocklist.enabled");
@@ -313,6 +318,8 @@ Config.prototype = {
   },
 
   _save: function() {
+    if (!this.loaded) return; // a safety check that should not be relied on
+
     var self = this;
 
     if (this._isSaving)

From b23431c6a969e005cfcf6830511f6c4bcadbabed Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 3 Jun 2011 20:22:39 -0700
Subject: [PATCH 116/829] wrapping Script.isUSOScript in a try/catch in case it
 throws an error

---
 extension/modules/script/script.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 10bba100..379d5029 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -140,9 +140,15 @@ Script.prototype = {
   get isActive() !this.userDisabled,
   pendingOperations: AddonManager.PENDING_NONE,
   type: "userscript",
-  isUSOScript: function() (usoURLChk.test(this._downloadURL)
-      || usoURLChk.test(this._homepageURL)
-      || usoURLChk.test(this._updateURL)),
+  isUSOScript: function() {
+    try {
+      return usoURLChk.test(this._downloadURL)
+          || usoURLChk.test(this._homepageURL)
+          || usoURLChk.test(this._updateURL);
+    } catch (e) {
+      return false;
+    }
+  },
   /*averageRating: undefined,
   reviewCount: undefined,
   totalDownloads: undefined,*/

From 9d6fc48039963420ddccaeb4ef0de3950d91403a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 3 Jun 2011 20:34:54 -0700
Subject: [PATCH 117/829] set Config.loaded = true only after everything in the
 callback has executed without throwing an error

---
 extension/modules/config/config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index aa20dae2..9aacb562 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -236,9 +236,6 @@ Config.prototype = {
 
     // called after the config has been loaded
     function callback(fileModified) timeout(function() {
-      // Flag config as loaded
-      self.loaded = true;
-
       let scripts = self._scripts;
       let len = scripts.length;
 
@@ -263,6 +260,9 @@ Config.prototype = {
       // Load the blocklist
       if (self._useBlocklist) self._loadBlocklist();
 
+      // Flag config as loaded
+      self.loaded = true;
+
       if (fileModified) self._save();
       aCallback();
     });

From 9095dbb9f7468b53afa99548a28d91c130d57cc2 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 3 Jun 2011 22:46:04 -0700
Subject: [PATCH 118/829] Config.loadBlocklist()'s guts are warpped in a
 timeout now, b/c if it throws then that shouldn't block w/e called it

---
 extension/modules/config/config.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 9aacb562..812ff8fb 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -144,17 +144,19 @@ Config.prototype = {
   },
 
   _loadBlocklist: function() {
-    var file = this._blocklistFile;
-    if (file.exists()) {
-      let self = this;
-      Scriptish_getContents(file, 0, function(str) {
-        self._blocklist = Instances.json.decode(str);
-        self._blocklistHash = Scriptish_cryptoHash(str);
-
-        // block scripts
-        self._blockScripts();
-      });
-    }
+    let self = this;
+    timeout(function() {
+      var file = self._blocklistFile;
+      if (file.exists()) {
+        Scriptish_getContents(file, 0, function(str) {
+          self._blocklist = Instances.json.decode(str);
+          self._blocklistHash = Scriptish_cryptoHash(str);
+      
+          // block scripts
+          self._blockScripts();
+        });
+      }
+    });
   },
 
   _loadXML: function(aFile) {

From d7a6ee30af9e3d9e6f13ba746053918ed6902a32 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 3 Jun 2011 22:46:51 -0700
Subject: [PATCH 119/829] restoring save delay code removed in
 e4a05b33bc633dc01a69514e6ceecf5153bd04fd

---
 extension/modules/config/config.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 812ff8fb..d5e1c8cb 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -15,13 +15,16 @@ inc("resource://scriptish/utils/Scriptish_getProfileFile.js");
 inc("resource://scriptish/utils/Scriptish_stringBundle.js");
 inc("resource://scriptish/utils/Scriptish_convert2RegExp.js");
 inc("resource://scriptish/utils/Scriptish_cryptoHash.js");
+inc("resource://scriptish/third-party/Timer.js");
 inc("resource://scriptish/utils/q.js");
 inc("resource://scriptish/script/script.js");
 })(Components.utils.import);
 
 function Config(aBaseDir) {
   var self = this;
+  this.timer = new Timer();
   this._observers = [];
+  this._saveTimer = null;
   this._excludes = [];
   this._excludeRegExps = [];
   this._scripts = [];
@@ -319,9 +322,20 @@ Config.prototype = {
     for (var i = scripts.length - 1; ~i; i--) scripts[i].doBlockCheck();
   },
 
-  _save: function() {
+  _save: function(aSaveNow) {
     if (!this.loaded) return; // a safety check that should not be relied on
 
+    // If we have not explicitly been told to save now, then defer execution
+    // via a timer, to avoid locking up the UI.
+    if (!aSaveNow) {
+      // Reduce work in the case of many changes near to each other in time.
+      if (this._saveTimer) this.timer.clearTimeout(this._saveTimer);
+      this._saveTimer =
+          this.timer.setTimeout(this._save.bind(this, true), 250);
+      return;
+    }
+    delete this["_saveTimer"];
+
     var self = this;
 
     if (this._isSaving)

From 104550a259ffc8e06df444d16f8d44603a934468 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 3 Jun 2011 23:41:40 -0700
Subject: [PATCH 120/829] replacing Scriptish.getConfig when the config is
 loaded

---
 extension/modules/scriptish.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 2f05f5ac..b355f72c 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -15,6 +15,8 @@ Scriptish_prefRoot.watch("enabled", function() {
 
 var global = this;
 
+function getConfig(aCallback) timeout(function() aCallback(global.config));
+
 const Scriptish = {
   updateSecurely: Scriptish_prefRoot.getValue("update.requireSecured"),
   notify: function(aSubject, aTopic, aData) {
@@ -31,9 +33,7 @@ const Scriptish = {
     Services.obs.notifyObservers(null, aTopic, JSON.stringify(aData));
   },
   getConfig: function(aCallback) {
-    if (global.config) {
-      aCallback(global.config);
-    } else if (!global.configQueue) {
+    if (!global.configQueue) {
       global.configQueue = [aCallback];
       var tools = {};
       Cu.import("resource://scriptish/config/config.js", tools);
@@ -41,6 +41,7 @@ const Scriptish = {
       cf.load(function() {
         Scriptish_log("Scriptish config loaded"); // TODO: force & l10n
         global.config = cf;
+        Scriptish.getConfig = getConfig;
         global.configQueue.forEach(function(f) f(cf));
         delete global["configQueue"];
       });

From 0c9fa1fcbd6f4d2cbbfb779627e38df20ed79ea0 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 4 Jun 2011 16:03:40 -0500
Subject: [PATCH 121/829] minor change: using classList to add/remove a class

---
 extension/content/js/addonstab.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 1b4eab4e..769fe575 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -78,12 +78,12 @@ window.addEventListener("load", function() {
   function onViewChanged() {
     let de = document.documentElement;
     if ("addons://list/userscript" == gViewController.currentViewId) {
-      de.className += ' scriptish';
+      de.classList.add("scriptish");
       Scriptish.getConfig(function(config) {
         $("scriptish-list-empty").collapsed = !!config.scripts.length;
       });
     } else {
-      de.className = de.className.replace(/ scriptish/g, '');
+      de.classList.remove("scriptish");
       $("scriptish-list-empty").collapsed = true;
     }
   }

From c91539035484c2d9d5f23f4caf5c4e1b4c764b74 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 4 Jun 2011 16:41:26 -0500
Subject: [PATCH 122/829] Closes #335 only display the 'scriptish-list-empty'
 box if needed (cherry picked from commit
 e803a166ec7ad3cd994546c402c0241c03ec9ee1)

---
 extension/content/js/addonstab.js | 7 ++++---
 extension/skin/addonstab.css      | 5 +----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 769fe575..e61a00fe 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -80,11 +80,12 @@ window.addEventListener("load", function() {
     if ("addons://list/userscript" == gViewController.currentViewId) {
       de.classList.add("scriptish");
       Scriptish.getConfig(function(config) {
-        $("scriptish-list-empty").collapsed = !!config.scripts.length;
+        if (!config.scripts.length)
+          $("scriptish-list-empty").style.display = "-moz-box";
       });
     } else {
       de.classList.remove("scriptish");
-      $("scriptish-list-empty").collapsed = true;
+      $("scriptish-list-empty").style.display = "none";
     }
   }
   window.addEventListener('ViewChanged', onViewChanged, false);
@@ -94,7 +95,7 @@ window.addEventListener("load", function() {
   var installObserver = {
     observe: function(aSubject, aTopic, aData) {
       if ("scriptish-script-installed" != aTopic) return;
-      $("scriptish-list-empty").collapsed = true;
+      $("scriptish-list-empty").style.display = "none";
       Services.obs.removeObserver(installObserver, "scriptish-script-installed");
       needToRemoveObserver = false;
     },
diff --git a/extension/skin/addonstab.css b/extension/skin/addonstab.css
index d3f18ed2..7a4c856c 100644
--- a/extension/skin/addonstab.css
+++ b/extension/skin/addonstab.css
@@ -5,12 +5,9 @@
   -moz-binding: url("chrome://scriptish/content/addonstab.xml#control-container");
 }
 
-page.scriptish #addon-list-empty, #user-scripts-list-empty{
+page.scriptish #addon-list-empty, #scriptish-list-empty {
   display: none;
 }
-page.scriptish #user-script-list-empty {
-  display: -moz-box;
-}
 
 /* Hide the 'restart now' link for user scripts. */
 page.scriptish #addon-list button[command=cmd_restartApp] {

From 7c5e2444abc22711a794231a3bc1c66678fd6224 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 4 Jun 2011 16:57:42 -0500
Subject: [PATCH 123/829] minor: removing a junk line from config.js

---
 extension/modules/config/config.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index d5e1c8cb..78bf5721 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -22,6 +22,7 @@ inc("resource://scriptish/script/script.js");
 
 function Config(aBaseDir) {
   var self = this;
+  this.loaded = false;
   this.timer = new Timer();
   this._observers = [];
   this._saveTimer = null;
@@ -297,8 +298,6 @@ Config.prototype = {
       });
     });
 
-    loaded: false,
-
     // Listen for the blocklist pref being modified
     Scriptish_prefRoot.watch("blocklist.enabled", function() {
       self._useBlocklist = Scriptish_prefRoot.getValue("blocklist.enabled");

From 5d40d15ab8f3d6931f0837e2d837f72d82912177 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 4 Jun 2011 19:30:55 -0500
Subject: [PATCH 124/829] Closes #337 localize the 'no user scripts installed'
 box (cherry picked from commit 917c5c8ededc3c8db6d36c979396b69b067a2ffb)

---
 extension/content/addonstab.xul             | 5 ++---
 extension/content/js/addonstab.js           | 5 +++++
 extension/locale/en-US/scriptish.properties | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/extension/content/addonstab.xul b/extension/content/addonstab.xul
index 21debdbc..456421cf 100644
--- a/extension/content/addonstab.xul
+++ b/extension/content/addonstab.xul
@@ -52,9 +52,8 @@
       class="alert-container" flex="1">
     <spacer class="alert-spacer-before"/>
     <vbox class="alert">
-      <label value="You don't have any user scripts installed"/>
-      <button id="scriptish-get-scripts-btn" label="Get user scripts"
-          class="addon-control"/>
+      <label id="scriptish-list-empty-label"/>
+      <button id="scriptish-get-scripts-btn" class="addon-control"/>
     </vbox>
     <spacer class="alert-spacer-after"/>
   </vbox>
diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index e61a00fe..4bb21e4c 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -75,6 +75,11 @@ window.addEventListener("load", function() {
     gBrowser.selectedTab = gBrowser.addTab("http://userscripts.org");
   }, false);
 
+  $("scriptish-list-empty-label").setAttribute(
+      "value", Scriptish_stringBundle("userscripts.noneInstalled"));
+  $("scriptish-get-scripts-btn").setAttribute(
+      "label", Scriptish_stringBundle("userscripts.get"));
+
   function onViewChanged() {
     let de = document.documentElement;
     if ("addons://list/userscript" == gViewController.currentViewId) {
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 35fc85e1..ad9c7a35 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -98,3 +98,5 @@ tooltip.loading=Loading...
 Uninstall=Uninstall
 Update=Update
 userscripts=User Scripts
+userscripts.get=Get user scripts
+userscripts.noneInstalled=You don't have any user scripts installed

From 2397eb71f6ad828acf23d7b05ff37141004f7489 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 4 Jun 2011 18:19:03 -0700
Subject: [PATCH 125/829] <em:minVersion>4.0</em:minVersion> for FF

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index c7df17e2..4d3e93f8 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -64,7 +64,7 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>4.0b5pre</em:minVersion>
+        <em:minVersion>4.0</em:minVersion>
         <em:maxVersion>7.*</em:maxVersion>
       </Description>
     </em:targetApplication>

From 0214edf18af7ebdbec07747b4706aba0cc05fb16 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 4 Jun 2011 21:01:19 -0500
Subject: [PATCH 126/829] minor fix: 'Service' -> 'Services' in
 modules\scriptish.js

---
 extension/modules/scriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index b355f72c..04e21e17 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -91,7 +91,7 @@ const Scriptish = {
     }
     return false;
   },
-  getMostRecentWindow: function() Service.wm.getMostRecentWindow("navigator:browser"),
+  getMostRecentWindow: function() Services.wm.getMostRecentWindow("navigator:browser"),
   getWindows: function() Services.wm.getEnumerator("navigator:browser")
 }
 

From e31b3a6a84ab6b7430cfcefb760ffedc527cfb69 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 5 Jun 2011 13:30:07 -0500
Subject: [PATCH 127/829] Closes #339 Adding sv-SE locale.  Crediting 'Mikael
 Hiort af Orns' as the translator. (cherry picked from commit
 fa5ee0f43afefdcf0ba9c3351fddd2cfb445c572)

---
 extension/chrome.manifest                   |   1 +
 extension/install.rdf                       |   1 +
 extension/locale/sv-SE/scriptish.properties | 100 ++++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 extension/locale/sv-SE/scriptish.properties

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index bd7da94d..73e799ab 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -22,3 +22,4 @@ overlay    chrome://scriptish/content/newscript.xul chrome://scriptish/content/c
 locale     scriptish  en-US  locale/en-US/
 locale     scriptish  ja-JP  locale/ja-JP/
 locale     scriptish  ru-RU  locale/ru-RU/
+locale     scriptish  sv-SE  locale/sv-SE/
diff --git a/extension/install.rdf b/extension/install.rdf
index 4d3e93f8..9b0a9509 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -56,6 +56,7 @@
     <em:contributor>John J. Barton</em:contributor>
 
     <em:translator>nishikawasasaki (kohsei yamamoto)</em:translator>
+    <em:translator>Mikael Hiort af Ornäs</em:translator>
 
     <em:updateURL>http://github.com/downloads/erikvold/scriptish/update.rdf</em:updateURL>
     <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjEA/hqcsMgPctoWvqJFfjtNcQbfBi1uP3zoWR3PPMRSXnpBJv/5Kb5lJD9HJ+963CFQ3oFvkgO9+oEWisiKBjxhx94Bynl0Ym2sZ1DdEzTsH9kV4HGFLjeYTix5WkQqdoswyM32ebtDSYrFbSqxpBrgHwVLELfFYM1qZsnWpJKwIDAQAB</em:updateKey>
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
new file mode 100644
index 00000000..27dad705
--- /dev/null
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -0,0 +1,100 @@
+copyDownloadURL=Kopiera hämtnings-URL
+copyDownloadURL.ak=K
+edit=Redigera
+edit.ak=e
+editor.couldNotLaunch=Det gick inte att starta redigeringsprogrammet.
+editor.pleasePickExecutable=Var vänlig välj ett körbart program att använda för redigering av användarskript.
+editor.prompt=Var vänlig välj först det textredigeringsprogram du föredrar
+error.api.clipboard.type=är inte en typ som stöds av GM_setClipboard.
+error.api.noResourceWithName=Det finns ingen resurs med namnet
+error.api.noSecondArgValue=Det andra argumentet har inte angivits: Värde
+error.api.reqURL.scheme=Otillåtet schema i URL
+error.api.reqURL=Ogiltig URL
+error.api.unsafeAccess=Åtkomstfel i Scriptish: unsafeWindow kan inte anropa
+error.charset=Ogiltig teckenuppsättning angavs.
+error.dependency.loading=Fel vid inläsning av beroende
+error.dependency.local=Säkerhetsundantag: Förfrågningar till lokala URL:er och chrome-URL:er är förbjudna
+error.dependency.serverReturned=Fel! Servern returnerade
+error.hash.algorithm=Ogiltig hashalgoritm angavs.
+error.icon.dataURL=Ogiltig data: URL för @icon
+error.icon.notImage=Fel! @icon har ingen MIME-bildtyp
+error.icon.URL=Ogiltig URL för @icon
+error.isInvalidValue=är ett ogiltigt värde
+error.matchPattern.rules.file=@match-mönstret för filschema uppfyller inte mönsterreglerna
+error.matchPattern.rules=@match-mönster uppfyller inte mönsterreglerna
+error.notSupported.Firefox=stöds inte i denna version av Firefox
+error.openingFile=Det gick inte att öppna filen
+error.pattern.parsing=Det gick inte att parsa mönstret
+error.pref.type=Inställningstypen stöds inte. Giltiga typer är: sträng, boolesk och 32-bitars heltal.
+error.resource.dupName=är en resursnamnsdubblett.  Varje @resource måste ha ett unikt namn.
+error.resource.syntax=Ogiltig syntax för @resource-deklaration
+error.retrieving=Det gick inte att hämta
+error.script.installing=Fel vid installation av användarskript
+error.script.loading=Fel vid inläsning av användarskript
+greeting.btn=Installera
+greeting.btn.ak=I
+greeting.msg=Detta är ett användarskript. Klicka på "Installera" för att börja använda det.
+install.domains=domäner:
+install.matches=matchningar:
+install.includes=kan köras på:
+install.excludes=kan inte köras på:
+install.requires=kräver:
+install.resources=resurser:
+install.installButton=Installera
+install.showScriptSource=Visa skriptets källa
+install.title=Installation av användarskript
+install.warning1=Skadliga skript kan kränka din integritet och agera för din räkning utan din vetskap.
+install.warning2=Du bör endast installera skript från källor som du litar på.
+menu.commands=Användarskriptkommandon…
+menu.commands.ak=A
+menu.install=Installera användarskript…
+menu.install.ak=I
+menu.manage=Hantera användarskript…
+menu.manage.ak=H
+menu.new=Nytt användarskript…
+menu.new.ak=N
+menu.options.ak=ä
+menu.show=Visa användarskriptets källa
+menu.show.ak=V
+menu.title=Scriptish
+menu.title.ak=c
+menuitem.install=Installera detta användarskript…
+menuitem.manage=Hantera användarskript
+menuitem.new=Nytt användarskript
+moving.script=Flyttar skriptfil från
+moving.dependency=Flyttar beroendefil från
+newscript.description=Beskrivning
+newscript.excludes=Undantagna (ett per rad)
+newscript.exists=Ett skript med samma namn är redan installerat.\nVill du ersätta det?
+newscript.id=ID
+newscript.includes=Inkluderade (ett per rad)
+newscript.name=Namn
+newscript.namespace=Namnområde
+newscript.noID=Var vänlig ange ett giltigt ID för ditt skript.
+newscript.noName=Var vänlig ange ett namn på ditt skript.
+nothing.timedOut=ingenting (tidsgränsen uppnåddes)
+openFolder=Öppna mapp
+openFolder.ak=Ö
+saving=Sparar
+scriptOptions.includes=Inkluderade av användaren:
+scriptOptions.excludes=Undantagna av användaren:
+scriptOptions.disableScriptIncludes=Inaktivera detta skripts inkluderade mönster och använd endast de användardefinierade mönstren.
+options=Inställningar
+options.excludes=Globala undantag
+options.addonManager=Tilläggshanteraren
+options.alsoUninstallPrefs=Vid avinstallation av ett skript, ta även bort dess inställningar
+options.changeEditor=Byt redigeringsprogram
+options.editor=Redigeringsprogram
+options.enableCopyDownloadURL=Aktivera kopiering av hämtnings-URL
+options.requireSecured=Kräv att användarskript uppdateras via HTTPS
+options.useDownloadURL=Använd hämtnings-URL:en för uppdateringar om ingen uppdaterings-URL finns angiven
+statusbar.enabled=Aktiverat
+statusbar.enabled.ak=A
+statusbar.installed=har installerats
+statusbar.modified=har ändrats
+statusbar.noScripts=Inga skript för sidan!
+statusbar.updated=har uppdaterats
+tooltip.loading=Läser in…
+Uninstall=Avinstallera
+Update=Uppdatera
+userscripts=Användarskript

From 28db832dc997a51024d1958a02e012d5de774a3f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 5 Jun 2011 12:36:30 -0700
Subject: [PATCH 128/829] <em:contributor>Greg Parris;
 http://phob.net/</em:contributor> -> <em:developer>Greg Parris;
 http://phob.net/</em:developer>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 9b0a9509..b2ad3c0a 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -27,12 +27,12 @@
     <em:iconURL>chrome://scriptish/skin/scriptish32.png</em:iconURL>
     <em:icon64URL>chrome://scriptish/skin/scriptish64.png</em:icon64URL>
 
+    <em:developer>Greg Parris; http://phob.net/</em:developer>
     <em:contributor>Aaron Boodman; http://youngpup.net/</em:contributor>
     <em:contributor>Anthony Lieuallen; http://arantius.com/</em:contributor>
     <em:contributor>Chris Feldmann; http://axlotl.net/</em:contributor>
     <em:contributor>David Schontzler; http://stilleye.com/</em:contributor>
     <em:contributor>Gareth Andrew; http://freegarethandrew.org/</em:contributor>
-    <em:contributor>Greg Parris; http://phob.net/</em:contributor>
     <em:contributor>Hisateru Tanaka</em:contributor>
     <em:contributor>Jeremy Dunck; http://dunck.us/anabasis/</em:contributor>
     <em:contributor>Jesper Kristensen; mailto:mail@jesperkristensen.dk</em:contributor>

From 919ac3830ce991012b81bd944060ffd0896d634d Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 5 Jun 2011 15:54:36 -0700
Subject: [PATCH 129/829] Closes #340 setting a explicit width & height for
 script-options.xul

---
 extension/content/script-options.xul | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension/content/script-options.xul b/extension/content/script-options.xul
index b92551e7..3fbae797 100644
--- a/extension/content/script-options.xul
+++ b/extension/content/script-options.xul
@@ -4,6 +4,8 @@
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     buttons="accept"
     id="scriptish-script-options-dialog"
+    width="500"
+    height="400"
     persist="screenX screenY">
   <script type="application/x-javascript" src="chrome://scriptish/content/js/script-options.js"/>
 

From 0c81ce0b4de7745a9cfc929c61f6c462f5dad1e0 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 5 Jun 2011 16:16:19 -0700
Subject: [PATCH 130/829] don't delay calling aCallback for
 Scriptish.getConfig(aCallback) when the config is available; keep script
 injection time consistent post load

---
 extension/modules/scriptish.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 04e21e17..4b3837e7 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -15,7 +15,8 @@ Scriptish_prefRoot.watch("enabled", function() {
 
 var global = this;
 
-function getConfig(aCallback) timeout(function() aCallback(global.config));
+// don't delay calling aCallback; keep script injection time consistent post load
+function getConfig(aCallback) aCallback(global.config);
 
 const Scriptish = {
   updateSecurely: Scriptish_prefRoot.getValue("update.requireSecured"),

From c1f12239649e20b55fe86e6ac09d706329d53be6 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 5 Jun 2011 17:06:14 -0700
Subject: [PATCH 131/829] Closes #342 removing window unload listener

---
 extension/components/scriptish.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 621357dd..6a1f57e9 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -93,6 +93,7 @@ ScriptishService.prototype = {
     if (!window || !window.unloaders || !window.unloaders.length) return;
     for (var i = window.unloaders.length - 1; ~i; i--)
       window.unloaders[i]();
+    delete windows[aWinID];
   },
 
   docReady: function(safeWin, chromeWin) {
@@ -202,7 +203,6 @@ ScriptishService.prototype = {
 
       windows[currentInnerWindowID].unloaders.push(function() {
         winClosed = true;
-        delete windows[currentInnerWindowID];
         self.docUnload(currentInnerWindowID, gmBrowserUI);
       });
     });
@@ -300,10 +300,10 @@ ScriptishService.prototype = {
     Cu.import("resource://scriptish/api.js", tools);
 
     let delays = [];
-    wrappedContentWin.addEventListener("unload", function() {
-      for (let [, timerID] in Iterator(delays))
-        self.timer.clearTimeout(timerID);
-    }, true);
+    let winID = Scriptish_getWindowIDs(wrappedContentWin).innerID;
+    windows[winID].unloaders.push(function() {
+      for (let [, id] in Iterator(delays)) self.timer.clearTimeout(id);
+    });
 
     // detect and grab reference to firebug console and context, if it exists
     let fbConsole = Scriptish_getFirebugConsole(wrappedContentWin, chromeWin);

From dfc47e2f3ff9f6b48e8f5fb56fb6196cdca5e479 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 5 Jun 2011 12:56:44 -0500
Subject: [PATCH 132/829] Adding 'customIsGreaseableSchemes' to support
 scripting of non-standard schemes.

---
 extension/defaults/preferences/scriptish.js | 1 +
 extension/modules/scriptish.js              | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index b21eb033..b384366c 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -1,6 +1,7 @@
 pref("extensions.scriptish.aboutIsGreaseable", false);
 pref("extensions.scriptish.fileIsGreaseable", false);
 pref("extensions.scriptish.unmhtIsGreaseable", false);
+pref("extensions.scriptish.customIsGreaseableSchemes", "");
 pref("extensions.scriptish.blocklist.enabled", true);
 pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 4b3837e7..590a1de6 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -89,8 +89,10 @@ const Scriptish = {
         return Scriptish_prefRoot.getValue('fileIsGreaseable');
       case "unmht":
         return Scriptish_prefRoot.getValue('unmhtIsGreaseable');
+      default:
+        let schemes = Scriptish_prefRoot.getValue('customIsGreaseableSchemes');
+        return schemes.split(",").some(function(s) s.trim() == scheme);
     }
-    return false;
   },
   getMostRecentWindow: function() Services.wm.getMostRecentWindow("navigator:browser"),
   getWindows: function() Services.wm.getEnumerator("navigator:browser")

From 7c711044629bd180f4f11e460d54030995ef8608 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 5 Jun 2011 12:58:17 -0500
Subject: [PATCH 133/829] minor style change: using double quotes

---
 extension/modules/scriptish.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 590a1de6..f08ced1d 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -84,13 +84,13 @@ const Scriptish = {
         // Always allow "about:blank".
         if (/^about:blank/.test(aURL)) return true;
         // Conditionally allow the rest of "about:".
-        return Scriptish_prefRoot.getValue('aboutIsGreaseable');
+        return Scriptish_prefRoot.getValue("aboutIsGreaseable");
       case "file":
-        return Scriptish_prefRoot.getValue('fileIsGreaseable');
+        return Scriptish_prefRoot.getValue("fileIsGreaseable");
       case "unmht":
-        return Scriptish_prefRoot.getValue('unmhtIsGreaseable');
+        return Scriptish_prefRoot.getValue("unmhtIsGreaseable");
       default:
-        let schemes = Scriptish_prefRoot.getValue('customIsGreaseableSchemes');
+        let schemes = Scriptish_prefRoot.getValue("customIsGreaseableSchemes");
         return schemes.split(",").some(function(s) s.trim() == scheme);
     }
   },

From 8e6b464a1e924ef514f74496695abcaff531a700 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 6 Jun 2011 07:30:31 -0700
Subject: [PATCH 134/829] For #338 changing method of including new schemes to
 match GM's

---
 extension/defaults/preferences/scriptish.js |  3 ---
 extension/modules/scriptish.js              | 10 ++--------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index b384366c..5b94aa04 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -1,7 +1,4 @@
 pref("extensions.scriptish.aboutIsGreaseable", false);
-pref("extensions.scriptish.fileIsGreaseable", false);
-pref("extensions.scriptish.unmhtIsGreaseable", false);
-pref("extensions.scriptish.customIsGreaseableSchemes", "");
 pref("extensions.scriptish.blocklist.enabled", true);
 pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index f08ced1d..79d1ecf7 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -83,15 +83,9 @@ const Scriptish = {
       case "about":
         // Always allow "about:blank".
         if (/^about:blank/.test(aURL)) return true;
-        // Conditionally allow the rest of "about:".
-        return Scriptish_prefRoot.getValue("aboutIsGreaseable");
-      case "file":
-        return Scriptish_prefRoot.getValue("fileIsGreaseable");
-      case "unmht":
-        return Scriptish_prefRoot.getValue("unmhtIsGreaseable");
+        // no break
       default:
-        let schemes = Scriptish_prefRoot.getValue("customIsGreaseableSchemes");
-        return schemes.split(",").some(function(s) s.trim() == scheme);
+        return !!Scriptish_prefRoot.getValue(scheme+"IsGreaseable", false);
     }
   },
   getMostRecentWindow: function() Services.wm.getMostRecentWindow("navigator:browser"),

From fc0f78d023d6c9ab812bcfa9f37b1caf342d3df3 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 6 Jun 2011 09:42:03 -0500
Subject: [PATCH 135/829] ordering contributors list alphabetically

---
 extension/install.rdf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index b2ad3c0a..3daee54d 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -37,6 +37,7 @@
     <em:contributor>Jeremy Dunck; http://dunck.us/anabasis/</em:contributor>
     <em:contributor>Jesper Kristensen; mailto:mail@jesperkristensen.dk</em:contributor>
     <em:contributor>Johan Sundström; http://ecmanaut.blogspot.com/</em:contributor>
+    <em:contributor>John J. Barton</em:contributor>
     <em:contributor>JP Sugarbroad</em:contributor>
     <em:contributor>Juan Pablo Guereca Alonso</em:contributor>
     <em:contributor>Manpreet Singh</em:contributor>
@@ -44,19 +45,18 @@
     <em:contributor>Marti Martz</em:contributor>
     <em:contributor>Matthew Gray; http://mkgray.com:8000/</em:contributor>
     <em:contributor>Matthias Bauer; http://moeffju.net/</em:contributor>
+    <em:contributor>Melih Bilgil; http://picol.org/</em:contributor>
     <em:contributor>Mike Medley; http://sizzlemctwizzle.com/</em:contributor>
     <em:contributor>Nikolas Coukouma; http://atrus.org/</em:contributor>
+    <em:contributor>Nils Maier</em:contributor>
     <em:contributor>Ori Avtallon</em:contributor>
     <em:contributor>Pak Kei (logo); http://arkidect.com/</em:contributor>
     <em:contributor>Sergio Abreu; http://sitedosergio.sitesbr.net/</em:contributor>
     <em:contributor>Slowpoke</em:contributor>
     <em:contributor>Tommi Rautava</em:contributor>
-    <em:contributor>Nils Maier</em:contributor>
-    <em:contributor>Melih Bilgil; http://picol.org/</em:contributor>
-    <em:contributor>John J. Barton</em:contributor>
 
-    <em:translator>nishikawasasaki (kohsei yamamoto)</em:translator>
     <em:translator>Mikael Hiort af Ornäs</em:translator>
+    <em:translator>nishikawasasaki (kohsei yamamoto)</em:translator>
 
     <em:updateURL>http://github.com/downloads/erikvold/scriptish/update.rdf</em:updateURL>
     <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjEA/hqcsMgPctoWvqJFfjtNcQbfBi1uP3zoWR3PPMRSXnpBJv/5Kb5lJD9HJ+963CFQ3oFvkgO9+oEWisiKBjxhx94Bynl0Ym2sZ1DdEzTsH9kV4HGFLjeYTix5WkQqdoswyM32ebtDSYrFbSqxpBrgHwVLELfFYM1qZsnWpJKwIDAQAB</em:updateKey>

From d6617766e77dfd184fcd44a3d743cb55837c504d Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 6 Jun 2011 09:44:40 -0500
Subject: [PATCH 136/829] adding 'Developers' section to about:scriptish

---
 extension/content/aboutScriptish.html  | 3 +++
 extension/content/js/aboutScriptish.js | 1 +
 2 files changed, 4 insertions(+)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index bb72876d..b42d2c5c 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -61,6 +61,9 @@ <h3>Creator:</h3>
             <li>Erik Vold &mdash; <a href="http://erikvold.com/">http://erikvold.com/</a></li>
           </ul>
 
+          <h3>Developers:</h3>
+          <ul id="devlist"></ul>
+
           <h3>Contributors:</h3>
           <ul id="contlist"></ul>
 
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index c90a4705..df953c3d 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -42,6 +42,7 @@ Cu.import("resource://scriptish/utils/q.js");
   }
 
   AddonManager.getAddonByID("scriptish@erikvold.com", function(aAddon) {
+    aAddon.developers.forEach(addPerson.bind($("devlist")));
     aAddon.contributors.forEach(addPerson.bind($("contlist")));
     aAddon.translators.forEach(addPerson.bind($("translist")));
   });

From 7ced7c347a3201a057ec920fb90df57f0dde8422 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 6 Jun 2011 07:46:15 -0700
Subject: [PATCH 137/829] using a slightly faster timeout for @run-at
 document-idle

---
 extension/components/scriptish.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 6a1f57e9..6c7311ad 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -179,11 +179,11 @@ ScriptishService.prototype = {
 
           // inject @run-at document-idle scripts
           if (scripts["document-idle"].length)
-            self.timer.setTimeout(function() {
+            timeout(function() {
               if (shouldNotRun()) return;
               self.injectScripts(
                   scripts["document-idle"], href, currentInnerWindowID, safeWin, chromeWin);
-            }, 0);
+            });
 
           // inject @run-at document-end scripts
           self.injectScripts(scripts["document-end"], href, currentInnerWindowID, safeWin, chromeWin);

From a70e5ad25b4a8b4c8067f2c9ac579b0ba26bac10 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 6 Jun 2011 07:49:34 -0700
Subject: [PATCH 138/829] adding a comment about why I'm not using the window's
 setTimeout for @delay

---
 extension/components/scriptish.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 6c7311ad..754110e9 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -327,6 +327,7 @@ ScriptishService.prototype = {
       let delay = script.delay;
       if (delay || delay === 0) {
         let (script = script, sb = sandbox) {
+          // don't use window's setTimeout, b/c then window could clearTimeout
           delays.push(self.timer.setTimeout(function() {
             self.evalInSandbox(script, sandbox);
           }, script.delay));

From 007197958217c77613248bb8e2631c2efd000262 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 6 Jun 2011 17:58:18 +0200
Subject: [PATCH 139/829] Closes #343 Add homepage for nmaier (cherry picked
 from commit 2da0425c1f5eb578197af911c536f50b88b26511)

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 3daee54d..41e4dd18 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -48,7 +48,7 @@
     <em:contributor>Melih Bilgil; http://picol.org/</em:contributor>
     <em:contributor>Mike Medley; http://sizzlemctwizzle.com/</em:contributor>
     <em:contributor>Nikolas Coukouma; http://atrus.org/</em:contributor>
-    <em:contributor>Nils Maier</em:contributor>
+    <em:contributor>Nils Maier; https://tn123.org/</em:contributor>
     <em:contributor>Ori Avtallon</em:contributor>
     <em:contributor>Pak Kei (logo); http://arkidect.com/</em:contributor>
     <em:contributor>Sergio Abreu; http://sitedosergio.sitesbr.net/</em:contributor>

From 845d706aaed39ceec8aae4b397d09d391b7f15aa Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 6 Jun 2011 18:34:41 +0200
Subject: [PATCH 140/829] Initial de (German) locale

---
 extension/locale/de/scriptish.properties | 102 +++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 extension/locale/de/scriptish.properties

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
new file mode 100644
index 00000000..f566c61b
--- /dev/null
+++ b/extension/locale/de/scriptish.properties
@@ -0,0 +1,102 @@
+copyDownloadURL=Download URL kopieren
+copyDownloadURL.ak=k
+edit=Bearbeiten
+edit.ak=B
+editor.couldNotLaunch=Konnte den Editor nicht starten.
+editor.pleasePickExecutable=Bitte wählen sie eine ausführbare Anwendung zum Bearbeiten von Benutzerskripten aus.
+editor.prompt=Bitte erst den bevorzugten Texteditor wählen
+error.api.clipboard.type=ist kein von GM_setClipboard unterstützter Typ.
+error.api.noResourceWithName=Keine Resource mit dem Namen
+error.api.noSecondArgValue=Zweites Argument nicht spezifiziert: Value
+error.api.reqURL.scheme=Verbotenes Schema (Protokoll) in URL
+error.api.reqURL=Ungültige URL
+error.api.unsafeAccess=Scriptish Zugriffsverletzung: unsafeWindow darf nicht aufrufen
+error.charset=Ungültige Zeichenkodierung angegeben.
+error.dependency.loading=Fehler beim Laden von Anhängigkeit
+error.dependency.local=SecurityException: Anfragen nach lokalen oder Chrome-URLs sind verboten
+error.dependency.serverReturned=Fehler! Server gab zurück
+error.hash.algorithm=Ungültiger Hash-Algorithmus angegeben.
+error.icon.dataURL=Ungültige data:-URL für @icon
+error.icon.notImage=Fehler! @icon hat keinen Bild MIME-Typ
+error.icon.URL=Ungültige URL für @icon
+error.isInvalidValue=ist ein ungültiger Wert
+error.matchPattern.rules.file=File-Schema @match Muster hält sich nicht an die Regeln für Muster
+error.matchPattern.rules=@match Muster hält sich nicht an die Regeln für Muster
+error.notSupported.Firefox=wird nicht in dieser Version von Firefox unterstützt
+error.openingFile=Konnte Datei nicht öffnen
+error.pattern.parsing=Muster konnte nicht verarbeitet werden
+error.pref.type=Nicht unterstützter Einstellungstyp. Gültige Typen sind: string, bool und 32-bit int.
+error.resource.dupName=ist ein doppelter Resourcenname. Jede @resource muss einen eindeutigen Namen tragen.
+error.resource.syntax=Ungültige Syntax für @resource Deklaration
+error.retrieving=Fehler beim Abrufen
+error.script.installing=Fehler bei der Installation des Benutzerskripts
+error.script.loading=Fehler beim Laden des Benutzerskripts
+greeting.btn=Installieren
+greeting.btn.ak=I
+greeting.msg=Dies ist ein Benutzerskript. „Installieren" klicken um es zu benutzen.
+install.domains=Seiten:
+install.matches=Passend zu:
+install.includes=Läuft auf:
+install.excludes=Läuft nicht auf:
+install.requires=Benötigt:
+install.resources=Resourcen:
+install.installButton=Installieren
+install.showScriptSource=Quelltext anzeigen
+install.title=Benutzerskript Installation
+install.warning1=Bösartige Benutzerskripte können Ihre Daten auspähen oder ohne Ihre Genehmigung in ihren Namen handeln. Es handelt sich um echte kleine Programme.
+install.warning2=Sie sollten nur Benutzerskripte aus Quellen installieren, denen Sie auch vertrauen.
+menu.commands=Benutzerskript Befehle...
+menu.commands.ak=B
+menu.install=Benutzerskript installieren...
+menu.install.ak=I
+menu.manage=Benutzerskripte verwalten...
+menu.manage.ak=v
+menu.new=Neues Benutzerskript...
+menu.new.ak=N
+menu.options.ak=O
+menu.show=Quelltext anzeigen...
+menu.show.ak=Q
+menu.title=Scriptish
+menu.title.ak=S
+menuitem.install=Dieses Benutzerskript installieren
+menuitem.manage=Benutzerskripte verwalten
+menuitem.new=Neues Benutzerskript
+moving.script=Verschiebe Benutzerskript von
+moving.dependency=Verschiebe Abhängigkeitsdatei von
+newscript.description=Beschreibung
+newscript.excludes=Ausnahmen (eine pro Zeile)
+newscript.exists=Ein Benutzerskript mit diesem Namen existiert bereits.\nÜberschreiben?
+newscript.id=ID
+newscript.includes=Einschlüsse (einer pro Zeile)
+newscript.name=Name
+newscript.namespace=Namensraum
+newscript.noID=Bitte gültige ID für Ihr Benutzerskript angeben.
+newscript.noName=Bitte Namen für Ihr Benutzerskript angeben.
+nothing.timedOut=Nichts (Zeitüberschreitung)
+openFolder=Ordner öffnen
+openFolder.ak=O
+saving=Speichern
+scriptOptions.includes=Benutzer-Einschlüsse:
+scriptOptions.excludes=Benutzer-Ausnahmen:
+scriptOptions.disableScriptIncludes=Die Einschlüsse dieses Benutzerskripts deaktivieren und nur Benutzereinschlüsse verwenden.
+options=Options
+options.excludes=Globale Ausnahmen
+options.addonManager=Add-ons-Manager
+options.alsoUninstallPrefs=Wenn ein Benutzerskript entfernt wird, dann auch seine Einstellungen entfernen
+options.changeEditor=Editor ändern
+options.editor=Editor
+options.enableCopyDownloadURL=Kopieren der Download-URL aktivieren
+options.requireSecured=Benutzerskripte müssen über eine sichere Verbindung (https) aktualisiert werden
+options.useDownloadURL=Download-URL für Aktualisierungen benutzen, wenn es keine gesonderte Aktualisierungs-URL gibt
+statusbar.enabled=Aktiviert
+statusbar.enabled.ak=K
+statusbar.installed=erfolgreich installiert
+statusbar.modified=geändert
+statusbar.noScripts=Keine Benutzerskripte für diese Seite!
+statusbar.updated=erfolgreich aktualisiert
+tooltip.loading=Lade...
+Uninstall=Entfernen
+Update=Aktualisieren
+userscripts=Benutzerskripte
+userscripts.get=Benutzerskripte finden
+userscripts.noneInstalled=Sie haben keine Benutzerskripte installiert

From 10d93d0e39e2305efb85efc2a23d56609ba1244f Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 6 Jun 2011 18:35:35 +0200
Subject: [PATCH 141/829] Register de locale in chrome.manifest

---
 extension/chrome.manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 73e799ab..f881696b 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -20,6 +20,7 @@ overlay    chrome://scriptish/content/options.xul chrome://scriptish/content/clo
 overlay    chrome://scriptish/content/newscript.xul chrome://scriptish/content/closewindow.xul
 
 locale     scriptish  en-US  locale/en-US/
+locale     scriptish  de  locale/de/
 locale     scriptish  ja-JP  locale/ja-JP/
 locale     scriptish  ru-RU  locale/ru-RU/
 locale     scriptish  sv-SE  locale/sv-SE/

From ab7c84da1b97c1d89fc8fdd3d7a8c0675f390479 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 6 Jun 2011 19:27:16 +0200
Subject: [PATCH 142/829] Add em:translator for de

No em:localized, because this would require to duplicate a lot of stuff such as all em:developer/em:contributor/em:translator and such.
---
 extension/install.rdf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/install.rdf b/extension/install.rdf
index 3daee54d..7e02f67c 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -56,6 +56,7 @@
     <em:contributor>Tommi Rautava</em:contributor>
 
     <em:translator>Mikael Hiort af Ornäs</em:translator>
+    <em:translator>Nils Maier (de)</em:translator>
     <em:translator>nishikawasasaki (kohsei yamamoto)</em:translator>
 
     <em:updateURL>http://github.com/downloads/erikvold/scriptish/update.rdf</em:updateURL>

From 70bbbb46392019304bdb39efbdc8316c969bea1c Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 6 Jun 2011 13:03:30 -0700
Subject: [PATCH 143/829] Closes #332 allow users to disable notifications.

---
 extension/defaults/preferences/scriptish.js       | 1 +
 extension/modules/utils/Scriptish_notification.js | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 5b94aa04..7c5e7f18 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -3,6 +3,7 @@ pref("extensions.scriptish.blocklist.enabled", true);
 pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
 pref("extensions.scriptish.blocklist.url", "https://github.com/erikvold/scriptish/raw/master/blocklist.json");
+pref("extensions.scriptish.disableNotifications", false);
 pref("extensions.scriptish.enableCopyDownloadURL", false);
 pref("extensions.scriptish.enableScriptRefreshing", true);
 pref("extensions.scriptish.uninstallPreferences", true);
diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index ccfd12ca..bba572a6 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -1,7 +1,12 @@
 var EXPORTED_SYMBOLS = ["Scriptish_notification"];
 Components.utils.import("resource://scriptish/constants.js");
+Components.utils.import("resource://scriptish/prefmanager.js");
+Components.utils.import("resource://scriptish/logging.js");
 
 function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
+  if (Scriptish_prefRoot.getValue("disableNotifications"))
+    return Scriptish_log(aMsg);
+
   timeout(function() {
     if (aCallback) var callback = new Observer(aCallback);
 

From 430177b89bcc16037c89f25226deb0072e495402 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 7 Jun 2011 16:37:15 +0200
Subject: [PATCH 144/829] The about menu item from the Add-on Manager should
 open about:scriptish

Possible other consumers of em:aboutURL, too.
Implement this by using a stub XUL "window" that in turn opens a new about:Scriptish tab within the most recent browser.
Do not use window.opener tricks or such, as there is no guarantee the opener will be a browser.
---
 extension/content/aboutStub.xul | 16 ++++++++++++++++
 extension/install.rdf           |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 extension/content/aboutStub.xul

diff --git a/extension/content/aboutStub.xul b/extension/content/aboutStub.xul
new file mode 100644
index 00000000..59ec4403
--- /dev/null
+++ b/extension/content/aboutStub.xul
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE window>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="text/javascript"><![CDATA[
+    try {
+      Components.utils.import("resource://gre/modules/Services.jsm");
+      let browserWindow = Services.wm.getMostRecentWindow("navigator:browser");
+      (browserWindow.delayedOpenTab || browserWindow.addTab)("about:scriptish");
+    }
+    catch (ex) {
+      // Shouldn't happen, obviously :p
+      Components.utils.reportError(ex);
+    }
+    close();
+  ]]></script>
+</window>
diff --git a/extension/install.rdf b/extension/install.rdf
index 6345da00..fa45937d 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -22,6 +22,7 @@
 
     <em:version>0.1.2pre</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
+    <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://github.com/erikvold/scriptish</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
     <em:iconURL>chrome://scriptish/skin/scriptish32.png</em:iconURL>

From 78b9689452c089b38f4812d31a6f6a901a59d761 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 7 Jun 2011 17:10:03 -0700
Subject: [PATCH 145/829] Closes #350 tabBrowser is null error for
 Scriptish_getBrowserForContentWindow

---
 extension/modules/utils/Scriptish_getBrowserForContentWindow.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/modules/utils/Scriptish_getBrowserForContentWindow.js b/extension/modules/utils/Scriptish_getBrowserForContentWindow.js
index d4b3c1fb..5922dbf1 100644
--- a/extension/modules/utils/Scriptish_getBrowserForContentWindow.js
+++ b/extension/modules/utils/Scriptish_getBrowserForContentWindow.js
@@ -6,6 +6,7 @@ function Scriptish_getBrowserForContentWindow(aWin) {
   while (browserEnumerator.hasMoreElements()) {
     let browserWin = browserEnumerator.getNext();
     let tabBrowser = browserWin.getBrowser();
+    if (!tabBrowser) continue;
     for (let [, tab] in Iterator(tabBrowser.tabs)) {
       if (!tab) continue;
       let win = tab.linkedBrowser.contentWindow;

From 475bc301693c0e6e5014a264afb5056577d5a76f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 7 Jun 2011 21:17:21 -0700
Subject: [PATCH 146/829] bug fix: testIsGMable.js tests failed when a pref
 like extensions.scriptish.fileIsGreaseable is not a bool type

---
 extension/modules/prefmanager.js | 8 +++++++-
 extension/modules/scriptish.js   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/extension/modules/prefmanager.js b/extension/modules/prefmanager.js
index b15f61b6..9acdc9b0 100644
--- a/extension/modules/prefmanager.js
+++ b/extension/modules/prefmanager.js
@@ -48,7 +48,13 @@ function Scriptish_PrefManager(startPoint) {
       return defaultValue != undefined ? defaultValue : null;
     }
     return null;
-  }
+  };
+
+  this.getBoolValue = function(aName, aDefault) {
+    if (pref.PREF_BOOL == pref.getPrefType(aName))
+      return pref.getBoolPref(aName);
+    return aDefault || false;
+  };
 
   /**
    * sets the named preference to the specified value. values must be strings,
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 79d1ecf7..b8b8309f 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -85,7 +85,7 @@ const Scriptish = {
         if (/^about:blank/.test(aURL)) return true;
         // no break
       default:
-        return !!Scriptish_prefRoot.getValue(scheme+"IsGreaseable", false);
+        return Scriptish_prefRoot.getBoolValue(scheme+"IsGreaseable");
     }
   },
   getMostRecentWindow: function() Services.wm.getMostRecentWindow("navigator:browser"),

From b725fbead5a2d8ba336c13a38fe0ef72072ab5f4 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 7 Jun 2011 22:25:51 -0700
Subject: [PATCH 147/829] test: Scriptish.enabled getter and
 extensions.scriptish.enabled pref exists and is a bool

---
 extension/content/tests/runTests.js           |  1 +
 .../content/tests/testScriptishEnabled.js     | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 extension/content/tests/testScriptishEnabled.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index a29cf037..c9c51638 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -5,6 +5,7 @@ function runTests() {
     function() include("tests/testCryptoHash.js"),
     function() include("tests/testToolsMenuItem.js"),
     function() include("tests/testIsGMable.js"),
+    function() include("tests/testScriptishEnabled.js"),
     function() include("tests/testTimeout.js"),
     function() include("tests/endTests.js"));
 }
diff --git a/extension/content/tests/testScriptishEnabled.js b/extension/content/tests/testScriptishEnabled.js
new file mode 100644
index 00000000..d2fcdb63
--- /dev/null
+++ b/extension/content/tests/testScriptishEnabled.js
@@ -0,0 +1,19 @@
+
+Components.utils.import("resource://scriptish/scriptish.js");
+
+module("Scriptish.enabled");
+var PREF_BRANCH = Services.prefs.getBranch("extensions.scriptish.");
+
+test("get enabled", function() {
+  expect(2);
+  try {
+    var enabled = PREF_BRANCH.getBoolPref("enabled");
+    ok(true, "no error getting pref")
+  } catch (e) {
+    var enabled = false; // default
+    ok(false, "failed to get pref")
+  }
+
+  equal(Scriptish.enabled, enabled,
+      "Scriptish should be " + ((enabled) ? "enabled" : "disabled"));
+});

From 0f9144a792c61c91bacf1cb3cb7942e98901a4a0 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 7 Jun 2011 22:37:43 -0700
Subject: [PATCH 148/829] test: Scriptish.updateSecurely returns
 extensions.scriptish.update.requireSecured and that it's a bool pref

---
 extension/content/tests/runTests.js           |  1 +
 .../tests/testScriptishUpdateSecurely.js      | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 extension/content/tests/testScriptishUpdateSecurely.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index c9c51638..b84a52a9 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -6,6 +6,7 @@ function runTests() {
     function() include("tests/testToolsMenuItem.js"),
     function() include("tests/testIsGMable.js"),
     function() include("tests/testScriptishEnabled.js"),
+    function() include("tests/testScriptishUpdateSecurely.js"),
     function() include("tests/testTimeout.js"),
     function() include("tests/endTests.js"));
 }
diff --git a/extension/content/tests/testScriptishUpdateSecurely.js b/extension/content/tests/testScriptishUpdateSecurely.js
new file mode 100644
index 00000000..77039e9e
--- /dev/null
+++ b/extension/content/tests/testScriptishUpdateSecurely.js
@@ -0,0 +1,19 @@
+
+Components.utils.import("resource://scriptish/scriptish.js");
+
+module("Scriptish.updateSecurely");
+var PREF_BRANCH = Services.prefs.getBranch("extensions.scriptish.");
+
+test("get updateSecurely", function() {
+  expect(2);
+  try {
+    var prefVal = PREF_BRANCH.getBoolPref("update.requireSecured");
+    ok(true, "no error getting pref")
+  } catch (e) {
+    var prefVal = false; // default
+    ok(false, "failed to get pref")
+  }
+
+  equal(Scriptish.updateSecurely, prefVal,
+      "Scriptish.updateSecurely does not match extensions.scriptish.update.requireSecured");
+});

From ebba8ac86f929e881fbd8ee622592c1b099a45af Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 7 Jun 2011 22:43:16 -0700
Subject: [PATCH 149/829] bug fix: Scriptish.updateSecurely should only return
 a bool

---
 extension/modules/scriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index b8b8309f..402e2387 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -19,7 +19,7 @@ var global = this;
 function getConfig(aCallback) aCallback(global.config);
 
 const Scriptish = {
-  updateSecurely: Scriptish_prefRoot.getValue("update.requireSecured"),
+  updateSecurely: Scriptish_prefRoot.getBoolValue("update.requireSecured"),
   notify: function(aSubject, aTopic, aData) {
     if (true === aData) {
       aData = {saved: true};

From 9c9996b3c3afc80d226a54a2d3d05fc762692855 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 7 Jun 2011 23:01:50 -0700
Subject: [PATCH 150/829] test: Scriptish.getConfig

---
 extension/content/tests/runTests.js      |  1 +
 extension/content/tests/testGetConfig.js | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 extension/content/tests/testGetConfig.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index b84a52a9..78c60bbe 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -5,6 +5,7 @@ function runTests() {
     function() include("tests/testCryptoHash.js"),
     function() include("tests/testToolsMenuItem.js"),
     function() include("tests/testIsGMable.js"),
+    function() include("tests/testGetConfig.js"),
     function() include("tests/testScriptishEnabled.js"),
     function() include("tests/testScriptishUpdateSecurely.js"),
     function() include("tests/testTimeout.js"),
diff --git a/extension/content/tests/testGetConfig.js b/extension/content/tests/testGetConfig.js
new file mode 100644
index 00000000..7085d282
--- /dev/null
+++ b/extension/content/tests/testGetConfig.js
@@ -0,0 +1,21 @@
+
+Components.utils.import("resource://scriptish/scriptish.js");
+Components.utils.import("resource://scriptish/config/config.js");
+
+module("Scriptish.getConfig");
+
+asyncTest("returns config", function() {
+  expect(3);
+
+  var gotConfig = false, config1;
+  Scriptish.getConfig(function(config) {
+    ok(config instanceof Config, "typeof config is right");
+    gotConfig = true;
+    config1 = config;
+  });
+  Scriptish.getConfig(function(config) {
+    ok(config === config1, "Scriptish.getConfig returns the same config");
+  });
+  ok(gotConfig, "should have got config synchronously despite the asynchronously signature of Scriptish.getConfig");
+  start();
+});

From bbc3c6f2af533c4625fa26d23b43a486d6b8bee2 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 8 Jun 2011 15:56:38 +0200
Subject: [PATCH 151/829] Rewrite options dialog to use <prefwindow>

<prefwindow> has a lot of advantages, such as platform specific integration that fits user expectations better.

Also add some advanced options:

* Use default locale
* Require built-in certs
* Disable notifications
* LogChrome

The security stuff was moved to the Advanced Pane, while Global Excludes received it's own pane.
Also, the current editor path is now shown within the UI

Icons courtesy of http://www.openclipart.org/
---
 extension/content/js/options.js             | 109 ++++++++++----------
 extension/content/options.xul               |  83 ++++++++++-----
 extension/locale/en-US/scriptish.properties |  13 ++-
 extension/skin/options.css                  |  15 +++
 extension/skin/options.png                  | Bin 0 -> 6150 bytes
 5 files changed, 139 insertions(+), 81 deletions(-)
 create mode 100644 extension/skin/options.css
 create mode 100644 extension/skin/options.png

diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index 7717e890..8c12efc1 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -1,70 +1,67 @@
+"use strict";
+
 Components.utils.import("resource://scriptish/scriptish.js");
 Components.utils.import("resource://scriptish/logging.js");
-Components.utils.import("resource://scriptish/prefmanager.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
-var $ = function(aID) document.getElementById(aID);
-
-window.addEventListener("load", function() {
-  var tmp;
+function $(aID) document.getElementById(aID);
 
-  tmp = Scriptish_stringBundle("options");
-  let dialog = $("scriptish-options-dialog");
-  dialog.setAttribute("title", "Scriptish - " + tmp);
-  dialog.setAttribute("ondialogaccept", "return doSave();");
-  $("scriptish-header").setAttribute("description", tmp);
-  $("caption-editor")
-      .setAttribute("label", Scriptish_stringBundle("options.editor"));
-  $("btn-editor")
-      .addEventListener("command", Scriptish_getEditor, false);
-  $("label-editor")
-      .setAttribute("value", Scriptish_stringBundle("options.changeEditor"));
+function changeEditor() {
+  var tools = {};
+  Components.utils.import("resource://scriptish/utils/Scriptish_getEditor.js", tools);
+  tools.Scriptish_getEditor(window, true);
+}
 
-  $("caption-uninstall")
-      .setAttribute("label", Scriptish_stringBundle("Uninstall"));
-  tmp = $("check-uninstall");
-  tmp.setAttribute("label", Scriptish_stringBundle("options.alsoUninstallPrefs"));
-  tmp.checked = Scriptish_prefRoot.getValue("uninstallPreferences");
+function saveExcludes() {
+  Scriptish.getConfig(function(config) (
+    config.excludes = $("excludes").value.match(/.+/g)));
+  Scriptish.notify(null, "scriptish-preferences-change", true);
+}
 
-  $("caption-update")
-      .setAttribute("label", Scriptish_stringBundle("Update"));
-  tmp = $("check-downloadURL");
-  tmp.setAttribute("label", Scriptish_stringBundle("options.useDownloadURL"));
-  tmp.checked = Scriptish_prefRoot.getValue("useDownloadURLForUpdateURL");
-  tmp = $("check-requireSecured");
-  tmp.setAttribute("label", Scriptish_stringBundle("options.requireSecured"));
-  tmp.checked = Scriptish_prefRoot.getValue("update.requireSecured");
+/*
+ * Localize XUL elements (as defined by localize-attributes) from a stringbundle
+ * @author Nils Maier
+ */
+addEventListener("DOMContentLoaded", function localize() {
+  removeEventListener("DOMContentLoaded", localize, false);
 
-  $("caption-addonmanager")
-      .setAttribute("label", Scriptish_stringBundle("options.addonManager"));
-  tmp = $("check-copydownloadURL");
-  tmp.setAttribute(
-      "label", Scriptish_stringBundle("options.enableCopyDownloadURL"));
-  tmp.checked = Scriptish_prefRoot.getValue("enableCopyDownloadURL");
+  let nodes = document.querySelectorAll("*[localize]");
+  for (let i = 0, e = nodes.length, n; i < e; ++i) {
+    n = nodes[i];
+    let localized = n.getAttribute("localize").split(",");
+    for each (let l in localized) {
+      try {
+        let s = Scriptish_stringBundle(n.getAttribute(l));
+        n.setAttribute(l, s);
 
-  // Setup global excludes
-  $("excludes-caption").setAttribute("label", Scriptish_stringBundle("options.excludes"));
-  Scriptish.getConfig(function(config) (
-      $("excludes").value = config.excludes.join("\n")));
+        // also localize panes
+        if (/^pane-/.test(n.id)) {
+          n = document.documentElement._selector.querySelector("*[pane=\"" + n.id + "\"]");
+          if (n) {
+            n.setAttribute(l, s);
+          }
+        }
+      }
+      catch (ex) {
+        Scriptish_log("Failed to set localized attribute; l=" + l);
+      }
+    }
+  }
 }, false);
 
-function Scriptish_getEditor() {
-  var tools = {};
-  Components.utils.import("resource://scriptish/utils/Scriptish_getEditor.js", tools);
-  tools.Scriptish_getEditor(window, true);
-}
+addEventListener("load", function init() {
+  removeEventListener("load", init, false);
 
-function doSave() {
-  Scriptish_prefRoot.setValue("uninstallPreferences",
-      !!$("check-uninstall").checked);
-  Scriptish_prefRoot.setValue("useDownloadURLForUpdateURL",
-      !!$("check-downloadURL").checked);
-  Scriptish_prefRoot.setValue("update.requireSecured",
-      !!$("check-requireSecured").checked);
-  Scriptish_prefRoot.setValue("enableCopyDownloadURL",
-      !!$("check-copydownloadURL").checked);
+  let instantApply = $('pref-editor').instantApply;
 
+  // init custom excludes preferences
+  let excludes = $("excludes");
   Scriptish.getConfig(function(config) (
-      config.excludes = $("excludes").value.match(/.+/g)));
-  Scriptish.notify(null, "scriptish-preferences-change", true);
-}
+    excludes.value = config.excludes.join("\n")));
+  if (instantApply) {
+    excludes.addEventListener("input", saveExcludes, false);
+  }
+  else {
+    addEventListener("dialogaccept", saveExcludes, true);
+  }
+}, false);
diff --git a/extension/content/options.xul b/extension/content/options.xul
index 747f3f09..ccaf41aa 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -1,40 +1,75 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    buttons="accept"
-    id="scriptish-options-dialog"
-    persist="screenX screenY">
-  <script type="application/x-javascript" src="chrome://scriptish/content/js/options.js"/>
+<?xml-stylesheet href="chrome://scriptish/skin/options.css" type="text/css"?>
+<prefwindow
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  id="scriptish-options-dialog"
+  title="options.title"
+  localize="title"
+  style="min-width: 48em;"
+  persist="screenX screenY">
 
-  <dialogheader id="scriptish-header" title="Scriptish"/>
+  <commandset>
+    <command id="cmd-change-editor" oncommand="changeEditor()"/>
+  </commandset>
 
-  <vbox>
-    <groupbox>
-      <caption id="excludes-caption" control="excludes"/>
-      <textbox id="excludes" multiline="true" rows="4" cols="60"/>
+  <preferences id="scriptish-preferences">
+    <preference id="pref-disableNotifications" name="extensions.scriptish.disableNotifications" type="bool"/>
+    <preference id="pref-editor" name="extensions.scriptish.editor" type="unichar"/>
+    <preference id="pref-enableCopyDownloadURL" name="extensions.scriptish.enableCopyDownloadURL" type="bool"/>
+    <preference id="pref-logChrome" name="extensions.scriptish.logChrome" type="bool"/>
+    <preference id="pref-uninstallPreferences" name="extensions.scriptish.uninstallPreferences" type="bool"/>
+    <preference id="pref-update-requireBuiltInCerts" name="extensions.scriptish.update.requireBuiltInCerts" type="bool"/>
+    <preference id="pref-update-requireSecured" name="extensions.scriptish.update.requireSecured" type="bool"/>
+    <preference id="pref-useDefaultLocale" name="extensions.scriptish.useDefaultLocale" type="bool"/>
+    <preference id="pref-useDownloadURLForUpdateURL" name="extensions.scriptish.useDownloadURLForUpdateURL" type="bool"/>
+  </preferences>
+
+  <prefpane id="pane-main" label="options.pane.main" localize="label">
+    <groupbox orient="horizontal">
+      <caption label="options.editor" localize="label"/>
+      <textbox preference="pref-editor" flex="1" readonly="true"/>
+      <button command="cmd-change-editor" label="options.changeEditor" localize="label"/>
     </groupbox>
 
     <groupbox>
-      <caption id="caption-editor"/>
-      <button id="btn-editor">
-        <label id="label-editor"/>
-      </button>
+      <caption label="Uninstall" localize="label"/>
+      <checkbox preference="pref-uninstallPreferences" label="options.alsoUninstallPrefs" localize="label"/>
     </groupbox>
 
     <groupbox>
-      <caption id="caption-uninstall"/>
-      <checkbox id="check-uninstall"/>
+      <caption label="Update" localize="label"/>
+      <checkbox preference="pref-useDownloadURLForUpdateURL" label="options.useDownloadURL" localize="label"/>
     </groupbox>
 
     <groupbox>
-      <caption id="caption-update"/>
-      <checkbox id="check-downloadURL"/>
-      <checkbox id="check-requireSecured"/>
+      <caption label="options.addonManager" localize="label"/>
+      <checkbox preference="pref-enableCopyDownloadURL" label="options.enableCopyDownloadURL" localize="label"/>
     </groupbox>
+  </prefpane>
 
+  <prefpane id="pane-excludes" label="options.pane.excludes" localize="label">
+    <textbox id="excludes" multiline="true" rows="15"/>
+  </prefpane>
+
+  <prefpane id="pane-advanced" label="options.pane.advanced" localize="label">
+    <groupbox>
+      <caption label="options.notifications" localize="label"/>
+      <checkbox preference="pref-disableNotifications" label="options.notifications.disable" localize="label"/>
+    </groupbox>
     <groupbox>
-      <caption id="caption-addonmanager"/>
-      <checkbox id="check-copydownloadURL"/>
+      <caption label="options.translation" localize="label"/>
+      <checkbox preference="pref-useDefaultLocale" label="options.translation.useEnglish" localize="label"/>
     </groupbox>
-  </vbox>
-</dialog>
+    <groupbox>
+      <caption label="options.logging" localize="label"/>
+      <checkbox preference="pref-logChrome" label="options.logChrome" localize="label"/>
+    </groupbox>
+    <groupbox>
+      <caption label="options.update.security" localize="label"/>
+      <checkbox preference="pref-update-requireSecured" label="options.requireSecured" localize="label"/>
+      <checkbox preference="pref-update-requireBuiltInCerts" label="options.requireBuiltInCerts" localize="label"/>
+    </groupbox>
+  </prefpane>
+
+  <script type="application/x-javascript" src="chrome://scriptish/content/js/options.js"/>
+</prefwindow>
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index ad9c7a35..3e420154 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -80,13 +80,24 @@ scriptOptions.includes=User Includes:
 scriptOptions.excludes=User Excludes:
 scriptOptions.disableScriptIncludes=Disable this script's include patterns and only use the user defined ones.
 options=Options
-options.excludes=Global Excludes
+options.title=Scriptish Options
+options.pane.main=Main
+options.pane.excludes=Global Excludes
+options.pane.advanced=Advanced
 options.addonManager=Add-on Manager
 options.alsoUninstallPrefs=When uninstalling a script, also remove its preferences
 options.changeEditor=Change Editor
 options.editor=Editor
 options.enableCopyDownloadURL=Enable copying of download URL
+options.logging=Logging
+options.logChrome=Log non-critical extension messages to the Error Console
+options.notifications=Notifications
+options.notifications.disable=Disable sliding notifications on script changes
+options.requireBuiltInCerts=Secure update requires using built-in certificates
 options.requireSecured=Require user scripts to update using HTTPS
+options.translation=Translation
+options.translation.useEnglish=Always use English
+options.update.security=Update Security
 options.useDownloadURL=Use download URL for updates if there is no update URL
 statusbar.enabled=Enabled
 statusbar.enabled.ak=E
diff --git a/extension/skin/options.css b/extension/skin/options.css
new file mode 100644
index 00000000..9fde6487
--- /dev/null
+++ b/extension/skin/options.css
@@ -0,0 +1,15 @@
+@import "chrome://global/skin/";
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+radio[pane] {
+  list-style-image: url(options.png);
+}
+radio[pane="pane-main"] {
+  -moz-image-region: rect(0px, 32px, 32px, 0px);
+}
+radio[pane="pane-excludes"] {
+  -moz-image-region: rect(0px, 64px, 32px, 32px);
+}
+radio[pane="pane-advanced"] {
+  -moz-image-region: rect(0px, 96px, 32px, 64px);
+}
diff --git a/extension/skin/options.png b/extension/skin/options.png
new file mode 100644
index 0000000000000000000000000000000000000000..78d233e3e0ebed51ba0421dcd01c04b23dc6f277
GIT binary patch
literal 6150
zcmV+h82RUkP)<h;3K|Lk000e1NJLTq003YB001Be1^@s6?ZACh0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU}s7XXYRCwCVT6cI9<<>v5vn^XwHpwQN
z4rzoM0t5nL0YpI{C<#sA67XW7qZF?cQ9wcX2we0r#EJ^iM4BRe3MvQ!8iA0Iklr?%
zwk6wl<~#2sSrSqR-uuV*KF|APGv%F`-#O=Ze&@_kEXx8J6h%R|MmW%lXvO2o-pWx{
zp0$_BWO7*YEqmb%oPviKE!XX6>{h8_6k%a|@TLT&^70RSD=YU;VObYE<k+QD4wi?9
zZ*<x1B@MT4zqOoYi{by<AV72lM(ZJdOgvt(NRcbwC}(+Vcr2`fruj11(J-37bKU#r
z4w)==|KpDr+D#_bX|u7}Uw&!Hh>AMB9)RE3IUUW6$jF^PtyxoJtgU6M^YYkz!-f@Z
zlgWBL%o<(Il*MmmuHN~%;f-Bi7-qh<IrHzXLv=d>dO=@!6s~~+`0e(YaGr#IPzZl@
zxkeb!Pz0{dBH%rRB1V&taQfL3C&Kt19&STbT)JfcZtmQ($~$)^bSDzfVCf03y*4X$
z=1gVFbsQ!W98XRzs>;e5x7=vV?yjSZ|L2-8nxay9JbK^JJ#UtiZK+E)@-zVfzm7;6
zmMGx!;o{}XziF$qNtv5gFl7IN_30X#N6iEtb>QFsdZnnV^?BWPSq=2>5PUMUZ~^1s
zRtIz?<VEv_iw23-PWor^mDMk=F${Zl*d8=QyX)>$D58S~4m|bj@#9V4TN;6_uHg0s
z4jn2SlacX6LuBN!gA_$~b(?#mqtg>suAJQhKI?P<xLm-ON@4ubqhaa+15Umtm-l+m
z<BprRijUyW3kwZB->+Z)Ei#$p-6@MVh{!&g;z^ZCrI$=10jbmjyzn=Vrln-xi|f-x
z3c2*%5yKL<#6?A&U-b3|^OkJ>fd8Kxpb$<#8Qg8R-2$ah0Fyb-4#j(mpyItIdMyuG
z8gjB{TF;t3Yx?{=e$4pwZ!X<9XxcN=B^#H&{bF!n$gI{&Y*#3v)B^{eo_yj&I3FJh
z4D~?G90}~$7+|mc!bO25DM>Wu!w*O4BO|}rKv5mucSdydu7p*qX2;H$p&<V^o;nHz
z(JCl^VJff=JCL=<9Xb>i&<!I{G!H}q!L*(|dxpfsM8Uv>gy}+oU?pb&ny2>nRr!lV
zA`lCOp!W0iM+Q-oeL|sd<zvH>rpNb<gZ{l^LqsCMG=}NoIuDhEBfwXfD4fd==C3nT
z<|d9PfvaeOeUebgNU5Ln5mA81NA52NiB!Vvw$<5Ssd5=RsPAC+1-56tm-+F#AI;-_
zQ&e!^$dTs>_yY7&FzSJtI~rU!t^$L%=JJpMopBPV_+i|+Wfv}3e^{{KOhsN^@;a7v
zKib~d*xiGWcA}?ElXI+i@(5HdoDEKglUqkJY8(W8@HtQdAvhWv;Z#aWQQgg(PrXu8
zlhfJbCcm^cb?DH<FM32o(1iJP+G<m!w(6upu853{ij4PFd4qsYgTY{gyn@2(X0ti3
zM|kMC9$}#}50Mb=+%0q+|Nh*J^w(cJ@SjIO7<f}aMGCdTdfGsjxwnTv0wlrzn1js8
zI-$;|thNm7=xr^-rn9k8;n5uUVzC(f{QN-euQs;q_lk{OJ8s{;Ch$p8N_!HRX7IV$
zXaZZ>IB;G2wJ8!tj1WJuXU~|xsHnp&k&qb|w`=gKRqeocIT3vPpG^G^C!uulJZ=pV
z31j!~50eH2yxRfiyB&qcqt4aT)MPO(2gvdM!ox#lLkA_K#`o(Juk!H%p@0u02dK~x
zg9h}Ce>7=GYE(poOo|k0vpb-$xHJn%@LbD!FRtI&&dWRGCVm`$fFerq4Bv|%?w}n#
z9F!x<DRBC+a+b34t>DB5>(H7!9w-!Y@Mun;ToOeTr4lKq)oS;4yWQ@lGFl`G5qWtv
z9ZP0yHMp9=cmG8rIOmQB(ca_0Pe_8GM;;MBo}NDTe-|!1^il8Lm4jBUoE4RlBICe6
zh2Sr00{{MXY&xAgu@i&yJUle_fuAPi^Hb6DKO*2C-n~J$;=PZrqT|K$X&Pvr01Rde
z)Ys|3TwV=!yav({$R!@&t(1X}rxHAcd~O>)BUtSAtGix*spjQ3clo*)_6eFt&z=9q
zjsqDRmu7ZJLBavT6!Ej-1I9*Uw<M|%!_D8{AAHagXu7RU8%rBuNO|IZA1|M>zOjAd
zB0_t_Z{EEr<y7X$3oTkbe(~Z{!!~U2;jUGX1CHmP07h5U4nPL!NSgUAX9RL=+4=Jp
zTYbGNV&X(M_}W&q<7#!Tphpz+`1%y^Res!k<sUg>xx9Am;swRU8O`8_W5T@<*)uZ8
zZnuF>r@O{7u0O*=L&t`Pg=m}@Ml}rvs6)CzMTEwnaPojN3{FBtd<0&t@&YwR2ic!@
zx2Qb7u;4pP(EU+04HSz#;Kr@&vfTW;k9@NE)xu6Az}{g0Sx_rrSrOZ1Vjvd|2n+yU
ze_vEw9kZE0E`U!DeX<>s`0veBhQx7i*@b%jmCV@Kj}_tJ^WtXD_GH7Of&T0)IA@N!
zX9PTsXivs$f`+*hK!HXOBn*R~kt01?9Hb-gnNGkj`{^g!@0&J#zo4XKulrdjD#hE&
zD@f(*!zI?Rkl=ynlLIA4n-;qZDr@S%ieBw0mw}(R5>!e#(vpNTfEDSc(PDuHlNt0z
zGe#c+em+XFhQ`lVl?M2@e1QP0RvUPFDuWo8D+Mq4PUktG5GwgLetuWrOEH9F<6^;I
z?cXW*Ee7BTc>(SXMd-W*ZNn<<_U%`HfA`(Yo1cEFZ<4RkAo%<&u)gXh4sQh}p`*Hg
zOaS}Ui|`=uT^)h{<B!%~UVZh%3wQ2JZXMp})nD8#DA-r6)go;&AV;9Rky4y^1P8v&
z0YUyMhz`?$msAY3wKZ&ZPLA=`?Hr@7x|)@Xg%A<w2mUHgJcoe>Gz3|kh!FuM{zjy(
zf}#@0x|zL?Vc0La%mEy&Fv3gtC$fDBi-{9MEG#UH<9z6fp(rBfD3AtAHO5?Hmozr_
z_U#oP#m17*NbB|d^GaSsG>AX@0ZcPd5mi^U%L&!9CxGgcW8lDj1bkOB_)J%xf9{;+
z*Hx=d%+JkDy`NjL$SOmf|BuU;uiO$Q4O=Odgn3fP`Gj_e=LchyhpJUjg<$`6^VY#C
zUCk#vips+LK$3Moe?Q+jn4G6*0s|;QO;#J`0GuRIo2^y^zqsMY3qQZZxR`DGwykzP
z&;YESy-NGgvs^Bh8+bB&R6Y<I7TP`8+I)`KPpmP5@qve<5tbtzAw}`hVx~`55F<!F
zKLh$1#0c7UMyQ-M0bDj42mbx}f`32wXU`JwznypI&a}=F+rgdd2rygzwfoCn;h`bV
z8yhj<>P<*HQqcH&gI23`ojd>Y+Vt07+H~Kkq+&e1c+&@2qaS<ZO^qgi=88bv=)`EU
zp!XLQmmL3e%gQZXtDtZoGA<O)%+}x1XVE=q<X)E>NQF|-eehdHlTz62J`vK<vdowm
z!fA6*Rw`*Uf^y#vP&0irFwI7|Cs7;QaD8jfk7xyc=?_0xeqFu#*!(+prgsK@>XMDb
zbCnp?egpdT?JX1vKwpmu7bDou#}inW6aKuJeWU~M?^W|_7HnF#=d1oGS*J+lat<eQ
zIYOgSiKO@RWp78h7^a$G82!QYb!;00D8?%KhzE)<7+IsIrP^}Yao(|-YCxc+%^+f8
z3Xcc}5^}&k6#l@M@`E1c__UmyC3|CH@KV&A=&4gN5~9HSi!)F?Z476Gb~5!o&L`jt
zeEqqHFFA9@eDU?yk0R~N?Cg37ekM{!w5L+3^7B)vgEbl@NwCG0I!@{MpySom=v>t`
zx{L?idsUS-Lt9%rIZP^}g~Fz;3929n4hbDV2?SSas%xqYMq>?1-CU%-G`9idaq`qk
zw$hU!b+ZbFz>{!}mEJ=-BrF6oKL2lZTxl^K^swj5%gI@s5gpCLqG@)-GtbCrG=l2O
z@1gQJl&E#J?Yy3&ozRFj;Fq2|N5DTkKPP8aSJ#T{*<)tHz<8llECR7e1R|8x0_1KR
zQX4UVLh1o!B^EP^jR!XI7?#a$&>PGSr&BJ$^+*I^(gm4J24SIL$^dnM(rmFt(|=_R
zBEII9FSa_Hu1$2xz|AvCR0B$dvTLsIV)6vMAgq`linmCWi%Bj><moAFxi5R}EpQt2
z?Y+NQrrLE{uoV`#S%$IOSy~`?VDjN~JZgBp0JS{7X$o)~pGR{tljwUQCc4u&K#2)1
z7Xwbx0K{{76b%lfFH*cZ(4Y>d3xDHuv2Ale-LG|r#pA_WEkcXHEn=EEEFd7D(*)a{
zB#ab<WhZ#z&-(6yuZfO6^61W;V*`f|7d183jzD#b+G%btxMxcgm>MB>W->&6egtHL
z5+P*lSgF%$ot@dcH<Nbr=E6?<j73HJoDO@m7oi}3Uv+4ZMyc}l1{umti`9-Q$cc$q
zF2P_R4ZQNM?%l<*y~JX%gcNH$G#rt}Hk7b+4GmCPS*5S7t>q|4TcyoyQwK12m@+}7
z;3F)Tn=Jyrd6ap4E#X?O(uV_|ZF`K+Q%F)rP<O!(iitV;*sfh;H6us10pHo&+vzF?
zIME2VXG{jel}nuSgio9(9r)U7bN0r?rFVAC&)!*?R;AUBzzQ|-*Nc}2=ie>7?sPi9
zOCbZA&%+|i3Vyymw7;)v{)6t{$IE-ZTrQ`D0-9?{m{Fyf%_u_)3a?+gdUY_?8j00a
z)gw;r-ICT$1sQ%bED_p;JeSBd9`fO3ag;bg;_Z>rZSXtUCy)w2pb!K*z;UCS;6K^o
z`R3C{n>^pyR_7D2`61!pFdBiWscCBrG{UXv&qC}Mhe0_w5yB=+km31rGJEx6(z3Ic
zbad^^w^xw6Zy<B`f$zvmlz5dVCSR1Hq{8)9_(6RCK9d)3et*r*)h~9agyyc<x@KtN
z(8&sg0#%Qg%O83?*N(<CH8vI<`{3<6UCYoyjJ87i3oZXTJ)Iga48`tJO{e>iKIP%^
zpt`KOu4yMG=9|ZM?|w2cDM{D@zV?+_9X8gugnQr=IQ0#Xn=&38XoNNfLL>Y&?OEvk
z#Ubz<k_ZvW$#Uf9xfy7L`PtdaI=Y7i8+OX19+LH=A06=&>1cYP6g8Mgi=h!}4JHT*
z45Y_A`siC5_I%Z^qDuP-CfqEJ^I5i^%Ex=ou*9KL0s_<&QB5*DzX8wD)$2*`1$=$|
zo=Sds?KZ2`w*GYHJEm^E58%b{2KQUn?=p|i>m2NEMnvVg%C{;qD&FYmrF^sJfAjdB
zJx>M<9r{4<>1OZ+0UB-{bIvWeJ>?m&HXEV!@svag{l7fO8G($v0|yLQJ9g|vS-QOS
zt-iQnXAJWGwvoezjtdS71kwW{6jE<!gmSG8T)3c@QU)R+9}IdUXlrU%z20C#U60Di
zLnc?qD7jpLl2wj0q~Lh}ZdoN7z`!MBtHlD^Y8_<Xym``K(62c2$+ny>D`74#*q9oZ
z*#$fW@1dpV{f6PoJFW#d&yS5g_Qd<|k5La9;s(FE8T^i<W_T;`$?%Bo1u+M{g&R{Q
zfb+gcAawNm)G3g#AB`}02=q)zQLqe?mJt)fpgeum?Q9gC+OK!qxUgUir-B;IW>hRr
z5DElXh<QPSu@Ni?Dp`|AN)L&Ia=M&yhm+x2GNk1|yk6=d;=nJitcLO`9VT%ro<m_S
zp@Fc8CM0-V!;N~<nB4F{1CaY-oJ=!`{AYvj(Xj#iLqlI0wr<_1fW$;jZnl8$bhdA-
z-4A}zi4z8aQb}XJkV<0XAnxmL;m_wLaCForYOrGdEp-YE-v2dt5hJ9gD)o2o&Q166
zIl8E}_F^*wd|IumnO9k@3o@Ea&Vu67i*~#HuZZx_Nf9BTL0$?e*Y#|2EDA`aEa8cp
z+tE~Wi<*aqGC_r|mIJ?}w6v_OwDcRGczsnW)i9x0%&)JlFT*uH?evY<hhOjA@YB@`
zfBtL78yf`z!8D$bN8R6Gd!QD!F+l5RwvVk3Ypbwvx6BjqIy8WXkI(!b6DNvWyji#W
zg>HF%-ob;0-`21H?EEXQoG!m`!A!PEV|zirgU5jHqiQEp9V90#zsEX#7A^AjP^;f^
ze~a|S%SAbP1se_@KXv%Ka~CG$=I4)J_WUyobMx{KHkunba7F0lq|eWFdDx~GP-r=@
zJ6uRrMkpw&fSjT-j&>|aIi;l~2S0v$>B5SN^6^=J{xRY5rHh9v%1bw#{cL+the>$x
zTT7NCKRIbFd2ukX&%l0jrp$q#uKWZybT`;sLk?AJF2<^i>+O*0mNN#SD0{sfd}&`c
z#yb}JsQSQw*m&sOvp2Qnz-CqyAmX|gw2;<t#aKyOa&p=2r8a}1uMm|30ny{>$<Xli
zXYDw@4fqER=&x_v_9^oCVnSg*FJAohBRh9KtsXwygBW4Jp<{4m@<gz-q9g9>ib<2)
z`Nvj=g23Tuqe{|WUqIduxZe@H{N^rsL}=(B^k9yTELIy*6QLBA)A%GWkVv&*onW@0
z+Cj}vaR%Z6OOZ|rZ_tzfcvb%W$6HA;c)EFZtb%$z)^m8;)OlM8_-=aeRYU5ysgMd&
zIlm{J(ekP?sHm<4lgY>>ZXYinhzN-Qg<RPtHcHA%;G6QJAdQr^6k{^HFJ-gTa}RT6
z<%*LjDRJa$1@f9uwdLR7#0P9R@VVRb!&-rVXa9b~_4nTU1o@kjljOxb8X@KUk|l@G
z2u}qhC5fdmv5;{18@QA_iA&66M6X^0kxQ3xYY^#r;gwhN8uRitbXim}>~KwB;9&CJ
zm-O?CO3EyS#U&?2B2h$0NN~JVCPxD>P~T7wcTwk?Or`>?<i`2<_;~PWKKS_h4K6P$
z8{QG{?I`H^$+O-L4-V%)sALb(ghJwgL>M(<G(0hU6!ec9K)`Qz?4b(>SxHX`r?R**
zT;L#)(5|E=UnNvuzdrVOa&n;^fx);2^*eh&IqL<GBt6;|{I9+uo}bwQe#;<6sJeUi
zxnGtpJzaI_l9lVEpb>@~ISO8b21D%Hb@#wGnc(b<8Tq>F*GDg5*~-qIb;0^{KKj=p
ziPS?#-u)JrmBaa8F7ABeh3BUHnf2GyvWm(Eo88X6E2yZbYRJBIYwE7mFHHI4+SQ#}
zZ8aA$SP`SBpcajqwX9QI-8=YvzUuFO+u4zX{ju;zHk-+&91aJ#-zg}7^oMWXf9zs|
zA$NyZJO+*M{rDqCA_S;1)El?EuR;Fie)*+7Yy0-h`{iS6BVZ&v_w%AfM@C>3?KgO^
zNRCEGI(f>y2KgL?fUo`Ik1;DOmM*^&Wf&wHmOXOoc5W|kZ?BM>**V9oR?AyWk-=2e
z=xViUb$}<4n6-7aT0FXn>#5mnZ{50iGd3tBcw$3+LkYvUj&vo~-3B;(>d?nCl4ouu
zl+t=|9EasJnFP!hK*`q*D8s;PC34LH0=@v`7?LunjQjj#NZ=6ar>q~{?d+y*TIb!Y
zrB-YHHV=<cCnilg^Yr1vJxNYz83=yEp9ucE+}ssif!1t<$!LV5Bhu5y`VJZ-Yysbi
zvhwWo>33_cU3+SU)mr!<2mA2NCB$no=B(a&hH){^Gc5DfzOAbpn~l?`H|p!nm}p63
z&1f{%yIc&n?{wz7jbrA#x;*>ljjIUz=a_K2H1xefEP|pZjGp+}=2cs!tC9N~(Obwg
z7!8nLoafRT4f$w{9J8gdw5GncFuy3T@b|y2lve4gYFv!Viu^*$Br>n4h$v03$X*cv
zzJbx%1=+D@3xDWs^|J;b{W#$wL}RsG*wxq3?@&}oz>pzlAAkS-NQu8c{IO$4UBU6=
zAGOx(-E8K46TfE7=#ZzM7TXO5I5%t7UES5IPcO4t@BBADYEFJ>ZDyb*a0+SP7Z;Zv
zJhgXo+TU5HZ6zEAl-f@{W!&TAC!vQs%c{z9E?)cfimB1`I~0NbZ`~<TJ~WW95+n3w
z-T6Fy6Gi#^Mn<ltXgbbPT>Sb%v-!%yUX~caFF5!`iJxB@QcszouyDnH3;h4)_&)&#
Y0Gfh&-Sn*XW&i*H07*qoM6N<$f&z^R?f?J)

literal 0
HcmV?d00001


From 89bd00cbd4b0a8345f367f054895b62a2340cd78 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 8 Jun 2011 16:02:20 +0200
Subject: [PATCH 152/829] Fix the Options menu item after the <prefwindow>
 migration

Using a <prefWindow> now requires a slightly different way to open the dialog.
Added to this, add an Options entry to the Tools menu, for parity with the bToolbar button.
---
 extension/content/browser.xul        |  7 +++++--
 extension/content/js/browser.js      | 12 +++++-------
 extension/modules/content/browser.js | 15 +++++++++++++--
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index 4b13e1cf..416a3058 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -6,13 +6,13 @@
   <script type="application/x-javascript" src="chrome://scriptish/content/js/browser.js"/>
 
   <broadcasterset id="mainBroadcasterSet">
+    <broadcaster id="scriptish-options-brd"/>
     <broadcaster id="scriptish-tb-popup-brd"/>
     <broadcaster id="scriptish-button-brd"/>
     <broadcaster id="scriptish-tb-no-scripts-brd"/>
     <broadcaster id="scriptish-tb-cmds-brd"/>
     <broadcaster id="scriptish-tb-new-us-brd"/>
     <broadcaster id="scriptish-tb-show-us-brd"/>
-    <broadcaster id="scriptish-tb-options-brd"/>
     <broadcaster id="scriptish-tb-enabled-brd"/>
   </broadcasterset>
 
@@ -29,6 +29,8 @@
       <menuitem id="scriptish-tools-enabled-item"
           observes="scriptish-tb-enabled-brd" type="checkbox"/>
       <menuseparator/>
+      <menuitem id="scriptish-tools-options" observes="scriptish-options-brd"/>
+      <menuseparator/>
       <menuitem id="scriptish-tools-show-us"/>
       <menuitem id="scriptish-tools-new"/>
       <menu id="scriptish-tools-commands" disabled="false"><menupopup/></menu>
@@ -47,10 +49,11 @@
         <menuseparator id="scriptish-tb-no-scripts-sep"/>
         <menu id="scriptish-tb-cmds" observes="scriptish-tb-cmds-brd" disabled="false"><menupopup/></menu>
         <menuseparator/>
+        <menuitem id="scriptish-tb-options" observes="scriptish-options-brd"/>
+        <menuseparator/>
         <menuitem id="scriptish-tb-new-us" observes="scriptish-tb-new-us-brd"/>
         <menuitem id="scriptish-tb-show-us" observes="scriptish-tb-show-us-brd"/>
         <menuseparator/>
-        <menuitem id="scriptish-tb-options" observes="scriptish-tb-options-brd"/>
         <menuitem id="scriptish-tb-enabled-item" observes="scriptish-tb-enabled-brd" type="checkbox"/>
       </menupopup>
     </toolbarbutton>
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 4a0abec0..e5643606 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -49,13 +49,6 @@ Scriptish_BrowserUI.tbBtnSetup = function() {
   sbShowUSEle.setAttribute("oncommand",
       "Scriptish_BrowserUIM.showUserscriptList()");
 
-  var showOptionsEle = $("scriptish-tb-options-brd");
-  showOptionsEle.setAttribute("label", Scriptish_stringBundle("options")+"...");
-  showOptionsEle.setAttribute("accesskey",
-      Scriptish_stringBundle("menu.options.ak"));
-  showOptionsEle.setAttribute("oncommand",
-      "Scriptish_BrowserUIM.openOptionsWin()");
-
   var sbPopUp = $("scriptish-tb-popup-brd");
   sbPopUp.setAttribute("onclick",
       "Scriptish_popupClicked(event);event.stopPropagation();");
@@ -84,6 +77,11 @@ Scriptish_BrowserUI.chromeLoad = function(e) {
   tmEle.setAttribute("label", Scriptish_stringBundle("menu.title"));
   tmEle.setAttribute("accesskey", Scriptish_stringBundle("menu.title.ak"));
 
+  tmEle = $('scriptish-options-brd');
+  tmEle.setAttribute("label", Scriptish_stringBundle("options"));
+  tmEle.setAttribute("accesskey", Scriptish_stringBundle("menu.options.ak"));
+  tmEle.setAttribute("oncommand", "Scriptish_BrowserUIM.openOptionsWin()");
+
   var statusEnabledItem = this.statusCasterEle = $("scriptish-tb-enabled-brd");
   statusEnabledItem.setAttribute("label",
       Scriptish_stringBundle("statusbar.enabled"));
diff --git a/extension/modules/content/browser.js b/extension/modules/content/browser.js
index 47664459..2ecf330b 100644
--- a/extension/modules/content/browser.js
+++ b/extension/modules/content/browser.js
@@ -52,8 +52,19 @@ Scriptish_BrowserUIM.prototype = {
   },
   newUserScript: function() (
     this.openChromeWindow("chrome://scriptish/content/newscript.xul")),
-  openOptionsWin: function() (
-    this.openChromeWindow("chrome://scriptish/content/options.xul")),
+  openOptionsWin: function() {
+    var instantApply = false;
+    try {
+      instantApply = Services.prefs.getBoolPref("browser.preferences.instantApply");
+    }
+    catch (ex) {};
+
+    this._win.openDialog(
+      "chrome://scriptish/content/options.xul",
+      "scriptish-options-dialog",
+      "chrome,titlebar,toolbar,resizable,centerscreen" + (instantApply ? ",dialog=no" : "")
+    );
+  },
   showUserscriptList: function() {
     Cu.import("resource://scriptish/addonprovider.js");
     timeout(Scriptish.openManager);

From 6630451bf556f32432a6f2b797dd1daac6177ebd Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 8 Jun 2011 16:10:10 +0200
Subject: [PATCH 153/829] de: Add new <prefwindow> strings

---
 extension/locale/de/scriptish.properties | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index f566c61b..3342b848 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -79,14 +79,25 @@ saving=Speichern
 scriptOptions.includes=Benutzer-Einschlüsse:
 scriptOptions.excludes=Benutzer-Ausnahmen:
 scriptOptions.disableScriptIncludes=Die Einschlüsse dieses Benutzerskripts deaktivieren und nur Benutzereinschlüsse verwenden.
-options=Options
-options.excludes=Globale Ausnahmen
+options=Optionen
+options.title=Scriptish Einstellungen
+options.pane.main=Allgemein
+options.pane.excludes=Globale Ausnahmen
+options.pane.advanced=Erweitert
 options.addonManager=Add-ons-Manager
 options.alsoUninstallPrefs=Wenn ein Benutzerskript entfernt wird, dann auch seine Einstellungen entfernen
 options.changeEditor=Editor ändern
 options.editor=Editor
 options.enableCopyDownloadURL=Kopieren der Download-URL aktivieren
+options.logging=Protokoll
+options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole protokollieren
+options.notifications=Benachrichtigungen
+options.notifications.disable=Benachrichtungen bei Benutzerskript-Änderungen deaktivieren
+options.requireBuiltInCerts=Sichere Aktualisierungen müssen eingebaute Zertifikate nutzen
 options.requireSecured=Benutzerskripte müssen über eine sichere Verbindung (https) aktualisiert werden
+options.translation=Übersetzung
+options.translation.useEnglish=Immer Englisch benutzen
+options.update.security=Aktualisierungsicherheit
 options.useDownloadURL=Download-URL für Aktualisierungen benutzen, wenn es keine gesonderte Aktualisierungs-URL gibt
 statusbar.enabled=Aktiviert
 statusbar.enabled.ak=K

From e70c1a899490e262d2a4a2ef92f48972a31d7628 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 8 Jun 2011 18:00:37 +0200
Subject: [PATCH 154/829] Fix various issues with about:scriptish

- Fore- and background colors properly set
- Add some more whitespace, as this makes the page more clear
- Limit the width of the page and also the inner-container width of text
- Add some paragraphs and line breaks
- Style more like the in-application pages (e.g. neterror) of Firefox
- /s/Contributors/Credits/ as there is already a Contributors subsection
- Re-organize Credits section: use more columns (depending on size)
- Re-organize Credits section: Do not put emphasis on the homepages by writing the urls explicitly; just make the person text into a link, and put less visual emphasis on the links
---
 extension/content/aboutScriptish.html  | 78 ++++++++++++++------------
 extension/content/js/aboutScriptish.js | 38 ++++++++-----
 extension/skin/aboutScriptish.css      | 65 ++++++++++++++++-----
 3 files changed, 118 insertions(+), 63 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index b42d2c5c..a77b48e1 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -11,24 +11,22 @@
 </head>
 
 <body>
-  <div id="container">
-    <header class="primary">
-      <img src="../skin/scriptish32.png" />
-      <h1>About:Scriptish</h1>
-    </header>
-
+  <article>
     <div id="main" role="main">
       <section id="about">
-        <header class="secondary">
-          <h2>About</h2>
+        <header class="primary">
+          <img src="../skin/scriptish32.png" />
+          <h1>About:Scriptish</h1>
         </header>
-        <p>Welcome to Scriptish!  Scriptish is a fork of Greasemonkey, the popular Firefox extension
-        for running user scripts. Greasemonkey has long supported Firefox 1.5, and only recently
+        <p>Welcome to Scriptish! Scriptish is a fork of Greasemonkey, the popular Firefox extension
+        for running user scripts.</p>
+        <p>Greasemonkey has long supported Firefox 1.5, and only recently
         decided to raise the minimum supported version of Firefox to 3.0. Plenty of legacy code
         still exists, however, and it has reached the point where Greasemonkey needs a complete
         reorganization. But unfortunately, development of Greasemonkey is incredibly slow for bug
-        fixes, let alone code base refactoring or the addition of features. This is why I decided to
-        fork Greasemonkey and start something new. &mdash; <a href="https://github.com/erikvold">@erikvold</a></p>
+        fixes, let alone code base refactoring or the addition of features.</p>
+        <p>This is why I decided to fork Greasemonkey and start something new. &mdash;
+        <a href="https://github.com/erikvold">@erikvold</a></p>
       </section>
 
       <section id="learn">
@@ -37,6 +35,8 @@ <h2>Learn</h2>
         </header>
         <p>Check out the <a href="https://github.com/erikvold/scriptish/wiki">Scriptish wiki</a>
         to learn about Scriptish and how to use it.</p>
+        <p>There are a lot of resources you can obtain third-party users scripts from, most notable <a href="http://userscripts.org/">userscripts.org</a>.<br>
+        But please <strong>be careful</strong> when installing third-party scripts, as there can be security and privacy issues. Hence, only install scripts from sources you trust.</p>
       </section>
 
       <section id="helpout">
@@ -53,36 +53,40 @@ <h2>Help Out</h2>
 
       <section id="contributors">
         <header class="secondary">
-          <h2>Contributors</h2>
+          <h2>Credits</h2>
+          <p>In alphabetical order</p>
         </header>
-        <div class="twoCol">
-          <h3>Creator:</h3>
-          <ul>
-            <li>Erik Vold &mdash; <a href="http://erikvold.com/">http://erikvold.com/</a></li>
-          </ul>
-
-          <h3>Developers:</h3>
-          <ul id="devlist"></ul>
+        <table><tr>
+          <td>
+            <h3>Creator:</h3>
+            <ul>
+              <li><a class="homepage" href="http://erikvold.com/" title="http://erikvold.com/">Erik Vold</a></li>
+            </ul>
 
-          <h3>Contributors:</h3>
-          <ul id="contlist"></ul>
+            <h3>Developers:</h3>
+            <ul id="devlist"></ul>
 
-          <h3>Translators:</h3>
-          <ul id="translist"></ul>
-        </div>
+            <h3>Translators:</h3>
+            <ul id="translist"></ul>
+          </td>
+          <td>
+            <h3>Contributors:</h3>
+            <ul id="contlist"></ul>
+          </td>
+        </tr></table>
       </section>
     </div>
+  </article>
 
-    <div id="test">
-      <section>
-        <header>
-          <h2 id="qunit-header2">Testing Scriptish</h2>
-          <h3 id="qunit-banner"></h3>
-          <h4 id="qunit-userAgent"></h4>
-        </header>
-        <ol id="qunit-tests"></ol>
-      </section>
-    </div>
-  </div>
+   <div id="test">
+     <section>
+       <header>
+         <h2 id="qunit-header2">Testing Scriptish</h2>
+         <h3 id="qunit-banner"></h3>
+         <h4 id="qunit-userAgent"></h4>
+       </header>
+       <ol id="qunit-tests"></ol>
+     </section>
+   </div>
 </body>
 </html>
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index df953c3d..eca186ff 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -15,6 +15,8 @@ Cu.import("resource://scriptish/constants.js");
 Cu.import("resource://scriptish/utils/q.js");
 
 (function() {
+  "use strict";
+
   // Show about:scriptish?test
   if (window.location.href.split("?")[1] == "test") {
     Q.and(
@@ -28,22 +30,32 @@ Cu.import("resource://scriptish/utils/q.js");
   }
 
   // Show about:scriptish
-  var addPerson = function(aPerson) {
-    var person = aPerson.name.split(/; +/);
-    var li = html("li", person[0]);
-    if (person[1]) {
-      var a = html("a", {
-        href: person[1]
-      }, person[1].replace(/^mailto:/i, ""));
-      li.innerHTML += " &mdash; ";
-      li.appendChild(a);
+  var addPersons = function(aList, aPersons) {
+    aPersons = aPersons.slice().sort(function(a, b) {
+      [a,b] = [a.name, b.name].map(function(p) {;
+        return p.split(/; +/)[0].toLowerCase();
+      });
+      return a < b ? -1 : (a > b ? 1 : 0);
+    });
+    for each (var person in aPersons) {
+      person = person.name.split(/; +/);
+      if (!person[1]) {
+        person = person[0];
+      }
+      else {
+        person = html("a", {
+          "class": "homepage",
+          title: person[1].replace(/^mailto:/i, ""),
+          href: person[1]
+        }, person[0]);
+      }
+      aList.appendChild(html("li", person));
     }
-    this.appendChild(li);
   }
 
   AddonManager.getAddonByID("scriptish@erikvold.com", function(aAddon) {
-    aAddon.developers.forEach(addPerson.bind($("devlist")));
-    aAddon.contributors.forEach(addPerson.bind($("contlist")));
-    aAddon.translators.forEach(addPerson.bind($("translist")));
+    addPersons($("devlist"), aAddon.developers);
+    addPersons($("contlist"), aAddon.contributors);
+    addPersons($("translist"), aAddon.translators);
   });
 })();
diff --git a/extension/skin/aboutScriptish.css b/extension/skin/aboutScriptish.css
index 87f47b68..92a16a6a 100644
--- a/extension/skin/aboutScriptish.css
+++ b/extension/skin/aboutScriptish.css
@@ -1,41 +1,80 @@
 body {
-  background-color: #333;
+  background-color: -moz-Dialog;
   font-family: Arial, Helvetica, sans-serif;
 }
 
 h1, h2, h3 {
   margin: 0;
   padding: 0;
+  margin-bottom: 1ex;
   font-family: "Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace!important;
 }
 
-section { margin-bottom: 40px; }
+section { margin-bottom: 3em; }
+section > p {
+  max-width: 80ex;
+}
 
-header { margin-bottom: 20px; }
-header.primary { border-bottom: 2px solid #bada55; }
-header.primary img { margin-bottom: -5px; }
+header { margin-bottom: 1.5em; }
+header.primary {
+  padding-bottom: 4px;
+  border-bottom: 2px solid #bada55;
+  font-size: x-large;
+}
+header.primary img {
+  margin-bottom: -5px;
+  padding-right: 6px;
+}
 header.primary h1 { display:inline; }
-header.secondary { border-bottom: 1px dotted #ccc; }
+header.secondary h2 { border-bottom: 1px dotted #ccc; }
 #test header { margin-bottom: 0; border: none; }
 
 ul { margin-top: 5px; padding-left: 15px; }
 
-p { margin: 0; padding: 0; }
+p { margin: 0; padding: 0; margin-bottom: 0.5em; }
+li { margin-bottom: 0.2em; }
 
 a { color: #00f; text-decoration: none; }
 a:hover { color: #09f; }
 
-#container {
-  margin: 2em auto 0;
-  padding: 10pt;
-  width: 70%;
+article {
+  color: black;
+  background-color: white;
+
+  margin: 2em auto 2em;
+  padding: 3em;
+  max-width: 110ex;
   background-color: #fff;
-  border: 2px solid #000;
+  border: 1px solid ThreeDShadow;
   border-radius: 15px;
 }
 
+table {
+  width: 100%;
+  padding: 0;
+  margin: 0;
+}
+td {
+  vertical-align: top;
+  margin: 1ex;
+}
+
+#contlist {
+  -moz-column-count: 2;
+}
+
+@media all and (min-width: 1100px) {
+  #contlist {
+    -moz-column-count: 3;
+  }
+}
+
 #test {
   display: none;
 }
 
-.twoCol { -moz-column-count: 2; }
+.homepage {
+  color: black;
+  border-bottom: 1px dotted lightgray;
+}
+

From 3f6e75e2dd4e49e17733072aa0a4f2be388cc2fe Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 8 Jun 2011 12:52:02 -0500
Subject: [PATCH 155/829] options.excludes -> options.pane.excludes for locales
 that have it

---
 extension/locale/ru-RU/scriptish.properties | 2 +-
 extension/locale/sv-SE/scriptish.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index f9464525..5ad22e9c 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -33,9 +33,9 @@ options.alsoUninstallPrefs=Удалять также ассоциированн
 options.changeEditor=Изменить редактор
 options.editor=Редактор
 options.useDownloadURL=Используйте URL для загрузки в качестве запасного URL для обновления (если он не определен)?
-options.excludes=Глобальные исключения
 options.addonManager=Менеджер Дополнений
 options.enableCopyDownloadURL=Включить копирование URL для загрузки
+options.pane.excludes=Глобальные исключения
 options.requireSecured=Разрешить обновления скриптов только по протоколу HTTPS
 statusbar.enabled=Включено
 statusbar.installed=успешно установлен
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 27dad705..71e95b7c 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -80,12 +80,12 @@ scriptOptions.includes=Inkluderade av användaren:
 scriptOptions.excludes=Undantagna av användaren:
 scriptOptions.disableScriptIncludes=Inaktivera detta skripts inkluderade mönster och använd endast de användardefinierade mönstren.
 options=Inställningar
-options.excludes=Globala undantag
 options.addonManager=Tilläggshanteraren
 options.alsoUninstallPrefs=Vid avinstallation av ett skript, ta även bort dess inställningar
 options.changeEditor=Byt redigeringsprogram
 options.editor=Redigeringsprogram
 options.enableCopyDownloadURL=Aktivera kopiering av hämtnings-URL
+options.pane.excludes=Globala undantag
 options.requireSecured=Kräv att användarskript uppdateras via HTTPS
 options.useDownloadURL=Använd hämtnings-URL:en för uppdateringar om ingen uppdaterings-URL finns angiven
 statusbar.enabled=Aktiverat

From 1af0fd7e80b8713263be4d6e89840bf9138db232 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 8 Jun 2011 20:28:06 +0200
Subject: [PATCH 156/829] Add ignoreRedirect argument to GM_xhr

Also add ignoreTempRedirect and ignorePermanentRedirect for more fine-grained control.

Closes #225
---
 extension/modules/api/GM_xmlhttpRequester.js | 79 +++++++++++++++++++-
 extension/modules/constants.js               |  4 +-
 2 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 6bc62fa0..5b9b0238 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -6,7 +6,76 @@ var EXPORTED_SYMBOLS = ["GM_xmlhttpRequester"];
   inc("resource://scriptish/api.js");
 })(Components.utils.import)
 
-const MIME_JSON = /^(application|text)\/(?:x-)?json/i
+const MIME_JSON = /^(application|text)\/(?:x-)?json/i;
+
+/**
+ * Abstract base class for (chained) request notification callback overrides
+ *
+ * Use such overrides sparely, as the individual request performance might
+ * degrade quite a bit.
+ *
+ * @param req XMLHttpRequest (chrome)
+ * @author Nils Maier
+ */
+function NotificationCallbacks(req) {
+  throw new Error("trying to initiate an abstract NotificationCallbacks");
+}
+NotificationCallbacks.prototype = {
+  init: function(req) {
+    // rewrite notification callbacks
+    this._channel = req.channel;
+    this._notificationCallbacks = this._channel.notificationCallbacks;
+    this._channel.notificationCallbacks = this;
+  },
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIInterfaceRequestor]),
+  getInterface: function(iid) {
+    try {
+      return this.query(iid);
+    }
+    catch (ex) {
+      return this.queryOriginal(iid);
+    }
+  },
+  queryOriginal: function(iid) {
+    if (this._notificationCallbacks) {
+      return this._notificationCallbacks.getInterface(iid);
+    }
+    throw Cr.NS_ERROR_NO_INTERFACE;
+  }
+}
+
+/**
+ * Ignore (specific) redirects
+ * @param req XMLHttpRequest (chrome)
+ * @author Nils Maier
+ */
+function IgnoreRedirect(req, ignoreFlags) {
+  this.init(req);
+  this.ignoreFlags = ignoreFlags;
+}
+IgnoreRedirect.prototype = {
+  __proto__: NotificationCallbacks.prototype,
+  query: XPCOMUtils.generateQI([Ci.nsIChannelEventSink]),
+  asyncOnChannelRedirect: function(oldChannel, newChannel, flags, callback) {
+    if (this.ignoreFlags & flags) {
+      // must throw here, not call callback.onRedirectVerifyCallback,
+      // or else it will completely cancel the request
+      throw Cr.NS_ERROR_UNEXPECTED;
+    }
+
+    try {
+      let ces = this.queryOriginal(Ci.nsIChannelEventSink);
+      if (ces) {
+        ces.asyncOnChannelRedirect(oldChannel, newChannel, flags, callback);
+        return;
+      }
+    }
+    catch (ex) {}
+
+    callback.onRedirectVerifyCallback(Cr.NS_OK);
+  }
+};
+
 
 function GM_xmlhttpRequester(unsafeContentWin, originUrl, aScript) {
   this.unsafeContentWin = unsafeContentWin;
@@ -77,6 +146,14 @@ GM_xmlhttpRequester.prototype.chromeStartRequest =
   if (details.ignoreCache)
     req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE; // bypass cache
 
+  if (details.ignoreRedirect)
+    new IgnoreRedirect(req,
+      Ci.nsIChannelEventSink.REDIRECT_TEMPORARY | Ci.nsIChannelEventSink.REDIRECT_PERMANENT);
+  if (details.ignoreTempRedirect)
+    new IgnoreRedirect(req, Ci.nsIChannelEventSink.REDIRECT_TEMPORARY);
+  if (details.ignorePermanentRedirect)
+    new IgnoreRedirect(req, Ci.nsIChannelEventSink.REDIRECT_PERMANENT);
+
   if (details.headers) {
     var headers = details.headers;
 
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index a414e2d9..73a75b63 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -1,8 +1,8 @@
 var EXPORTED_SYMBOLS = [
-    "Cc", "Ci", "AddonManager", "AddonManagerPrivate", "NetUtil", "XPCOMUtils",
+    "Cc", "Ci", "Cr", "AddonManager", "AddonManagerPrivate", "NetUtil", "XPCOMUtils",
     "Services", "Instances", "timeout"];
 
-const {classes: Cc, interfaces: Ci} = Components;
+const {classes: Cc, interfaces: Ci, results: Cr} = Components;
 const ONE_SHOT = Ci.nsITimer.TYPE_ONE_SHOT;
 var Services = {};
 (function(inc, tools){

From f393b9a989729f5efd2808e783ca3fc57effa59b Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 8 Jun 2011 20:31:48 +0200
Subject: [PATCH 157/829] Add failOnRedirect and redirectionLimit arguments to
 GM_xhr

failOnRedirect is the same as redirectionLimit = 0
It will only work on nsIHttpChannels (mainly because there are no redirects specified or implemented in other prototcolls).

failOnRedirect or redirectionLimit will cause an error when redirected (too much) just like a regular redirection loop would.
---
 extension/modules/api/GM_xmlhttpRequester.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 5b9b0238..e4d8a925 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -154,6 +154,20 @@ GM_xmlhttpRequester.prototype.chromeStartRequest =
   if (details.ignorePermanentRedirect)
     new IgnoreRedirect(req, Ci.nsIChannelEventSink.REDIRECT_PERMANENT);
 
+  let redirectionLimit = null;
+  if (details.failOnRedirect) {
+    redirectionLimit = 0;
+  }
+  if ("redirectionLimit" in details) {
+    if (details.redirectionLimit < 0 || details.redirectionLimit > 10) {
+      throw new Error("redirectionLimit must be within (0, 10), but it is " + details.redirectionLimit);
+    }
+    redirectionLimit = details.redirectionLimit;
+  }
+  if (redirectionLimit !== null && req.channel instanceof Ci.nsIHttpChannel) {
+    req.channel.redirectionLimit = redirectionLimit;
+  }
+
   if (details.headers) {
     var headers = details.headers;
 

From b78e3697f62fb7adcf0124dc2324d1a695e2de80 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 8 Jun 2011 20:57:40 +0200
Subject: [PATCH 158/829] about:scriptish?test -- style messed up after #352

Closes #353
---
 extension/content/aboutScriptish.html  | 138 ++++++++++++-------------
 extension/content/js/aboutScriptish.js |   2 +-
 extension/skin/aboutScriptish.css      |   6 ++
 3 files changed, 75 insertions(+), 71 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index a77b48e1..3e60909c 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -11,82 +11,80 @@
 </head>
 
 <body>
-  <article>
-    <div id="main" role="main">
-      <section id="about">
-        <header class="primary">
-          <img src="../skin/scriptish32.png" />
-          <h1>About:Scriptish</h1>
-        </header>
-        <p>Welcome to Scriptish! Scriptish is a fork of Greasemonkey, the popular Firefox extension
-        for running user scripts.</p>
-        <p>Greasemonkey has long supported Firefox 1.5, and only recently
-        decided to raise the minimum supported version of Firefox to 3.0. Plenty of legacy code
-        still exists, however, and it has reached the point where Greasemonkey needs a complete
-        reorganization. But unfortunately, development of Greasemonkey is incredibly slow for bug
-        fixes, let alone code base refactoring or the addition of features.</p>
-        <p>This is why I decided to fork Greasemonkey and start something new. &mdash;
-        <a href="https://github.com/erikvold">@erikvold</a></p>
-      </section>
+  <article id="main">
+     <section id="about">
+       <header class="primary">
+         <img src="../skin/scriptish32.png" />
+         <h1>About:Scriptish</h1>
+       </header>
+       <p>Welcome to Scriptish! Scriptish is a fork of Greasemonkey, the popular Firefox extension
+       for running user scripts.</p>
+       <p>Greasemonkey has long supported Firefox 1.5, and only recently
+       decided to raise the minimum supported version of Firefox to 3.0. Plenty of legacy code
+       still exists, however, and it has reached the point where Greasemonkey needs a complete
+       reorganization. But unfortunately, development of Greasemonkey is incredibly slow for bug
+       fixes, let alone code base refactoring or the addition of features.</p>
+       <p>This is why I decided to fork Greasemonkey and start something new. &mdash;
+       <a href="https://github.com/erikvold">@erikvold</a></p>
+     </section>
 
-      <section id="learn">
-        <header class="secondary">
-          <h2>Learn</h2>
-        </header>
-        <p>Check out the <a href="https://github.com/erikvold/scriptish/wiki">Scriptish wiki</a>
-        to learn about Scriptish and how to use it.</p>
-        <p>There are a lot of resources you can obtain third-party users scripts from, most notable <a href="http://userscripts.org/">userscripts.org</a>.<br>
-        But please <strong>be careful</strong> when installing third-party scripts, as there can be security and privacy issues. Hence, only install scripts from sources you trust.</p>
-      </section>
+     <section id="learn">
+       <header class="secondary">
+         <h2>Learn</h2>
+       </header>
+       <p>Check out the <a href="https://github.com/erikvold/scriptish/wiki">Scriptish wiki</a>
+       to learn about Scriptish and how to use it.</p>
+       <p>There are a lot of resources you can obtain third-party users scripts from, most notable <a href="http://userscripts.org/">userscripts.org</a>.<br>
+       But please <strong>be careful</strong> when installing third-party scripts, as there can be security and privacy issues. Hence, only install scripts from sources you trust.</p>
+     </section>
 
-      <section id="helpout">
-        <header class="secondary">
-          <h2>Help Out</h2>
-        </header>
-        <p>There are many ways you can help out with Scriptish:</p>
-        <ul>
-          <li><a href="https://github.com/erikvold/scriptish/issues">Report a bug</a></li>
-          <li><a href="https://github.com/erikvold/scriptish/issues">Request a feature</a></li>
-          <li>Like coding?  <a href="https://github.com/erikvold/scriptish">Fork us!</a></li>
-        </ul>
-      </section>
+     <section id="helpout">
+       <header class="secondary">
+         <h2>Help Out</h2>
+       </header>
+       <p>There are many ways you can help out with Scriptish:</p>
+       <ul>
+         <li><a href="https://github.com/erikvold/scriptish/issues">Report a bug</a></li>
+         <li><a href="https://github.com/erikvold/scriptish/issues">Request a feature</a></li>
+         <li>Like coding?  <a href="https://github.com/erikvold/scriptish">Fork us!</a></li>
+       </ul>
+     </section>
 
-      <section id="contributors">
-        <header class="secondary">
-          <h2>Credits</h2>
-          <p>In alphabetical order</p>
-        </header>
-        <table><tr>
-          <td>
-            <h3>Creator:</h3>
-            <ul>
-              <li><a class="homepage" href="http://erikvold.com/" title="http://erikvold.com/">Erik Vold</a></li>
-            </ul>
+     <section id="contributors">
+       <header class="secondary">
+         <h2>Credits</h2>
+         <p>In alphabetical order</p>
+       </header>
+       <table><tr>
+         <td>
+           <h3>Creator:</h3>
+           <ul>
+             <li><a class="homepage" href="http://erikvold.com/" title="http://erikvold.com/">Erik Vold</a></li>
+           </ul>
 
-            <h3>Developers:</h3>
-            <ul id="devlist"></ul>
+           <h3>Developers:</h3>
+           <ul id="devlist"></ul>
 
-            <h3>Translators:</h3>
-            <ul id="translist"></ul>
-          </td>
-          <td>
-            <h3>Contributors:</h3>
-            <ul id="contlist"></ul>
-          </td>
-        </tr></table>
-      </section>
-    </div>
+           <h3>Translators:</h3>
+           <ul id="translist"></ul>
+         </td>
+         <td>
+           <h3>Contributors:</h3>
+           <ul id="contlist"></ul>
+         </td>
+       </tr></table>
+     </section>
   </article>
 
-   <div id="test">
-     <section>
-       <header>
-         <h2 id="qunit-header2">Testing Scriptish</h2>
-         <h3 id="qunit-banner"></h3>
-         <h4 id="qunit-userAgent"></h4>
-       </header>
-       <ol id="qunit-tests"></ol>
-     </section>
-   </div>
+  <article id="test">
+    <section>
+      <header>
+        <h2 id="qunit-header2">Testing Scriptish</h2>
+        <h3 id="qunit-banner"></h3>
+        <h4 id="qunit-userAgent"></h4>
+      </header>
+      <ol id="qunit-tests"></ol>
+    </section>
+  </article>
 </body>
 </html>
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index eca186ff..09e2906d 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -23,7 +23,7 @@ Cu.import("resource://scriptish/utils/q.js");
         include("js/third-party/qunit/qunit.js"),
         include("tests/runTests.js")).then(function() {
       $("main").style.display = "none";
-      $("test").style.display = "inherit";
+      $("test").style.display = "block";
       runTests();
     });
     return;
diff --git a/extension/skin/aboutScriptish.css b/extension/skin/aboutScriptish.css
index 92a16a6a..46a2a9fe 100644
--- a/extension/skin/aboutScriptish.css
+++ b/extension/skin/aboutScriptish.css
@@ -48,6 +48,12 @@ article {
   border: 1px solid ThreeDShadow;
   border-radius: 15px;
 }
+#test {
+  padding: 0;
+}
+#test > section {
+  margin: 0;
+}
 
 table {
   width: 100%;

From 28143ef0a858d05998b244035afd95f7ca83c4d3 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 8 Jun 2011 11:54:38 -0700
Subject: [PATCH 159/829] Closes #353 fixing up the css on about:scriptish?test
 a bit

---
 extension/content/aboutScriptish.html | 24 ++++++++++++------------
 extension/skin/aboutScriptish.css     |  8 ++++++++
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index a77b48e1..07721a47 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -4,8 +4,8 @@
   <title>About: Scriptish</title>
   <base href="chrome://scriptish/content"/>
   <link rel="icon" href="../skin/scriptish16.png"/>
-  <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
   <link rel="stylesheet" href="js/third-party/qunit/qunit.css" type="text/css" media="screen"/>
+  <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
   <script src="js/aboutScriptish.js"></script>
   <script src="js/third-party/html/html.js"></script>
 </head>
@@ -76,17 +76,17 @@ <h3>Contributors:</h3>
         </tr></table>
       </section>
     </div>
-  </article>
 
-   <div id="test">
-     <section>
-       <header>
-         <h2 id="qunit-header2">Testing Scriptish</h2>
-         <h3 id="qunit-banner"></h3>
-         <h4 id="qunit-userAgent"></h4>
-       </header>
-       <ol id="qunit-tests"></ol>
-     </section>
-   </div>
+    <div id="test">
+      <section>
+        <header>
+          <h2 id="qunit-header2">Testing Scriptish</h2>
+          <h3 id="qunit-banner"></h3>
+          <h4 id="qunit-userAgent"></h4>
+        </header>
+        <ol id="qunit-tests"></ol>
+      </section>
+    </div>
+  </article>
 </body>
 </html>
diff --git a/extension/skin/aboutScriptish.css b/extension/skin/aboutScriptish.css
index 92a16a6a..69367bfe 100644
--- a/extension/skin/aboutScriptish.css
+++ b/extension/skin/aboutScriptish.css
@@ -78,3 +78,11 @@ td {
   border-bottom: 1px dotted lightgray;
 }
 
+#qunit-testresult {
+  max-width: 100% !important;
+}
+
+#qunit-tests li {
+  margin: 0 !important;
+}
+

From 11483b430cd5004ceccec28bf81b54233111f28a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 8 Jun 2011 12:44:02 -0700
Subject: [PATCH 160/829] <em:contributor>Nils Maier;
 https://tn123.org/</em:contributor> -> <em:developer>Nils Maier;
 https://tn123.org/</em:developer>

---
 extension/install.rdf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/install.rdf b/extension/install.rdf
index fa45937d..a27ea531 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -29,6 +29,7 @@
     <em:icon64URL>chrome://scriptish/skin/scriptish64.png</em:icon64URL>
 
     <em:developer>Greg Parris; http://phob.net/</em:developer>
+    <em:developer>Nils Maier; https://tn123.org/</em:developer>
     <em:contributor>Aaron Boodman; http://youngpup.net/</em:contributor>
     <em:contributor>Anthony Lieuallen; http://arantius.com/</em:contributor>
     <em:contributor>Chris Feldmann; http://axlotl.net/</em:contributor>

From ca7cb4603dc85cfbeacaef2884c714b92ad6c476 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 8 Jun 2011 20:59:51 -0700
Subject: [PATCH 161/829] bug fix: wait for all tests to load before starting
 them (ie: disable autostart)

---
 extension/content/aboutScriptish.html  | 1 +
 extension/content/js/aboutScriptish.js | 6 +++---
 extension/content/tests/runTests.js    | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 1a7f4865..043a4664 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -6,6 +6,7 @@
   <link rel="icon" href="../skin/scriptish16.png"/>
   <link rel="stylesheet" href="js/third-party/qunit/qunit.css" type="text/css" media="screen"/>
   <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
+  <script src="js/third-party/qunit/qunit.js"></script>
   <script src="js/aboutScriptish.js"></script>
   <script src="js/third-party/html/html.js"></script>
 </head>
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index 09e2906d..d7356b1b 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -1,5 +1,7 @@
 const Cu = Components.utils;
 
+QUnit.config.autostart = false; // prevents QUnit from auto starting onload
+
 function $(aID) document.getElementById(aID);
 function include(aSrc) {
   var deferred = Q.defer();
@@ -19,9 +21,7 @@ Cu.import("resource://scriptish/utils/q.js");
 
   // Show about:scriptish?test
   if (window.location.href.split("?")[1] == "test") {
-    Q.and(
-        include("js/third-party/qunit/qunit.js"),
-        include("tests/runTests.js")).then(function() {
+    include("tests/runTests.js").then(function() {
       $("main").style.display = "none";
       $("test").style.display = "block";
       runTests();
diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 78c60bbe..b0df820b 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -9,5 +9,7 @@ function runTests() {
     function() include("tests/testScriptishEnabled.js"),
     function() include("tests/testScriptishUpdateSecurely.js"),
     function() include("tests/testTimeout.js"),
-    function() include("tests/endTests.js"));
+    function() include("tests/endTests.js")).then(function() {
+      QUnit.start(); // once all tests have been loaded run them
+    });
 }

From efe1814db20e5a703af09493def1ba73370505e4 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 8 Jun 2011 21:03:46 -0700
Subject: [PATCH 162/829] test: a couple of Scriptish_log tests

---
 extension/content/tests/runTests.js           |  1 +
 .../content/tests/testScriptishLogger.js      | 78 +++++++++++++++++++
 extension/content/tests/testTimeout.js        |  4 +-
 extension/modules/constants.js                |  3 +
 extension/modules/logging.js                  |  2 +-
 5 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100644 extension/content/tests/testScriptishLogger.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index b0df820b..2874928a 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -8,6 +8,7 @@ function runTests() {
     function() include("tests/testGetConfig.js"),
     function() include("tests/testScriptishEnabled.js"),
     function() include("tests/testScriptishUpdateSecurely.js"),
+    function() include("tests/testScriptishLogger.js"),
     function() include("tests/testTimeout.js"),
     function() include("tests/endTests.js")).then(function() {
       QUnit.start(); // once all tests have been loaded run them
diff --git a/extension/content/tests/testScriptishLogger.js b/extension/content/tests/testScriptishLogger.js
new file mode 100644
index 00000000..3aca8ec7
--- /dev/null
+++ b/extension/content/tests/testScriptishLogger.js
@@ -0,0 +1,78 @@
+
+Components.utils.import("resource://scriptish/constants.js");
+Components.utils.import("resource://scriptish/logging.js");
+
+module("Scriptish_log");
+var PREF_BRANCH = Services.prefs.getBranch("extensions.scriptish.");
+
+asyncTest("extensions.scriptish.logChrome", 2, function() {
+  var tID, logChrome = false;
+
+  // making console listener
+  var consoleListener = {
+    observe: function({message}) {
+      if ("[Scriptish] TEST" == message && logChrome) {
+        clearTimeout(tID);
+        unregListener();
+        ok(true, "message was logged successfully as expected");
+        start();
+      }
+    }
+  };
+
+  // add console listener
+  Services.cs.registerListener(consoleListener);
+  function unregListener() Services.cs.unregisterListener(consoleListener);
+
+  // get extensions.scriptish.logChrome pref if it exists
+  try {
+    logChrome = PREF_BRANCH.getBoolPref("logChrome");
+  } catch (e) {}
+
+  try {
+    Scriptish_log("TEST");
+    ok(true, "sent message without error being thrown");
+  } catch (e) {
+    ok(false, e);
+  }
+
+  tID = setTimeout(function() {
+    unregListener();
+    ok(!logChrome, "message was not logged");
+    start();
+  }, 500);
+});
+
+
+asyncTest("forced log message", 2, function() {
+  var tID;
+
+  // making console listener
+  var consoleListener = {
+    observe: function({message}) {
+      if ("[Scriptish] FORCED TEST" == message) {
+        clearTimeout(tID);
+        unregListener();
+        ok(true, "message was logged successfully as expected");
+        start();
+      }
+    }
+  };
+
+  // add console listener
+  Services.cs.registerListener(consoleListener);
+  function unregListener() Services.cs.unregisterListener(consoleListener);
+
+  try {
+    Scriptish_log("FORCED TEST", true);
+    ok(true, "sent message without error being thrown");
+  } catch (e) {
+    ok(false, e);
+  }
+
+  tID = setTimeout(function() {
+    unregListener();
+    ok(false, "message was not logged");
+    start();
+  }, 500);
+});
diff --git a/extension/content/tests/testTimeout.js b/extension/content/tests/testTimeout.js
index b439a319..0812ddfe 100644
--- a/extension/content/tests/testTimeout.js
+++ b/extension/content/tests/testTimeout.js
@@ -3,9 +3,7 @@ Components.utils.import("resource://scriptish/constants.js");
 
 module("Timeout");
 
-asyncTest("Default Works", function() {
-  expect(1);
-
+asyncTest("Default Works", 1, function() {
   try {
     var t2;
     timeout(function() {
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 73a75b63..32925a7f 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -56,6 +56,9 @@ XPCOMUtils.defineLazyServiceGetter(
     Services, "cb", "@mozilla.org/widget/clipboardhelper;1",
     "nsIClipboardHelper");
 
+XPCOMUtils.defineLazyServiceGetter(
+    Services, "cs", "@mozilla.org/consoleservice;1", "nsIConsoleService");
+
 XPCOMUtils.defineLazyServiceGetter(
     Services, "eps", "@mozilla.org/uriloader/external-protocol-service;1",
     "nsIExternalProtocolService");
diff --git a/extension/modules/logging.js b/extension/modules/logging.js
index 21cbe3c5..706cb332 100644
--- a/extension/modules/logging.js
+++ b/extension/modules/logging.js
@@ -18,7 +18,7 @@ function Scriptish_logError(aErr, opt_warn, fileName, lineNumber) {
 }
 
 function Scriptish_log(aMsg, aForce) {
-  if (!aForce && !Scriptish_prefRoot.getValue("logChrome", false)) return;
+  if (!aForce && !Scriptish_prefRoot.getBoolValue("logChrome")) return;
   // make sure msg is a string, and remove NULL bytes which truncate it
   Services.console.logStringMessage(("[Scriptish] " + aMsg).replace("\0","","g"));
 }

From cf77e74d75757305239c0bd04e2d21aba499fd93 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 8 Jun 2011 21:56:45 -0700
Subject: [PATCH 163/829] test: Scriptish_log removes null chars from messages

---
 .../content/tests/testScriptishLogger.js      | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/extension/content/tests/testScriptishLogger.js b/extension/content/tests/testScriptishLogger.js
index 3aca8ec7..cbcb64b4 100644
--- a/extension/content/tests/testScriptishLogger.js
+++ b/extension/content/tests/testScriptishLogger.js
@@ -29,18 +29,18 @@ asyncTest("extensions.scriptish.logChrome", 2, function() {
     logChrome = PREF_BRANCH.getBoolPref("logChrome");
   } catch (e) {}
 
+  tID = setTimeout(function() {
+    unregListener();
+    ok(!logChrome, "message was not logged");
+    start();
+  }, 500);
+
   try {
     Scriptish_log("TEST");
     ok(true, "sent message without error being thrown");
   } catch (e) {
     ok(false, e);
   }
-
-  tID = setTimeout(function() {
-    unregListener();
-    ok(!logChrome, "message was not logged");
-    start();
-  }, 500);
 });
 
 
@@ -63,16 +63,52 @@ asyncTest("forced log message", 2, function() {
   Services.cs.registerListener(consoleListener);
   function unregListener() Services.cs.unregisterListener(consoleListener);
 
+  tID = setTimeout(function() {
+    unregListener();
+    ok(false, "message was not logged");
+    start();
+  }, 500);
+
   try {
     Scriptish_log("FORCED TEST", true);
     ok(true, "sent message without error being thrown");
   } catch (e) {
     ok(false, e);
   }
+});
+
+asyncTest("null char removed", 2, function() {
+  var tID, msg = "FORCED \0TEST \0WITH \0NULLS";
+
+  // making console listener
+  var consoleListener = {
+    observe: function({message}) {
+      if ("[Scriptish] FORCED TEST WITH NULLS" == message || msg == message) {
+        if ("[Scriptish] FORCED TEST WITH NULLS" == message)
+          ok(true, "message was logged successfully as expected");
+        else if (msg == message)
+          ok(false, "null chars were not removed");
+        clearTimeout(tID);
+        unregListener();
+        start();
+      }
+    }
+  };
+
+  // add console listener
+  Services.cs.registerListener(consoleListener);
+  function unregListener() Services.cs.unregisterListener(consoleListener);
 
   tID = setTimeout(function() {
     unregListener();
     ok(false, "message was not logged");
     start();
   }, 500);
+
+  try {
+    Scriptish_log(msg, true);
+    ok(true, "sent message without error being thrown");
+  } catch (e) {
+    ok(false, e);
+  }
 });

From d3009510a0832cae344fb260781ff4096833b3b9 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 9 Jun 2011 11:59:48 +0200
Subject: [PATCH 164/829] Add description to global excludes prefpane

Closes #354
---
 extension/content/options.xul               | 8 ++++++--
 extension/locale/en-US/scriptish.properties | 4 ++++
 extension/skin/options.css                  | 9 +++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index ccaf41aa..8d23c579 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -27,7 +27,7 @@
   <prefpane id="pane-main" label="options.pane.main" localize="label">
     <groupbox orient="horizontal">
       <caption label="options.editor" localize="label"/>
-      <textbox preference="pref-editor" flex="1" readonly="true"/>
+      <textbox preference="pref-editor" flex="1" readonly="true" placeholder="options.editor.notset" localize="placeholder"/>
       <button command="cmd-change-editor" label="options.changeEditor" localize="label"/>
     </groupbox>
 
@@ -48,7 +48,11 @@
   </prefpane>
 
   <prefpane id="pane-excludes" label="options.pane.excludes" localize="label">
-    <textbox id="excludes" multiline="true" rows="15"/>
+    <description control="excludes" value="options.excludes.desc" localize="value"/>
+    <textbox id="excludes" multiline="true" rows="15" placeholder="options.excludes.empty" localize="placeholder"/>
+    <hbox pack="end">
+      <label class="remark" control="excludes" value="options.excludes.remark" localize="value"/>
+    </hbox>
   </prefpane>
 
   <prefpane id="pane-advanced" label="options.pane.advanced" localize="label">
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 3e420154..787e6d5a 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -88,6 +88,10 @@ options.addonManager=Add-on Manager
 options.alsoUninstallPrefs=When uninstalling a script, also remove its preferences
 options.changeEditor=Change Editor
 options.editor=Editor
+options.editor.notset=No editor selected
+options.excludes.empty=No global excludes specified
+options.excludes.desc=Global excludes will override any script or user specified rules
+options.excludes.remark=(You may specify one exclude per line)
 options.enableCopyDownloadURL=Enable copying of download URL
 options.logging=Logging
 options.logChrome=Log non-critical extension messages to the Error Console
diff --git a/extension/skin/options.css b/extension/skin/options.css
index 9fde6487..a8489362 100644
--- a/extension/skin/options.css
+++ b/extension/skin/options.css
@@ -13,3 +13,12 @@ radio[pane="pane-excludes"] {
 radio[pane="pane-advanced"] {
   -moz-image-region: rect(0px, 96px, 32px, 64px);
 }
+
+description {
+  font-weight: bold;
+}
+
+.remark {
+  font-style: italic;
+  font-size: x-small;
+}

From a297088208a559ce962856aec84ccf04a0e937cc Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 9 Jun 2011 13:10:00 +0200
Subject: [PATCH 165/829] Allow to enable/disable all schemes.

Also put enabled schemes under a enabledSchemes.* prefBranch and set sane defaults.
http/https schemes are now synonymous, as the difference is not really the prptocol, just the added SSL/TLS encapsulation.
Also, always allow parameterized/queried about:blank, so users do not have to turn on general about: support just to get some sites using about:blank tricks working.
---
 extension/content/tests/testIsGMable.js     |  8 ++++----
 extension/defaults/preferences/scriptish.js |  8 +++++++-
 extension/modules/scriptish.js              | 13 +++++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/extension/content/tests/testIsGMable.js b/extension/content/tests/testIsGMable.js
index 91fcb178..85684a02 100644
--- a/extension/content/tests/testIsGMable.js
+++ b/extension/content/tests/testIsGMable.js
@@ -49,7 +49,7 @@ test("HTTPS", function() {
 test("ABOUT", function() {
   expect(6);
   try {
-    var aboutIsGMable = PREF_BRANCH.getBoolPref("aboutIsGreaseable");
+    var aboutIsGMable = PREF_BRANCH.getBoolPref("enabledSchemes.about");
   } catch (e) {
     var aboutIsGMable = false; // default
   }
@@ -61,7 +61,7 @@ test("ABOUT", function() {
   equal(
       Scriptish.isGreasemonkeyable("about:blank?test"),
       true,
-      "about:blank?test is " + (aboutIsGMable ? "ok" : "not ok"));
+      "about:blank?test is always ok");
   equal(
       Scriptish.isGreasemonkeyable("about:home"),
       aboutIsGMable,
@@ -83,7 +83,7 @@ test("ABOUT", function() {
 test("FILE", function() {
   expect(5);
   try {
-    var fileIsGMable = PREF_BRANCH.getBoolPref("fileIsGreaseable");
+    var fileIsGMable = PREF_BRANCH.getBoolPref("enabledSchemes.file");
   } catch (e) {
     var fileIsGMable = false; // default
   }
@@ -113,7 +113,7 @@ test("FILE", function() {
 test("UNMHT", function() {
   expect(5);
   try {
-    var unmhtIsGMable = PREF_BRANCH.getBoolPref("unmhtIsGreaseable");
+    var unmhtIsGMable = PREF_BRANCH.getBoolPref("enabledSchemes.unmht");
   } catch (e) {
     var unmhtIsGMable = false; // default
   }
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 7c5e7f18..2847ea6d 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -1,9 +1,15 @@
-pref("extensions.scriptish.aboutIsGreaseable", false);
 pref("extensions.scriptish.blocklist.enabled", true);
 pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
 pref("extensions.scriptish.blocklist.url", "https://github.com/erikvold/scriptish/raw/master/blocklist.json");
 pref("extensions.scriptish.disableNotifications", false);
+pref("extensions.scriptish.enabledSchemes.about", false);
+pref("extensions.scriptish.enabledSchemes.chrome", false);
+pref("extensions.scriptish.enabledSchemes.data", true);
+pref("extensions.scriptish.enabledSchemes.file", false);
+pref("extensions.scriptish.enabledSchemes.ftp", true);
+pref("extensions.scriptish.enabledSchemes.http", true);
+pref("extensions.scriptish.enabledSchemes.unmht", false);
 pref("extensions.scriptish.enableCopyDownloadURL", false);
 pref("extensions.scriptish.enableScriptRefreshing", true);
 pref("extensions.scriptish.uninstallPreferences", true);
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 402e2387..80c3e0f6 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -70,22 +70,27 @@ const Scriptish = {
     // if the url provide is not a valid url, then an error could be thrown
     try {
       var scheme = Services.io.extractScheme(aURL);
+      if (!scheme) {
+        return false;
+      }
     } catch (e) {
       return false;
     }
-
     switch (scheme) {
       case "http":
       case "https":
+        return Scriptish_prefRoot.getBoolValue("enabledSchemes.http", true);
+
       case "ftp":
       case "data":
-        return true;
+        return Scriptish_prefRoot.getBoolValue("enabledSchemes." + scheme, true);
+
       case "about":
         // Always allow "about:blank".
-        if (/^about:blank/.test(aURL)) return true;
+        if (/^about:blank(?:[#?].*)?$/.test(aURL)) return true;
         // no break
       default:
-        return Scriptish_prefRoot.getBoolValue(scheme+"IsGreaseable");
+        return Scriptish_prefRoot.getBoolValue("enabledSchemes." + scheme, false);
     }
   },
   getMostRecentWindow: function() Services.wm.getMostRecentWindow("navigator:browser"),

From 682d912e369643d779e20fe5470ce53f4a659623 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 9 Jun 2011 13:26:36 +0200
Subject: [PATCH 166/829] Add enabledSchemes checkboxen to the advanced
 prefpane

---
 extension/content/options.xul               | 20 ++++++++++++++++++++
 extension/locale/en-US/scriptish.properties |  9 +++++++++
 2 files changed, 29 insertions(+)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index 8d23c579..acaf7df0 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -16,6 +16,13 @@
     <preference id="pref-disableNotifications" name="extensions.scriptish.disableNotifications" type="bool"/>
     <preference id="pref-editor" name="extensions.scriptish.editor" type="unichar"/>
     <preference id="pref-enableCopyDownloadURL" name="extensions.scriptish.enableCopyDownloadURL" type="bool"/>
+    <preference id="pref-enabledSchemes-about" name="extensions.scriptish.enabledSchemes.about" type="bool"/>
+    <preference id="pref-enabledSchemes-chrome" name="extensions.scriptish.enabledSchemes.chrome" type="bool"/>
+    <preference id="pref-enabledSchemes-data" name="extensions.scriptish.enabledSchemes.data" type="bool"/>
+    <preference id="pref-enabledSchemes-file" name="extensions.scriptish.enabledSchemes.file" type="bool"/>
+    <preference id="pref-enabledSchemes-ftp" name="extensions.scriptish.enabledSchemes.ftp" type="bool"/>
+    <preference id="pref-enabledSchemes-http" name="extensions.scriptish.enabledSchemes.http" type="bool"/>
+    <preference id="pref-enabledSchemes-unmht" name="extensions.scriptish.enabledSchemes.unmht" type="bool"/>
     <preference id="pref-logChrome" name="extensions.scriptish.logChrome" type="bool"/>
     <preference id="pref-uninstallPreferences" name="extensions.scriptish.uninstallPreferences" type="bool"/>
     <preference id="pref-update-requireBuiltInCerts" name="extensions.scriptish.update.requireBuiltInCerts" type="bool"/>
@@ -64,6 +71,19 @@
       <caption label="options.translation" localize="label"/>
       <checkbox preference="pref-useDefaultLocale" label="options.translation.useEnglish" localize="label"/>
     </groupbox>
+    <groupbox>
+      <caption label="options.enabledSchemes" localize="label"/>
+      <checkbox preference="pref-enabledSchemes-http" label="options.enabledSchemes.http" localize="label"/>
+      <checkbox preference="pref-enabledSchemes-ftp" label="options.enabledSchemes.ftp" localize="label"/>
+      <checkbox preference="pref-enabledSchemes-data" label="options.enabledSchemes.data" localize="label"/>
+      <separator class="thin"/>
+      <checkbox preference="pref-enabledSchemes-file" label="options.enabledSchemes.file" localize="label"/>
+      <checkbox preference="pref-enabledSchemes-unmht" label="options.enabledSchemes.unmht" localize="label"/>
+      <separator class="thin"/>
+      <checkbox preference="pref-enabledSchemes-about" label="options.enabledSchemes.about" localize="label"/>
+      <checkbox preference="pref-enabledSchemes-chrome" label="options.enabledSchemes.chrome" localize="label"/>
+      <label class="remark" value="options.enabledSchemes.securityRemark" localize="value"/>
+    </groupbox>
     <groupbox>
       <caption label="options.logging" localize="label"/>
       <checkbox preference="pref-logChrome" label="options.logChrome" localize="label"/>
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 787e6d5a..41d4acc7 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -89,6 +89,15 @@ options.alsoUninstallPrefs=When uninstalling a script, also remove its preferenc
 options.changeEditor=Change Editor
 options.editor=Editor
 options.editor.notset=No editor selected
+options.enabledSchemes=Enabled protocol schemes
+options.enabledSchemes.about=about protocol (internal)
+options.enabledSchemes.chrome=chrome protocol (internal)
+options.enabledSchemes.data=data protocol
+options.enabledSchemes.file=file protocol (Local files)
+options.enabledSchemes.ftp=ftp protocol
+options.enabledSchemes.http=http/https protocol
+options.enabledSchemes.unmht=unmht protocol (Mozilla Archive format)
+options.enabledSchemes.securityRemark=The internal protocols might have full system access, and hence pose a sizable security risk with untrusted scripts!
 options.excludes.empty=No global excludes specified
 options.excludes.desc=Global excludes will override any script or user specified rules
 options.excludes.remark=(You may specify one exclude per line)

From 5694eac6ab5b2805f62e03ebd76b59c0466b75c2 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 9 Jun 2011 13:35:10 +0200
Subject: [PATCH 167/829] Put the general schemes on the main prefpane

And keep the advanced, possibly dangerous schemes on the advanced pane. We don't really want n00bs to click them, and if they do, they have been warned :p
---
 extension/content/options.xul               | 37 +++++++++++++++------
 extension/locale/en-US/scriptish.properties |  4 ++-
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index acaf7df0..fcd7badd 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -32,6 +32,13 @@
   </preferences>
 
   <prefpane id="pane-main" label="options.pane.main" localize="label">
+    <groupbox>
+      <caption label="options.enabledSchemes.main" localize="label"/>
+      <checkbox preference="pref-enabledSchemes-http" label="options.enabledSchemes.http" localize="label"/>
+      <checkbox preference="pref-enabledSchemes-ftp" label="options.enabledSchemes.ftp" localize="label"/>
+      <checkbox preference="pref-enabledSchemes-data" label="options.enabledSchemes.data" localize="label"/>
+    </groupbox>
+
     <groupbox orient="horizontal">
       <caption label="options.editor" localize="label"/>
       <textbox preference="pref-editor" flex="1" readonly="true" placeholder="options.editor.notset" localize="placeholder"/>
@@ -71,18 +78,26 @@
       <caption label="options.translation" localize="label"/>
       <checkbox preference="pref-useDefaultLocale" label="options.translation.useEnglish" localize="label"/>
     </groupbox>
-    <groupbox>
-      <caption label="options.enabledSchemes" localize="label"/>
-      <checkbox preference="pref-enabledSchemes-http" label="options.enabledSchemes.http" localize="label"/>
-      <checkbox preference="pref-enabledSchemes-ftp" label="options.enabledSchemes.ftp" localize="label"/>
-      <checkbox preference="pref-enabledSchemes-data" label="options.enabledSchemes.data" localize="label"/>
-      <separator class="thin"/>
-      <checkbox preference="pref-enabledSchemes-file" label="options.enabledSchemes.file" localize="label"/>
-      <checkbox preference="pref-enabledSchemes-unmht" label="options.enabledSchemes.unmht" localize="label"/>
+    <groupbox id="enabledschemes-advanced">
+      <caption label="options.enabledSchemes.advanced" localize="label"/>
+      <grid>
+        <columns>
+          <column flex="1"/>
+          <column flex="1"/>
+        </columns>
+        <rows>
+          <row>
+            <checkbox preference="pref-enabledSchemes-file" label="options.enabledSchemes.file" localize="label"/>
+            <checkbox preference="pref-enabledSchemes-chrome" label="options.enabledSchemes.chrome" localize="label"/>
+          </row>
+          <row>
+            <checkbox preference="pref-enabledSchemes-unmht" label="options.enabledSchemes.unmht" localize="label"/>
+            <checkbox preference="pref-enabledSchemes-about" label="options.enabledSchemes.about" localize="label"/>
+          </row>
+        </rows>
+      </grid>
       <separator class="thin"/>
-      <checkbox preference="pref-enabledSchemes-about" label="options.enabledSchemes.about" localize="label"/>
-      <checkbox preference="pref-enabledSchemes-chrome" label="options.enabledSchemes.chrome" localize="label"/>
-      <label class="remark" value="options.enabledSchemes.securityRemark" localize="value"/>
+      <label class="remark" control="enabledschemes-advanced" value="options.enabledSchemes.securityRemark" localize="value"/>
     </groupbox>
     <groupbox>
       <caption label="options.logging" localize="label"/>
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 41d4acc7..54284fd3 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -89,6 +89,8 @@ options.alsoUninstallPrefs=When uninstalling a script, also remove its preferenc
 options.changeEditor=Change Editor
 options.editor=Editor
 options.editor.notset=No editor selected
+options.enabledSchemes.main=Protocol schemes
+options.enabledSchemes.advanced=Additional protocol schemes
 options.enabledSchemes=Enabled protocol schemes
 options.enabledSchemes.about=about protocol (internal)
 options.enabledSchemes.chrome=chrome protocol (internal)
@@ -97,7 +99,7 @@ options.enabledSchemes.file=file protocol (Local files)
 options.enabledSchemes.ftp=ftp protocol
 options.enabledSchemes.http=http/https protocol
 options.enabledSchemes.unmht=unmht protocol (Mozilla Archive format)
-options.enabledSchemes.securityRemark=The internal protocols might have full system access, and hence pose a sizable security risk with untrusted scripts!
+options.enabledSchemes.securityRemark=The additonal protocol schemes might have full system access, and hence pose a sizable security risk with untrusted scripts!
 options.excludes.empty=No global excludes specified
 options.excludes.desc=Global excludes will override any script or user specified rules
 options.excludes.remark=(You may specify one exclude per line)

From 9720d47ea9a1036ea751fdbf82892d02ad8819c8 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 9 Jun 2011 13:36:59 +0200
Subject: [PATCH 168/829] Also make <caption> bold within the preference dialog

---
 extension/skin/options.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/skin/options.css b/extension/skin/options.css
index a8489362..bc1df4ba 100644
--- a/extension/skin/options.css
+++ b/extension/skin/options.css
@@ -14,6 +14,7 @@ radio[pane="pane-advanced"] {
   -moz-image-region: rect(0px, 96px, 32px, 64px);
 }
 
+caption,
 description {
   font-weight: bold;
 }

From c9145b0c89f73dc9efb18cdbd835bd2b5697a927 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 9 Jun 2011 13:41:25 +0200
Subject: [PATCH 169/829] Break the protocol security remark into two

This avoids display (crop) issues due to an overlong line, e.g. on mac
---
 extension/content/options.xul               | 1 +
 extension/locale/en-US/scriptish.properties | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index fcd7badd..4f887d70 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -98,6 +98,7 @@
       </grid>
       <separator class="thin"/>
       <label class="remark" control="enabledschemes-advanced" value="options.enabledSchemes.securityRemark" localize="value"/>
+      <label class="remark" control="enabledschemes-advanced" value="options.enabledSchemes.securityRemark2" localize="value"/>
     </groupbox>
     <groupbox>
       <caption label="options.logging" localize="label"/>
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 54284fd3..543e0567 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -99,7 +99,8 @@ options.enabledSchemes.file=file protocol (Local files)
 options.enabledSchemes.ftp=ftp protocol
 options.enabledSchemes.http=http/https protocol
 options.enabledSchemes.unmht=unmht protocol (Mozilla Archive format)
-options.enabledSchemes.securityRemark=The additonal protocol schemes might have full system access, and hence pose a sizable security risk with untrusted scripts!
+options.enabledSchemes.securityRemark=The additonal protocol schemes might have full system access.
+options.enabledSchemes.securityRemark2=Hence they pose a sizable security risk with untrusted scripts!
 options.excludes.empty=No global excludes specified
 options.excludes.desc=Global excludes will override any script or user specified rules
 options.excludes.remark=(You may specify one exclude per line)

From cb2894c4851e632a1a66fc1a8b8ca2303cc92bca Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 9 Jun 2011 13:57:37 +0200
Subject: [PATCH 170/829] Fix qunit reruns via about:scriptish

---
 extension/content/aboutScriptish.html  | 2 +-
 extension/content/js/aboutScriptish.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 043a4664..ff485b23 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>About: Scriptish</title>
-  <base href="chrome://scriptish/content"/>
+  <base href="chrome://scriptish/content/aboutScriptish.html"/>
   <link rel="icon" href="../skin/scriptish16.png"/>
   <link rel="stylesheet" href="js/third-party/qunit/qunit.css" type="text/css" media="screen"/>
   <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index d7356b1b..97141af9 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -14,13 +14,14 @@ function include(aSrc) {
 
 
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/utils/q.js");
 
 (function() {
   "use strict";
 
   // Show about:scriptish?test
-  if (window.location.href.split("?")[1] == "test") {
+  var param = window.location.href.split("?")[1];
+  if (param) {
+    Cu.import("resource://scriptish/utils/q.js");
     include("tests/runTests.js").then(function() {
       $("main").style.display = "none";
       $("test").style.display = "block";

From ad9f5a84f6cffa461e4af3b402cd0faa9c805500 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 9 Jun 2011 15:29:44 +0200
Subject: [PATCH 171/829] l10n: Drop "schemes" and typo fixes

---
 extension/locale/en-US/scriptish.properties | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 543e0567..bbdb4d0d 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -89,9 +89,8 @@ options.alsoUninstallPrefs=When uninstalling a script, also remove its preferenc
 options.changeEditor=Change Editor
 options.editor=Editor
 options.editor.notset=No editor selected
-options.enabledSchemes.main=Protocol schemes
-options.enabledSchemes.advanced=Additional protocol schemes
-options.enabledSchemes=Enabled protocol schemes
+options.enabledSchemes.main=Protocols
+options.enabledSchemes.advanced=Additional protocols
 options.enabledSchemes.about=about protocol (internal)
 options.enabledSchemes.chrome=chrome protocol (internal)
 options.enabledSchemes.data=data protocol
@@ -99,7 +98,7 @@ options.enabledSchemes.file=file protocol (Local files)
 options.enabledSchemes.ftp=ftp protocol
 options.enabledSchemes.http=http/https protocol
 options.enabledSchemes.unmht=unmht protocol (Mozilla Archive format)
-options.enabledSchemes.securityRemark=The additonal protocol schemes might have full system access.
+options.enabledSchemes.securityRemark=The additional protocols might have full system access.
 options.enabledSchemes.securityRemark2=Hence they pose a sizable security risk with untrusted scripts!
 options.excludes.empty=No global excludes specified
 options.excludes.desc=Global excludes will override any script or user specified rules

From c313bf33823b203f5bc37d3e2b1d47f75a72f84c Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 9 Jun 2011 15:34:19 +0200
Subject: [PATCH 172/829] de: add recent preferences strings

---
 extension/locale/de/scriptish.properties | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 3342b848..2226ea69 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -88,6 +88,21 @@ options.addonManager=Add-ons-Manager
 options.alsoUninstallPrefs=Wenn ein Benutzerskript entfernt wird, dann auch seine Einstellungen entfernen
 options.changeEditor=Editor ändern
 options.editor=Editor
+options.editor.notset=Kein Editor ausgewählt
+options.enabledSchemes.main=Protokolle
+options.enabledSchemes.advanced=Zusätzliche Protokolle
+options.enabledSchemes.about=about Protokoll (intern)
+options.enabledSchemes.chrome=chrome Protokoll (intern)
+options.enabledSchemes.data=data Protokoll
+options.enabledSchemes.file=file Protokoll (Lokale Dateien)
+options.enabledSchemes.ftp=ftp Protokoll
+options.enabledSchemes.http=http/https Protokoll
+options.enabledSchemes.unmht=unmht Protokoll (Mozilla Archive Format)
+options.enabledSchemes.securityRemark=Die zusätzlichen Protokolle können vollen Systemzugriff haben.
+options.enabledSchemes.securityRemark2=Daher stellen sie ein beträchliches Sicherheitsrisko mit nicht vertrauten Benutzerskripten dar!
+options.excludes.empty=Keine globalen Ausnahmen spezifiziert
+options.excludes.desc=Globale Ausnahmen heben Benutzerskript oder Benutzer Regeln auf
+options.excludes.remark=(Sie können eine Ausnahme pro Zeile spezifizieren)
 options.enableCopyDownloadURL=Kopieren der Download-URL aktivieren
 options.logging=Protokoll
 options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole protokollieren

From e1d0aa22401ef907e845289a8ca1c4c3317fe939 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 9 Jun 2011 10:15:14 -0500
Subject: [PATCH 173/829] Only run QUnit tests if 'test' param is set.

Also allowing for other parameters.
---
 extension/content/js/aboutScriptish.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index 97141af9..a659d946 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -19,8 +19,8 @@ Cu.import("resource://scriptish/constants.js");
   "use strict";
 
   // Show about:scriptish?test
-  var param = window.location.href.split("?")[1];
-  if (param) {
+  var params = window.location.href.split("?")[1];
+  if (/(?:^|&)test(?:&|=|$)/i.test(params)) {
     Cu.import("resource://scriptish/utils/q.js");
     include("tests/runTests.js").then(function() {
       $("main").style.display = "none";

From d7b78944bec820100bb40773a75a96cebb8ab04d Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 9 Jun 2011 10:21:27 -0500
Subject: [PATCH 174/829] Moving things around in aboutScriptish.css

---
 extension/skin/aboutScriptish.css | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/extension/skin/aboutScriptish.css b/extension/skin/aboutScriptish.css
index ea6b58e8..f4516276 100644
--- a/extension/skin/aboutScriptish.css
+++ b/extension/skin/aboutScriptish.css
@@ -27,12 +27,11 @@ header.primary img {
 }
 header.primary h1 { display:inline; }
 header.secondary h2 { border-bottom: 1px dotted #ccc; }
-#test header { margin-bottom: 0; border: none; }
 
 ul { margin-top: 5px; padding-left: 15px; }
+li { margin-bottom: 0.2em; }
 
 p { margin: 0; padding: 0; margin-bottom: 0.5em; }
-li { margin-bottom: 0.2em; }
 
 a { color: #00f; text-decoration: none; }
 a:hover { color: #09f; }
@@ -48,12 +47,6 @@ article {
   border: 1px solid ThreeDShadow;
   border-radius: 15px;
 }
-#test {
-  padding: 0;
-}
-#test > section {
-  margin: 0;
-}
 
 table {
   width: 100%;
@@ -75,15 +68,21 @@ td {
   }
 }
 
-#test {
-  display: none;
-}
-
 .homepage {
   color: black;
   border-bottom: 1px dotted lightgray;
 }
 
+#test {
+  display: none;
+  padding: 0;
+}
+#test > section {
+  margin: 0;
+}
+
+#test header { margin-bottom: 0; border: none; }
+
 #qunit-testresult {
   max-width: 100% !important;
 }

From b8e199db76b25942524e92e44178d440b1c84c18 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 9 Jun 2011 10:22:15 -0500
Subject: [PATCH 175/829] Removing the bottom margin from #qunit-header2

---
 extension/skin/aboutScriptish.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension/skin/aboutScriptish.css b/extension/skin/aboutScriptish.css
index f4516276..cf2fe707 100644
--- a/extension/skin/aboutScriptish.css
+++ b/extension/skin/aboutScriptish.css
@@ -83,6 +83,8 @@ td {
 
 #test header { margin-bottom: 0; border: none; }
 
+#qunit-header2 { margin-bottom: 0; }
+
 #qunit-testresult {
   max-width: 100% !important;
 }

From 40f2062ceb2336af035ae97ede42a69d182fe965 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 9 Jun 2011 10:38:37 -0500
Subject: [PATCH 176/829] tweaking the Learn text in about:scriptish

---
 extension/content/aboutScriptish.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index ff485b23..87fab56b 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -35,8 +35,9 @@ <h2>Learn</h2>
        </header>
        <p>Check out the <a href="https://github.com/erikvold/scriptish/wiki">Scriptish wiki</a>
        to learn about Scriptish and how to use it.</p>
-       <p>There are a lot of resources you can obtain third-party users scripts from, most notable <a href="http://userscripts.org/">userscripts.org</a>.<br>
-       But please <strong>be careful</strong> when installing third-party scripts, as there can be security and privacy issues. Hence, only install scripts from sources you trust.</p>
+       <p>There are many resources from which you can obtain users scripts, most notably <a href="http://userscripts.org/">userscripts.org</a>.<br>
+       Please <strong>be careful</strong> when installing user scripts, as they can introduce significant security and privacy issues.
+       Only install scripts from sources you trust!</p>
      </section>
 
      <section id="helpout">

From 0cbe06b64cd76d9f1d154588bea1e57a6f52c68d Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 9 Jun 2011 10:40:32 -0500
Subject: [PATCH 177/829] making the about:scriptish Credits note smaller

---
 extension/content/aboutScriptish.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 87fab56b..a119f9dd 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -55,7 +55,7 @@ <h2>Help Out</h2>
      <section id="contributors">
        <header class="secondary">
          <h2>Credits</h2>
-         <p>In alphabetical order</p>
+         <p><small>* Listed in alphabetical order</small></p>
        </header>
        <table><tr>
          <td>

From 2f496a58cea415cf6ee6078c794dcf5bc95d836d Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 9 Jun 2011 10:35:33 -0700
Subject: [PATCH 178/829] Closes #356 only run qunit tests if the first url
 param of about:scriptish is 'test' or 'filter'

---
 extension/content/js/aboutScriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index a659d946..8cae3715 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -20,7 +20,7 @@ Cu.import("resource://scriptish/constants.js");
 
   // Show about:scriptish?test
   var params = window.location.href.split("?")[1];
-  if (/(?:^|&)test(?:&|=|$)/i.test(params)) {
+  if (/(?:^|&)(?:test|filter)(?:&|=|$)/i.test(params)) {
     Cu.import("resource://scriptish/utils/q.js");
     include("tests/runTests.js").then(function() {
       $("main").style.display = "none";

From a8c68bdf6ebc4f0a798d618d20f1b20c98aa1312 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 9 Jun 2011 12:16:58 -0700
Subject: [PATCH 179/829] <em:contributor>Nils Maier;
 https://tn123.org/</em:contributor> -> <em:developer>Nils Maier;
 https://tn123.org/</em:developer>

missed this part in 11483b430cd5004ceccec28bf81b54233111f28a
---
 extension/install.rdf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index a27ea531..a121cf80 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -50,7 +50,6 @@
     <em:contributor>Melih Bilgil; http://picol.org/</em:contributor>
     <em:contributor>Mike Medley; http://sizzlemctwizzle.com/</em:contributor>
     <em:contributor>Nikolas Coukouma; http://atrus.org/</em:contributor>
-    <em:contributor>Nils Maier; https://tn123.org/</em:contributor>
     <em:contributor>Ori Avtallon</em:contributor>
     <em:contributor>Pak Kei (logo); http://arkidect.com/</em:contributor>
     <em:contributor>Sergio Abreu; http://sitedosergio.sitesbr.net/</em:contributor>

From c3dc69df6f8243013cbd50679e7a27b942e34ac5 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 9 Jun 2011 19:28:33 -0700
Subject: [PATCH 180/829] adding a 'debug' param to the test.sh script

---
 test.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index ef9e6697..2d65268b 100755
--- a/test.sh
+++ b/test.sh
@@ -2,4 +2,8 @@
 
 ./build.sh test
 echo "Running mozmill tests..."
-mozmill -t tests/mozmill-tests -a scriptish-test.xpi
+if [ "debug" == "$1" ]; then
+  mozmill -t tests/mozmill-tests -a scriptish-test.xpi --show-all
+else
+  mozmill -t tests/mozmill-tests -a scriptish-test.xpi
+fi

From ad93abcbd1b4ef23c3194977948f063a5e28beeb Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 9 Jun 2011 20:15:32 -0700
Subject: [PATCH 181/829] test: adding one test for Scriptish_openInTab
 defaults

---
 extension/modules/api.js                      | 27 +--------
 .../modules/utils/Scriptish_openInTab.js      | 37 ++++++++++++
 test.sh                                       | 16 +++++
 .../tests/restartTests/testOpenInTab/test1.js | 58 +++++++++++++++++++
 4 files changed, 113 insertions(+), 25 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_openInTab.js
 create mode 100644 tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js

diff --git a/extension/modules/api.js b/extension/modules/api.js
index ea314803..1ce16272 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -5,6 +5,7 @@ Cu.import("resource://scriptish/constants.js");
 Cu.import("resource://scriptish/logging.js");
 Cu.import("resource://scriptish/utils/Scriptish_notification.js");
 Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+Cu.import("resource://scriptish/utils/Scriptish_openInTab.js");
 
 const moduleFilename = Components.stack.filename;
 const NS_XHTML = "http://www.w3.org/1999/xhtml";
@@ -175,31 +176,7 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
 
   this.GM_openInTab = function GM_openInTab(aURL, aReuse) {
     if (!GM_apiLeakCheck("GM_openInTab")) return;
-
-    // Try to reuse an existing tab
-    if (aReuse) {
-      let browserEnumerator = Services.wm.getEnumerator("navigator:browser");
-
-      while (browserEnumerator.hasMoreElements()) {
-        let browserWin = browserEnumerator.getNext();
-        let tabBrowser = browserWin.gBrowser;
-        let i = tabBrowser.browsers.length - 1;
-
-        for (; ~i; i--) {
-          let browser = tabBrowser.getBrowserAtIndex(i);
-          // TODO: check rel=canonical too
-          if (aURL === browser.currentURI.spec) {
-            tabBrowser.selectedTab = tabBrowser.tabContainer.childNodes[i];
-            browserWin.focus();
-            return getWindowForBrowser(browser);
-          }
-        }
-      }
-    }
-
-    // Opening a new tab
-    return getWindowForBrowser(aChromeWin.gBrowser
-        .getBrowserForTab(aChromeWin.gBrowser.addTab(aURL)))
+    return Scriptish_openInTab(aURL, aReuse, aChromeWin);
   }
 
   this.GM_xmlhttpRequest = function GM_xmlhttpRequest() {
diff --git a/extension/modules/utils/Scriptish_openInTab.js b/extension/modules/utils/Scriptish_openInTab.js
new file mode 100644
index 00000000..6d84dfa5
--- /dev/null
+++ b/extension/modules/utils/Scriptish_openInTab.js
@@ -0,0 +1,37 @@
+var EXPORTED_SYMBOLS = ["Scriptish_openInTab"];
+
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+Cu.import("resource://scriptish/scriptish.js");
+
+function Scriptish_openInTab(aURL, aReuse, aChromeWin) {
+  aChromeWin = aChromeWin || Scriptish.getMostRecentWindow();
+
+  // Try to reuse an existing tab
+  if (aReuse) {
+    let browserEnumerator = Services.wm.getEnumerator("navigator:browser");
+
+    while (browserEnumerator.hasMoreElements()) {
+      let browserWin = browserEnumerator.getNext();
+      let tabBrowser = browserWin.gBrowser;
+      let i = tabBrowser.browsers.length - 1;
+
+      for (; ~i; i--) {
+        let browser = tabBrowser.getBrowserAtIndex(i);
+        // TODO: check rel=canonical too
+        if (aURL === browser.currentURI.spec) {
+          tabBrowser.selectedTab = tabBrowser.tabContainer.childNodes[i];
+          browserWin.focus();
+          return getWindowForBrowser(browser);
+        }
+      }
+    }
+  }
+
+  // Opening a new tab
+  return getWindowForBrowser(aChromeWin.gBrowser
+      .getBrowserForTab(aChromeWin.gBrowser.addTab(aURL)))
+}
+
+function getWindowForBrowser(browser) browser.docShell
+    .QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindow);
diff --git a/test.sh b/test.sh
index 2d65268b..cfe9b9f0 100755
--- a/test.sh
+++ b/test.sh
@@ -7,3 +7,19 @@ if [ "debug" == "$1" ]; then
 else
   mozmill -t tests/mozmill-tests -a scriptish-test.xpi
 fi
+
+echo "Starting restart tests in 10 secs... (Press ctrl+z to cancel)"
+sleep 7
+echo "Starting restart tests in 3 secs..."
+sleep 1
+echo "Starting restart tests in 2 secs..."
+sleep 1
+echo "Starting restart tests in 1 secs..."
+sleep 1
+echo "Running mozmill-restart tests..."
+
+if [ "debug" == "$1" ]; then
+  mozmill-restart -t tests/mozmill-tests/tests/restartTests -a scriptish-test.xpi --show-all
+else
+  mozmill-restart -t tests/mozmill-tests/tests/restartTests -a scriptish-test.xpi
+fi
diff --git a/tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js b/tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js
new file mode 100644
index 00000000..1b665919
--- /dev/null
+++ b/tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js
@@ -0,0 +1,58 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Scriptish mozmill test suite.
+ *
+ * The Initial Developer of the Original Code is Erik Vold.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Erik Vold <erikvvold@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+Components.utils.import("resource://scriptish/utils/Scriptish_openInTab.js");
+
+var tabs = require("../../../../../../mozmill-tests/lib/tabs");
+
+var setupModule = function(module) {
+  module.controller = mozmill.getBrowserController();
+}
+
+var testOpenInTabDefaults = function() {
+  var win = controller.window;
+
+  tabs.closeAllTabs(controller);
+  controller.assert(function() (tabs.getTabsWithURL("about:scriptish").length == 0));
+
+  // Open about:scriptish and verify the page loaded
+  Scriptish_openInTab("about:scriptish");
+  let tabBrowser = win.gBrowser;
+
+  controller.waitFor(function() {
+    return tabs.getTabsWithURL("about:scriptish").length == 1;
+  }, "wait for about:scriptish", 500, 100);
+}

From cb0932313fe6466e6783036ec2951cec80839243 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 9 Jun 2011 20:40:27 -0700
Subject: [PATCH 182/829] Closes #355 using wrong default in
 testScriptishEnabled.js

Also adding extensions.scriptish.enabled to defaults/preferences/scriptish.js
---
 extension/content/tests/testScriptishEnabled.js | 5 ++---
 extension/defaults/preferences/scriptish.js     | 1 +
 extension/modules/scriptish.js                  | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extension/content/tests/testScriptishEnabled.js b/extension/content/tests/testScriptishEnabled.js
index d2fcdb63..c1b876d5 100644
--- a/extension/content/tests/testScriptishEnabled.js
+++ b/extension/content/tests/testScriptishEnabled.js
@@ -4,13 +4,12 @@ Components.utils.import("resource://scriptish/scriptish.js");
 module("Scriptish.enabled");
 var PREF_BRANCH = Services.prefs.getBranch("extensions.scriptish.");
 
-test("get enabled", function() {
-  expect(2);
+test("get enabled", 2, function() {
   try {
     var enabled = PREF_BRANCH.getBoolPref("enabled");
     ok(true, "no error getting pref")
   } catch (e) {
-    var enabled = false; // default
+    var enabled = true; // default
     ok(false, "failed to get pref")
   }
 
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 2847ea6d..ebcc8313 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -3,6 +3,7 @@ pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
 pref("extensions.scriptish.blocklist.url", "https://github.com/erikvold/scriptish/raw/master/blocklist.json");
 pref("extensions.scriptish.disableNotifications", false);
+pref("extensions.scriptish.enabled", true);
 pref("extensions.scriptish.enabledSchemes.about", false);
 pref("extensions.scriptish.enabledSchemes.chrome", false);
 pref("extensions.scriptish.enabledSchemes.data", true);
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 80c3e0f6..3f558427 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -7,6 +7,7 @@ Cu.import("resource://scriptish/logging.js");
 function setStatus() (enabled = Scriptish_prefRoot.getValue("enabled", true));
 function notifyStatusChg(aVal) (
     Scriptish.notify(null, "scriptish-enabled", {enabling: aVal}));
+
 var ignoreEnable = false, enabled = setStatus();
 Scriptish_prefRoot.watch("enabled", function() {
   if (ignoreEnable) return ignoreEnable = false;

From 0ffae0f8df20bd501aeffe327b347a63be25e3a3 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 9 Jun 2011 22:12:27 -0700
Subject: [PATCH 183/829] adding a windowtype='scriptish:install' attribute to
 the install.xul window

---
 extension/content/install.xul | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/content/install.xul b/extension/content/install.xul
index 2e7a15bb..bd350b72 100644
--- a/extension/content/install.xul
+++ b/extension/content/install.xul
@@ -3,6 +3,7 @@
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/1999/xhtml"
     id="scriptish"
+    windowtype="scriptish:install"
     style="width: 42em; height:32em;"
     persist="width,height"
     buttons="accept,cancel"

From ee6a5d21d74bee8e2ae577d21174ca0d51e72161 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 9 Jun 2011 23:08:41 -0700
Subject: [PATCH 184/829] Closes #347 support GM's openInTab's new
 aLoadInBackground argument

---
 extension/modules/api.js                      |  4 +--
 .../modules/utils/Scriptish_openInTab.js      | 14 ++++++---
 .../tests/restartTests/testOpenInTab/test1.js | 31 +++++++++++++++++--
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 1ce16272..6e9ff048 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -174,9 +174,9 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
     return aScript.getScriptHeader(key);
   }
 
-  this.GM_openInTab = function GM_openInTab(aURL, aReuse) {
+  this.GM_openInTab = function GM_openInTab(aURL, aLoadInBackground, aReuse) {
     if (!GM_apiLeakCheck("GM_openInTab")) return;
-    return Scriptish_openInTab(aURL, aReuse, aChromeWin);
+    return Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin);
   }
 
   this.GM_xmlhttpRequest = function GM_xmlhttpRequest() {
diff --git a/extension/modules/utils/Scriptish_openInTab.js b/extension/modules/utils/Scriptish_openInTab.js
index 6d84dfa5..2223da96 100644
--- a/extension/modules/utils/Scriptish_openInTab.js
+++ b/extension/modules/utils/Scriptish_openInTab.js
@@ -4,7 +4,7 @@ const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 Cu.import("resource://scriptish/scriptish.js");
 
-function Scriptish_openInTab(aURL, aReuse, aChromeWin) {
+function Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin) {
   aChromeWin = aChromeWin || Scriptish.getMostRecentWindow();
 
   // Try to reuse an existing tab
@@ -20,8 +20,10 @@ function Scriptish_openInTab(aURL, aReuse, aChromeWin) {
         let browser = tabBrowser.getBrowserAtIndex(i);
         // TODO: check rel=canonical too
         if (aURL === browser.currentURI.spec) {
-          tabBrowser.selectedTab = tabBrowser.tabContainer.childNodes[i];
-          browserWin.focus();
+          if (!aLoadInBackground) {
+            tabBrowser.selectedTab = tabBrowser.tabContainer.childNodes[i];
+            browserWin.focus();
+          }
           return getWindowForBrowser(browser);
         }
       }
@@ -29,8 +31,10 @@ function Scriptish_openInTab(aURL, aReuse, aChromeWin) {
   }
 
   // Opening a new tab
-  return getWindowForBrowser(aChromeWin.gBrowser
-      .getBrowserForTab(aChromeWin.gBrowser.addTab(aURL)))
+  var browser = aChromeWin.gBrowser;
+  return getWindowForBrowser(browser.getBrowserForTab(browser.loadOneTab(aURL, {
+    "inBackground": !!aLoadInBackground
+  })));
 }
 
 function getWindowForBrowser(browser) browser.docShell
diff --git a/tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js b/tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js
index 1b665919..c72dd5ba 100644
--- a/tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js
+++ b/tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js
@@ -38,6 +38,8 @@ Components.utils.import("resource://scriptish/utils/Scriptish_openInTab.js");
 
 var tabs = require("../../../../../../mozmill-tests/lib/tabs");
 
+var URL = "about:scriptish";
+
 var setupModule = function(module) {
   module.controller = mozmill.getBrowserController();
 }
@@ -46,13 +48,36 @@ var testOpenInTabDefaults = function() {
   var win = controller.window;
 
   tabs.closeAllTabs(controller);
-  controller.assert(function() (tabs.getTabsWithURL("about:scriptish").length == 0));
+  controller.assert(function() (tabs.getTabsWithURL(URL).length == 0));
 
   // Open about:scriptish and verify the page loaded
-  Scriptish_openInTab("about:scriptish");
+  var window = Scriptish_openInTab(URL);
   let tabBrowser = win.gBrowser;
 
   controller.waitFor(function() {
-    return tabs.getTabsWithURL("about:scriptish").length == 1;
+    return controller.tabs.activeTab.defaultView.location.href == URL;
   }, "wait for about:scriptish", 500, 100);
+
+  window.close();
+  controller.assert(function() (tabs.getTabsWithURL(URL).length == 0));
+}
+
+var testOpenInTabArgLoadInBackground = function() {
+  var win = controller.window;
+
+  tabs.closeAllTabs(controller);
+  controller.assert(function() (tabs.getTabsWithURL(URL).length == 0));
+
+  // Open about:scriptish and verify the page loaded
+  var window = Scriptish_openInTab(URL, true);
+  let tabBrowser = win.gBrowser;
+
+  controller.waitFor(function() {
+    return tabs.getTabsWithURL(URL).length == 1;
+  }, "wait for about:scriptish", 500, 100);
+
+  controller.assert(function() controller.tabs.activeTab.defaultView.location.href != URL);
+
+  window.close();
+  controller.assert(function() (tabs.getTabsWithURL(URL).length == 0));
 }

From 34b31ffec85e7f536b4a0d8536cb7011eaeae26e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 10 Jun 2011 12:52:57 -0700
Subject: [PATCH 185/829] test: Scriptish_openInTab's aReuse

---
 .../tests/restartTests/testOpenInTab/test1.js | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js b/tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js
index c72dd5ba..a4f1a65e 100644
--- a/tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js
+++ b/tests/mozmill-tests/tests/restartTests/testOpenInTab/test1.js
@@ -81,3 +81,29 @@ var testOpenInTabArgLoadInBackground = function() {
   window.close();
   controller.assert(function() (tabs.getTabsWithURL(URL).length == 0));
 }
+
+var testOpenInTabArgReuse = function() {
+  var win = controller.window;
+
+  tabs.closeAllTabs(controller);
+  controller.assert(function() (tabs.getTabsWithURL(URL).length == 0));
+
+  // Open about:scriptish and verify the page loaded
+  var window = Scriptish_openInTab(URL, false, true);
+  let tabBrowser = win.gBrowser;
+
+  // resuse should open a new tab when there is not one already, and focus on it
+  controller.waitFor(function() {
+    return controller.tabs.activeTab.defaultView.location.href == URL;
+  }, "wait for about:scriptish", 500, 100);
+
+  var window2 = Scriptish_openInTab(URL, false, true);
+  // resuse should not open a new tab when there is one already, and focus on it
+  controller.waitFor(function() {
+    var win = controller.tabs.activeTab.defaultView;
+    return window2 === win && window2 === window;
+  }, "wait for about:scriptish again w/ reuse = true", 500, 100);
+
+  window.close();
+  controller.assert(function() (tabs.getTabsWithURL(URL).length == 0));
+}

From 68b9ea2b600aebd9a7b865f9478299bbd94aa5e9 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 11 Jun 2011 17:57:23 -0500
Subject: [PATCH 186/829] Closes #359 Add a 'Save As User Script' option to
 scratchpad's File menu (cherry picked from commit
 f960962eb2b24bc5ce45ab27db301e8914bc7953)

---
 extension/chrome.manifest                     |  1 +
 extension/content/js/newscript.js             |  9 +++++-
 extension/content/js/scratchpad.js            | 29 +++++++++++++++++++
 extension/content/scratchpad.xul              | 18 ++++++++++++
 extension/locale/en-US/scriptish.properties   |  2 ++
 extension/modules/content/browser.js          | 17 ++++++++---
 .../utils/Scriptish_createUserScriptSource.js |  6 +++-
 7 files changed, 76 insertions(+), 6 deletions(-)
 create mode 100644 extension/content/js/scratchpad.js
 create mode 100644 extension/content/scratchpad.xul

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index f881696b..fbeb1b6c 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -11,6 +11,7 @@ skin       scriptish    classic/1.0 skin/
 style      chrome://global/content/customizeToolbar.xul chrome://scriptish/skin/browser.css
 
 overlay    chrome://browser/content/browser.xul chrome://scriptish/content/browser.xul
+overlay    chrome://browser/content/scratchpad.xul chrome://scriptish/content/scratchpad.xul
 overlay    chrome://navigator/content/navigator.xul chrome://scriptish/content/browser.xul
 overlay    about:addons chrome://scriptish/content/addonstab.xul
 overlay    chrome://mozapps/content/extensions/extensions.xul chrome://scriptish/content/addonstab.xul
diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 7fe81c09..1736f221 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -5,6 +5,13 @@ Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
 var $ = function(aID) document.getElementById(aID);
 
+var scriptContent = "";
+try {
+  scriptContent = window.arguments[0]
+      .QueryInterface(Components.interfaces.nsIDialogParamBlock)
+      .GetString(0);
+} catch(e) {}
+
 window.addEventListener("load", function() {
   $("scriptish").setAttribute("title", Scriptish_stringBundle("menu.new"));
   $("scriptish").setAttribute("ondialogaccept", "return doInstall();");
@@ -78,7 +85,7 @@ function createScriptSource() {
     excludes: $("excludes").value ? $("excludes").value.match(/.+/g) : []
   }
   try {
-    return Scriptish_createUserScriptSource(header);
+    return Scriptish_createUserScriptSource(header, scriptContent);
   } catch (e) {
     alert(e.message);
   }
diff --git a/extension/content/js/scratchpad.js b/extension/content/js/scratchpad.js
new file mode 100644
index 00000000..428aacae
--- /dev/null
+++ b/extension/content/js/scratchpad.js
@@ -0,0 +1,29 @@
+(function(inc, tools) {
+  inc("resource://scriptish/utils/Scriptish_stringBundle.js", tools);
+
+  function $(aID) document.getElementById(aID);
+
+  window.addEventListener("DOMContentLoaded", function init() {
+    window.removeEventListener("DOMContentLoaded", init, false);
+    // command
+    $("sp-cmd-scriptish-savetouserscript").setAttribute("oncommand",
+        "Scratchpad.browserWindow.Scriptish_BrowserUIM.newUserScript(document.getElementById('scratchpad-textbox').value);");
+
+    // key
+    var tmp = $("sp-key-scriptish-savetouserscript")
+    tmp.setAttribute("key",
+        tools.Scriptish_stringBundle("scratchpad.saveAsUserScript.ak"));
+    tmp.setAttribute("modifiers", "accel");
+    tmp.setAttribute("command", "sp-cmd-scriptish-savetouserscript");
+
+    // menuitem
+    tmp = $("sp-menu-scriptish-savetouserscript");
+    tmp.setAttribute("label",
+        tools.Scriptish_stringBundle("scratchpad.saveAsUserScript"));
+    tmp.setAttribute("accesskey",
+        tools.Scriptish_stringBundle("scratchpad.saveAsUserScript.ak"));
+    tmp.setAttribute("key", "sp-key-scriptish-savetouserscript");
+    tmp.setAttribute("command", "sp-cmd-scriptish-savetouserscript");
+    $("sp-menu-filepopup").insertBefore(tmp, $("sp-menu-saveas").nextSibling);
+  }, false);
+})(Components.utils.import, {});
diff --git a/extension/content/scratchpad.xul b/extension/content/scratchpad.xul
new file mode 100644
index 00000000..d6bf7ad1
--- /dev/null
+++ b/extension/content/scratchpad.xul
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<overlay id="scriptish-scratchpad-overlay"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/x-javascript" src="chrome://scriptish/content/js/scratchpad.js"/>
+
+  <commandset id="sp-commandset">
+    <command id="sp-cmd-scriptish-savetouserscript"/>
+  </commandset>
+
+  <keyset id="sp-keyset">
+    <key id="sp-key-scriptish-savetouserscript"/>
+  </keyset>
+
+  <menupopup id="sp-menu-filepopup">
+    <menuitem id="sp-menu-scriptish-savetouserscript"/>
+  </menupopup>
+</overlay>
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index bbdb4d0d..19e28f9d 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -76,6 +76,8 @@ nothing.timedOut=nothing (timed out)
 openFolder=Open Folder
 openFolder.ak=O
 saving=Saving
+scratchpad.saveAsUserScript=Save As User Script
+scratchpad.saveAsUserScript.ak=u
 scriptOptions.includes=User Includes:
 scriptOptions.excludes=User Excludes:
 scriptOptions.disableScriptIncludes=Disable this script's include patterns and only use the user defined ones.
diff --git a/extension/modules/content/browser.js b/extension/modules/content/browser.js
index 2ecf330b..f5b29b86 100644
--- a/extension/modules/content/browser.js
+++ b/extension/modules/content/browser.js
@@ -45,13 +45,22 @@ Scriptish_BrowserUIM.prototype = {
       tbImg.setAttribute("scriptish-disabled", "scriptish-disabled");
     }
   },
-  openChromeWindow: function(aURL) {
+  openChromeWindow: function(aURL, aParams) {
+    aParams = aParams || null;
     Services.ww.openWindow(
         this._win, aURL, null, "chrome,dependent,centerscreen,resizable,dialog",
-        null);
+        aParams);
+  },
+  newUserScript: function(aContent) {
+    var params = null;
+    aContent = aContent || null;
+    if (aContent) {
+      params = Cc["@mozilla.org/embedcomp/dialogparam;1"]
+          .createInstance(Ci.nsIDialogParamBlock);
+      params.SetString(0, aContent);
+    }
+    this.openChromeWindow("chrome://scriptish/content/newscript.xul", params);
   },
-  newUserScript: function() (
-    this.openChromeWindow("chrome://scriptish/content/newscript.xul")),
   openOptionsWin: function() {
     var instantApply = false;
     try {
diff --git a/extension/modules/utils/Scriptish_createUserScriptSource.js b/extension/modules/utils/Scriptish_createUserScriptSource.js
index 9ef8fccd..54f512d9 100644
--- a/extension/modules/utils/Scriptish_createUserScriptSource.js
+++ b/extension/modules/utils/Scriptish_createUserScriptSource.js
@@ -2,7 +2,7 @@ var EXPORTED_SYMBOLS = ["Scriptish_createUserScriptSource"];
 Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
-function Scriptish_createUserScriptSource(aHeader) {
+function Scriptish_createUserScriptSource(aHeader, aContent) {
   var script = ["// ==UserScript=="];
   var tmpAry, val, i;
 
@@ -39,5 +39,9 @@ function Scriptish_createUserScriptSource(aHeader) {
       script.push("// @exclude        "+val);
 
   script.push("// ==/UserScript==");
+
+  if (aContent)
+    script.push(aContent);
+
   return script.join(Services.appinfo.OS == "WINNT" ? "\r\n" : "\n");
 }

From ca672e69f4f72d7cfd7c11d7c56838fb57022e37 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 13 Jun 2011 19:40:42 -0500
Subject: [PATCH 187/829] Closes #348 use Scriptish_openInTab in aboutStub.xul
 (cherry picked from commit 1999646eb3e5032e8b9fc43862bbaeb0f76c32a3)

---
 extension/content/aboutStub.xul | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/extension/content/aboutStub.xul b/extension/content/aboutStub.xul
index 59ec4403..65ddf54d 100644
--- a/extension/content/aboutStub.xul
+++ b/extension/content/aboutStub.xul
@@ -2,15 +2,8 @@
 <!DOCTYPE window>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="text/javascript"><![CDATA[
-    try {
-      Components.utils.import("resource://gre/modules/Services.jsm");
-      let browserWindow = Services.wm.getMostRecentWindow("navigator:browser");
-      (browserWindow.delayedOpenTab || browserWindow.addTab)("about:scriptish");
-    }
-    catch (ex) {
-      // Shouldn't happen, obviously :p
-      Components.utils.reportError(ex);
-    }
+    Components.utils.import("resource://scriptish/utils/Scriptish_openInTab.js");
+    Scriptish_openInTab("about:scriptish", false, true);
     close();
   ]]></script>
 </window>

From ca0853d782ce86b9cd89a6b941c58026cd28617f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 13 Jun 2011 21:39:01 -0700
Subject: [PATCH 188/829] minor: moving GM_updatingEnabled and GM_generateUUID
 to GM_api.prototype

---
 extension/modules/api.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 6e9ff048..e1b2f5a1 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -229,11 +229,12 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
     Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
     return tools.Scriptish_cryptoHash.apply(null, arguments);
   }
+}
 
-  this.GM_generateUUID = function() Services.uuid.generateUUID().toString();
+GM_API.prototype.GM_generateUUID = function GM_generateUUID() (
+    Services.uuid.generateUUID().toString());
 
-  this.GM_updatingEnabled = true;
-}
+GM_API.prototype.GM_updatingEnabled = true;
 
 GM_API.prototype.GM_setClipboard = function GM_setClipboard() {
   if (!GM_apiLeakCheck("GM_setClipboard")) return;
@@ -241,7 +242,3 @@ GM_API.prototype.GM_setClipboard = function GM_setClipboard() {
   Cu.import("resource://scriptish/api/GM_setClipboard.js", tools);
   tools.GM_setClipboard.apply(null, arguments);
 }
-
-
-function getWindowForBrowser(browser) browser.docShell
-    .QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindow);

From cc81a8c75eab2d69eb37815222e27f72e006aefe Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 5 Jun 2011 17:40:48 -0700
Subject: [PATCH 189/829] WIP #341 removed use of Q in config.js, and
 Config._load* are loading synchronously again

---
 extension/modules/config/config.js | 123 +++++++++++++----------------
 1 file changed, 56 insertions(+), 67 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 78bf5721..426c3d0e 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -16,7 +16,6 @@ inc("resource://scriptish/utils/Scriptish_stringBundle.js");
 inc("resource://scriptish/utils/Scriptish_convert2RegExp.js");
 inc("resource://scriptish/utils/Scriptish_cryptoHash.js");
 inc("resource://scriptish/third-party/Timer.js");
-inc("resource://scriptish/utils/q.js");
 inc("resource://scriptish/script/script.js");
 })(Components.utils.import);
 
@@ -166,74 +165,66 @@ Config.prototype = {
   _loadXML: function(aFile) {
     Scriptish_log("Scriptish Config._loadXML");
     var self = this;
-    var deferred = Q.defer();
 
     if (aFile.exists()) {
-      Scriptish_getContents(aFile, 0, function(str) {
-        if (!str) return timeout(function() deferred.reject(false));
-
-        var doc = Instances.dp.parseFromString(str, "text/xml");
-
-        // Stop if there was a parsing error
-        if (doc.documentElement.nodeName == "parsererror")
-          return timeout(function() deferred.reject(false));
-
-        var nodes = doc.evaluate("/UserScriptConfig/Script | /UserScriptConfig/Exclude", doc, null, 0, null);
-        let excludes = [];
-
-        for (var node; node = nodes.iterateNext();) {
-          switch (node.nodeName) {
-          case "Script":
-            Script.loadFromXML(self, node);
-            break;
-          case "Exclude":
-            excludes.push(node.firstChild.nodeValue.trim());
-            break;
-          }
+      var str = Scriptish_getContents(aFile);
+      if (!str) return new Error("File not found");
+
+      var doc = Instances.dp.parseFromString(str, "text/xml");
+
+      // Stop if there was a parsing error
+      if (doc.documentElement.nodeName == "parsererror")
+        return new Error("Parse error");
+
+      var nodes = doc.evaluate("/UserScriptConfig/Script | /UserScriptConfig/Exclude", doc, null, 0, null);
+      let excludes = [];
+
+      for (var node; node = nodes.iterateNext();) {
+        switch (node.nodeName) {
+        case "Script":
+          Script.loadFromXML(self, node);
+          break;
+        case "Exclude":
+          excludes.push(node.firstChild.nodeValue.trim());
+          break;
         }
-        self.addExclude(excludes);
+      }
+      self.addExclude(excludes);
 
-        deferred.resolve(true); // force a save
-      });
-    } else {
-      timeout(function() deferred.reject(false));
+      return true;// force a save
     }
 
-    return deferred.promise;
+    return new Error("File not found");
   },
 
   _loadJSON: function(aFile) {
     Scriptish_log("Scriptish Config._loadJSON");
     var self = this;
     var config = {};
-    var deferred = Q.defer();
 
     if (aFile.exists()) {
-      Scriptish_getContents(aFile, 0, function(str) {
-        if (!str) return timeout(function() deferred.reject(false));
-
-        try {
-          config = JSON.parse(str);
-        } catch(e) {
-          // Unable to parse the file.
-          return deferred.reject(e);
-        }
+      var str = Scriptish_getContents(aFile);
+      if (!str) return new Error("File not found");
 
-        // load scripts
-        var fileModified = false, scripts = config.scripts;
-        for (var i = scripts.length - 1; ~i; i--)
-          fileModified = Script.loadFromJSON(self, scripts[i]) || fileModified;
+      try {
+        config = JSON.parse(str);
+      } catch(e) {
+        // Unable to parse the file.
+        return new Error("Parse error");
+      }
 
-        // load global excludes
-        config.excludes.forEach(function(i) self.addExclude(i));
+      // load scripts
+      var fileModified = false, scripts = config.scripts;
+      for (var i = scripts.length - 1; ~i; i--)
+        fileModified = Script.loadFromJSON(self, scripts[i]) || fileModified;
 
-        deferred.resolve(fileModified);
-      });
-    } else {
-      timeout(function() deferred.reject(false));
+      // load global excludes
+      config.excludes.forEach(function(i) self.addExclude(i));
+
+      return fileModified;
     }
 
-    return deferred.promise;
+    return new Error("File not found");
   },
 
   load: function(aCallback) {
@@ -241,7 +232,7 @@ Config.prototype = {
     var self = this;
 
     // called after the config has been loaded
-    function callback(fileModified) timeout(function() {
+    function callback(fileModified) {
       let scripts = self._scripts;
       let len = scripts.length;
 
@@ -271,32 +262,30 @@ Config.prototype = {
 
       if (fileModified) self._save();
       aCallback();
-    });
+    };
 
     // Load the config (trying from various sources)
     var configFile;
     // source: Scriptish JSON tmp
-    self._loadJSON(self._tempFile).then(function() {
-      callback(true);  // need to force save here
-    }, function(aErr) {
-      if ("boolean" != typeof aErr) {
-        // the tmp file exists but is corrupt, so force save
-        callback = callback.bind(null, true);
-      }
-
+    var fileModified = self._loadJSON(self._tempFile);
+    if (fileModified instanceof Error) {
       // source: Scriptish JSON
       (configFile = self._scriptDir).append(SCRIPTISH_CONFIG_JSON);
-      self._loadJSON(configFile).then(callback, function() {
+      fileModified = self._loadJSON(configFile);
+      if (fileModified instanceof Error) {
         // source: Scriptish XML
         (configFile = self._scriptDir).append(SCRIPTISH_CONFIG_XML);
-        self._loadXML(configFile).then(callback, function() {
+        fileModified = self._loadXML(configFile);
+        if (fileModified instanceof Error) {
           // source: Older GM Style XML
           (configFile = self._scriptDir).append("config.xml");
-          self._loadXML(configFile).then(
-              callback, (function() callback(true)));
-        });
-      });
-    });
+          fileModified = self._loadXML(configFile);
+          if (fileModified instanceof Error)
+            fileModified = true;
+        }
+      }
+    }
+    callback(fileModified);
 
     // Listen for the blocklist pref being modified
     Scriptish_prefRoot.watch("blocklist.enabled", function() {

From e53b87093220baf1f91de3dad44ed6350f4bd1da Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 5 Jun 2011 21:26:22 -0500
Subject: [PATCH 190/829] modifying Config._load* functions to handle the
 various 'save' cases

---
 extension/modules/config/config.js | 47 +++++++++++++++---------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 426c3d0e..77295869 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -162,19 +162,19 @@ Config.prototype = {
     });
   },
 
-  _loadXML: function(aFile) {
+  _loadXML: function(aFile, aCallback) {
     Scriptish_log("Scriptish Config._loadXML");
     var self = this;
 
     if (aFile.exists()) {
       var str = Scriptish_getContents(aFile);
-      if (!str) return new Error("File not found");
+      if (!str) return aCallback(false);
 
       var doc = Instances.dp.parseFromString(str, "text/xml");
 
       // Stop if there was a parsing error
       if (doc.documentElement.nodeName == "parsererror")
-        return new Error("Parse error");
+        return aCallback(false);
 
       var nodes = doc.evaluate("/UserScriptConfig/Script | /UserScriptConfig/Exclude", doc, null, 0, null);
       let excludes = [];
@@ -191,26 +191,26 @@ Config.prototype = {
       }
       self.addExclude(excludes);
 
-      return true;// force a save
+      return aCallback(true);
     }
 
-    return new Error("File not found");
+    aCallback(false);
   },
 
-  _loadJSON: function(aFile) {
+  _loadJSON: function(aFile, aCallback) {
     Scriptish_log("Scriptish Config._loadJSON");
     var self = this;
     var config = {};
 
     if (aFile.exists()) {
       var str = Scriptish_getContents(aFile);
-      if (!str) return new Error("File not found");
+      if (!str) return aCallback(false);
 
       try {
         config = JSON.parse(str);
       } catch(e) {
         // Unable to parse the file.
-        return new Error("Parse error");
+        return aCallback(false);
       }
 
       // load scripts
@@ -221,10 +221,10 @@ Config.prototype = {
       // load global excludes
       config.excludes.forEach(function(i) self.addExclude(i));
 
-      return fileModified;
+      return aCallback(true, fileModified);
     }
 
-    return new Error("File not found");
+    aCallback(false);
   },
 
   load: function(aCallback) {
@@ -267,25 +267,26 @@ Config.prototype = {
     // Load the config (trying from various sources)
     var configFile;
     // source: Scriptish JSON tmp
-    var fileModified = self._loadJSON(self._tempFile);
-    if (fileModified instanceof Error) {
+    self._loadJSON(self._tempFile, function(aSuccess) {
+      if (aSuccess) return callback(true);
+
       // source: Scriptish JSON
+      // NOTE: this is the only case where we care if the file was modified
       (configFile = self._scriptDir).append(SCRIPTISH_CONFIG_JSON);
-      fileModified = self._loadJSON(configFile);
-      if (fileModified instanceof Error) {
+      self._loadJSON(configFile, function(aSuccess, aModified) {
+        if (aSuccess) return callback(aModified);
+
         // source: Scriptish XML
         (configFile = self._scriptDir).append(SCRIPTISH_CONFIG_XML);
-        fileModified = self._loadXML(configFile);
-        if (fileModified instanceof Error) {
+        self._loadXML(configFile, function(aSuccess) {
+          if (aSuccess) return callback(true);
+
           // source: Older GM Style XML
           (configFile = self._scriptDir).append("config.xml");
-          fileModified = self._loadXML(configFile);
-          if (fileModified instanceof Error)
-            fileModified = true;
-        }
-      }
-    }
-    callback(fileModified);
+          self._loadXML(configFile, function() callback(true));
+        });
+      });
+    });
 
     // Listen for the blocklist pref being modified
     Scriptish_prefRoot.watch("blocklist.enabled", function() {

From a0bd72f6b2222f4549eef5b02603eda28c31212e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 14 Jun 2011 08:56:29 -0700
Subject: [PATCH 191/829] test: Scriptish_convert2RegExp

---
 extension/content/tests/runTests.js           |  1 +
 .../tests/testScriptishConvert2RegExp.js      | 44 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 extension/content/tests/testScriptishConvert2RegExp.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 2874928a..2192b1d1 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -8,6 +8,7 @@ function runTests() {
     function() include("tests/testGetConfig.js"),
     function() include("tests/testScriptishEnabled.js"),
     function() include("tests/testScriptishUpdateSecurely.js"),
+    function() include("tests/testScriptishConvert2RegExp.js"),
     function() include("tests/testScriptishLogger.js"),
     function() include("tests/testTimeout.js"),
     function() include("tests/endTests.js")).then(function() {
diff --git a/extension/content/tests/testScriptishConvert2RegExp.js b/extension/content/tests/testScriptishConvert2RegExp.js
new file mode 100644
index 00000000..00fd5c14
--- /dev/null
+++ b/extension/content/tests/testScriptishConvert2RegExp.js
@@ -0,0 +1,44 @@
+
+Components.utils.import("resource://scriptish/utils/Scriptish_convert2RegExp.js");
+
+module("Scriptish_convert2RegExp");
+
+test("Regular @includes", 5, function() {
+  var url = "https://google.com/";
+  var regExp = Scriptish_convert2RegExp("https://google.com/*");
+  equal(
+    regExp.toString(),
+    "/^https:\\/\\/google\\.com\\/.*$/i",
+    "Regular @include"
+  );
+  equal(regExp.isTLD, undefined, "should not be a tld");
+  ok(regExp.test(url));
+
+  regExp = Scriptish_convert2RegExp("https?://google.tld/*");
+  equal(
+    regExp.toString(),
+    "/^https\\?:\\/\\/google\\.tld\\/.*$/i",
+    "@include with ?"
+  );
+  equal(regExp.isTLD, true, "should be a tld");
+});
+
+test("Regular Exp @includes", 5, function() {
+  var url = "http://google.com/";
+  var regExp = Scriptish_convert2RegExp("/https?:\/\/google\\.com\/.*/i");
+  equal(
+    regExp.toString(),
+    "/https?:\\/\\/google\\.com\\/.*/i",
+    "Reg exp @include, with i flag"
+  );
+  ok(regExp.test("http://GOOGLE.COM/"));
+
+  var regExp = Scriptish_convert2RegExp("/https?:\/\/google\\.com\/.*/");
+  equal(
+    regExp.toString(),
+    "/https?:\\/\\/google\\.com\\/.*/",
+    "Reg exp @include"
+  );
+  ok(regExp.test(url));
+  ok(!regExp.test("http://googleTcom/"));
+});

From 34e06e5e0d11054a869b21b9c2fa12e8b1a5b063 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 14 Jun 2011 09:20:32 -0700
Subject: [PATCH 192/829] test: Scriptish_memoize

---
 extension/content/tests/runTests.js           |  1 +
 .../content/tests/testScriptishMemoize.js     | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 extension/content/tests/testScriptishMemoize.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 2192b1d1..6327a805 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -9,6 +9,7 @@ function runTests() {
     function() include("tests/testScriptishEnabled.js"),
     function() include("tests/testScriptishUpdateSecurely.js"),
     function() include("tests/testScriptishConvert2RegExp.js"),
+    function() include("tests/testScriptishMemoize.js"),
     function() include("tests/testScriptishLogger.js"),
     function() include("tests/testTimeout.js"),
     function() include("tests/endTests.js")).then(function() {
diff --git a/extension/content/tests/testScriptishMemoize.js b/extension/content/tests/testScriptishMemoize.js
new file mode 100644
index 00000000..015588a9
--- /dev/null
+++ b/extension/content/tests/testScriptishMemoize.js
@@ -0,0 +1,25 @@
+
+Components.utils.import("resource://scriptish/utils/Scriptish_memoize.js");
+
+module("Scriptish_memoize");
+
+test("Memoization", function() {
+  var counter = 0;
+  var memoizedFunc = Scriptish_memoize(function(aIn1, aIn2) {
+    counter++;
+    return aIn1 + aIn2;
+  });
+
+  equal(memoizedFunc(2,2), 4, "2 + 2 = 4");
+  ok(counter, 1);
+  equal(memoizedFunc(2,3), 5, "2 + 3 = 5");
+  ok(counter, 2);
+  equal(memoizedFunc(2,2), 4, "2 + 2 = 4");
+  ok(counter, 2);
+  equal(memoizedFunc(2,3), 5, "2 + 3 = 5");
+  ok(counter, 2);
+  equal(memoizedFunc(12,34), 46, "12 + 34 = 46");
+  ok(counter, 3);
+  equal(memoizedFunc(1,234), 235, "1 + 234 = 235");
+  ok(counter, 4);
+});

From 2f93d7da46fa8ce4921a3894265322e21f03f9b6 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 9 Jun 2011 13:13:42 -0500
Subject: [PATCH 193/829] Use a more reliable way to retrieve URL params in
 QUnit.

For 'about:scriptish?test', window.location.search is an empty string.
---
 extension/content/js/third-party/qunit/qunit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/third-party/qunit/qunit.js b/extension/content/js/third-party/qunit/qunit.js
index 5d72dcc3..a95f1a7f 100644
--- a/extension/content/js/third-party/qunit/qunit.js
+++ b/extension/content/js/third-party/qunit/qunit.js
@@ -449,8 +449,8 @@ var config = {
 
 // Load paramaters
 (function() {
-	var location = window.location || { search: "", protocol: "file:" },
-		params = location.search.slice( 1 ).split( "&" ),
+	var location = window.location || { href: "", protocol: "file:" },
+		params = ( location.href.split( "?" )[ 1 ] || "" ).split( "&" ),
 		length = params.length,
 		urlParams = {},
 		current;

From 6c17acc38c6128a6bddff852f7a306dc2afa348a Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 9 Jun 2011 13:31:55 -0500
Subject: [PATCH 194/829] Adding the 'urlbase' option to QUnit.

---
 extension/content/js/third-party/qunit/qunit.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/third-party/qunit/qunit.js b/extension/content/js/third-party/qunit/qunit.js
index a95f1a7f..45464b41 100644
--- a/extension/content/js/third-party/qunit/qunit.js
+++ b/extension/content/js/third-party/qunit/qunit.js
@@ -444,7 +444,9 @@ var config = {
 	reorder: true,
 
 	noglobals: false,
-	notrycatch: false
+	notrycatch: false,
+
+	urlbase: ""
 };
 
 // Load paramaters
@@ -646,7 +648,7 @@ extend(QUnit, {
 			querystring += encodeURIComponent( key ) + "=" +
 				encodeURIComponent( params[ key ] ) + "&";
 		}
-		return window.location.pathname + querystring.slice( 0, -1 );
+		return config.urlbase + window.location.pathname + querystring.slice( 0, -1 );
 	},
 
 	// Logging callbacks; all receive a single argument with the listed properties

From bd2810dac365784ec6fb54e13f15af8af0a14450 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 9 Jun 2011 13:35:44 -0500
Subject: [PATCH 195/829] Using QUnit.config.urlbase in aboutScriptish.js

---
 extension/content/js/aboutScriptish.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index 8cae3715..63237e78 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -1,5 +1,6 @@
 const Cu = Components.utils;
 
+QUnit.config.urlbase = "about:scriptish";
 QUnit.config.autostart = false; // prevents QUnit from auto starting onload
 
 function $(aID) document.getElementById(aID);

From 344c607994bbf760cd2f40b00f71ea263a3b9738 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 9 Jun 2011 14:30:39 -0500
Subject: [PATCH 196/829] revert 2f496a58cea415cf6ee6078c794dcf5bc95d836d since
 the 'test' param will always be set when filtering QUnit tests

---
 extension/content/js/aboutScriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index 63237e78..0e9eb7bc 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -21,7 +21,7 @@ Cu.import("resource://scriptish/constants.js");
 
   // Show about:scriptish?test
   var params = window.location.href.split("?")[1];
-  if (/(?:^|&)(?:test|filter)(?:&|=|$)/i.test(params)) {
+  if (/(?:^|&)test(?:&|=|$)/i.test(params)) {
     Cu.import("resource://scriptish/utils/q.js");
     include("tests/runTests.js").then(function() {
       $("main").style.display = "none";

From 3173e968561cd427602776c61dbf6c581533c4c3 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 9 Jun 2011 18:51:45 -0500
Subject: [PATCH 197/829] Using default 'qunit-header' behavior now that URL
 params are working.

---
 extension/content/aboutScriptish.html | 2 +-
 extension/skin/aboutScriptish.css     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index a119f9dd..f70f2ee0 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -81,7 +81,7 @@ <h3>Contributors:</h3>
   <article id="test">
     <section>
       <header>
-        <h2 id="qunit-header2">Testing Scriptish</h2>
+        <h2 id="qunit-header">Testing Scriptish</h2>
         <h3 id="qunit-banner"></h3>
         <h4 id="qunit-userAgent"></h4>
       </header>
diff --git a/extension/skin/aboutScriptish.css b/extension/skin/aboutScriptish.css
index cf2fe707..f4516276 100644
--- a/extension/skin/aboutScriptish.css
+++ b/extension/skin/aboutScriptish.css
@@ -83,8 +83,6 @@ td {
 
 #test header { margin-bottom: 0; border: none; }
 
-#qunit-header2 { margin-bottom: 0; }
-
 #qunit-testresult {
   max-width: 100% !important;
 }

From b82da23aaffdfa5c39c3c93894946c65fcce2a15 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 14 Jun 2011 11:35:58 -0700
Subject: [PATCH 198/829] Revert "Adding the 'urlbase' option to QUnit."

This reverts commit 6c17acc38c6128a6bddff852f7a306dc2afa348a.
---
 extension/content/js/third-party/qunit/qunit.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/extension/content/js/third-party/qunit/qunit.js b/extension/content/js/third-party/qunit/qunit.js
index 45464b41..a95f1a7f 100644
--- a/extension/content/js/third-party/qunit/qunit.js
+++ b/extension/content/js/third-party/qunit/qunit.js
@@ -444,9 +444,7 @@ var config = {
 	reorder: true,
 
 	noglobals: false,
-	notrycatch: false,
-
-	urlbase: ""
+	notrycatch: false
 };
 
 // Load paramaters
@@ -648,7 +646,7 @@ extend(QUnit, {
 			querystring += encodeURIComponent( key ) + "=" +
 				encodeURIComponent( params[ key ] ) + "&";
 		}
-		return config.urlbase + window.location.pathname + querystring.slice( 0, -1 );
+		return window.location.pathname + querystring.slice( 0, -1 );
 	},
 
 	// Logging callbacks; all receive a single argument with the listed properties

From 49bac645e9ee6e897062a5cae2f695b7b7954026 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 14 Jun 2011 11:42:49 -0700
Subject: [PATCH 199/829] overwriting QUnit.url() instead of editing qunit.js

---
 extension/content/tests/runTests.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 6327a805..cb2f4354 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -1,3 +1,13 @@
+
+QUnit.url = function(params) {
+  var querystring = "";
+  for (var key in params) {
+    querystring += "&" + encodeURIComponent(key) + "=" +
+        encodeURIComponent(params[key]);
+  }
+  return "about:scriptish?test" + querystring;
+}
+
 function runTests() {
   var tools = {};
   Q.chain(

From 25e013ff6812be998123a3849ee6d3cf3c8489d8 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 14 Jun 2011 12:05:21 -0700
Subject: [PATCH 200/829] ignoring keys with no values in QUnit.url()

---
 extension/content/tests/runTests.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index cb2f4354..b1b22243 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -2,6 +2,7 @@
 QUnit.url = function(params) {
   var querystring = "";
   for (var key in params) {
+    if (!params[key]) continue;
     querystring += "&" + encodeURIComponent(key) + "=" +
         encodeURIComponent(params[key]);
   }

From 6a399425962a766dfaa31ffb1eb52e6224d1f7a1 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 14 Jun 2011 20:35:34 -0500
Subject: [PATCH 201/829] Closes #82 Display 'reinstall' if a user script is
 already installed.  Also consolidating 'Install' translations into the
 'install' key. (cherry picked from commit
 72519a1c31ae4622501ed5ee11cbce98474cf95c)

---
 extension/content/js/browser.js             | 11 +++++++++--
 extension/content/js/install.js             |  8 ++++++--
 extension/locale/de/scriptish.properties    |  3 +--
 extension/locale/en-US/scriptish.properties |  4 ++--
 extension/locale/ja-JP/scriptish.properties |  3 +--
 extension/locale/ru-RU/scriptish.properties |  3 +--
 extension/locale/sv-SE/scriptish.properties |  3 +--
 7 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index e5643606..bcc445d8 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -160,8 +160,15 @@ Scriptish_BrowserUI.disableMenuCommand = function(commandUUID, aWinID) {
  * a user selects "show script source" in the install dialog.
  */
 Scriptish_BrowserUI.showInstallBanner = function(browser) {
-  var greeting = Scriptish_stringBundle("greeting.msg");
+  var self = this;
   var notificationBox = gBrowser.getNotificationBox(browser);
+  var greeting = Scriptish_stringBundle("greeting.msg");
+  var btnLabel;
+  Scriptish.getConfig(function(config) {
+    btnLabel = Scriptish_stringBundle(
+        (config.installIsUpdate(self.scriptDownloader_.script) ? "re" : "")
+        + "install");
+  });
 
   // Remove existing notifications. Notifications get removed
   // automatically onclick and on page navigation, but we need to remove
@@ -175,7 +182,7 @@ Scriptish_BrowserUI.showInstallBanner = function(browser) {
     "install-userscript",
     "chrome://scriptish/skin/scriptish16.png",
     notificationBox.PRIORITY_WARNING_MEDIUM,
-    [{label: Scriptish_stringBundle("greeting.btn"),
+    [{label: btnLabel,
       accessKey: Scriptish_stringBundle("greeting.btn.ak"),
       popup: null,
       callback: this.installCurrentScript.bind(this)
diff --git a/extension/content/js/install.js b/extension/content/js/install.js
index 52780285..7f908cb0 100644
--- a/extension/content/js/install.js
+++ b/extension/content/js/install.js
@@ -4,6 +4,7 @@ const valueSplitter = /(\S+)\s+([^\r\f\n]+)/;
 
 Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/logging.js");
+Components.utils.import("resource://scriptish/scriptish.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
 function $(id) document.getElementById(id);
@@ -56,8 +57,11 @@ on("load", function() {
 
   // setup buttons
   let dialog = document.documentElement;
-  dialog.getButton("accept").setAttribute("label",
-      Scriptish_stringBundle("install.installButton"));
+  Scriptish.getConfig(function(config) {
+    dialog.getButton("accept").setAttribute("label",
+        Scriptish_stringBundle(
+        (config.installIsUpdate(scriptDownloader.script) ? "re" : "") + "install"));
+  });
   dialog.getButton("cancel").focus();
 
   // setup other l10n
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 2226ea69..3ede944c 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -31,16 +31,15 @@ error.resource.syntax=Ungültige Syntax für @resource Deklaration
 error.retrieving=Fehler beim Abrufen
 error.script.installing=Fehler bei der Installation des Benutzerskripts
 error.script.loading=Fehler beim Laden des Benutzerskripts
-greeting.btn=Installieren
 greeting.btn.ak=I
 greeting.msg=Dies ist ein Benutzerskript. „Installieren" klicken um es zu benutzen.
+install=Installieren
 install.domains=Seiten:
 install.matches=Passend zu:
 install.includes=Läuft auf:
 install.excludes=Läuft nicht auf:
 install.requires=Benötigt:
 install.resources=Resourcen:
-install.installButton=Installieren
 install.showScriptSource=Quelltext anzeigen
 install.title=Benutzerskript Installation
 install.warning1=Bösartige Benutzerskripte können Ihre Daten auspähen oder ohne Ihre Genehmigung in ihren Namen handeln. Es handelt sich um echte kleine Programme.
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 19e28f9d..f916fc84 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -31,16 +31,15 @@ error.resource.syntax=Invalid syntax for @resource declaration
 error.retrieving=Failed to retrieve
 error.script.installing=Error installing user script
 error.script.loading=Error loading user script
-greeting.btn=Install
 greeting.btn.ak=I
 greeting.msg=This is a user script. Click install to start using it.
+install=Install
 install.domains=domains:
 install.matches=matches:
 install.includes=runs on:
 install.excludes=does not run on:
 install.requires=requires:
 install.resources=resources:
-install.installButton=Install
 install.showScriptSource=Show Script Source
 install.title=User Script Installation
 install.warning1=Malicious scripts can violate your privacy and act on your behalf without your knowledge.
@@ -75,6 +74,7 @@ newscript.noName=Please provide a name for your script.
 nothing.timedOut=nothing (timed out)
 openFolder=Open Folder
 openFolder.ak=O
+reinstall=Reinstall
 saving=Saving
 scratchpad.saveAsUserScript=Save As User Script
 scratchpad.saveAsUserScript.ak=u
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 2c78ce60..cf7828f2 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -29,11 +29,10 @@ error.resource.syntax=@resource宣言のシンタックスが不正です。
 error.retrieving=Failed to retrieve
 error.script.installing=ユーザースクリプトのインストール中にエラーが発生しました。
 error.script.loading=ユーザースクリプトのロード中にエラーが発生しました。
-greeting.btn=インストール
 greeting.btn.ak=I
 greeting.msg=ユーザースクリプトです。使用を開始するにはクリックして下さい。
+install=インストール
 install.excludes=スクリプト無効:
-install.installButton=インストール
 install.matches=一致:
 install.includes=スクリプト有効:
 install.showScriptSource=スクリプトのソースを表示
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 5ad22e9c..1310d368 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -2,10 +2,9 @@ edit=Редактировать
 editor.couldNotLaunch=Не могу запустить редактор.
 editor.pleasePickExecutable=Пожалуйста, выберите приложение для редактирования скриптов
 editor.prompt=Пожалуйста сначала выберите ваш редактор скриптов
-greeting.btn=Установить
 greeting.msg=Это юзерскрипт. Нажмите "Установить" чтобы начать использовать его.
+install=Установить
 install.excludes=не запускать на:
-install.installButton=Установить
 install.matches=совпадений:
 install.includes=запуск на:
 install.showScriptSource=Показать исходный код скрипта
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 71e95b7c..749b0cd8 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -31,16 +31,15 @@ error.resource.syntax=Ogiltig syntax för @resource-deklaration
 error.retrieving=Det gick inte att hämta
 error.script.installing=Fel vid installation av användarskript
 error.script.loading=Fel vid inläsning av användarskript
-greeting.btn=Installera
 greeting.btn.ak=I
 greeting.msg=Detta är ett användarskript. Klicka på "Installera" för att börja använda det.
+install=Installera
 install.domains=domäner:
 install.matches=matchningar:
 install.includes=kan köras på:
 install.excludes=kan inte köras på:
 install.requires=kräver:
 install.resources=resurser:
-install.installButton=Installera
 install.showScriptSource=Visa skriptets källa
 install.title=Installation av användarskript
 install.warning1=Skadliga skript kan kränka din integritet och agera för din räkning utan din vetskap.

From a84fb592fcda3b02e6e2bbcee98d785daa76cdc3 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 19 Jun 2011 00:45:16 +0200
Subject: [PATCH 202/829] Scriptish_getContents broken when NetworkHelper not
 shipped

Seamonkey (and others?) do not ship the NetworkHelper module, part of
the HUDConsole, hence the Cu.import fails, effectively causing other
missing error handling to render the whole application useless.

As a work-around reimplement the one function Scriptish currently uses
if Cu.import fails.
---
 .../modules/utils/Scriptish_getContents.js    | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/extension/modules/utils/Scriptish_getContents.js b/extension/modules/utils/Scriptish_getContents.js
index e94c7de0..a4f7326c 100644
--- a/extension/modules/utils/Scriptish_getContents.js
+++ b/extension/modules/utils/Scriptish_getContents.js
@@ -1,10 +1,37 @@
 var EXPORTED_SYMBOLS = ["Scriptish_getContents"];
-Components.utils.import("resource:///modules/NetworkHelper.jsm");
 Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/logging.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_getUriFromFile.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
+try {
+  // only available when the HUD console is shipped
+  // that excludes Seamonkey at the moment
+  Components.utils.import("resource:///modules/NetworkHelper.jsm");
+}
+catch (ex) {
+  // Minimal replacement
+  // XXX: Might want to keep this up-to-date?!
+  this.NetworkHelper = {
+    readAndConvertFromStream: function NH_readAndConvertFromStream(aStream, aCharset) {
+      let text = null;
+      try {
+        text = NetUtil.readInputStreamToString(aStream, aStream.available());
+        if (!aCharset) {
+          return text;
+        }
+        let conv = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
+          .createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+        conv.charset = aCharset;
+        return conv.ConvertToUnicode(text);
+      }
+      catch (ex) {
+        return text;
+      }
+    }
+  };
+}
+
 function Scriptish_getContents(aFile, aCharset, aCallback) {
   if (!aCharset) aCharset = "UTF-8";
 

From 7f0e416b85afa0e6444ecbba131f0c9037fefe5d Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 19 Jun 2011 00:50:53 +0200
Subject: [PATCH 203/829] Official support Seamonkey up to Seamonkey Beta2.2

Closes #367
---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index a121cf80..d64bf94c 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -76,7 +76,7 @@
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1a3</em:minVersion>
-        <em:maxVersion>2.1b3pre</em:maxVersion>
+        <em:maxVersion>2.2.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>

From 0ab4623ddd146c1d4a974e804a2780b17057a550 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 19 Jun 2011 00:52:11 +0200
Subject: [PATCH 204/829] Fix testToolsMenuItem failure on Seamonkey

---
 extension/content/tests/testToolsMenuItem.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/tests/testToolsMenuItem.js b/extension/content/tests/testToolsMenuItem.js
index cd0d8d5f..85dc60dc 100644
--- a/extension/content/tests/testToolsMenuItem.js
+++ b/extension/content/tests/testToolsMenuItem.js
@@ -9,7 +9,7 @@ test("Exists", function() {
   var win = Services.wm.getMostRecentWindow("navigator:browser");
   function $(aID) win.document.getElementById(aID);
   var scriptish_menu = $("scriptish_general_menu");
-  var tools_menu = $("menu_ToolsPopup");
+  var tools_menu = $("menu_ToolsPopup") || $("taskPopup");
   ok(!!scriptish_menu, "Scriptish menu exists");
   ok(!!tools_menu, "Tools menu exists");
   equal(scriptish_menu.parentNode, tools_menu, "The Scriptish menu is a child of the Tools menu");

From f7c8fe811a87fb949c15e837acedbfbe870728f1 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 11 Jun 2011 18:48:30 -0500
Subject: [PATCH 205/829] only test global excludes against a URL once per page
 load

---
 extension/components/scriptish.js  | 2 +-
 extension/content/js/browser.js    | 2 +-
 extension/modules/config/config.js | 7 ++++++-
 extension/modules/script/script.js | 3 +--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 754110e9..b0725088 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -283,7 +283,7 @@ ScriptishService.prototype = {
         let chk = isScriptRunnable(script, url, isTopWin);
         if (chk) scripts[script.runAt].push(script);
         return chk;
-      });
+      }, [url]);
 
       aCallback(scripts);
     });
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index bcc445d8..daf1febe 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -314,7 +314,7 @@ function Scriptish_showPopup(aEvent) Scriptish.getConfig(function(config) {
       return urls.some(function(url) script.matchesURL(url));
     }
 
-    return config.getMatchingScripts(testMatchURLs).sort(function(a,b) {
+    return config.getMatchingScripts(testMatchURLs, urls).sort(function(a,b) {
       a = a.name.toLocaleLowerCase(), b = b.name.toLocaleLowerCase();
       return a.localeCompare(b);
     });
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 78bf5721..a06f3658 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -436,7 +436,12 @@ Config.prototype = {
   },
 
   get scripts() this._scripts.concat(),
-  getMatchingScripts: function(testFunc) this.scripts.filter(testFunc),
+  getMatchingScripts: function(testFunc, urls) {
+    for (var i = 0; i < urls.length; i++)
+      if (this._excludeRegExps.some(function(reg) reg.test(urls[i])))
+        return [];
+    return this.scripts.filter(testFunc);
+  },
   sortScripts: function() this._scripts.sort(function(a, b) b.priority - a.priority),
   injectScript: function(script) {
     var unsafeWin = this.wrappedContentWin.wrappedJSObject;
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 379d5029..40db644a 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -332,8 +332,7 @@ Script.prototype = {
           && !this._user_excludeRegExps.some(testI);
 
     let includes = this._user_includeRegExps.concat(this._includeRegExps);
-    let excludes = this._user_excludeRegExps.concat(this._excludeRegExps)
-        .concat(this._config.excludeRegExps);
+    let excludes = this._user_excludeRegExps.concat(this._excludeRegExps);
 
     return (includes.some(testI) || this._matches.some(testII))
         && !excludes.some(testI);

From 85e228a737bca9f27b31d62e8ab6d96a8e2710d9 Mon Sep 17 00:00:00 2001
From: mrwarper <mrwarper@yahoo.es>
Date: Wed, 22 Jun 2011 02:33:38 -0700
Subject: [PATCH 206/829] Added es-ES locale

---
 extension/chrome.manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index fbeb1b6c..5b7d1d2f 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -22,6 +22,7 @@ overlay    chrome://scriptish/content/newscript.xul chrome://scriptish/content/c
 
 locale     scriptish  en-US  locale/en-US/
 locale     scriptish  de  locale/de/
+locale     scriptish  es-ES  locale/es_ES/
 locale     scriptish  ja-JP  locale/ja-JP/
 locale     scriptish  ru-RU  locale/ru-RU/
 locale     scriptish  sv-SE  locale/sv-SE/

From 5f96c6e7c5e278d2df3ffcbdf1f306636d48b9ef Mon Sep 17 00:00:00 2001
From: mrwarper <mrwarper@yahoo.es>
Date: Wed, 22 Jun 2011 02:36:16 -0700
Subject: [PATCH 207/829] Added es-ES description and translator name

---
 extension/install.rdf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/extension/install.rdf b/extension/install.rdf
index d64bf94c..74222c85 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -17,6 +17,14 @@
         <em:description>Управление пользовательских скриптов для Firefox</em:description>
       </Description>
     </em:localized>
+    <em:localized>
+      <Description>
+        <em:locale>es-ES</em:locale>
+        <em:name>Scriptish</em:name>
+        <em:description>Un gestor de scripts de usuario para aplicaciones Mozilla</em:description>
+      </Description>
+    </em:localized>
+
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
@@ -59,6 +67,7 @@
     <em:translator>Mikael Hiort af Ornäs</em:translator>
     <em:translator>Nils Maier (de)</em:translator>
     <em:translator>nishikawasasaki (kohsei yamamoto)</em:translator>
+    <em:translator>Alfredo Fernández Díaz</em:translator>
 
     <em:updateURL>http://github.com/downloads/erikvold/scriptish/update.rdf</em:updateURL>
     <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjEA/hqcsMgPctoWvqJFfjtNcQbfBi1uP3zoWR3PPMRSXnpBJv/5Kb5lJD9HJ+963CFQ3oFvkgO9+oEWisiKBjxhx94Bynl0Ym2sZ1DdEzTsH9kV4HGFLjeYTix5WkQqdoswyM32ebtDSYrFbSqxpBrgHwVLELfFYM1qZsnWpJKwIDAQAB</em:updateKey>

From 910ca73db7f0b907c855c10b934e37dc54610ea8 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 25 Jun 2011 14:34:12 -0500
Subject: [PATCH 208/829] Closes #371 Reuse the Scriptish Options window if it
 is already open, and make it modal for non-instantApply systems. (cherry
 picked from commit 897cae67d92335c54c2107196cc792d4fbe72a0e)

---
 extension/modules/content/browser.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/extension/modules/content/browser.js b/extension/modules/content/browser.js
index f5b29b86..aff7c9bd 100644
--- a/extension/modules/content/browser.js
+++ b/extension/modules/content/browser.js
@@ -14,6 +14,7 @@ const ICON_24_OFF = "chrome://scriptish/skin/scriptish24_disabled.png";
 function Scriptish_BrowserUIM(aWin, aBrowserUI) {
   this.$ = function(aID) aWin.document.getElementById(aID);
   this._win = aWin;
+  this._optionsWin = null;
   this._browserUI = aBrowserUI;
 }
 Scriptish_BrowserUIM.prototype = {
@@ -68,11 +69,14 @@ Scriptish_BrowserUIM.prototype = {
     }
     catch (ex) {};
 
-    this._win.openDialog(
-      "chrome://scriptish/content/options.xul",
-      "scriptish-options-dialog",
-      "chrome,titlebar,toolbar,resizable,centerscreen" + (instantApply ? ",dialog=no" : "")
-    );
+    if (!this._optionsWin || this._optionsWin.closed) {
+      this._optionsWin = this._win.openDialog(
+        "chrome://scriptish/content/options.xul",
+        "scriptish-options-dialog",
+        "chrome,titlebar,toolbar,resizable,centerscreen" + (instantApply ? ",dialog=no" : ",modal")
+      );
+    }
+    this._optionsWin.focus();
   },
   showUserscriptList: function() {
     Cu.import("resource://scriptish/addonprovider.js");

From 76730803052b3a306ad7e81668993b432baf4f1d Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 25 Jun 2011 18:06:28 -0700
Subject: [PATCH 209/829] test fix: testAboutScriptishTestsRan was busted in
 3173e968561cd427602776c61dbf6c581533c4c3

---
 .../tests/testAboutScriptish/testAboutScriptishTests.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js
index 895e6244..588b57fb 100644
--- a/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js
+++ b/tests/mozmill-tests/tests/testAboutScriptish/testAboutScriptishTests.js
@@ -45,7 +45,7 @@ var testAboutScriptishTestsRan = function() {
   controller.open("about:scriptish?test");
   controller.waitForPageLoad();
   controller.assertNode(
-      new elementslib.ID(controller.tabs.activeTab, "qunit-header2"));
+      new elementslib.ID(controller.tabs.activeTab, "test"));
   var config = controller.tabs.activeTab.defaultView.QUnit.config;
 
   controller.waitFor(function() {

From ad7723396890659489e8eb47e38eef8abbbcc078 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 25 Jun 2011 18:16:52 -0700
Subject: [PATCH 210/829] =?UTF-8?q?adding=20es-ES=20translations=20from=20?=
 =?UTF-8?q?Alfredo=20Fern=C3=A1ndez=20D=C3=ADaz?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extension/locale/es-ES/scriptish.properties | 96 +++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 extension/locale/es-ES/scriptish.properties

diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
new file mode 100644
index 00000000..e369d75f
--- /dev/null
+++ b/extension/locale/es-ES/scriptish.properties
@@ -0,0 +1,96 @@
+copyDownloadURL=Copiar URL de descarga
+copyDownloadURL.ak=C
+edit=Editar
+edit.ak=E
+editor.couldNotLaunch=Error al abrir el editor.
+editor.pleasePickExecutable=Por favor elija un programa para editar sus scripts de usuario.
+editor.prompt=Por favor, elija antes su editor de texto favorito
+error.api.clipboard.type=no es un tipo soportado por GM_setClipboard.
+error.api.noResourceWithName=No hay recursos con el nombre
+error.api.noSecondArgValue=Segundo argumento no especificado: Valor
+error.api.reqURL.scheme=Esquema no permitido en URL
+error.api.reqURL=URL no válido
+error.api.unsafeAccess=Violación de acceso de Scriptish: unsafeWindow no puede invocar
+error.charset=El conjunto de caracteres especificado no es válido.
+error.dependency.loading=Error al cargar dependencia
+error.dependency.local=Excepción de seguridad: prohibidas las peticiones a URLs locales y chrome
+error.dependency.serverReturned=¡Error! El servidor ha devuelto
+error.hash.algorithm=Especificado algoritmo de hash no válido.
+error.icon.dataURL=URL de tipo datos para @icon no válido
+error.icon.notImage=¡Error!: @icon no tiene un tipo MIME de imagen
+error.icon.URL=URL para @icon no válido
+error.isInvalidValue=es un valor no permitido
+error.matchPattern.rules.file=El filtro @match del esquema File no se ajusta a las reglas para filtros
+error.matchPattern.rules=el filtro @match no se ajusta a las reglas para filtros
+error.notSupported.Firefox=no soportado por esta versión de Firefox
+error.observerNotFound=Observer no encontrado
+error.openingFile=Error abriendo el archivo
+error.pattern.parsing=Error interpretando el filtro
+error.pref.type=Tipo de preferencia no soportado. Tipos válidos: cadena, booleano y entero de 32 bits.
+error.resource.dupName=es un nombre de recurso duplicado. Cada declaración @resource debe tener un nombre único.
+error.resource.syntax=Sintaxis no válida para la declaración @resource
+error.retrieving=Error al descargar
+error.script.installing=Error al instalar script de usuario
+error.script.loading=Error al cargar script de usuario
+greeting.btn=Instalar
+greeting.btn.ak=I
+greeting.msg=Este es un script de usuario. Pulse instalar para empezar a usarlo.
+install.domains=dominios:
+install.matches=filtros:
+install.includes=se ejecuta sobre:
+install.excludes=no se ejecuta sobre:
+install.requires=requiere:
+install.resources=recursos:
+install.installButton=Instalar
+install.showScriptSource=Mostrar código fuente del script
+install.title=Instalar script de usuario
+install.warning1=Los scripts maliciosos pueden violar su privacidad y actuar en su nombre sin su conocimiento.
+install.warning2=Sólo debería instalar scripts de fuentes en las que confíe.
+menu.commands=Mandatos del script de usuario...
+menu.commands.ak=M
+menu.install=Instalar script de usuario...
+menu.install.ak=I
+menu.manage=Gestionar scripts de usuario...
+menu.manage.ak=G
+menu.new=Nuevo script de usuario...
+menu.new.ak=N
+menu.options.ak=O
+menu.show=Ver código fuente del script
+menu.show.ak=V
+menu.title=Scriptish
+menu.title.ak=S
+menuitem.install=Instalar este script de usuario...
+menuitem.manage=Gestionar scripts de usuario
+menuitem.new=Nuevo script de usuario
+newscript.description=Descripción
+newscript.excludes=Exclusiones (una por línea)
+newscript.exists=Ya hay instalado un script con ese nombre.\n¿Sobreescribir?
+newscript.id=ID
+newscript.includes=Inclusiones (Una por línea)
+newscript.name=Nombre
+newscript.namespace=Espacio de nombres
+newscript.noID=Por favor, introduzca un ID válido para su script.
+newscript.noName=Por favor, introduzca un nombre para su script.
+openFolder=Abrir carpeta
+openFolder.ak=A
+scriptOptions.includes=Inclusiones de usuario:
+scriptOptions.excludes=Exclusiones de usuario:
+scriptOptions.disableScriptIncludes=Desactivar los filtros de inclusión de este script y utilizar sólo los definidos por el usuario.
+options=Opciones
+options.excludes=Exclusiones globales
+options.addonManager=Gestor de extensiones
+options.alsoUninstallPrefs=Al desinstalar un script, borrar también sus preferencias
+options.changeEditor=Cambiar editor
+options.editor=Editor
+options.enableCopyDownloadURL=Activar copia del URL de descarga
+options.useDownloadURL=Utilizar URL de descarga para actualizar si no hay URL de actualización
+statusbar.enabled=Activado
+statusbar.enabled.ak=A
+statusbar.installed=instalado con éxito
+statusbar.modified=modificado
+statusbar.noScripts=¡No hay scripts para esta página!
+statusbar.updated=actualizado con éxito
+tooltip.loading=Cargando...
+Uninstall=Desinstalar
+Update=Actualizar
+userscripts=Scripts de usuario

From 752deb8b68f44b71b5a62f17ef17ebece408afc5 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 24 Jun 2011 10:56:24 -0500
Subject: [PATCH 211/829] Adding pt-BR (Brazilian Portuguese), courtesy of
 Mauro Jos da Silva

---
 extension/install.rdf                       |   1 +
 extension/locale/pt-BR/scriptish.properties | 100 ++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 extension/locale/pt-BR/scriptish.properties

diff --git a/extension/install.rdf b/extension/install.rdf
index 74222c85..098e1207 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -64,6 +64,7 @@
     <em:contributor>Slowpoke</em:contributor>
     <em:contributor>Tommi Rautava</em:contributor>
 
+    <em:translator>Mauro José da Silva (pt-BR)</em:translator>
     <em:translator>Mikael Hiort af Ornäs</em:translator>
     <em:translator>Nils Maier (de)</em:translator>
     <em:translator>nishikawasasaki (kohsei yamamoto)</em:translator>
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
new file mode 100644
index 00000000..992601ce
--- /dev/null
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -0,0 +1,100 @@
+copyDownloadURL=Copiar endereço de download
+copyDownloadURL.ak=C
+edit=Editar
+edit.ak=E
+editor.couldNotLaunch=Não foi possível iniciar o editor.
+editor.pleasePickExecutable=Por favor, escolha um aplicativo para ser usado como editor de scripts de usuário.
+editor.prompt=Escolha seu editor de texto preferido
+error.api.clipboard.type=não é um tipo suportado por GM_setClipboard.
+error.api.noResourceWithName=Nenhum recurso com o nome
+error.api.noSecondArgValue=Segundo argumento não especificado: Valor
+error.api.reqURL.scheme=Esquema não permitido em URL
+error.api.reqURL=Endereço inválido
+error.api.unsafeAccess=Violação de acesso do Scriptish: unsafeWindow não pode chamar
+error.charset=O conjunto de caracteres especificado é inválido.
+error.dependency.loading=Erro carregando dependência
+error.dependency.local=Exceção de segurança: não são permitidas solicitações a endereços locais e de chrome
+error.dependency.serverReturned=Erro! O servidor retornou
+error.hash.algorithm=O algoritmo de hash especificado é inválido.
+error.icon.dataURL=Dados inválidos: endereço para @icon
+error.icon.notImage=Erro! @icon não tem um tipo MIME de imagem
+error.icon.URL=Endereço inválido para @icon
+error.isInvalidValue=é um nome inválido
+error.matchPattern.rules.file=o padrão de @match do esquema "file:" não está de acordo com as regras.
+error.matchPattern.rules=o padrão de @match não está de acordo com as regras.
+error.notSupported.Firefox=não é suportado por esta versão do Firefox
+error.openingFile=Não foi possível abrir o arquivo
+error.pattern.parsing=Não foi possível analisar o padrão
+error.pref.type=Tipo de preferência não suportado. Os tipos válidos são: string, bool e integers de 32 bits.
+error.resource.dupName=é um nome de recurso duplicado. Cada item de @resource precisa ter um nome exclusivo.
+error.resource.syntax=sintaxe inválida para a declaração @resource.
+error.retrieving=Falha ao obter
+error.script.installing=Erro ao instalar script de usuário
+error.script.loading=Erro ao carregar script de usuário
+greeting.btn=Instalar
+greeting.btn.ak=I
+greeting.msg=Este é um script de usuário. Clique no botão "Instalar" para começar a usá-lo.
+install.domains=domínios:
+install.matches=funciona em (@match):
+install.includes=funciona em (@include):
+install.excludes=não se executa em:
+install.requires=necessita de:
+install.resources=recursos:
+install.installButton=Instalar
+install.showScriptSource=Exibir código-fonte do script
+install.title=Instalação de Script de Usuário
+install.warning1=Scripts nocivos podem violar a sua privacidade e agir em seu nome sem o seu conhecimento.
+install.warning2=Você só deve instalar scripts de fontes em que você confia.
+menu.commands=Comandos de script de usuário
+menu.commands.ak=C
+menu.install=Instalar script de usuário
+menu.install.ak=I
+menu.manage=Gerenciar script de usuário
+menu.manage.ak=G
+menu.new=Novo script de usuário...
+menu.new.ak=N
+menu.options.ak=O
+menu.show=Exibir código-fonte do script de usuário
+menu.show.ak=E
+menu.title=Scriptish
+menu.title.ak=S
+menuitem.install=Instalar este script de usuário...
+menuitem.manage=Gerenciar scripts de usuário
+menuitem.new=Novo script de usuário
+moving.script=Movendo arquivo de script:
+moving.dependency=Movendo arquivo de dependência:
+newscript.description=Descrição
+newscript.excludes=Exclusões (uma por linha)
+newscript.exists=Um script com esse nome já está instalado.\nDeseja substituir?
+newscript.id=Identificador
+newscript.includes=Inclusões (uma por linha)
+newscript.name=Nome
+newscript.namespace=Espaço de nomes
+newscript.noID=Por favor, informe um identificador válido para o seu script.
+newscript.noName=Por favor, informe um nome para o seu script.
+nothing.timedOut=nada (excedido o tempo limite)
+openFolder=Abrir pasta
+openFolder.ak=A
+saving=Salvando
+scriptOptions.includes=Inclusões personalizadas:
+scriptOptions.excludes=Exclusões personalizadas:
+scriptOptions.disableScriptIncludes=Desativar as inclusões originais deste sript e usar somente as inclusões personalizadas.
+options=Opções
+options.excludes=Exclusões globais
+options.addonManager=Gerenciador de complementos
+options.alsoUninstallPrefs=Ao desinstalar um script, remover também as suas preferências
+options.changeEditor=Alterar editor
+options.editor=Editor
+options.enableCopyDownloadURL=Habilitar cópia do endereço de download
+options.requireSecured=Exigir que scripts de usuário atualizem usando HTTPS
+options.useDownloadURL=Usar endereço de download para atualizações se não houver endereço de atualização
+statusbar.enabled=Ativado
+statusbar.enabled.ak=A
+statusbar.installed=instalado com sucesso
+statusbar.modified=modificado
+statusbar.noScripts=Nenhum script para esta página!
+statusbar.updated=atualizado com sucesso
+tooltip.loading=Carregando...
+Uninstall=Desinstalação
+Update=Atualização
+userscripts=Scripts de usuário

From fb6a98a31057f92e6d899c4ec95e6629e8683821 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 24 Jun 2011 11:31:11 -0500
Subject: [PATCH 212/829] consolidating 'install' translations in pt-BR

---
 extension/locale/pt-BR/scriptish.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 992601ce..d42206d7 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -31,16 +31,15 @@ error.resource.syntax=sintaxe inválida para a declaração @resource.
 error.retrieving=Falha ao obter
 error.script.installing=Erro ao instalar script de usuário
 error.script.loading=Erro ao carregar script de usuário
-greeting.btn=Instalar
 greeting.btn.ak=I
 greeting.msg=Este é um script de usuário. Clique no botão "Instalar" para começar a usá-lo.
+install=Instalar
 install.domains=domínios:
 install.matches=funciona em (@match):
 install.includes=funciona em (@include):
 install.excludes=não se executa em:
 install.requires=necessita de:
 install.resources=recursos:
-install.installButton=Instalar
 install.showScriptSource=Exibir código-fonte do script
 install.title=Instalação de Script de Usuário
 install.warning1=Scripts nocivos podem violar a sua privacidade e agir em seu nome sem o seu conhecimento.

From 10780cad319e5a06f6b1a4ddbf553a181e9e32ad Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 24 Jun 2011 11:45:51 -0500
Subject: [PATCH 213/829] updating pt-BR to reflect changes in en-US

---
 extension/locale/pt-BR/scriptish.properties | 33 ++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index d42206d7..0e3efc34 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -74,18 +74,47 @@ newscript.noName=Por favor, informe um nome para o seu script.
 nothing.timedOut=nada (excedido o tempo limite)
 openFolder=Abrir pasta
 openFolder.ak=A
+reinstall=
 saving=Salvando
+scratchpad.saveAsUserScript=
+scratchpad.saveAsUserScript.ak=
 scriptOptions.includes=Inclusões personalizadas:
 scriptOptions.excludes=Exclusões personalizadas:
 scriptOptions.disableScriptIncludes=Desativar as inclusões originais deste sript e usar somente as inclusões personalizadas.
 options=Opções
-options.excludes=Exclusões globais
+options.title=
+options.pane.main=
+options.pane.excludes=Exclusões globais
+options.pane.advanced=
 options.addonManager=Gerenciador de complementos
 options.alsoUninstallPrefs=Ao desinstalar um script, remover também as suas preferências
 options.changeEditor=Alterar editor
 options.editor=Editor
+options.editor.notset=
+options.enabledSchemes.main=
+options.enabledSchemes.advanced=
+options.enabledSchemes.about=
+options.enabledSchemes.chrome=
+options.enabledSchemes.data=
+options.enabledSchemes.file=
+options.enabledSchemes.ftp=
+options.enabledSchemes.http=
+options.enabledSchemes.unmht=
+options.enabledSchemes.securityRemark=
+options.enabledSchemes.securityRemark2=
+options.excludes.empty=
+options.excludes.desc=
+options.excludes.remark=
 options.enableCopyDownloadURL=Habilitar cópia do endereço de download
+options.logging=
+options.logChrome=
+options.notifications=
+options.notifications.disable=
+options.requireBuiltInCerts=
 options.requireSecured=Exigir que scripts de usuário atualizem usando HTTPS
+options.translation=
+options.translation.useEnglish=
+options.update.security=
 options.useDownloadURL=Usar endereço de download para atualizações se não houver endereço de atualização
 statusbar.enabled=Ativado
 statusbar.enabled.ak=A
@@ -97,3 +126,5 @@ tooltip.loading=Carregando...
 Uninstall=Desinstalação
 Update=Atualização
 userscripts=Scripts de usuário
+userscripts.get=
+userscripts.noneInstalled=

From 32e06306f8b077fa57815a79685187dbcb7930e4 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 24 Jun 2011 11:55:12 -0500
Subject: [PATCH 214/829] updating sv-SE to reflect changes in en-US

---
 extension/locale/sv-SE/scriptish.properties | 33 ++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 749b0cd8..42d2dbd2 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -74,18 +74,47 @@ newscript.noName=Var vänlig ange ett namn på ditt skript.
 nothing.timedOut=ingenting (tidsgränsen uppnåddes)
 openFolder=Öppna mapp
 openFolder.ak=Ö
+reinstall=
 saving=Sparar
+scratchpad.saveAsUserScript=
+scratchpad.saveAsUserScript.ak=
 scriptOptions.includes=Inkluderade av användaren:
 scriptOptions.excludes=Undantagna av användaren:
 scriptOptions.disableScriptIncludes=Inaktivera detta skripts inkluderade mönster och använd endast de användardefinierade mönstren.
 options=Inställningar
+options.title=
+options.pane.main=
+options.pane.excludes=Globala undantag
+options.pane.advanced=
 options.addonManager=Tilläggshanteraren
 options.alsoUninstallPrefs=Vid avinstallation av ett skript, ta även bort dess inställningar
 options.changeEditor=Byt redigeringsprogram
 options.editor=Redigeringsprogram
+options.editor.notset=
+options.enabledSchemes.main=
+options.enabledSchemes.advanced=
+options.enabledSchemes.about=
+options.enabledSchemes.chrome=
+options.enabledSchemes.data=
+options.enabledSchemes.file=
+options.enabledSchemes.ftp=
+options.enabledSchemes.http=
+options.enabledSchemes.unmht=
+options.enabledSchemes.securityRemark=
+options.enabledSchemes.securityRemark2=
+options.excludes.empty=
+options.excludes.desc=
+options.excludes.remark=
 options.enableCopyDownloadURL=Aktivera kopiering av hämtnings-URL
-options.pane.excludes=Globala undantag
+options.logging=
+options.logChrome=
+options.notifications=
+options.notifications.disable=
+options.requireBuiltInCerts=
 options.requireSecured=Kräv att användarskript uppdateras via HTTPS
+options.translation=
+options.translation.useEnglish=
+options.update.security=
 options.useDownloadURL=Använd hämtnings-URL:en för uppdateringar om ingen uppdaterings-URL finns angiven
 statusbar.enabled=Aktiverat
 statusbar.enabled.ak=A
@@ -97,3 +126,5 @@ tooltip.loading=Läser in…
 Uninstall=Avinstallera
 Update=Uppdatera
 userscripts=Användarskript
+userscripts.get=
+userscripts.noneInstalled=

From 239f6b841c44c6390eb1f91f03a7ec989c4c53d6 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 24 Jun 2011 12:09:21 -0500
Subject: [PATCH 215/829] updating ru-RU to reflect changes in en-US

---
 extension/locale/ru-RU/scriptish.properties | 119 ++++++++++++++------
 1 file changed, 87 insertions(+), 32 deletions(-)

diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 1310d368..6d75ee8c 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -1,42 +1,123 @@
+copyDownloadURL=
+copyDownloadURL.ak=
 edit=Редактировать
+edit.ak=
 editor.couldNotLaunch=Не могу запустить редактор.
 editor.pleasePickExecutable=Пожалуйста, выберите приложение для редактирования скриптов
 editor.prompt=Пожалуйста сначала выберите ваш редактор скриптов
+error.api.clipboard.type=Тип данных не подходит для GM_setClipboard.
+error.api.noResourceWithName=Нет ресурса с таким именем
+error.api.noSecondArgValue=Второй аргумент - значение - не задан
+error.api.reqURL.scheme=Схема  URL запрещена
+error.api.reqURL=Неверный URL
+error.api.unsafeAccess=Нарушение доступа Scriptish: из unsafeWindow не позволено работать с 
+error.charset=Неверная кодировка.
+error.dependency.loading=Не могу загрузить зависимость
+error.dependency.local=Исключение безопасности: запрещено вызывать локальные пути
+error.dependency.serverReturned=Ошибка! Сервер вернул 
+error.hash.algorithm=Неверный алгоритм хеширования.
+error.icon.dataURL=Неверный URL для  @icon
+error.icon.notImage=
+error.icon.URL=Неверный URL для @icon
+error.isInvalidValue= - неверное значение
+error.matchPattern.rules.file=Шаблон @match схемы file:// не соответствует правилам
+error.matchPattern.rules=шаблон @match не соответствует правилам
+error.notSupported.Firefox=не поддерживается в этой версии Огненного Лиса
+error.openingFile=Не могу открыть файл
+error.pattern.parsing=Шаблон не парсится
+error.pref.type=Неподдерживаемый тип настройки. Правильные типы: строка, булев и 32хбитное целое.
+error.resource.dupName= - повторяющееся имя для ресурса. Имена ресурсов должны быть уникальными.
+error.resource.syntax=Неправильный синтаксис в обьявлении @resource
+error.retrieving=Failed to retrieve
+error.script.installing=Ошибка при установке юзерскрипта
+error.script.loading=Ошибка при загрузке юзерскрипта
+greeting.btn.ak=
 greeting.msg=Это юзерскрипт. Нажмите "Установить" чтобы начать использовать его.
 install=Установить
-install.excludes=не запускать на:
+install.domains=
 install.matches=совпадений:
 install.includes=запуск на:
+install.excludes=не запускать на:
+install.requires=
+install.resources=
 install.showScriptSource=Показать исходный код скрипта
 install.title=Установщик скриптов
 install.warning1=Вредоносные скрипты могут нарушить Вашу конфиденциальность и действовать от Вашего имени без Вашего согласия.
 install.warning2=Вы должны устанавливать скрипты только из доверенных источников.
 menu.commands=Команды скрипта...
+menu.commands.ak=
 menu.install=Установить скрипт...
+menu.install.ak=
 menu.manage=Управление пользовательскими скриптами...
+menu.manage.ak=
 menu.new=Создать скрипт...
+menu.new.ak=
+menu.options.ak=
 menu.show=Посмотреть исходный код скрипта
+menu.show.ak=
+menu.title=Scriptish
+menu.title.ak=
 menuitem.install=Установить этот скрипт...
 menuitem.manage=Управление скриптами
 menuitem.new=Новый скрипт
+moving.script=
+moving.dependency=
 newscript.description=Описание
 newscript.excludes=Исключать страницы (Одно правило на строчку)
 newscript.exists=Скрипт с таким именем уже установлен.\nПерезаписать?
+newscript.id=
 newscript.includes=Включать страницы (Одно правило на строчку)
 newscript.name=Имя
+newscript.namespace=
 newscript.noID=Пожалуйста, введите идентификатор скрипта
 newscript.noName=Пожалуйста, задайте имя скрипта.
+nothing.timedOut=
 openFolder=Открыть папку скрипта.
+openFolder.ak=
+reinstall=
+saving=
+scratchpad.saveAsUserScript=
+scratchpad.saveAsUserScript.ak=
+scriptOptions.includes=Пользовательские включения:
+scriptOptions.excludes=Пользовательские исключения:
+scriptOptions.disableScriptIncludes=Отключить прописанные в скрипте включения, использовать только эти.
 options=Настройки
+options.title=
+options.pane.main=
+options.pane.excludes=Глобальные исключения
+options.pane.advanced=
+options.addonManager=Менеджер Дополнений
 options.alsoUninstallPrefs=Удалять также ассоциированные настройки
 options.changeEditor=Изменить редактор
 options.editor=Редактор
-options.useDownloadURL=Используйте URL для загрузки в качестве запасного URL для обновления (если он не определен)?
-options.addonManager=Менеджер Дополнений
+options.editor.notset=
+options.enabledSchemes.main=
+options.enabledSchemes.advanced=
+options.enabledSchemes.about=
+options.enabledSchemes.chrome=
+options.enabledSchemes.data=
+options.enabledSchemes.file=
+options.enabledSchemes.ftp=
+options.enabledSchemes.http=
+options.enabledSchemes.unmht=
+options.enabledSchemes.securityRemark=
+options.enabledSchemes.securityRemark2=
+options.excludes.empty=
+options.excludes.desc=
+options.excludes.remark=
 options.enableCopyDownloadURL=Включить копирование URL для загрузки
-options.pane.excludes=Глобальные исключения
+options.logging=
+options.logChrome=
+options.notifications=
+options.notifications.disable=
+options.requireBuiltInCerts=
 options.requireSecured=Разрешить обновления скриптов только по протоколу HTTPS
+options.translation=
+options.translation.useEnglish=
+options.update.security=
+options.useDownloadURL=Используйте URL для загрузки в качестве запасного URL для обновления (если он не определен)?
 statusbar.enabled=Включено
+statusbar.enabled.ak=
 statusbar.installed=успешно установлен
 statusbar.modified=изменен
 statusbar.noScripts=Нет скриптов для страницы!
@@ -45,31 +126,5 @@ tooltip.loading=Грузим ...
 Uninstall=Удалить
 Update=Обновить
 userscripts=Пользовательские скрипты
-error.api.clipboard.type=Тип данных не подходит для GM_setClipboard.
-error.api.noResourceWithName=Нет ресурса с таким именем
-error.api.noSecondArgValue=Второй аргумент - значение - не задан
-error.api.reqURL.scheme=Схема  URL запрещена
-error.api.reqURL=Неверный URL
-error.api.unsafeAccess=Нарушение доступа Scriptish: из unsafeWindow не позволено работать с 
-error.charset=Неверная кодировка.
-error.dependency.loading=Не могу загрузить зависимость
-error.dependency.local=Исключение безопасности: запрещено вызывать локальные пути
-error.dependency.serverReturned=Ошибка! Сервер вернул 
-error.hash.algorithm=Неверный алгоритм хеширования.
-error.icon.dataURL=Неверный URL для  @icon
-error.icon.URL=Неверный URL для @icon
-error.isInvalidValue= - неверное значение
-error.matchPattern.rules.file=Шаблон @match схемы file:// не соответствует правилам
-error.matchPattern.rules=шаблон @match не соответствует правилам
-error.notSupported.Firefox=не поддерживается в этой версии Огненного Лиса
-error.openingFile=Не могу открыть файл
-error.pattern.parsing=Шаблон не парсится
-error.pref.type=Неподдерживаемый тип настройки. Правильные типы: строка, булев и 32хбитное целое.
-error.resource.dupName= - повторяющееся имя для ресурса. Имена ресурсов должны быть уникальными.
-error.resource.syntax=Неправильный синтаксис в обьявлении @resource
-error.retrieving=Failed to retrieve
-error.script.installing=Ошибка при установке юзерскрипта
-error.script.loading=Ошибка при загрузке юзерскрипта
-scriptOptions.includes=Пользовательские включения:
-scriptOptions.excludes=Пользовательские исключения:
-scriptOptions.disableScriptIncludes=Отключить прописанные в скрипте включения, использовать только эти.
+userscripts.get=
+userscripts.noneInstalled=

From 875af1aa0f2da4da495f11fd4c057a8bb7ba455c Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 24 Jun 2011 12:20:01 -0500
Subject: [PATCH 216/829] updating ja-JP to reflect changes in en-US

---
 extension/locale/ja-JP/scriptish.properties | 57 ++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index cf7828f2..ccdb131b 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -1,5 +1,7 @@
 copyDownloadURL=ダウンロードするURLのコピー
+copyDownloadURL.ak=
 edit=編集
+edit.ak=
 editor.couldNotLaunch=エディタの起動に失敗しました。
 editor.pleasePickExecutable=ユーザースクリプトを編集するには実行可能なアプリケーションを選んで下さい。
 editor.prompt=最初にお好みのエディタを指定してください。
@@ -32,36 +34,87 @@ error.script.loading=ユーザースクリプトのロード中にエラーが
 greeting.btn.ak=I
 greeting.msg=ユーザースクリプトです。使用を開始するにはクリックして下さい。
 install=インストール
-install.excludes=スクリプト無効:
+install.domains=
 install.matches=一致:
 install.includes=スクリプト有効:
+install.excludes=スクリプト無効:
+install.requires=
+install.resources=
 install.showScriptSource=スクリプトのソースを表示
 install.title=ユーザースクリプトのインストール
 install.warning1=悪意のあるスクリプトがプライバシーを侵害して知らないうちに動作するかもしれません。
 install.warning2=信頼できるソースからのみスクリプトをインストールするべきです。
 menu.commands=ユーザースクリプトコマンド...
+menu.commands.ak=
 menu.install=ユーザースクリプトのインストール...
+menu.install.ak=
 menu.manage=ユーザースクリプト管理...
+menu.manage.ak=
 menu.new=新規スクリプト...
+menu.new.ak=
+menu.options.ak=
 menu.show=ソースを見る
+menu.show.ak=
+menu.title=
+menu.title.ak=
 menuitem.install=このスクリプトをインストール
 menuitem.manage=ユーザースクリプト管理
 menuitem.new=新しいユーザースクリプト
+moving.script=
+moving.dependency=
 newscript.description=説明
 newscript.excludes=除外サイト (1行ずつ指定)
 newscript.exists=その名前のスクリプトはすでにインストールされています。\n上書きしてもよろしいですか?
+newscript.id=
 newscript.includes=有効サイト (1行ずつ指定)
 newscript.name=名前
 newscript.namespace=名前空間（URI）
 newscript.noID=スクリプトのIDを確認してください。
 newscript.noName=スクリプトに名前をつけて下さい。
+nothing.timedOut=
 openFolder=フォルダを開く
+openFolder.ak=
+reinstall=
+saving=
+scratchpad.saveAsUserScript=
+scratchpad.saveAsUserScript.ak=
+scriptOptions.includes=
+scriptOptions.excludes=
+scriptOptions.disableScriptIncludes=
 options=オプション
+options.title=
+options.pane.main=
+options.pane.excludes=
+options.pane.advanced=
 options.addonManager=アドオン管理
 options.alsoUninstallPrefs=関連設定もアンインストールする
 options.changeEditor=エディタ変更
 options.editor=エディタ
+options.editor.notset=
+options.enabledSchemes.main=
+options.enabledSchemes.advanced=
+options.enabledSchemes.about=
+options.enabledSchemes.chrome=
+options.enabledSchemes.data=
+options.enabledSchemes.file=
+options.enabledSchemes.ftp=
+options.enabledSchemes.http=
+options.enabledSchemes.unmht=
+options.enabledSchemes.securityRemark=
+options.enabledSchemes.securityRemark2=
+options.excludes.empty=
+options.excludes.desc=
+options.excludes.remark=
 options.enableCopyDownloadURL= ダウンロードURLコピー有効化
+options.logging=
+options.logChrome=
+options.notifications=
+options.notifications.disable=
+options.requireBuiltInCerts=
+options.requireSecured=
+options.translation=
+options.translation.useEnglish=
+options.update.security=
 options.useDownloadURL=ダウンロードURLの指定がない場合もURLを使いますか？
 statusbar.enabled=有効
 statusbar.enabled.ak=E
@@ -73,3 +126,5 @@ tooltip.loading=読み込み中...
 Uninstall=アンインストール
 Update=更新
 userscripts=ユーザースクリプト
+userscripts.get=
+userscripts.noneInstalled=

From cc86b47e45fba585502cf15a3babdbf3b27680bc Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 24 Jun 2011 12:22:57 -0500
Subject: [PATCH 217/829] updating de to reflect changes in en-US

---
 extension/locale/de/scriptish.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 3ede944c..01b5e43c 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -74,7 +74,10 @@ newscript.noName=Bitte Namen für Ihr Benutzerskript angeben.
 nothing.timedOut=Nichts (Zeitüberschreitung)
 openFolder=Ordner öffnen
 openFolder.ak=O
+reinstall=
 saving=Speichern
+scratchpad.saveAsUserScript=
+scratchpad.saveAsUserScript.ak=
 scriptOptions.includes=Benutzer-Einschlüsse:
 scriptOptions.excludes=Benutzer-Ausnahmen:
 scriptOptions.disableScriptIncludes=Die Einschlüsse dieses Benutzerskripts deaktivieren und nur Benutzereinschlüsse verwenden.

From d74cdbd947bd70f4b5d60d68623a95c3c63bdd95 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 24 Jun 2011 12:55:56 -0500
Subject: [PATCH 218/829] moving some stuff around in the localizations

---
 extension/locale/de/scriptish.properties    | 22 ++++++++++-----------
 extension/locale/en-US/scriptish.properties | 22 ++++++++++-----------
 extension/locale/ja-JP/scriptish.properties | 22 ++++++++++-----------
 extension/locale/pt-BR/scriptish.properties | 22 ++++++++++-----------
 extension/locale/ru-RU/scriptish.properties | 22 ++++++++++-----------
 extension/locale/sv-SE/scriptish.properties | 22 ++++++++++-----------
 6 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 01b5e43c..4d126100 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -20,8 +20,8 @@ error.icon.dataURL=Ungültige data:-URL für @icon
 error.icon.notImage=Fehler! @icon hat keinen Bild MIME-Typ
 error.icon.URL=Ungültige URL für @icon
 error.isInvalidValue=ist ein ungültiger Wert
-error.matchPattern.rules.file=File-Schema @match Muster hält sich nicht an die Regeln für Muster
 error.matchPattern.rules=@match Muster hält sich nicht an die Regeln für Muster
+error.matchPattern.rules.file=File-Schema @match Muster hält sich nicht an die Regeln für Muster
 error.notSupported.Firefox=wird nicht in dieser Version von Firefox unterstützt
 error.openingFile=Konnte Datei nicht öffnen
 error.pattern.parsing=Muster konnte nicht verarbeitet werden
@@ -35,9 +35,9 @@ greeting.btn.ak=I
 greeting.msg=Dies ist ein Benutzerskript. „Installieren" klicken um es zu benutzen.
 install=Installieren
 install.domains=Seiten:
-install.matches=Passend zu:
-install.includes=Läuft auf:
 install.excludes=Läuft nicht auf:
+install.includes=Läuft auf:
+install.matches=Passend zu:
 install.requires=Benötigt:
 install.resources=Resourcen:
 install.showScriptSource=Quelltext anzeigen
@@ -60,8 +60,8 @@ menu.title.ak=S
 menuitem.install=Dieses Benutzerskript installieren
 menuitem.manage=Benutzerskripte verwalten
 menuitem.new=Neues Benutzerskript
-moving.script=Verschiebe Benutzerskript von
 moving.dependency=Verschiebe Abhängigkeitsdatei von
+moving.script=Verschiebe Benutzerskript von
 newscript.description=Beschreibung
 newscript.excludes=Ausnahmen (eine pro Zeile)
 newscript.exists=Ein Benutzerskript mit diesem Namen existiert bereits.\nÜberschreiben?
@@ -74,13 +74,6 @@ newscript.noName=Bitte Namen für Ihr Benutzerskript angeben.
 nothing.timedOut=Nichts (Zeitüberschreitung)
 openFolder=Ordner öffnen
 openFolder.ak=O
-reinstall=
-saving=Speichern
-scratchpad.saveAsUserScript=
-scratchpad.saveAsUserScript.ak=
-scriptOptions.includes=Benutzer-Einschlüsse:
-scriptOptions.excludes=Benutzer-Ausnahmen:
-scriptOptions.disableScriptIncludes=Die Einschlüsse dieses Benutzerskripts deaktivieren und nur Benutzereinschlüsse verwenden.
 options=Optionen
 options.title=Scriptish Einstellungen
 options.pane.main=Allgemein
@@ -116,6 +109,13 @@ options.translation=Übersetzung
 options.translation.useEnglish=Immer Englisch benutzen
 options.update.security=Aktualisierungsicherheit
 options.useDownloadURL=Download-URL für Aktualisierungen benutzen, wenn es keine gesonderte Aktualisierungs-URL gibt
+reinstall=
+saving=Speichern
+scratchpad.saveAsUserScript=
+scratchpad.saveAsUserScript.ak=
+scriptOptions.includes=Benutzer-Einschlüsse:
+scriptOptions.excludes=Benutzer-Ausnahmen:
+scriptOptions.disableScriptIncludes=Die Einschlüsse dieses Benutzerskripts deaktivieren und nur Benutzereinschlüsse verwenden.
 statusbar.enabled=Aktiviert
 statusbar.enabled.ak=K
 statusbar.installed=erfolgreich installiert
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index f916fc84..780dd633 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -20,8 +20,8 @@ error.icon.dataURL=Invalid data: URL for @icon
 error.icon.notImage=Error! @icon does not have an image MIME type
 error.icon.URL=Invalid URL for @icon
 error.isInvalidValue=is an invalid value
-error.matchPattern.rules.file=File scheme @match pattern does not conform to pattern rules
 error.matchPattern.rules=@match pattern does not conform to pattern rules
+error.matchPattern.rules.file=File scheme @match pattern does not conform to pattern rules
 error.notSupported.Firefox=is not supported by this version of Firefox
 error.openingFile=Could not open file
 error.pattern.parsing=Pattern could not be parsed
@@ -35,9 +35,9 @@ greeting.btn.ak=I
 greeting.msg=This is a user script. Click install to start using it.
 install=Install
 install.domains=domains:
-install.matches=matches:
-install.includes=runs on:
 install.excludes=does not run on:
+install.includes=runs on:
+install.matches=matches:
 install.requires=requires:
 install.resources=resources:
 install.showScriptSource=Show Script Source
@@ -60,8 +60,8 @@ menu.title.ak=S
 menuitem.install=Install This User Script...
 menuitem.manage=Manage User Scripts
 menuitem.new=New User Script
-moving.script=Moving script file from
 moving.dependency=Moving dependency file from
+moving.script=Moving script file from
 newscript.description=Description
 newscript.excludes=Excludes (One per line)
 newscript.exists=A script with that name is already installed.\nOK to overwrite?
@@ -74,13 +74,6 @@ newscript.noName=Please provide a name for your script.
 nothing.timedOut=nothing (timed out)
 openFolder=Open Folder
 openFolder.ak=O
-reinstall=Reinstall
-saving=Saving
-scratchpad.saveAsUserScript=Save As User Script
-scratchpad.saveAsUserScript.ak=u
-scriptOptions.includes=User Includes:
-scriptOptions.excludes=User Excludes:
-scriptOptions.disableScriptIncludes=Disable this script's include patterns and only use the user defined ones.
 options=Options
 options.title=Scriptish Options
 options.pane.main=Main
@@ -116,6 +109,13 @@ options.translation=Translation
 options.translation.useEnglish=Always use English
 options.update.security=Update Security
 options.useDownloadURL=Use download URL for updates if there is no update URL
+reinstall=Reinstall
+saving=Saving
+scratchpad.saveAsUserScript=Save As User Script
+scratchpad.saveAsUserScript.ak=u
+scriptOptions.includes=User Includes:
+scriptOptions.excludes=User Excludes:
+scriptOptions.disableScriptIncludes=Disable this script's include patterns and only use the user defined ones.
 statusbar.enabled=Enabled
 statusbar.enabled.ak=E
 statusbar.installed=installed successfully
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index ccdb131b..8d38d6b5 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -20,8 +20,8 @@ error.icon.dataURL=不正なデータです: @icon用のURL　
 error.icon.notImage=エラー! @icon は画像のMIMEタイプを持ちません。
 error.icon.URL=@icon用のURLが不正です。
 error.isInvalidValue=は不正な値です。
-error.matchPattern.rules.file=
 error.matchPattern.rules=@matchパターンがパターンのルールに合いません。
+error.matchPattern.rules.file=
 error.notSupported.Firefox=はこのバージョンのFirefoxでサポートされていません。
 error.openingFile=ファイルを開くことが出来ません。
 error.pattern.parsing=パターンはパースされませんでした。
@@ -35,9 +35,9 @@ greeting.btn.ak=I
 greeting.msg=ユーザースクリプトです。使用を開始するにはクリックして下さい。
 install=インストール
 install.domains=
-install.matches=一致:
-install.includes=スクリプト有効:
 install.excludes=スクリプト無効:
+install.includes=スクリプト有効:
+install.matches=一致:
 install.requires=
 install.resources=
 install.showScriptSource=スクリプトのソースを表示
@@ -60,8 +60,8 @@ menu.title.ak=
 menuitem.install=このスクリプトをインストール
 menuitem.manage=ユーザースクリプト管理
 menuitem.new=新しいユーザースクリプト
-moving.script=
 moving.dependency=
+moving.script=
 newscript.description=説明
 newscript.excludes=除外サイト (1行ずつ指定)
 newscript.exists=その名前のスクリプトはすでにインストールされています。\n上書きしてもよろしいですか?
@@ -74,13 +74,6 @@ newscript.noName=スクリプトに名前をつけて下さい。
 nothing.timedOut=
 openFolder=フォルダを開く
 openFolder.ak=
-reinstall=
-saving=
-scratchpad.saveAsUserScript=
-scratchpad.saveAsUserScript.ak=
-scriptOptions.includes=
-scriptOptions.excludes=
-scriptOptions.disableScriptIncludes=
 options=オプション
 options.title=
 options.pane.main=
@@ -116,6 +109,13 @@ options.translation=
 options.translation.useEnglish=
 options.update.security=
 options.useDownloadURL=ダウンロードURLの指定がない場合もURLを使いますか？
+reinstall=
+saving=
+scratchpad.saveAsUserScript=
+scratchpad.saveAsUserScript.ak=
+scriptOptions.includes=
+scriptOptions.excludes=
+scriptOptions.disableScriptIncludes=
 statusbar.enabled=有効
 statusbar.enabled.ak=E
 statusbar.installed=インストール成功
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 0e3efc34..f0a4b90a 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -20,8 +20,8 @@ error.icon.dataURL=Dados inválidos: endereço para @icon
 error.icon.notImage=Erro! @icon não tem um tipo MIME de imagem
 error.icon.URL=Endereço inválido para @icon
 error.isInvalidValue=é um nome inválido
-error.matchPattern.rules.file=o padrão de @match do esquema "file:" não está de acordo com as regras.
 error.matchPattern.rules=o padrão de @match não está de acordo com as regras.
+error.matchPattern.rules.file=o padrão de @match do esquema "file:" não está de acordo com as regras.
 error.notSupported.Firefox=não é suportado por esta versão do Firefox
 error.openingFile=Não foi possível abrir o arquivo
 error.pattern.parsing=Não foi possível analisar o padrão
@@ -35,9 +35,9 @@ greeting.btn.ak=I
 greeting.msg=Este é um script de usuário. Clique no botão "Instalar" para começar a usá-lo.
 install=Instalar
 install.domains=domínios:
-install.matches=funciona em (@match):
-install.includes=funciona em (@include):
 install.excludes=não se executa em:
+install.includes=funciona em (@include):
+install.matches=funciona em (@match):
 install.requires=necessita de:
 install.resources=recursos:
 install.showScriptSource=Exibir código-fonte do script
@@ -60,8 +60,8 @@ menu.title.ak=S
 menuitem.install=Instalar este script de usuário...
 menuitem.manage=Gerenciar scripts de usuário
 menuitem.new=Novo script de usuário
-moving.script=Movendo arquivo de script:
 moving.dependency=Movendo arquivo de dependência:
+moving.script=Movendo arquivo de script:
 newscript.description=Descrição
 newscript.excludes=Exclusões (uma por linha)
 newscript.exists=Um script com esse nome já está instalado.\nDeseja substituir?
@@ -74,13 +74,6 @@ newscript.noName=Por favor, informe um nome para o seu script.
 nothing.timedOut=nada (excedido o tempo limite)
 openFolder=Abrir pasta
 openFolder.ak=A
-reinstall=
-saving=Salvando
-scratchpad.saveAsUserScript=
-scratchpad.saveAsUserScript.ak=
-scriptOptions.includes=Inclusões personalizadas:
-scriptOptions.excludes=Exclusões personalizadas:
-scriptOptions.disableScriptIncludes=Desativar as inclusões originais deste sript e usar somente as inclusões personalizadas.
 options=Opções
 options.title=
 options.pane.main=
@@ -116,6 +109,13 @@ options.translation=
 options.translation.useEnglish=
 options.update.security=
 options.useDownloadURL=Usar endereço de download para atualizações se não houver endereço de atualização
+reinstall=
+saving=Salvando
+scratchpad.saveAsUserScript=
+scratchpad.saveAsUserScript.ak=
+scriptOptions.includes=Inclusões personalizadas:
+scriptOptions.excludes=Exclusões personalizadas:
+scriptOptions.disableScriptIncludes=Desativar as inclusões originais deste sript e usar somente as inclusões personalizadas.
 statusbar.enabled=Ativado
 statusbar.enabled.ak=A
 statusbar.installed=instalado com sucesso
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 6d75ee8c..841b069b 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -20,8 +20,8 @@ error.icon.dataURL=Неверный URL для  @icon
 error.icon.notImage=
 error.icon.URL=Неверный URL для @icon
 error.isInvalidValue= - неверное значение
-error.matchPattern.rules.file=Шаблон @match схемы file:// не соответствует правилам
 error.matchPattern.rules=шаблон @match не соответствует правилам
+error.matchPattern.rules.file=Шаблон @match схемы file:// не соответствует правилам
 error.notSupported.Firefox=не поддерживается в этой версии Огненного Лиса
 error.openingFile=Не могу открыть файл
 error.pattern.parsing=Шаблон не парсится
@@ -35,9 +35,9 @@ greeting.btn.ak=
 greeting.msg=Это юзерскрипт. Нажмите "Установить" чтобы начать использовать его.
 install=Установить
 install.domains=
-install.matches=совпадений:
-install.includes=запуск на:
 install.excludes=не запускать на:
+install.includes=запуск на:
+install.matches=совпадений:
 install.requires=
 install.resources=
 install.showScriptSource=Показать исходный код скрипта
@@ -60,8 +60,8 @@ menu.title.ak=
 menuitem.install=Установить этот скрипт...
 menuitem.manage=Управление скриптами
 menuitem.new=Новый скрипт
-moving.script=
 moving.dependency=
+moving.script=
 newscript.description=Описание
 newscript.excludes=Исключать страницы (Одно правило на строчку)
 newscript.exists=Скрипт с таким именем уже установлен.\nПерезаписать?
@@ -74,13 +74,6 @@ newscript.noName=Пожалуйста, задайте имя скрипта.
 nothing.timedOut=
 openFolder=Открыть папку скрипта.
 openFolder.ak=
-reinstall=
-saving=
-scratchpad.saveAsUserScript=
-scratchpad.saveAsUserScript.ak=
-scriptOptions.includes=Пользовательские включения:
-scriptOptions.excludes=Пользовательские исключения:
-scriptOptions.disableScriptIncludes=Отключить прописанные в скрипте включения, использовать только эти.
 options=Настройки
 options.title=
 options.pane.main=
@@ -116,6 +109,13 @@ options.translation=
 options.translation.useEnglish=
 options.update.security=
 options.useDownloadURL=Используйте URL для загрузки в качестве запасного URL для обновления (если он не определен)?
+reinstall=
+saving=
+scratchpad.saveAsUserScript=
+scratchpad.saveAsUserScript.ak=
+scriptOptions.includes=Пользовательские включения:
+scriptOptions.excludes=Пользовательские исключения:
+scriptOptions.disableScriptIncludes=Отключить прописанные в скрипте включения, использовать только эти.
 statusbar.enabled=Включено
 statusbar.enabled.ak=
 statusbar.installed=успешно установлен
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 42d2dbd2..73b5b31e 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -20,8 +20,8 @@ error.icon.dataURL=Ogiltig data: URL för @icon
 error.icon.notImage=Fel! @icon har ingen MIME-bildtyp
 error.icon.URL=Ogiltig URL för @icon
 error.isInvalidValue=är ett ogiltigt värde
-error.matchPattern.rules.file=@match-mönstret för filschema uppfyller inte mönsterreglerna
 error.matchPattern.rules=@match-mönster uppfyller inte mönsterreglerna
+error.matchPattern.rules.file=@match-mönstret för filschema uppfyller inte mönsterreglerna
 error.notSupported.Firefox=stöds inte i denna version av Firefox
 error.openingFile=Det gick inte att öppna filen
 error.pattern.parsing=Det gick inte att parsa mönstret
@@ -35,9 +35,9 @@ greeting.btn.ak=I
 greeting.msg=Detta är ett användarskript. Klicka på "Installera" för att börja använda det.
 install=Installera
 install.domains=domäner:
-install.matches=matchningar:
-install.includes=kan köras på:
 install.excludes=kan inte köras på:
+install.includes=kan köras på:
+install.matches=matchningar:
 install.requires=kräver:
 install.resources=resurser:
 install.showScriptSource=Visa skriptets källa
@@ -60,8 +60,8 @@ menu.title.ak=c
 menuitem.install=Installera detta användarskript…
 menuitem.manage=Hantera användarskript
 menuitem.new=Nytt användarskript
-moving.script=Flyttar skriptfil från
 moving.dependency=Flyttar beroendefil från
+moving.script=Flyttar skriptfil från
 newscript.description=Beskrivning
 newscript.excludes=Undantagna (ett per rad)
 newscript.exists=Ett skript med samma namn är redan installerat.\nVill du ersätta det?
@@ -74,13 +74,6 @@ newscript.noName=Var vänlig ange ett namn på ditt skript.
 nothing.timedOut=ingenting (tidsgränsen uppnåddes)
 openFolder=Öppna mapp
 openFolder.ak=Ö
-reinstall=
-saving=Sparar
-scratchpad.saveAsUserScript=
-scratchpad.saveAsUserScript.ak=
-scriptOptions.includes=Inkluderade av användaren:
-scriptOptions.excludes=Undantagna av användaren:
-scriptOptions.disableScriptIncludes=Inaktivera detta skripts inkluderade mönster och använd endast de användardefinierade mönstren.
 options=Inställningar
 options.title=
 options.pane.main=
@@ -116,6 +109,13 @@ options.translation=
 options.translation.useEnglish=
 options.update.security=
 options.useDownloadURL=Använd hämtnings-URL:en för uppdateringar om ingen uppdaterings-URL finns angiven
+reinstall=
+saving=Sparar
+scratchpad.saveAsUserScript=
+scratchpad.saveAsUserScript.ak=
+scriptOptions.includes=Inkluderade av användaren:
+scriptOptions.excludes=Undantagna av användaren:
+scriptOptions.disableScriptIncludes=Inaktivera detta skripts inkluderade mönster och använd endast de användardefinierade mönstren.
 statusbar.enabled=Aktiverat
 statusbar.enabled.ak=A
 statusbar.installed=har installerats

From 3b7e9ea2eac09eb30ef6cd9f2d91ad2a376d2726 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 26 Jun 2011 05:10:20 -0700
Subject: [PATCH 219/829] minor performance tweaks to
 Config.getMatchingScripts()

---
 extension/modules/config/config.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 8e07f605..de26836d 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -427,9 +427,12 @@ Config.prototype = {
 
   get scripts() this._scripts.concat(),
   getMatchingScripts: function(testFunc, urls) {
-    for (var i = 0; i < urls.length; i++)
-      if (this._excludeRegExps.some(function(reg) reg.test(urls[i])))
+    var globalExcludes = this._excludeRegExps;
+    for (var i = urls.length - 1; ~i; i--) {
+      let url = urls[i];
+      if (globalExcludes.some(function(reg) reg.test(url)))
         return [];
+    }
     return this.scripts.filter(testFunc);
   },
   sortScripts: function() this._scripts.sort(function(a, b) b.priority - a.priority),

From 3d48bcfcf66cb968c50a860db17ddaf7618365d9 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 26 Jun 2011 08:25:51 -0500
Subject: [PATCH 220/829] Updating ja-JP using a mix of the previous and
 Babelzilla translations.  Crediting 'k2jp' as a ja-JP translator.

---
 extension/install.rdf                       |   5 +-
 extension/locale/ja-JP/scriptish.properties | 144 ++++++++++----------
 2 files changed, 75 insertions(+), 74 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 098e1207..c372d612 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -64,11 +64,12 @@
     <em:contributor>Slowpoke</em:contributor>
     <em:contributor>Tommi Rautava</em:contributor>
 
+    <em:translator>Alfredo Fernández Díaz</em:translator>
+    <em:translator>k2jp (ja-JP)</em:translator>
     <em:translator>Mauro José da Silva (pt-BR)</em:translator>
     <em:translator>Mikael Hiort af Ornäs</em:translator>
     <em:translator>Nils Maier (de)</em:translator>
-    <em:translator>nishikawasasaki (kohsei yamamoto)</em:translator>
-    <em:translator>Alfredo Fernández Díaz</em:translator>
+    <em:translator>nishikawasasaki (kohsei yamamoto) (ja-JP)</em:translator>
 
     <em:updateURL>http://github.com/downloads/erikvold/scriptish/update.rdf</em:updateURL>
     <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjEA/hqcsMgPctoWvqJFfjtNcQbfBi1uP3zoWR3PPMRSXnpBJv/5Kb5lJD9HJ+963CFQ3oFvkgO9+oEWisiKBjxhx94Bynl0Ym2sZ1DdEzTsH9kV4HGFLjeYTix5WkQqdoswyM32ebtDSYrFbSqxpBrgHwVLELfFYM1qZsnWpJKwIDAQAB</em:updateKey>
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 8d38d6b5..baea5465 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -1,38 +1,38 @@
-copyDownloadURL=ダウンロードするURLのコピー
-copyDownloadURL.ak=
+copyDownloadURL=ダウンロード URL をコピー
+copyDownloadURL.ak=C
 edit=編集
-edit.ak=
-editor.couldNotLaunch=エディタの起動に失敗しました。
-editor.pleasePickExecutable=ユーザースクリプトを編集するには実行可能なアプリケーションを選んで下さい。
-editor.prompt=最初にお好みのエディタを指定してください。
-error.api.clipboard.type=GM_setClipboardによってサポートされていない型です。
-error.api.noResourceWithName=
-error.api.noSecondArgValue=
-error.api.reqURL.scheme=
-error.api.reqURL=不正なURLです。
-error.api.unsafeAccess=Scriptishアクセス違反: unsafeWindowは以下を呼び出すことが出来ません　
-error.charset=不正なキャラセットが定義されました。
-error.dependency.loading=依存関係の読み込み中にエラーが起きました。
-error.dependency.local=SecurityException: ローカルとchromeURLへのリクエストは禁止されています。
-error.dependency.serverReturned=エラー! サーバーは以下を返しました　
-error.hash.algorithm=不正なhash algorithmが定義されました。
-error.icon.dataURL=不正なデータです: @icon用のURL　
-error.icon.notImage=エラー! @icon は画像のMIMEタイプを持ちません。
-error.icon.URL=@icon用のURLが不正です。
-error.isInvalidValue=は不正な値です。
-error.matchPattern.rules=@matchパターンがパターンのルールに合いません。
-error.matchPattern.rules.file=
-error.notSupported.Firefox=はこのバージョンのFirefoxでサポートされていません。
-error.openingFile=ファイルを開くことが出来ません。
-error.pattern.parsing=パターンはパースされませんでした。
-error.pref.type=選択された型はサポートされていません。 正しい型は次のものです: string, bool, 32ビットintegersです。
-error.resource.dupName=は重複したりソース名です。  どの@resourceも一意の名前を持つべきです。
-error.resource.syntax=@resource宣言のシンタックスが不正です。
-error.retrieving=Failed to retrieve
-error.script.installing=ユーザースクリプトのインストール中にエラーが発生しました。
-error.script.loading=ユーザースクリプトのロード中にエラーが発生しました。
+edit.ak=E
+editor.couldNotLaunch=エディタの起動に失敗しました
+editor.pleasePickExecutable=ユーザースクリプト編集用の実行可能アプリケーションを選択してください
+editor.prompt=まず、好みのエディタを指定してください
+error.api.clipboard.type=は GM_setClipboard がサポートしてない型です
+error.api.noResourceWithName=名前付きリソースがありません
+error.api.noSecondArgValue=２番目の引数が指定されていません： 値
+error.api.reqURL.scheme=URL 内で許されないスキームです
+error.api.reqURL=不正な URL です
+error.api.unsafeAccess=Scriptish アクセス違反： unsafeWindow は以下を呼び出すことが出来ません
+error.charset=不正な文字セットが指定されました
+error.dependency.loading=依存関係の読み込みでエラーが発生しました
+error.dependency.local=セキュリティ例外： ローカル及び chrome URL へのリクエストは禁止されています
+error.dependency.serverReturned=エラー！ サーバーは以下を返しました　
+error.hash.algorithm=不正なハッシュ・アルゴリズムが指定されました
+error.icon.dataURL=不正なデータです： @icon 用の URL　
+error.icon.notImage=エラー！ @icon が画像の MIME タイプではありません
+error.icon.URL=@icon の URL が不正です
+error.isInvalidValue=は不正な値です
+error.matchPattern.rules=@match のパターンがルールに適合していません
+error.matchPattern.rules.file=ファイルスキームの @match のパターンがルールに適合していません
+error.notSupported.Firefox=はこのバージョンの Firefox でサポートされていません
+error.openingFile=ファイルを開くことが出来ませんでした
+error.pattern.parsing=パターンをパースできませんでした
+error.pref.type=サポートしてない設定の型です。正しい型は次の通り： string, bool, 32-bit integers
+error.resource.dupName=はソース名として重複しています。@resource の名前は一意でなければなりません
+error.resource.syntax=@resource 宣言の構文が不正です
+error.retrieving=取得に失敗しました
+error.script.installing=ユーザースクリプトのインストールでエラーが発生しました
+error.script.loading=ユーザースクリプトの読み込みでエラーが発生しました
 greeting.btn.ak=I
-greeting.msg=ユーザースクリプトです。使用を開始するにはクリックして下さい。
+greeting.msg=これはユーザースクリプトです。使用するには インストール をクリックして下さい
 install=インストール
 install.domains=
 install.excludes=スクリプト無効:
@@ -42,46 +42,46 @@ install.requires=
 install.resources=
 install.showScriptSource=スクリプトのソースを表示
 install.title=ユーザースクリプトのインストール
-install.warning1=悪意のあるスクリプトがプライバシーを侵害して知らないうちに動作するかもしれません。
-install.warning2=信頼できるソースからのみスクリプトをインストールするべきです。
-menu.commands=ユーザースクリプトコマンド...
-menu.commands.ak=
-menu.install=ユーザースクリプトのインストール...
-menu.install.ak=
-menu.manage=ユーザースクリプト管理...
-menu.manage.ak=
-menu.new=新規スクリプト...
-menu.new.ak=
-menu.options.ak=
-menu.show=ソースを見る
-menu.show.ak=
-menu.title=
-menu.title.ak=
-menuitem.install=このスクリプトをインストール
-menuitem.manage=ユーザースクリプト管理
-menuitem.new=新しいユーザースクリプト
-moving.dependency=
-moving.script=
+install.warning1=悪意のあるスクリプトはあなたの知らぬ間にプライバシーを侵害していることがあります
+install.warning2=信頼できる場所からのみスクリプトをインストールすべきです
+menu.commands=ユーザースクリプトのコマンド…
+menu.commands.ak=C
+menu.install=ユーザースクリプトのインストール…
+menu.install.ak=I
+menu.manage=ユーザースクリプト管理…
+menu.manage.ak=M
+menu.new=新規ユーザースクリプト…
+menu.new.ak=N
+menu.options.ak=O
+menu.show=ユーザースクリプトのソースを見る
+menu.show.ak=V
+menu.title=Scriptish
+menu.title.ak=S
+menuitem.install=このユーザースクリプトをインストール…
+menuitem.manage=ユーザースクリプトを管理
+menuitem.new=新たなユーザースクリプト
+moving.dependency=依存関係ファイルを次から移動：
+moving.script=スクリプトを次から移動：
 newscript.description=説明
-newscript.excludes=除外サイト (1行ずつ指定)
-newscript.exists=その名前のスクリプトはすでにインストールされています。\n上書きしてもよろしいですか?
+newscript.excludes=@exclude（スクリプトを実行したくない URL を１行１つずつ列挙）
+newscript.exists=その名前のスクリプトは既にインストールされています。\n上書きしますか？
 newscript.id=
-newscript.includes=有効サイト (1行ずつ指定)
+newscript.includes=@include（スクリプトを実行したい URL を１行１つずつ列挙）
 newscript.name=名前
 newscript.namespace=名前空間（URI）
-newscript.noID=スクリプトのIDを確認してください。
-newscript.noName=スクリプトに名前をつけて下さい。
-nothing.timedOut=
+newscript.noID=スクリプトに正しい ID を指定してください
+newscript.noName=スクリプトに名前をつけてください
+nothing.timedOut=なし（タイムアウト）
 openFolder=フォルダを開く
-openFolder.ak=
+openFolder.ak=O
 options=オプション
 options.title=
 options.pane.main=
 options.pane.excludes=
 options.pane.advanced=
-options.addonManager=アドオン管理
-options.alsoUninstallPrefs=関連設定もアンインストールする
-options.changeEditor=エディタ変更
+options.addonManager=アドオンマネージャ
+options.alsoUninstallPrefs=スクリプトをアンインストールする時、その設定も削除する
+options.changeEditor=エディタを変更する
 options.editor=エディタ
 options.editor.notset=
 options.enabledSchemes.main=
@@ -98,31 +98,31 @@ options.enabledSchemes.securityRemark2=
 options.excludes.empty=
 options.excludes.desc=
 options.excludes.remark=
-options.enableCopyDownloadURL= ダウンロードURLコピー有効化
+options.enableCopyDownloadURL=ダウンロード URL のコピーを有効にする
 options.logging=
 options.logChrome=
 options.notifications=
 options.notifications.disable=
 options.requireBuiltInCerts=
-options.requireSecured=
+options.requireSecured=ユーザースクリプトが HTTPS で更新されるようにする
 options.translation=
 options.translation.useEnglish=
-options.update.security=
-options.useDownloadURL=ダウンロードURLの指定がない場合もURLを使いますか？
+options.update.security=Update Security
+options.useDownloadURL=更新用 URL がない場合、ダウンロード URL を使用する
 reinstall=
-saving=
+saving=保存
 scratchpad.saveAsUserScript=
 scratchpad.saveAsUserScript.ak=
 scriptOptions.includes=
 scriptOptions.excludes=
-scriptOptions.disableScriptIncludes=
+scriptOptions.disableScriptIncludes=スクリプト内 include を無効にし、この指定のみを利用
 statusbar.enabled=有効
 statusbar.enabled.ak=E
-statusbar.installed=インストール成功
+statusbar.installed=インストールに成功しました
 statusbar.modified=変更されました
-statusbar.noScripts=現在有効なスクリプトがありません!
+statusbar.noScripts=このページ用スクリプトはありません！
 statusbar.updated=正常に更新されました
-tooltip.loading=読み込み中...
+tooltip.loading=読み込み中…
 Uninstall=アンインストール
 Update=更新
 userscripts=ユーザースクリプト

From da2bc72e44a5d247f8de0716aaa6ff9010fef24b Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 26 Jun 2011 08:36:36 -0500
Subject: [PATCH 221/829] updating es-ES to reflect changes in en-US

---
 extension/locale/es-ES/scriptish.properties | 54 +++++++++++++++++----
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index e369d75f..6e8f2cfc 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -20,10 +20,9 @@ error.icon.dataURL=URL de tipo datos para @icon no válido
 error.icon.notImage=¡Error!: @icon no tiene un tipo MIME de imagen
 error.icon.URL=URL para @icon no válido
 error.isInvalidValue=es un valor no permitido
-error.matchPattern.rules.file=El filtro @match del esquema File no se ajusta a las reglas para filtros
 error.matchPattern.rules=el filtro @match no se ajusta a las reglas para filtros
+error.matchPattern.rules.file=El filtro @match del esquema File no se ajusta a las reglas para filtros
 error.notSupported.Firefox=no soportado por esta versión de Firefox
-error.observerNotFound=Observer no encontrado
 error.openingFile=Error abriendo el archivo
 error.pattern.parsing=Error interpretando el filtro
 error.pref.type=Tipo de preferencia no soportado. Tipos válidos: cadena, booleano y entero de 32 bits.
@@ -32,16 +31,15 @@ error.resource.syntax=Sintaxis no válida para la declaración @resource
 error.retrieving=Error al descargar
 error.script.installing=Error al instalar script de usuario
 error.script.loading=Error al cargar script de usuario
-greeting.btn=Instalar
 greeting.btn.ak=I
 greeting.msg=Este es un script de usuario. Pulse instalar para empezar a usarlo.
+install=Instalar
 install.domains=dominios:
-install.matches=filtros:
-install.includes=se ejecuta sobre:
 install.excludes=no se ejecuta sobre:
+install.includes=se ejecuta sobre:
+install.matches=filtros:
 install.requires=requiere:
 install.resources=recursos:
-install.installButton=Instalar
 install.showScriptSource=Mostrar código fuente del script
 install.title=Instalar script de usuario
 install.warning1=Los scripts maliciosos pueden violar su privacidad y actuar en su nombre sin su conocimiento.
@@ -62,6 +60,8 @@ menu.title.ak=S
 menuitem.install=Instalar este script de usuario...
 menuitem.manage=Gestionar scripts de usuario
 menuitem.new=Nuevo script de usuario
+moving.dependency=
+moving.script=
 newscript.description=Descripción
 newscript.excludes=Exclusiones (una por línea)
 newscript.exists=Ya hay instalado un script con ese nombre.\n¿Sobreescribir?
@@ -71,19 +71,51 @@ newscript.name=Nombre
 newscript.namespace=Espacio de nombres
 newscript.noID=Por favor, introduzca un ID válido para su script.
 newscript.noName=Por favor, introduzca un nombre para su script.
+nothing.timedOut=
 openFolder=Abrir carpeta
 openFolder.ak=A
-scriptOptions.includes=Inclusiones de usuario:
-scriptOptions.excludes=Exclusiones de usuario:
-scriptOptions.disableScriptIncludes=Desactivar los filtros de inclusión de este script y utilizar sólo los definidos por el usuario.
 options=Opciones
-options.excludes=Exclusiones globales
+options.title=
+options.pane.main=
+options.pane.excludes=Exclusiones globales
+options.pane.advanced=
 options.addonManager=Gestor de extensiones
 options.alsoUninstallPrefs=Al desinstalar un script, borrar también sus preferencias
 options.changeEditor=Cambiar editor
 options.editor=Editor
+options.editor.notset=
+options.enabledSchemes.main=
+options.enabledSchemes.advanced=
+options.enabledSchemes.about=
+options.enabledSchemes.chrome=
+options.enabledSchemes.data=
+options.enabledSchemes.file=
+options.enabledSchemes.ftp=
+options.enabledSchemes.http=
+options.enabledSchemes.unmht=
+options.enabledSchemes.securityRemark=
+options.enabledSchemes.securityRemark2=
+options.excludes.empty=
+options.excludes.desc=
+options.excludes.remark=
 options.enableCopyDownloadURL=Activar copia del URL de descarga
+options.logging=
+options.logChrome=
+options.notifications=
+options.notifications.disable=
+options.requireBuiltInCerts=
+options.requireSecured=
+options.translation=
+options.translation.useEnglish=
+options.update.security=
 options.useDownloadURL=Utilizar URL de descarga para actualizar si no hay URL de actualización
+reinstall=
+saving=
+scratchpad.saveAsUserScript=
+scratchpad.saveAsUserScript.ak=
+scriptOptions.includes=Inclusiones de usuario:
+scriptOptions.excludes=Exclusiones de usuario:
+scriptOptions.disableScriptIncludes=Desactivar los filtros de inclusión de este script y utilizar sólo los definidos por el usuario.
 statusbar.enabled=Activado
 statusbar.enabled.ak=A
 statusbar.installed=instalado con éxito
@@ -94,3 +126,5 @@ tooltip.loading=Cargando...
 Uninstall=Desinstalar
 Update=Actualizar
 userscripts=Scripts de usuario
+userscripts.get=
+userscripts.noneInstalled=

From 1c123384a32fef3bf20e419cde5558660865bfe1 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 26 Jun 2011 08:38:10 -0500
Subject: [PATCH 222/829] specifying which locale each translator worked on

---
 extension/install.rdf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index c372d612..0945110d 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -64,10 +64,10 @@
     <em:contributor>Slowpoke</em:contributor>
     <em:contributor>Tommi Rautava</em:contributor>
 
-    <em:translator>Alfredo Fernández Díaz</em:translator>
+    <em:translator>Alfredo Fernández Díaz (es-ES)</em:translator>
     <em:translator>k2jp (ja-JP)</em:translator>
     <em:translator>Mauro José da Silva (pt-BR)</em:translator>
-    <em:translator>Mikael Hiort af Ornäs</em:translator>
+    <em:translator>Mikael Hiort af Ornäs (sv-SE)</em:translator>
     <em:translator>Nils Maier (de)</em:translator>
     <em:translator>nishikawasasaki (kohsei yamamoto) (ja-JP)</em:translator>
 

From e8c96a928899b79c0bbd135f33144afd74d33a5b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 26 Jun 2011 07:12:56 -0700
Subject: [PATCH 223/829] Bug #252 Fix all creations of nsITimer that are
 locally-scoped and susceptible to GC before firing.

---
 extension/content/tests/testGetConfig.js       |  7 ++++---
 extension/modules/constants.js                 | 18 +++++++++++++++---
 .../tests/testGeneral/testTimeout.js           | 15 ++++++++++-----
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/extension/content/tests/testGetConfig.js b/extension/content/tests/testGetConfig.js
index 7085d282..2f035090 100644
--- a/extension/content/tests/testGetConfig.js
+++ b/extension/content/tests/testGetConfig.js
@@ -4,18 +4,19 @@ Components.utils.import("resource://scriptish/config/config.js");
 
 module("Scriptish.getConfig");
 
-asyncTest("returns config", function() {
-  expect(3);
-
+asyncTest("returns config", 3, function() {
   var gotConfig = false, config1;
+
   Scriptish.getConfig(function(config) {
     ok(config instanceof Config, "typeof config is right");
     gotConfig = true;
     config1 = config;
   });
+
   Scriptish.getConfig(function(config) {
     ok(config === config1, "Scriptish.getConfig returns the same config");
   });
+
   ok(gotConfig, "should have got config synchronously despite the asynchronously signature of Scriptish.getConfig");
   start();
 });
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 32925a7f..6eae4dc5 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -3,7 +3,7 @@ var EXPORTED_SYMBOLS = [
     "Services", "Instances", "timeout"];
 
 const {classes: Cc, interfaces: Ci, results: Cr} = Components;
-const ONE_SHOT = Ci.nsITimer.TYPE_ONE_SHOT;
+const global = this;
 var Services = {};
 (function(inc, tools){
   inc("resource://gre/modules/XPCOMUtils.jsm");
@@ -88,6 +88,18 @@ XPCOMUtils.defineLazyServiceGetter(
     "nsIUUIDGenerator");
 
 function timeout(cb, delay) {
-  Instances.timer.initWithCallback(
-      { notify: function(){ cb.call(null) } }, delay || 0, ONE_SHOT);
+  var callback = function() cb.call(null);
+  delay = delay || 0;
+  if (0 >= delay) {
+    Services.tm.currentThread.dispatch(callback, Ci.nsIThread.DISPATCH_NORMAL);
+    return;
+  }
+
+  if (!global.setTimeout) {
+    let tools = {};
+    Components.utils.import("resource://scriptish/third-party/Timer.js", tools);
+    global.setTimeout = (new tools.Timer()).setTimeout;
+  }
+
+  setTimeout(callback, delay);
 }
diff --git a/tests/mozmill-tests/tests/testGeneral/testTimeout.js b/tests/mozmill-tests/tests/testGeneral/testTimeout.js
index 6436b2b4..5ed497f4 100644
--- a/tests/mozmill-tests/tests/testGeneral/testTimeout.js
+++ b/tests/mozmill-tests/tests/testGeneral/testTimeout.js
@@ -54,6 +54,7 @@ var testTimeoutDefault = function() {
   timeout(function() {
     success = true;
   });
+  controller.assert(function() !success);
 
   controller.waitFor(
       function() { return success; },
@@ -61,15 +62,19 @@ var testTimeoutDefault = function() {
       250, 10);
 }
 
-//Test that timeout works
+//Test that timeout works with a param
 var testTimeoutWithParam = function() {
   var success = false;
-  timeout(function() {
-   success = true;
-  }, 50);
+  timeout(function() (success = true), 50);
+
+  controller.assert(function() !success);
+  controller.sleep(30);
+  controller.assert(function() !success);
+  controller.sleep(30);
+  controller.assert(function() success);
 
   controller.waitFor(
-     function() { return success; },
+     function() success,
      "Test timeout works with a param",
      250, 10);
 }

From 090afc0ac97e744eb1b37bfe809bf3c1b0821984 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 26 Jun 2011 18:17:17 -0700
Subject: [PATCH 224/829] Closes #372 After upgrading a user script
 'installing' message hangs

---
 extension/modules/script/scriptinstaller.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/extension/modules/script/scriptinstaller.js b/extension/modules/script/scriptinstaller.js
index 9f8898bd..dbb9e5d9 100644
--- a/extension/modules/script/scriptinstaller.js
+++ b/extension/modules/script/scriptinstaller.js
@@ -19,7 +19,7 @@ ScriptInstall.prototype = {
         timeout(function() {
           self.changed("InstallStarted");
           self.scriptDownloader.installScript();
-        }, 0)
+        });
         break;
       case "DownloadCancelled":
         this.state = AddonManager.STATE_CANCELLED;
@@ -36,12 +36,13 @@ ScriptInstall.prototype = {
       default:
         return;
     }
-    AddonManagerPrivate.callAddonListeners("on"+aType, this);
+    AddonManagerPrivate.callAddonListeners("on"+aType, this, this._script);
     if (!this._listeners.length) return;
     var listeners = this._listeners;
     for (var i = 0, listener; listener = listeners[i]; i++) {
-      if (listener["on"+aType])
-        listener["on"+aType](this, ("InstallEnded" == aType && this._script));
+      if (listener["on"+aType]) {
+        listener["on"+aType](this, this._script);
+      }
     }
   },
   get name() this._script.name,

From a99b35a891b41322232bc3c134b5ab8d5c9545be Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Jun 2011 10:36:37 +0200
Subject: [PATCH 225/829] Translate new de-locale strings

Closes #370
---
 extension/locale/de/scriptish.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 4d126100..db9e64d1 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -109,10 +109,10 @@ options.translation=Übersetzung
 options.translation.useEnglish=Immer Englisch benutzen
 options.update.security=Aktualisierungsicherheit
 options.useDownloadURL=Download-URL für Aktualisierungen benutzen, wenn es keine gesonderte Aktualisierungs-URL gibt
-reinstall=
+reinstall=Neu installieren
 saving=Speichern
-scratchpad.saveAsUserScript=
-scratchpad.saveAsUserScript.ak=
+scratchpad.saveAsUserScript=Als Benutzerskript speichern
+scratchpad.saveAsUserScript.ak=B
 scriptOptions.includes=Benutzer-Einschlüsse:
 scriptOptions.excludes=Benutzer-Ausnahmen:
 scriptOptions.disableScriptIncludes=Die Einschlüsse dieses Benutzerskripts deaktivieren und nur Benutzereinschlüsse verwenden.

From c9318782c15ab4dd07892fdbb332c97ec3132ded Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Jun 2011 19:37:10 +0200
Subject: [PATCH 226/829] Hook up the window console into the script sandbox if
 possible

Closes #374
---
 extension/components/scriptish.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index b0725088..309d684d 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -296,9 +296,22 @@ ScriptishService.prototype = {
     let script;
     let unsafeContentWin = wrappedContentWin.wrappedJSObject;
     let tools = {};
-    Cu.import("resource://scriptish/api/GM_console.js", tools);
     Cu.import("resource://scriptish/api.js", tools);
 
+    tools.console = (function getConsole() {
+      let rv = Scriptish_getFirebugConsole(wrappedContentWin, chromeWin);
+      if (rv) {
+        return rv;
+      }
+      if (wrappedContentWin.console) {
+        return wrappedContentWin.console;
+      }
+      rv = {};
+      Cu.import("resource://scriptish/api/GM_console.js", rv);
+      return rv.GM_console(script);
+    })();
+
+
     let delays = [];
     let winID = Scriptish_getWindowIDs(wrappedContentWin).innerID;
     windows[winID].unloaders.push(function() {
@@ -319,7 +332,7 @@ ScriptishService.prototype = {
 
       // add GM_* API to sandbox
       for (var funcName in GM_API) sandbox[funcName] = GM_API[funcName];
-      sandbox.console = fbConsole || new tools.GM_console(script);
+      sandbox.console = tools.console;
 
       sandbox.unsafeWindow = unsafeContentWin;
       sandbox.__proto__ = wrappedContentWin;

From a86144240b7f88786f7a4fe7cd787df4e695877a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Jun 2011 20:42:57 +0200
Subject: [PATCH 227/829] Make script errors appear in the corresponding script
 console.

The trick here is to rewrite errors so that they become nsIScriptError2
instances with a correct window id assigned so that the web console
nsIConsoleListener will pick it up and associate it accordingly.

Disclaimer: inspired by some moz-scratchpad stuff
Closes #375
---
 extension/components/scriptish.js             |  28 +-
 .../content/tests/testScriptishLogger.js      | 265 ++++++++++++------
 extension/modules/constants.js                |   3 +-
 extension/modules/logging.js                  |  94 ++++++-
 4 files changed, 299 insertions(+), 91 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 309d684d..521b0919 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -342,26 +342,32 @@ ScriptishService.prototype = {
         let (script = script, sb = sandbox) {
           // don't use window's setTimeout, b/c then window could clearTimeout
           delays.push(self.timer.setTimeout(function() {
-            self.evalInSandbox(script, sandbox);
+            self.evalInSandbox(script, sandbox, wrappedContentWin);
           }, script.delay));
         }
       } else {
-        this.evalInSandbox(script, sandbox);
+        this.evalInSandbox(script, sandbox, wrappedContentWin);
       }
     }
   },
 
-  evalInSandbox: function(aScript, aSandbox) {
+  evalInSandbox: function(aScript, aSandbox, aWindow) {
     var jsVer = aScript.jsversion;
     var fileURL;
 
     try {
       for (let [, req] in Iterator(aScript.requires)) {
-        fileURL = req.fileURL;
-        Cu.evalInSandbox(
-            req.textContent + "\n", aSandbox, jsVer, fileURLPrefix+fileURL, 1);
+        try {
+          fileURL = req.fileURL;
+          Cu.evalInSandbox(
+              req.textContent + "\n", aSandbox, jsVer, fileURLPrefix+fileURL, 1);
+        }
+        catch (ex) {
+          Scriptish_logScriptError(ex, aWindow, fileURL);
+        }
       }
-    } catch (e) {
+    }
+    catch (e) {
       return Scriptish_logError(e, 0, fileURL, e.lineNumber);
     }
 
@@ -372,13 +378,15 @@ ScriptishService.prototype = {
         Cu.evalInSandbox(src, aSandbox, jsVer, fileURLPrefix+fileURL, 1);
       // catch errors when return is not in a function or when a window global
       // is being overwritten (which throws NS_ERROR_OUT_OF_MEMORY..)
-      } catch (e if (e.message == "return not in function"
+      }
+      catch (e if (e.message == "return not in function"
           || /\(NS_ERROR_OUT_OF_MEMORY\) \[nsIXPCComponents_Utils.evalInSandbox\]/.test(e.message))) {
         Cu.evalInSandbox(
             "(function(){"+src+"})()", aSandbox, jsVer, fileURLPrefix+fileURL, 1);
       }
-    } catch (e) {
-      Scriptish_logError(e, 0, fileURL, e.lineNumber);
+    }
+    catch (e) {
+      Scriptish_logScriptError(e, aWindow, fileURL, aScript.id);
     }
   }
 }
diff --git a/extension/content/tests/testScriptishLogger.js b/extension/content/tests/testScriptishLogger.js
index cbcb64b4..de8ebb9b 100644
--- a/extension/content/tests/testScriptishLogger.js
+++ b/extension/content/tests/testScriptishLogger.js
@@ -5,110 +5,219 @@ Components.utils.import("resource://scriptish/logging.js");
 module("Scriptish_log");
 var PREF_BRANCH = Services.prefs.getBranch("extensions.scriptish.");
 
-asyncTest("extensions.scriptish.logChrome", 2, function() {
-  var tID, logChrome = false;
-
-  // making console listener
-  var consoleListener = {
-    observe: function({message}) {
-      if ("[Scriptish] TEST" == message && logChrome) {
-        clearTimeout(tID);
-        unregListener();
-        ok(true, "message was logged successfully as expected");
+function runListener(callback) {
+  var list = {
+    observe: function(message) {
+      unreg();
+      try {
+        callback(message);
+      }
+      finally {
         start();
       }
     }
   };
+  var unreg = function() {
+    if (!list) {
+      return;
+    }
+    Services.console.unregisterListener(list);
+    list = null;
+  }
+  Services.console.registerListener(list);
+  return unreg;
+}
 
-  // add console listener
-  Services.cs.registerListener(consoleListener);
-  function unregListener() Services.cs.unregisterListener(consoleListener);
 
-  // get extensions.scriptish.logChrome pref if it exists
-  try {
-    logChrome = PREF_BRANCH.getBoolPref("logChrome");
-  } catch (e) {}
+asyncTest("extensions.scriptish.logChrome = false", 0, function() {
+  var unreg = runListener(function({message}) {
+    equal(message, "[Scriptish] TEST");
+  });
 
-  tID = setTimeout(function() {
-    unregListener();
-    ok(!logChrome, "message was not logged");
-    start();
-  }, 500);
+  var logChrome = null;
+  try {
+    var logChrome = PREF_BRANCH.getBoolPref("logChrome");
+  }
+  catch (ex) {}
+  PREF_BRANCH.setBoolPref("logChrome", false);
 
   try {
     Scriptish_log("TEST");
-    ok(true, "sent message without error being thrown");
-  } catch (e) {
-    ok(false, e);
+    start();
+  }
+  finally {
+    unreg();
+    if (logChrome !== null) {
+      PREF_BRANCH.setBoolPref("logChrome", logChrome);
+    }
+    else {
+      PREF_BRANCH.clearUserPref("logChrome", logChrome);
+    }
   }
 });
 
 
-asyncTest("forced log message", 2, function() {
-  var tID;
+asyncTest("extensions.scriptish.logChrome = true", 1, function() {
+  runListener(function({message}) {
+    equal(message, "[Scriptish] TEST");
+  });
 
-  // making console listener
-  var consoleListener = {
-    observe: function({message}) {
-      if ("[Scriptish] FORCED TEST" == message) {
-        clearTimeout(tID);
-        unregListener();
-        ok(true, "message was logged successfully as expected");
-        start();
-      }
+  var logChrome = null;
+  try {
+    var logChrome = PREF_BRANCH.getBoolPref("logChrome");
+  }
+  catch (ex) {}
+  PREF_BRANCH.setBoolPref("logChrome", true);
+
+  try {
+    Scriptish_log("TEST");
+  }
+  finally {
+    if (logChrome !== null) {
+      PREF_BRANCH.setBoolPref("logChrome", logChrome);
     }
-  };
+    else {
+      PREF_BRANCH.clearUserPref("logChrome", logChrome);
+    }
+  }
+});
 
-  // add console listener
-  Services.cs.registerListener(consoleListener);
-  function unregListener() Services.cs.unregisterListener(consoleListener);
+asyncTest("null char removed", 1, function() {
+  runListener(function({message}) {
+    equal(message, "[Scriptish] FORCED TEST WITH NULLS");
+  });
 
-  tID = setTimeout(function() {
-    unregListener();
-    ok(false, "message was not logged");
-    start();
-  }, 500);
+  var logChrome = null;
+  try {
+    var logChrome = PREF_BRANCH.getBoolPref("logChrome");
+  }
+  catch (ex) {}
+  PREF_BRANCH.setBoolPref("logChrome", true);
 
   try {
-    Scriptish_log("FORCED TEST", true);
-    ok(true, "sent message without error being thrown");
-  } catch (e) {
-    ok(false, e);
+    Scriptish_log("FORCED \0TEST \0WITH \0NULLS");
+  }
+  finally {
+    if (logChrome !== null) {
+      PREF_BRANCH.setBoolPref("logChrome", logChrome);
+    }
+    else {
+      PREF_BRANCH.clearUserPref("logChrome", logChrome);
+    }
   }
 });
 
-asyncTest("null char removed", 2, function() {
-  var tID, msg = "FORCED \0TEST \0WITH \0NULLS";
-
-  // making console listener
-  var consoleListener = {
-    observe: function({message}) {
-      if ("[Scriptish] FORCED TEST WITH NULLS" == message || msg == message) {
-        if ("[Scriptish] FORCED TEST WITH NULLS" == message)
-          ok(true, "message was logged successfully as expected");
-        else if (msg == message)
-          ok(false, "null chars were not removed");
-        clearTimeout(tID);
-        unregListener();
-        start();
-      }
-    }
-  };
+// logScriptError
+
+asyncTest("logScriptError: js error", 9, function() {
+  runListener(function(message) {
+    ok(message instanceof Ci.nsIScriptError);
+    ok(message instanceof Ci.nsIScriptError2);
+
+    equal(message.errorMessage, "[baz] Error: foo");
+    equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
+    equal(message.sourceLine, "");
+    ok(message.lineNumber > 10);
+    equal(message.columnNumber, 0);
+    equal(message.category, "scriptish userscript error");
+    equal(message.flags, message.errorFlag);
+  });
+  Scriptish_logScriptError(new Error("foo"), window, "bar.js", "baz");
+});
 
-  // add console listener
-  Services.cs.registerListener(consoleListener);
-  function unregListener() Services.cs.unregisterListener(consoleListener);
+asyncTest("logScriptError: nsIScriptError", 9, function() {
+  runListener(function(message) {
+    ok(message instanceof Ci.nsIScriptError);
+    ok(message instanceof Ci.nsIScriptError2);
+
+    equal(message.errorMessage, "[baz] foo");
+    equal(message.sourceName, "source");
+    equal(message.sourceLine, "line");
+    equal(message.lineNumber, 0xaa);
+    equal(message.columnNumber, 0xff);
+    equal(message.category, "category");
+    equal(message.flags, message.warningFlag);
+  });
+  var se = Instances.se;
+  se.init("foo", "source", "line", 0xaa, 0xff, se.warningFlag, "category");
+  Scriptish_logScriptError(se, window, "bar.js", "baz");
+});
 
-  tID = setTimeout(function() {
-    unregListener();
-    ok(false, "message was not logged");
-    start();
-  }, 500);
+asyncTest("logScriptError: nsIScriptError; omit id", 9, function() {
+  runListener(function(message) {
+    ok(message instanceof Ci.nsIScriptError);
+    ok(message instanceof Ci.nsIScriptError2);
+
+    equal(message.errorMessage, "[Scriptish] foo");
+    equal(message.sourceName, "source");
+    equal(message.sourceLine, "line");
+    equal(message.lineNumber, 0xaa);
+    equal(message.columnNumber, 0xff);
+    equal(message.category, "category");
+    equal(message.flags, message.warningFlag);
+  });
+  var se = Instances.se;
+  se.init("foo", "source", "line", 0xaa, 0xff, se.warningFlag, "category");
+  Scriptish_logScriptError(se, window);
+});
+
+asyncTest("test nsIScriptError; omit optionals", function() {
+  expect(9);
+  runListener(function(message) {
+    ok(message instanceof Ci.nsIScriptError);
+    ok(message instanceof Ci.nsIScriptError2);
+
+    equal(message.errorMessage, "[Scriptish] foo");
+    equal(message.sourceName, "[user.js]");
+    equal(message.sourceLine, "line");
+    equal(message.lineNumber, 0xaa);
+    equal(message.columnNumber, 0xff);
+    equal(message.category, "category");
+    equal(message.flags, message.warningFlag);
+  });
+  var se = Instances.se;
+  se.init("foo", "", "line", 0xaa, 0xff, se.warningFlag, "category");
+  Scriptish_logScriptError(se, window);
+});
+
+asyncTest("test nsIException", function() {
+  expect(9);
+  runListener(function(message) {
+    ok(message instanceof Ci.nsIScriptError);
+    ok(message instanceof Ci.nsIScriptError2);
+
+    equal(message.errorMessage, "[baz] foo");
+    equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
+    equal(message.sourceLine, "");
+    ok(message.lineNumber > 10);
+    equal(message.columnNumber, 0);
+    equal(message.category, "scriptish userscript error");
+    equal(message.flags, message.errorFlag);
+  });
+  var ex = Components.Exception("foo");
+  Scriptish_logScriptError(ex, window, "bar.js", "baz");
+});
 
+asyncTest("test TypeError", function() {
+  expect(9);
+  runListener(function(message) {
+    ok(message instanceof Ci.nsIScriptError);
+    ok(message instanceof Ci.nsIScriptError2);
+
+    equal(message.errorMessage, "[baz] TypeError: f is undefined");
+    equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
+    equal(message.sourceLine, "");
+    ok(message.lineNumber > 10);
+    equal(message.columnNumber, 0);
+    equal(message.category, "scriptish userscript error");
+    equal(message.flags, message.errorFlag);
+  });
   try {
-    Scriptish_log(msg, true);
-    ok(true, "sent message without error being thrown");
-  } catch (e) {
-    ok(false, e);
+    var f;
+    f.o.o = b.a.r;
+  }
+  catch (ex) {
+    Scriptish_logScriptError(ex, window, "bar.js", "baz");
   }
 });
+
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 6eae4dc5..7914a04d 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -29,7 +29,8 @@ var Instances = {
   get json() Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON),
   get lf() Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile),
   get process() Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess),
-  get se() Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError),
+  get se() Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError)
+      .QueryInterface(Ci.nsIScriptError2),
   get ss() Cc["@mozilla.org/supports-string;1"]
       .createInstance(Ci.nsISupportsString),
   get suc() Cc["@mozilla.org/intl/scriptableunicodeconverter"]
diff --git a/extension/modules/logging.js b/extension/modules/logging.js
index 706cb332..611c4934 100644
--- a/extension/modules/logging.js
+++ b/extension/modules/logging.js
@@ -1,8 +1,10 @@
-var EXPORTED_SYMBOLS = ["Scriptish_logError", "Scriptish_log"];
+var EXPORTED_SYMBOLS = ["Scriptish_logError", "Scriptish_logScriptError", "Scriptish_log"];
+
+const Cu = Components.utils;
 (function(inc){
   inc("resource://scriptish/constants.js");
   inc("resource://scriptish/prefmanager.js");
-})(Components.utils.import)
+})(Cu.import)
 
 // Utility to create an error message in the log without throwing an error.
 function Scriptish_logError(aErr, opt_warn, fileName, lineNumber) {
@@ -17,6 +19,94 @@ function Scriptish_logError(aErr, opt_warn, fileName, lineNumber) {
   Services.console.logMessage(e);
 }
 
+/**
+ * Utility to log scripts in such a way that the web console will pick it up
+ *
+ * @author nmaier
+ * @param aError {object} Any supported script error
+ * @param aWindow {window} The content window to associate the error with
+ * @param aFileURL {object} Optional. nsIURI or .toString() giving the error location
+ * @param aId {string} Optional. Script id.
+ */
+function Scriptish_logScriptError(aError, aWindow, aFileURL, aId) {
+  try {
+    let se = Instances.se;
+
+    let windowId = 0;
+    try {
+      windowId = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+        .getInterface(Ci.nsIDOMWindowUtils)
+        .outerWindowID;
+    }
+    catch (ex) {
+      throw new Error("failed to get window id window id");
+    }
+
+    // defaults
+    var errorMessage = "";
+    var sourceName = null;
+    var sourceLine = "";
+    var lineNumber = 0;
+    var columnNumber = 0;
+    var flags = se.errorFlag;
+    var category = "scriptish userscript error";
+
+    // get what we can
+    if ((aError instanceof Ci.nsIScriptError) || (aError instanceof Ci.nsIScriptError2)) {
+      var {errorMessage, sourceName, sourceLine, lineNumber, columnNumber, flags, category} = aError;
+    }
+    else if (aError instanceof Ci.nsIException) {
+      var {message:errorMessage, filename:sourceName, lineNumber, columnNumber} = aError;
+    }
+    // generic script error
+    else if ("message" in aError) {
+      // do not use aError.message, as this might hide the Error prefix
+      // such as "SyntaxError: ..."
+      errorMessage = aError.toString() || errorMessage;
+
+      lineNumber = aError.lineNumber || lineNumber;
+      columnNumber = aError.columnNumber || columnNumber;
+
+      // We don't want that injected "scriptish/service.js -> realfile" stuff
+      // Currently, moz will do this for us :p
+      if (!/->/.test(aError.fileName || "->")) {
+        sourceName = aError.fileName;
+      }
+    }
+    else {
+      errorMessage = aError.toString();
+    }
+
+    // if we haven't a sourceName yet, then derive it from aFileURL
+    if (!sourceName) {
+      aFileURL = aFileURL || "[user.js]";
+      if (aFileURL instanceof Ci.nsIURI) {
+        sourceName = aFileURL.spec;
+      }
+      else {
+        sourceName = aFileURL.toString();
+      }
+    }
+
+    // dispatch
+    se.initWithWindowID(
+      "[" + (aId  || "Scriptish") + "] " + errorMessage,
+      sourceName,
+      sourceLine,
+      lineNumber,
+      columnNumber,
+      flags,
+      category,
+      windowId
+      );
+    Services.console.logMessage(se);
+  }
+  catch (ex) {
+    // You never know :p
+    Scriptish_logError(aError, false, aFileURL, aError.lineNumber);
+  }
+}
+
 function Scriptish_log(aMsg, aForce) {
   if (!aForce && !Scriptish_prefRoot.getBoolValue("logChrome")) return;
   // make sure msg is a string, and remove NULL bytes which truncate it

From 28a7ee350d5a795c702eb25117df31ef8cfb67ba Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 27 Jun 2011 14:16:37 -0500
Subject: [PATCH 228/829] Some more updates to ja-JP from k2jp (BabelZilla)

---
 extension/locale/ja-JP/scriptish.properties | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index baea5465..1524ac0e 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -46,7 +46,7 @@ install.warning1=悪意のあるスクリプトはあなたの知らぬ間にプ
 install.warning2=信頼できる場所からのみスクリプトをインストールすべきです
 menu.commands=ユーザースクリプトのコマンド…
 menu.commands.ak=C
-menu.install=ユーザースクリプトのインストール…
+menu.install=ユーザースクリプトをインストール…
 menu.install.ak=I
 menu.manage=ユーザースクリプト管理…
 menu.manage.ak=M
@@ -107,7 +107,7 @@ options.requireBuiltInCerts=
 options.requireSecured=ユーザースクリプトが HTTPS で更新されるようにする
 options.translation=
 options.translation.useEnglish=
-options.update.security=Update Security
+options.update.security=
 options.useDownloadURL=更新用 URL がない場合、ダウンロード URL を使用する
 reinstall=
 saving=保存
@@ -118,10 +118,10 @@ scriptOptions.excludes=
 scriptOptions.disableScriptIncludes=スクリプト内 include を無効にし、この指定のみを利用
 statusbar.enabled=有効
 statusbar.enabled.ak=E
-statusbar.installed=インストールに成功しました
-statusbar.modified=変更されました
+statusbar.installed=のインストールに成功しました
+statusbar.modified=は変更されました
 statusbar.noScripts=このページ用スクリプトはありません！
-statusbar.updated=正常に更新されました
+statusbar.updated=は正常に更新されました
 tooltip.loading=読み込み中…
 Uninstall=アンインストール
 Update=更新

From f418fbc5bf772654b107cfd88e125a989619d43a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Jun 2011 21:09:05 +0200
Subject: [PATCH 229/829] Remove variable missed from cleanup

---
 extension/components/scriptish.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 521b0919..adb4f3aa 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -318,9 +318,6 @@ ScriptishService.prototype = {
       for (let [, id] in Iterator(delays)) self.timer.clearTimeout(id);
     });
 
-    // detect and grab reference to firebug console and context, if it exists
-    let fbConsole = Scriptish_getFirebugConsole(wrappedContentWin, chromeWin);
-
     for (var i = 0; script = scripts[i++];) {
       sandbox = new Cu.Sandbox(wrappedContentWin);
 

From a19e1302490e4b6f4972539d79fc82d1804132e9 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Jun 2011 22:52:48 +0200
Subject: [PATCH 230/829] Fix var double definition in testScriptishLogger

---
 extension/content/tests/testScriptishLogger.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/content/tests/testScriptishLogger.js b/extension/content/tests/testScriptishLogger.js
index de8ebb9b..dfb4f219 100644
--- a/extension/content/tests/testScriptishLogger.js
+++ b/extension/content/tests/testScriptishLogger.js
@@ -36,7 +36,7 @@ asyncTest("extensions.scriptish.logChrome = false", 0, function() {
 
   var logChrome = null;
   try {
-    var logChrome = PREF_BRANCH.getBoolPref("logChrome");
+    logChrome = PREF_BRANCH.getBoolPref("logChrome");
   }
   catch (ex) {}
   PREF_BRANCH.setBoolPref("logChrome", false);
@@ -64,7 +64,7 @@ asyncTest("extensions.scriptish.logChrome = true", 1, function() {
 
   var logChrome = null;
   try {
-    var logChrome = PREF_BRANCH.getBoolPref("logChrome");
+    logChrome = PREF_BRANCH.getBoolPref("logChrome");
   }
   catch (ex) {}
   PREF_BRANCH.setBoolPref("logChrome", true);
@@ -89,7 +89,7 @@ asyncTest("null char removed", 1, function() {
 
   var logChrome = null;
   try {
-    var logChrome = PREF_BRANCH.getBoolPref("logChrome");
+    logChrome = PREF_BRANCH.getBoolPref("logChrome");
   }
   catch (ex) {}
   PREF_BRANCH.setBoolPref("logChrome", true);

From 027d6460e13a8bdeb3637d2a408ba627bb927eb0 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Jun 2011 22:47:43 +0200
Subject: [PATCH 231/829] Provide user pref for caching script & dep contents

CachedResource added, which at the moment implements cached textContent
that Script and ScriptDependency will use, as they now inherit from CR.

Caching is controlled by the new `cache.enabled` preference, which by
default it set to true.  The Advanced panel now features a checkbox
for the user to access and control the preference.

The regular script modification checks will catch any modified scripts,
so that script editing is still possible without hacks.

Closes #289
---
 extension/content/options.xul                 |  5 +
 extension/content/tests/runTests.js           |  1 +
 extension/content/tests/testCachedResource.js | 95 +++++++++++++++++++
 extension/defaults/preferences/scriptish.js   |  1 +
 extension/locale/de/scriptish.properties      |  2 +
 extension/locale/en-US/scriptish.properties   |  2 +
 extension/locale/es-ES/scriptish.properties   |  2 +
 extension/locale/ja-JP/scriptish.properties   |  2 +
 extension/locale/pt-BR/scriptish.properties   |  2 +
 extension/locale/ru-RU/scriptish.properties   |  6 +-
 extension/locale/sv-SE/scriptish.properties   |  2 +
 extension/modules/script/cachedresource.js    | 48 ++++++++++
 extension/modules/script/script.js            | 10 +-
 extension/modules/script/scriptdependency.js  |  4 +-
 14 files changed, 174 insertions(+), 8 deletions(-)
 create mode 100644 extension/content/tests/testCachedResource.js
 create mode 100644 extension/modules/script/cachedresource.js

diff --git a/extension/content/options.xul b/extension/content/options.xul
index 4f887d70..c848301d 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -13,6 +13,7 @@
   </commandset>
 
   <preferences id="scriptish-preferences">
+    <preference id="pref-cache-enabled" name="extensions.scriptish.cache.enabled" type="bool"/>
     <preference id="pref-disableNotifications" name="extensions.scriptish.disableNotifications" type="bool"/>
     <preference id="pref-editor" name="extensions.scriptish.editor" type="unichar"/>
     <preference id="pref-enableCopyDownloadURL" name="extensions.scriptish.enableCopyDownloadURL" type="bool"/>
@@ -70,6 +71,10 @@
   </prefpane>
 
   <prefpane id="pane-advanced" label="options.pane.advanced" localize="label">
+    <groupbox>
+      <caption label="options.cache" localize="label"/>
+      <checkbox preference="pref-cache-enabled" label="options.cache.enabled" localize="label"/>
+    </groupbox>
     <groupbox>
       <caption label="options.notifications" localize="label"/>
       <checkbox preference="pref-disableNotifications" label="options.notifications.disable" localize="label"/>
diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index b1b22243..82a6aad7 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -13,6 +13,7 @@ function runTests() {
   var tools = {};
   Q.chain(
     function() include("tests/testAvailability.js"),
+    function() include("tests/testCachedResource.js"),
     function() include("tests/testCryptoHash.js"),
     function() include("tests/testToolsMenuItem.js"),
     function() include("tests/testIsGMable.js"),
diff --git a/extension/content/tests/testCachedResource.js b/extension/content/tests/testCachedResource.js
new file mode 100644
index 00000000..d448e2a4
--- /dev/null
+++ b/extension/content/tests/testCachedResource.js
@@ -0,0 +1,95 @@
+Components.utils.import("resource://scriptish/constants.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_getTempFile.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_getWriteStream.js");
+Components.utils.import("resource://scriptish/script/cachedresource.js");
+
+var PREF_BRANCH = Services.prefs.getBranch("extensions.scriptish.");
+
+function CachedResourceMock() {
+  this._file = Scriptish_getTempFile();
+  this.write();
+}
+CachedResourceMock.prototype = {
+  __proto__: CachedResource.prototype,
+  _accesses: 0,
+  write: function() {
+    this._script = "accesses " + (++this._accesses);
+    var foStream = tools.Scriptish_getWriteStream(this._file);
+    foStream.write(this._script, this._script.length);
+    foStream.close();
+  },
+  testCache: function(shouldEqual) {
+    (shouldEqual ? equal : notEqual)(this.textContent, this._script);
+  },
+  destroy: function() {
+    try {
+      this._file.remove(true);
+    }
+    catch (ex) {
+      // no op
+    }
+  }
+};
+
+module("Cached Resource");
+
+test("not cached", 2, function() {
+  var enabled = PREF_BRANCH.getBoolPref("cache.enabled");
+  PREF_BRANCH.setBoolPref("cache.enabled", false);
+  try {
+    var mock = new CachedResourceMock();
+    try {
+      mock.testCache(true);
+      mock.write();
+      mock.testCache(true);
+    }
+    finally {
+      mock.destroy();
+    }
+  }
+  finally {
+    PREF_BRANCH.setBoolPref("cache.enabled", enabled);
+  }
+
+});
+
+test("cached", 2, function() {
+  var enabled = PREF_BRANCH.getBoolPref("cache.enabled");
+  PREF_BRANCH.setBoolPref("cache.enabled", true);
+  try {
+    var mock = new CachedResourceMock();
+    try {
+      mock.testCache(true);
+      mock.write();
+      mock.testCache(false);
+    }
+    finally {
+      mock.destroy();
+    }
+  }
+  finally {
+    PREF_BRANCH.setBoolPref("cache.enabled", enabled);
+  }
+});
+
+test("toggled", 3, function() {
+  var enabled = PREF_BRANCH.getBoolPref("cache.enabled");
+  PREF_BRANCH.setBoolPref("cache.enabled", true);
+  try {
+    var mock = new CachedResourceMock();
+    try {
+      mock.testCache(true);
+      mock.write();
+      mock.testCache(false);
+      PREF_BRANCH.setBoolPref("cache.enabled", false);
+      mock.write();
+      mock.testCache(true);
+    }
+    finally {
+      mock.destroy();
+    }
+  }
+  finally {
+    PREF_BRANCH.setBoolPref("cache.enabled", enabled);
+  }
+});
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index ebcc8313..1b8cb973 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -2,6 +2,7 @@ pref("extensions.scriptish.blocklist.enabled", true);
 pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
 pref("extensions.scriptish.blocklist.url", "https://github.com/erikvold/scriptish/raw/master/blocklist.json");
+pref("extensions.scriptish.cache.enabled", true);
 pref("extensions.scriptish.disableNotifications", false);
 pref("extensions.scriptish.enabled", true);
 pref("extensions.scriptish.enabledSchemes.about", false);
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index db9e64d1..00984db4 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -81,6 +81,8 @@ options.pane.excludes=Globale Ausnahmen
 options.pane.advanced=Erweitert
 options.addonManager=Add-ons-Manager
 options.alsoUninstallPrefs=Wenn ein Benutzerskript entfernt wird, dann auch seine Einstellungen entfernen
+options.cache=Cache
+options.cache.enabled=Benutzerskripte zwischenspeichern
 options.changeEditor=Editor ändern
 options.editor=Editor
 options.editor.notset=Kein Editor ausgewählt
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 780dd633..e22ab918 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -81,6 +81,8 @@ options.pane.excludes=Global Excludes
 options.pane.advanced=Advanced
 options.addonManager=Add-on Manager
 options.alsoUninstallPrefs=When uninstalling a script, also remove its preferences
+options.cache=Cache
+options.cache.enabled=Cache user scripts
 options.changeEditor=Change Editor
 options.editor=Editor
 options.editor.notset=No editor selected
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 6e8f2cfc..0b3022d9 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -81,6 +81,8 @@ options.pane.excludes=Exclusiones globales
 options.pane.advanced=
 options.addonManager=Gestor de extensiones
 options.alsoUninstallPrefs=Al desinstalar un script, borrar también sus preferencias
+options.cache=
+options.cache.enabled=
 options.changeEditor=Cambiar editor
 options.editor=Editor
 options.editor.notset=
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 1524ac0e..74219d65 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -81,6 +81,8 @@ options.pane.excludes=
 options.pane.advanced=
 options.addonManager=アドオンマネージャ
 options.alsoUninstallPrefs=スクリプトをアンインストールする時、その設定も削除する
+options.cache=
+options.cache.enabled=
 options.changeEditor=エディタを変更する
 options.editor=エディタ
 options.editor.notset=
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index f0a4b90a..18f9d443 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -81,6 +81,8 @@ options.pane.excludes=Exclusões globais
 options.pane.advanced=
 options.addonManager=Gerenciador de complementos
 options.alsoUninstallPrefs=Ao desinstalar um script, remover também as suas preferências
+options.cache=
+options.cache.enabled=
 options.changeEditor=Alterar editor
 options.editor=Editor
 options.editor.notset=
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 841b069b..238c0960 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -10,11 +10,11 @@ error.api.noResourceWithName=Нет ресурса с таким именем
 error.api.noSecondArgValue=Второй аргумент - значение - не задан
 error.api.reqURL.scheme=Схема  URL запрещена
 error.api.reqURL=Неверный URL
-error.api.unsafeAccess=Нарушение доступа Scriptish: из unsafeWindow не позволено работать с 
+error.api.unsafeAccess=Нарушение доступа Scriptish: из unsafeWindow не позволено работать с
 error.charset=Неверная кодировка.
 error.dependency.loading=Не могу загрузить зависимость
 error.dependency.local=Исключение безопасности: запрещено вызывать локальные пути
-error.dependency.serverReturned=Ошибка! Сервер вернул 
+error.dependency.serverReturned=Ошибка! Сервер вернул
 error.hash.algorithm=Неверный алгоритм хеширования.
 error.icon.dataURL=Неверный URL для  @icon
 error.icon.notImage=
@@ -81,6 +81,8 @@ options.pane.excludes=Глобальные исключения
 options.pane.advanced=
 options.addonManager=Менеджер Дополнений
 options.alsoUninstallPrefs=Удалять также ассоциированные настройки
+options.cache=
+options.cache.enabled=
 options.changeEditor=Изменить редактор
 options.editor=Редактор
 options.editor.notset=
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 73b5b31e..9cd9e7c4 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -81,6 +81,8 @@ options.pane.excludes=Globala undantag
 options.pane.advanced=
 options.addonManager=Tilläggshanteraren
 options.alsoUninstallPrefs=Vid avinstallation av ett skript, ta även bort dess inställningar
+options.cache=
+options.cache.enabled=
 options.changeEditor=Byt redigeringsprogram
 options.editor=Redigeringsprogram
 options.editor.notset=
diff --git a/extension/modules/script/cachedresource.js b/extension/modules/script/cachedresource.js
new file mode 100644
index 00000000..687a2d96
--- /dev/null
+++ b/extension/modules/script/cachedresource.js
@@ -0,0 +1,48 @@
+var EXPORTED_SYMBOLS = ["CachedResource"];
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+Cu.import("resource://scriptish/prefmanager.js");
+Cu.import("resource://scriptish/utils/Scriptish_getContents.js");
+
+var useCache = Scriptish_prefRoot.getValue("cache.enabled");
+Scriptish_prefRoot.watch("cache.enabled", function() {
+  useCache = Scriptish_prefRoot.getValue("cache.enabled");
+});
+
+function CachedResource() {}
+CachedResource.prototype = {
+  _textContent: null,
+  clearResourceCaches: function() {
+    this.clearCachedTextContent();
+  },
+  clearCachedTextContent: function() this._textContent = null,
+  get textContent() {
+    if (!useCache || !this._textContent) {
+      this._textContent = Scriptish_getContents(this._file);
+    }
+    return this._textContent;
+  },
+  _getTextContent_callback: function(aCallback, content) {
+    this._textContent = content;
+    aCallback(content);
+  },
+  getTextContent: function(aCallback) {
+    if (!aCallback) {
+      return this.textContent;
+    }
+
+    if (!useCache || !this._textContent) {
+      Scriptish_getContents(
+        this._file,
+        null,
+        this._getTextContent_callback.bind(this, aCallback)
+        );
+    }
+    else {
+      aCallback(this._textContent);
+    }
+
+    // avoid not-all-paths-return warning
+    return null;
+  }
+};
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 40db644a..7154a5e4 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -13,6 +13,7 @@ Cu.import("resource://scriptish/utils/Scriptish_getContents.js");
 Cu.import("resource://scriptish/utils/Scriptish_getTLDURL.js");
 Cu.import("resource://scriptish/utils/Scriptish_convert2RegExp.js");
 Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+Cu.import("resource://scriptish/script/cachedresource.js");
 Cu.import("resource://scriptish/script/scriptinstaller.js");
 Cu.import("resource://scriptish/script/scripticon.js");
 Cu.import("resource://scriptish/script/scriptrequire.js");
@@ -92,6 +93,7 @@ function Script(config) {
   this["_run-at"] = null;
 }
 Script.prototype = {
+  __proto__: CachedResource.prototype,
   includesDisabled: false,
   isCompatible: true,
   blocklistState: Ci.nsIBlocklistService.STATE_NOT_BLOCKED,
@@ -347,7 +349,7 @@ Script.prototype = {
   },
   get name() this._name,
   get namespace() this._namespace,
-  get prefroot() { 
+  get prefroot() {
     if (!this._prefroot) this._prefroot = ["scriptvals.", this.id, "."].join("");
     return this._prefroot;
   },
@@ -520,8 +522,6 @@ Script.prototype = {
   },
 
   get fileURL() Scriptish_getUriFromFile(this._file).spec,
-  get textContent() Scriptish_getContents(this._file),
-  getTextContent: function(aCallback) Scriptish_getContents(this._file, 0, aCallback),
 
   get size() {
     var size = this._file.fileSize;
@@ -610,6 +610,8 @@ Script.prototype = {
     var oldPriority = this.priority;
     var newPriority = newScript.priority;
 
+    this.clearResourceCaches();
+
     // Copy new values.
     this.blocked = newScript.blocked;
     this.updateAvailable = false;
@@ -1157,7 +1159,7 @@ Script.loadFromXML = function(aConfig, aNode) {
 
     script._modified = script._file.lastModifiedTime;
     var parsedScript = Script.parse(
-        aConfig, Scriptish_getContents(script._file), 
+        aConfig, Scriptish_getContents(script._file),
         script._downloadURL && NetUtil.newURI(script._downloadURL),
         script);
     script._dependhash = tools.Scriptish_cryptoHash(parsedScript._rawMeta);
diff --git a/extension/modules/script/scriptdependency.js b/extension/modules/script/scriptdependency.js
index 768e2018..6cafa7fc 100644
--- a/extension/modules/script/scriptdependency.js
+++ b/extension/modules/script/scriptdependency.js
@@ -5,6 +5,7 @@ inc("resource://scriptish/logging.js");
 inc("resource://scriptish/utils/Scriptish_getUriFromFile.js");
 inc("resource://scriptish/utils/Scriptish_getContents.js");
 inc("resource://scriptish/utils/Scriptish_stringBundle.js");
+inc("resource://scriptish/script/cachedresource.js");
 })(Components.utils.import)
 
 function ScriptDependency(aScript) {
@@ -19,6 +20,7 @@ function ScriptDependency(aScript) {
 }
 
 ScriptDependency.prototype = {
+  __proto__: CachedResource.prototype,
   get _file() {
     var file = this._script._basedirFile;
     file.append(this._filename);
@@ -26,8 +28,6 @@ ScriptDependency.prototype = {
   },
   get tempFile() this._tempFile,
   get fileURL() Scriptish_getUriFromFile(this._file).spec,
-  get textContent() Scriptish_getContents(this._file),
-  getTextContent: function(aCallback) Scriptish_getContents(this._file, 0, aCallback),
 
   get downloadURL() this._downloadURL,
   get downloadURLFilename() {

From b30f9b0d671b431c754d0e6d633fe246e2e33032 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Jun 2011 23:00:33 +0200
Subject: [PATCH 232/829] Fix Qunit result detail table styles

---
 extension/skin/aboutScriptish.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/skin/aboutScriptish.css b/extension/skin/aboutScriptish.css
index f4516276..405cd632 100644
--- a/extension/skin/aboutScriptish.css
+++ b/extension/skin/aboutScriptish.css
@@ -48,12 +48,12 @@ article {
   border-radius: 15px;
 }
 
-table {
+#main table {
   width: 100%;
   padding: 0;
   margin: 0;
 }
-td {
+#main td {
   vertical-align: top;
   margin: 1ex;
 }

From 6cdda9f2a4953461ba12c01d58240eb87405ba17 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Jun 2011 23:14:47 +0200
Subject: [PATCH 233/829] Consolidate qunit tests a bit

- Test more of cryptoHash according to
  http://mxr.mozilla.org/mozilla-central/source/security/manager/ssl/tests/unit/test_hash_algorithms.js
  (@nmaier wrote test_hash_algorithms.js)
- A little less global pollution in testCachedResource
---
 extension/content/tests/testCachedResource.js | 12 ++--
 extension/content/tests/testCryptoHash.js     | 56 ++++++++++++++++---
 2 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/extension/content/tests/testCachedResource.js b/extension/content/tests/testCachedResource.js
index d448e2a4..1d7c33e9 100644
--- a/extension/content/tests/testCachedResource.js
+++ b/extension/content/tests/testCachedResource.js
@@ -1,20 +1,20 @@
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_getTempFile.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_getWriteStream.js");
-Components.utils.import("resource://scriptish/script/cachedresource.js");
 
 var PREF_BRANCH = Services.prefs.getBranch("extensions.scriptish.");
 
 function CachedResourceMock() {
-  this._file = Scriptish_getTempFile();
+  this._file = CachedResourceMock.Scriptish_getTempFile();
   this.write();
 }
+Components.utils.import("resource://scriptish/utils/Scriptish_getTempFile.js", CachedResourceMock);
+Components.utils.import("resource://scriptish/utils/Scriptish_getWriteStream.js", CachedResourceMock);
+Components.utils.import("resource://scriptish/script/cachedresource.js", CachedResourceMock);
 CachedResourceMock.prototype = {
-  __proto__: CachedResource.prototype,
+  __proto__: CachedResourceMock.CachedResource.prototype,
   _accesses: 0,
   write: function() {
     this._script = "accesses " + (++this._accesses);
-    var foStream = tools.Scriptish_getWriteStream(this._file);
+    var foStream = CachedResourceMock.Scriptish_getWriteStream(this._file);
     foStream.write(this._script, this._script.length);
     foStream.close();
   },
diff --git a/extension/content/tests/testCryptoHash.js b/extension/content/tests/testCryptoHash.js
index 750c319d..e00a1230 100644
--- a/extension/content/tests/testCryptoHash.js
+++ b/extension/content/tests/testCryptoHash.js
@@ -1,15 +1,53 @@
-
-Components.utils.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
-
 module("Scriptish_cryptoHash");
 
 test("General", function() {
-  expect(2);
+  var tools = {};
+  Components.utils.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
+
+
+  var messages = [
+    "The quick brown fox jumps over the lazy dog",
+    ""
+  ];
+  var hashes = {
+    md2: [
+      "03d85a0d629d2c442e987525319fc471",
+      "8350e5a3e24c153df2275c9f80692773"
+    ],
+    md5: [
+      "9e107d9d372bb6826bd81d3542a419d6",
+      "d41d8cd98f00b204e9800998ecf8427e"
+    ],
+    sha1: [
+      "2fd4e1c67a2d28fced849ee1bb76e7391b93eb12",
+      "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+    ],
+    sha256: [
+      "d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592",
+      "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+    ],
+    sha384: [
+     "ca737f1014a48f4c0b6dd43cb177b0afd9e5169367544c494011e3317dbf9a509cb1e5dc1e85a941bbee3d7f2afbc9b1",
+     "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b"
+    ],
+    sha512: [
+      "07e547d9586f6a73f73fbac0435ed76951218fb7d0c8d788a309d785436bbb642e93a252a954f23912547d1e8a3b5ed6e1bfd7097821233fa0538f3db854fee6",
+      "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"
+    ]
+  };
+
+  function check(hash, algo) {
+    for (var i = 0; i < hash.length; ++i) {
+      var m = messages[i];
+      var h = hash[i];
+      equal(tools.Scriptish_cryptoHash(m, algo), h);
+    }
+  }
 
-  var str = "Hello World!";
-  var str_DEF_SHA1 = tools.Scriptish_cryptoHash(str);
-  var str_SHA1 = tools.Scriptish_cryptoHash(str, "SHA1");
+  for (var algo in hashes) {
+    check(hashes[algo], algo);
+  }
 
-  equal(str_DEF_SHA1, "2ef7bde608ce5404e97d5f042f95f89f1c232871", "Default hashing algorithm is SHA1");
-  equal(str_SHA1, "2ef7bde608ce5404e97d5f042f95f89f1c232871", "Specifying an algorithm (SHA1) works");
+  // check default
+  check(hashes.sha1, null);
 });

From 517b24c6ba5998d46f6d4b63d5e81291d1850204 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Jun 2011 23:41:43 +0200
Subject: [PATCH 234/829] Warn about return from main scope in user scripts

---
 extension/components/scriptish.js           | 12 ++++++++++++
 extension/locale/de/scriptish.properties    |  1 +
 extension/locale/en-US/scriptish.properties |  1 +
 extension/locale/es-ES/scriptish.properties |  1 +
 extension/locale/ja-JP/scriptish.properties |  1 +
 extension/locale/pt-BR/scriptish.properties |  1 +
 extension/locale/ru-RU/scriptish.properties |  1 +
 extension/locale/sv-SE/scriptish.properties |  1 +
 8 files changed, 19 insertions(+)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index adb4f3aa..ebca5408 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -14,6 +14,7 @@ Cu.import("resource://scriptish/utils/Scriptish_alert.js");
 Cu.import("resource://scriptish/utils/Scriptish_getBrowserForContentWindow.js");
 Cu.import("resource://scriptish/utils/Scriptish_getFirebugConsole.js");
 Cu.import("resource://scriptish/utils/Scriptish_getWindowIDs.js");
+Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
 const {nsIContentPolicy: CP, nsIDOMXPathResult: XPATH_RESULT} = Ci;
 const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "complete"];
@@ -378,6 +379,17 @@ ScriptishService.prototype = {
       }
       catch (e if (e.message == "return not in function"
           || /\(NS_ERROR_OUT_OF_MEMORY\) \[nsIXPCComponents_Utils.evalInSandbox\]/.test(e.message))) {
+        var sw = Instances.se;
+        sw.init(
+          Scriptish_stringBundle("warning.returnfrommain"),
+          fileURL,
+          "",
+          e.lineNumber || 0,
+          e.columnNumber || 0,
+          sw.warningFlag,
+          "scriptish userscript warnings"
+          );
+        Scriptish_logScriptError(sw, aWindow, fileURL, aScript.id);
         Cu.evalInSandbox(
             "(function(){"+src+"})()", aSandbox, jsVer, fileURLPrefix+fileURL, 1);
       }
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 00984db4..faf82ed1 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -130,3 +130,4 @@ Update=Aktualisieren
 userscripts=Benutzerskripte
 userscripts.get=Benutzerskripte finden
 userscripts.noneInstalled=Sie haben keine Benutzerskripte installiert
+warning.returnfrommain="return" aus dem Haupt-Scope wird normalerweise nicht unterstützt. Sie sollten dies im Benutzerskript beheben.
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index e22ab918..5f3a68b2 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -130,3 +130,4 @@ Update=Update
 userscripts=User Scripts
 userscripts.get=Get user scripts
 userscripts.noneInstalled=You don't have any user scripts installed
+warning.returnfrommain="return" from the main scope is not generally supported. You should fix that in your user script.
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 0b3022d9..8fc7509b 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -130,3 +130,4 @@ Update=Actualizar
 userscripts=Scripts de usuario
 userscripts.get=
 userscripts.noneInstalled=
+warning.returnfrommain=
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 74219d65..507d9290 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -130,3 +130,4 @@ Update=更新
 userscripts=ユーザースクリプト
 userscripts.get=
 userscripts.noneInstalled=
+warning.returnfrommain=
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 18f9d443..07604c93 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -130,3 +130,4 @@ Update=Atualização
 userscripts=Scripts de usuário
 userscripts.get=
 userscripts.noneInstalled=
+warning.returnfrommain=
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 238c0960..03b26b15 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -130,3 +130,4 @@ Update=Обновить
 userscripts=Пользовательские скрипты
 userscripts.get=
 userscripts.noneInstalled=
+warning.returnfrommain=
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 9cd9e7c4..67205918 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -130,3 +130,4 @@ Update=Uppdatera
 userscripts=Användarskript
 userscripts.get=
 userscripts.noneInstalled=
+warning.returnfrommain=

From ba3f1c01a9649b90e52378ea9bde1a6215b790a4 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 00:14:29 +0200
Subject: [PATCH 235/829] Make the nsIContentPolicy blazing fast

And less gc-y
---
 extension/components/scriptish.js             | 50 +++++++++++--------
 .../modules/utils/Scriptish_installUri.js     |  9 ++--
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index ebca5408..d5e55e26 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -222,33 +222,42 @@ ScriptishService.prototype = {
     }
     return;
   },
-
+  _test_org: {
+    "chrome": true,
+    "about": true
+  },
+  _test_cl: {
+    "chrome": true,
+    "resource": true
+  },
+  _reg_userjs: /\.user\.js$/,
   shouldLoad: function(ct, cl, org, ctx, mt, ext) {
-    var tools = {};
-    Cu.import("resource://scriptish/utils/Scriptish_installUri.js", tools);
-
     // block content detection of scriptish by denying it chrome: & resource:
     // content, unless loaded from chrome: or about:
-    if (org && !/^(?:chrome|about)$/.test(org.scheme)
-        && /^(?:chrome|resource)$/.test(cl.scheme) && cl.host == "scriptish") {
+    if (org && !this._test_org[org.scheme]
+        && this._test_cl[cl.scheme]
+        && cl.host == "scriptish") {
       return CP.REJECT_SERVER;
     }
 
-    var ret = CP.ACCEPT;
     // don't intercept anything when Scriptish is not enabled
-    if (!Scriptish.enabled) return ret;
+    if (!Scriptish.enabled) return CP.ACCEPT;
     // don't interrupt the view-source: scheme
-    if ("view-source" == cl.scheme) return ret;
+    if ("view-source" == cl.scheme) return CP.ACCEPT;
 
-    if ((ct == CP.TYPE_DOCUMENT || CP.TYPE_SUBDOCUMENT)
-        && cl.spec.match(/\.user\.js$/)
+    this.ignoreNextScript_ = false;
+
+    // CP.TYPE is not binary, so do not use bitwise logic tricks
+    if ((ct == CP.TYPE_DOCUMENT || ct == CP.TYPE_SUBDOCUMENT)
+        && this._reg_userjs.test(cl.spec)
         && !this.ignoreNextScript_ && !this.isTempScript(cl)) {
-      tools.Scriptish_installUri(cl, ctx.contentWindow);
-      ret = CP.REJECT_REQUEST;
+      this.ignoreNextScript_ = false;
+      this.Scriptish_installUri(cl, ctx.contentWindow);
+      return CP.REJECT_REQUEST;
     }
 
     this.ignoreNextScript_ = false;
-    return ret;
+    return CP.ACCEPT;
   },
 
   shouldProcess: function(ct, cl, org, ctx, mt, ext) CP.ACCEPT,
@@ -258,16 +267,12 @@ ScriptishService.prototype = {
     this.ignoreNextScript_ = true;
   },
 
+  _tmpDir: Services.dirsvc.get("TmpD", Ci.nsILocalFile),
   isTempScript: function(uri) {
-    if (uri.scheme != "file") return false;
-
-    var fph = Cc["@mozilla.org/network/protocol;1?name=file"]
-        .getService(Ci.nsIFileProtocolHandler);
-
-    var file = fph.getFileFromURLSpec(uri.spec);
-    var tmpDir = Services.dirsvc.get("TmpD", Ci.nsILocalFile);
+    if (!(uri instanceof Ci.nsIFileURL)) return false;
 
-    return file.parent.equals(tmpDir) && file.leafName != "newscript.user.js";
+    var file = uri.file;
+    return file.parent.equals(this._tmpDir) && file.leafName != "newscript.user.js";
   },
 
   initScripts: function(url, wrappedContentWin, aCallback) {
@@ -399,5 +404,6 @@ ScriptishService.prototype = {
     }
   }
 }
+Cu.import("resource://scriptish/utils/Scriptish_installUri.js", ScriptishService.prototype);
 
 var NSGetFactory = XPCOMUtils.generateNSGetFactory([ScriptishService]);
diff --git a/extension/modules/utils/Scriptish_installUri.js b/extension/modules/utils/Scriptish_installUri.js
index 7614a48f..e5d8c7a6 100644
--- a/extension/modules/utils/Scriptish_installUri.js
+++ b/extension/modules/utils/Scriptish_installUri.js
@@ -3,8 +3,11 @@ Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/config/configdownloader.js");
 
 function Scriptish_installUri(aURI, aWin) {
-  if (!aWin) aWin = Services.wm.getMostRecentWindow("navigator:browser");
-
   // docs for nsicontentpolicy say we're not supposed to block, so short timer.
-  timeout(function() Scriptish_configDownloader.startInstall(aURI, aWin));
+  timeout(function() {
+    Scriptish_configDownloader.startInstall(
+      aURI,
+      aWin || Services.wm.getMostRecentWindow("navigator:browser")
+      );
+  });
 }

From 313e3cf08a71c5c62424fa6e11f4fba1ac163c31 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 01:07:31 +0200
Subject: [PATCH 236/829] Install should re-get the script.

Security consideration: This is not better or worse than before. A
server might push cache-control anyway.
---
 extension/modules/script/scriptdownloader.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index c6dba185..9d1d16eb 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -25,7 +25,7 @@ function ScriptDownloader(uri, contentWin) {
 }
 ScriptDownloader.prototype.startInstall = function() {
   this.type = "install";
-  this.startDownload();
+  this.startDownload(true);
 }
 ScriptDownloader.prototype.startViewScript = function() {
   this.type = "view";
@@ -38,11 +38,14 @@ ScriptDownloader.prototype.startUpdateScript = function(aScriptInstaller) {
   this.startDownload();
   return this;
 }
-ScriptDownloader.prototype.startDownload = function() {
+ScriptDownloader.prototype.startDownload = function(bypassCache) {
   Scriptish_log("Fetching Script");
   let req = this.req_ = Instances.xhr;
   req.overrideMimeType("text/plain");
   req.open("GET", this.uri_.spec, true);
+  if (bypassCache && (req.channel instanceof Ci.nsIRequest)) {
+    req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE;
+  }
   if (this.secure) {
     // suppress "bad certificate" dialogs and fail on redirects from a bad certificate.
     req.channel.notificationCallbacks =

From a7c4ff555fdcdb203bc1f83767dde77481327cb6 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 01:11:12 +0200
Subject: [PATCH 237/829] Dynamically inserted iframes (frames?) not processed

Wait for location/src-less frames via DOMContentLoaded. Once we receive
that event, push to `docReady` again and synthetisize another
DOMContentLoaded,

Closes #298
---
 extension/components/scriptish.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index d5e55e26..b6df44db 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -108,6 +108,11 @@ ScriptishService.prototype = {
         || (safeWin.frameElement && safeWin.frameElement.src))
         || "";
 
+    if (!href && safeWin.frameElement) {
+      this.waitForFrame(safeWin, chromeWin);
+      return;
+    }
+
     // Show the scriptish install banner if the user is navigating to a .user.js
     // file in a top-level tab.  If the file was previously cached it might have
     // been given a number after .user, like gmScript.user-12.js
@@ -222,6 +227,28 @@ ScriptishService.prototype = {
     }
     return;
   },
+
+  waitForFrame: function(safeWin, chromeWin) {
+    let self = this;
+    safeWin.addEventListener("DOMContentLoaded", function _frame_loader() {
+      // not perfect, but anyway
+      let href = (safeWin.location.href
+          || (safeWin.frameElement && safeWin.frameElement.src))
+          || "";
+
+      if (!href) {
+        return; // wait for it :p
+      }
+      safeWin.removeEventListener("DOMContentLoaded", _frame_loader, false);
+      self.docReady(safeWin, chromeWin);
+
+      // fake DOMContentLoaded to get things rolling
+      var evt = safeWin.document.createEvent("Events");
+      evt.initEvent("DOMContentLoaded", true, true);
+      safeWin.dispatchEvent(evt);
+    }, false);
+  },
+
   _test_org: {
     "chrome": true,
     "about": true

From c1781862b7ae6e59b29ae21ef70e509163c121aa Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 28 Jun 2011 08:58:31 -0500
Subject: [PATCH 238/829] Closes #376 <preferences> should be defined in a
 <prefpane> (cherry picked from commit
 894ca379445c6d1141cfb0ed012961d516cbe8e6)

---
 extension/content/options.xul | 43 +++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index c848301d..906db590 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -12,27 +12,17 @@
     <command id="cmd-change-editor" oncommand="changeEditor()"/>
   </commandset>
 
-  <preferences id="scriptish-preferences">
-    <preference id="pref-cache-enabled" name="extensions.scriptish.cache.enabled" type="bool"/>
-    <preference id="pref-disableNotifications" name="extensions.scriptish.disableNotifications" type="bool"/>
-    <preference id="pref-editor" name="extensions.scriptish.editor" type="unichar"/>
-    <preference id="pref-enableCopyDownloadURL" name="extensions.scriptish.enableCopyDownloadURL" type="bool"/>
-    <preference id="pref-enabledSchemes-about" name="extensions.scriptish.enabledSchemes.about" type="bool"/>
-    <preference id="pref-enabledSchemes-chrome" name="extensions.scriptish.enabledSchemes.chrome" type="bool"/>
-    <preference id="pref-enabledSchemes-data" name="extensions.scriptish.enabledSchemes.data" type="bool"/>
-    <preference id="pref-enabledSchemes-file" name="extensions.scriptish.enabledSchemes.file" type="bool"/>
-    <preference id="pref-enabledSchemes-ftp" name="extensions.scriptish.enabledSchemes.ftp" type="bool"/>
-    <preference id="pref-enabledSchemes-http" name="extensions.scriptish.enabledSchemes.http" type="bool"/>
-    <preference id="pref-enabledSchemes-unmht" name="extensions.scriptish.enabledSchemes.unmht" type="bool"/>
-    <preference id="pref-logChrome" name="extensions.scriptish.logChrome" type="bool"/>
-    <preference id="pref-uninstallPreferences" name="extensions.scriptish.uninstallPreferences" type="bool"/>
-    <preference id="pref-update-requireBuiltInCerts" name="extensions.scriptish.update.requireBuiltInCerts" type="bool"/>
-    <preference id="pref-update-requireSecured" name="extensions.scriptish.update.requireSecured" type="bool"/>
-    <preference id="pref-useDefaultLocale" name="extensions.scriptish.useDefaultLocale" type="bool"/>
-    <preference id="pref-useDownloadURLForUpdateURL" name="extensions.scriptish.useDownloadURLForUpdateURL" type="bool"/>
-  </preferences>
-
   <prefpane id="pane-main" label="options.pane.main" localize="label">
+    <preferences>
+      <preference id="pref-enabledSchemes-http" name="extensions.scriptish.enabledSchemes.http" type="bool"/>
+      <preference id="pref-enabledSchemes-ftp" name="extensions.scriptish.enabledSchemes.ftp" type="bool"/>
+      <preference id="pref-enabledSchemes-data" name="extensions.scriptish.enabledSchemes.data" type="bool"/>
+      <preference id="pref-editor" name="extensions.scriptish.editor" type="unichar"/>
+      <preference id="pref-uninstallPreferences" name="extensions.scriptish.uninstallPreferences" type="bool"/>
+      <preference id="pref-useDownloadURLForUpdateURL" name="extensions.scriptish.useDownloadURLForUpdateURL" type="bool"/>
+      <preference id="pref-enableCopyDownloadURL" name="extensions.scriptish.enableCopyDownloadURL" type="bool"/>
+    </preferences>
+
     <groupbox>
       <caption label="options.enabledSchemes.main" localize="label"/>
       <checkbox preference="pref-enabledSchemes-http" label="options.enabledSchemes.http" localize="label"/>
@@ -71,6 +61,19 @@
   </prefpane>
 
   <prefpane id="pane-advanced" label="options.pane.advanced" localize="label">
+    <preferences>
+      <preference id="pref-cache-enabled" name="extensions.scriptish.cache.enabled" type="bool"/>
+      <preference id="pref-disableNotifications" name="extensions.scriptish.disableNotifications" type="bool"/>
+      <preference id="pref-useDefaultLocale" name="extensions.scriptish.useDefaultLocale" type="bool"/>
+      <preference id="pref-enabledSchemes-file" name="extensions.scriptish.enabledSchemes.file" type="bool"/>
+      <preference id="pref-enabledSchemes-chrome" name="extensions.scriptish.enabledSchemes.chrome" type="bool"/>
+      <preference id="pref-enabledSchemes-unmht" name="extensions.scriptish.enabledSchemes.unmht" type="bool"/>
+      <preference id="pref-enabledSchemes-about" name="extensions.scriptish.enabledSchemes.about" type="bool"/>
+      <preference id="pref-logChrome" name="extensions.scriptish.logChrome" type="bool"/>
+      <preference id="pref-update-requireSecured" name="extensions.scriptish.update.requireSecured" type="bool"/>
+      <preference id="pref-update-requireBuiltInCerts" name="extensions.scriptish.update.requireBuiltInCerts" type="bool"/>
+    </preferences>
+
     <groupbox>
       <caption label="options.cache" localize="label"/>
       <checkbox preference="pref-cache-enabled" label="options.cache.enabled" localize="label"/>

From 656aa1c12bb0980a0a9dd01e533c4c7f7a0d1f19 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 13:08:46 +0200
Subject: [PATCH 239/829] Avoid stat thrashing

Many nsIFile properties will effectively cause a stat() call, e.g.
lastModifiedTime or fileSize.
As scriptish does regularly check these properties, e.g. when loading a
website, the number of stat() calls should be clammed. This commit clams
such calls to 1 in 1000ms.
Together with the previous CachedResource patch, this might greatly
reduce the disk load where it matters, i.e. during high activity loads.
---
 extension/components/scriptish.js  |  4 ---
 extension/modules/script/script.js | 47 +++++++++++++++++++++++-------
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index b6df44db..bb3f27ff 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -20,10 +20,6 @@ const {nsIContentPolicy: CP, nsIDOMXPathResult: XPATH_RESULT} = Ci;
 const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "complete"];
 
 function isScriptRunnable(script, url, topWin) {
-  if (!script.fileExists()) {
-    script.uninstall();
-    return false;
-  }
   let chk = !(!topWin && script.noframes)
       && !script.delayInjection
       && script.enabled
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 7154a5e4..69962d71 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -524,10 +524,13 @@ Script.prototype = {
   get fileURL() Scriptish_getUriFromFile(this._file).spec,
 
   get size() {
-    var size = this._file.fileSize;
-    for each (var r in this._requires) size += r._file.fileSize;
-    for each (var r in this._resources) size += r._file.fileSize;
-    return size;
+    if (!this._size) {
+      var size = this._file.fileSize;
+      for each (var r in this._requires) size += r._file.fileSize;
+      for each (var r in this._resources) size += r._file.fileSize;
+      this._size = size;
+    }
+    return this._size;
   },
 
   getScriptHeader: function(aKey) {
@@ -582,10 +585,30 @@ Script.prototype = {
   get previewURL() Services.io.newFileURI(this._tempFile).spec,
 
   isModified: function() {
-    if (!this.fileExists()) return false;
-    if (this._modified != this._file.lastModifiedTime) {
-      this._modified = this._file.lastModifiedTime;
-      return true;
+    let now = Date.now();
+    if (now - this._isModified_lastcheck < 1000) {
+      // prevent thrashing by stat requests
+      // it can be safely assumed, that a user does not usually change a script
+      // and reload a website more often than once in a second
+      return false;
+    }
+    this._isModified_lastcheck = now;
+
+    try {
+      let lmt = this._file.lastModifiedTime;
+      if (this._modified != lmt) {
+        this._modified = lmt;
+
+        // drop the precomputed size
+        this._size = 0;
+
+        return true;
+      }
+    }
+    catch (ex) {
+      if (!this.fileExists()) {
+        this.uninstallProcess();
+      }
     }
     return false;
   },
@@ -748,7 +771,9 @@ Script.prototype = {
 
     if (Services.pbs.privateBrowsingEnabled) this._downloadURL = null;
 
-    this._modified = this._file.lastModifiedTime;
+    // set up _modified and stat thrashing stuff
+    this.isModified();
+
     this._dependhash = tools.Scriptish_cryptoHash(this._rawMeta);
     return this;
   }
@@ -1157,7 +1182,9 @@ Script.loadFromXML = function(aConfig, aNode) {
     var tools = {};
     Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
 
-    script._modified = script._file.lastModifiedTime;
+    // set up _modified and stat thrashing stuff
+    script.isModified();
+
     var parsedScript = Script.parse(
         aConfig, Scriptish_getContents(script._file),
         script._downloadURL && NetUtil.newURI(script._downloadURL),

From fac6bb4fd98fb7923d573d13a950736e58b2ec96 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 14:28:23 +0200
Subject: [PATCH 240/829] Put the XUL/DOM localization stuff into a module for
 reuse

---
 extension/content/js/options.js               | 32 +-------------
 .../modules/utils/Scriptish_localizeDOM.js    | 42 +++++++++++++++++++
 2 files changed, 44 insertions(+), 30 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_localizeDOM.js

diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index 8c12efc1..7670c179 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -2,6 +2,7 @@
 
 Components.utils.import("resource://scriptish/scriptish.js");
 Components.utils.import("resource://scriptish/logging.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_localizeDOM.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
 function $(aID) document.getElementById(aID);
@@ -18,36 +19,7 @@ function saveExcludes() {
   Scriptish.notify(null, "scriptish-preferences-change", true);
 }
 
-/*
- * Localize XUL elements (as defined by localize-attributes) from a stringbundle
- * @author Nils Maier
- */
-addEventListener("DOMContentLoaded", function localize() {
-  removeEventListener("DOMContentLoaded", localize, false);
-
-  let nodes = document.querySelectorAll("*[localize]");
-  for (let i = 0, e = nodes.length, n; i < e; ++i) {
-    n = nodes[i];
-    let localized = n.getAttribute("localize").split(",");
-    for each (let l in localized) {
-      try {
-        let s = Scriptish_stringBundle(n.getAttribute(l));
-        n.setAttribute(l, s);
-
-        // also localize panes
-        if (/^pane-/.test(n.id)) {
-          n = document.documentElement._selector.querySelector("*[pane=\"" + n.id + "\"]");
-          if (n) {
-            n.setAttribute(l, s);
-          }
-        }
-      }
-      catch (ex) {
-        Scriptish_log("Failed to set localized attribute; l=" + l);
-      }
-    }
-  }
-}, false);
+Scriptish_localizeOnLoad(this);
 
 addEventListener("load", function init() {
   removeEventListener("load", init, false);
diff --git a/extension/modules/utils/Scriptish_localizeDOM.js b/extension/modules/utils/Scriptish_localizeDOM.js
new file mode 100644
index 00000000..5fa02e6c
--- /dev/null
+++ b/extension/modules/utils/Scriptish_localizeDOM.js
@@ -0,0 +1,42 @@
+"use strict";
+
+const EXPORTED_SYMBOLS = ["Scriptish_localizeSubtree", "Scriptish_localizeOnLoad"];
+
+Components.utils.import("resource://scriptish/logging.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_stringbundle.js");
+
+function Scriptish_localizeOnLoad(window) {
+  window.addEventListener("DOMContentLoaded", function localize() {
+    window.removeEventListener("DOMContentLoaded", localize, false);
+
+    Scriptish_localizeSubtree(window.document);
+  }, false);
+}
+
+function Scriptish_localizeSubtree(aNode) {
+  let document = aNode.ownerDocument || aNode;
+  let nodes = aNode.querySelectorAll("*[localize]");
+
+  for (let i = 0, e = nodes.length, n; i < e; ++i) {
+    n = nodes[i];
+    let localized = n.getAttribute("localize").split(",");
+    for each (let l in localized) {
+      try {
+        let s = Scriptish_stringBundle(n.getAttribute(l));
+        n.setAttribute(l, s);
+
+        // also localize pref-panes
+        if (/^pane-/.test(n.id)) {
+          n = document.documentElement._selector.querySelector("*[pane=\"" + n.id + "\"]");
+          if (n) {
+            n.setAttribute(l, s);
+          }
+        }
+      }
+      catch (ex) {
+        Scriptish_log("Failed to set localized attribute; l=" + l);
+      }
+    }
+  }
+
+}

From df7ef22935890ac383d76f8812790b78404f9113 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 14:35:26 +0200
Subject: [PATCH 241/829] Newscript: use a <grid> and Scriptish_localizeDOM

---
 extension/content/js/newscript.js | 13 +++----
 extension/content/newscript.xul   | 57 +++++++++++++++++++------------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 1736f221..5880d8b9 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -1,10 +1,13 @@
 Components.utils.import("resource://scriptish/prefmanager.js");
 Components.utils.import("resource://scriptish/scriptish.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_createUserScriptSource.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_localizeDOM.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
 var $ = function(aID) document.getElementById(aID);
 
+Scriptish_localizeOnLoad(this);
+
 var scriptContent = "";
 try {
   scriptContent = window.arguments[0]
@@ -13,15 +16,7 @@ try {
 } catch(e) {}
 
 window.addEventListener("load", function() {
-  $("scriptish").setAttribute("title", Scriptish_stringBundle("menu.new"));
-  $("scriptish").setAttribute("ondialogaccept", "return doInstall();");
-  $("label-id").setAttribute("value", Scriptish_stringBundle("newscript.id"));
-  $("label-name").setAttribute("value", Scriptish_stringBundle("newscript.name"));
-  $("label-namespace").setAttribute("value", Scriptish_stringBundle("newscript.namespace"));
-  $("label-description").setAttribute("value", Scriptish_stringBundle("newscript.description"));
-  $("label-includes").setAttribute("value", Scriptish_stringBundle("newscript.includes"));
-  $("label-excludes").setAttribute("value", Scriptish_stringBundle("newscript.excludes"));
-  $("label-includes").setAttribute("value", Scriptish_stringBundle("newscript.includes"));
+  $("scriptish").addEventListener("dialogaccept", function() doInstall(), false);
 
   // load defaults
   $("id").value = Scriptish_prefRoot.getValue("newscript_id", "");
diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index 88e1aa15..e0439e66 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -3,27 +3,42 @@
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     id="scriptish"
     buttons="accept,cancel"
-    orient="vertical">
+    orient="vertical"
+    title="menu.new"
+    localize="title"
+    >
   <script type="application/x-javascript" src="chrome://scriptish/content/js/newscript.js" />
 
-  <vbox>
-    <label id="label-id" control="id"/>
-    <textbox id="id"/>
-    <separator class="thin"/>
-    <label id="label-name" control="name"/>
-    <textbox id="name"/>
-    <separator class="thin"/>
-    <label id="label-namespace" control="namespace"/>
-    <textbox id="namespace"/>
-    <separator class="thin"/>
-    <label id="label-description" control="description"/>
-    <textbox id="description"/>
-    <separator class="thin"/>
-    <label id="label-includes" control="includes"/>
-    <textbox id="includes" multiline="true" rows="4" cols="60"/>
-    <separator class="thin"/>
-    <label id="label-excludes" control="excludes"/>
-    <textbox id="excludes" multiline="true" rows="4" cols="60"/>
-    <separator class="thin"/>
-  </vbox>
+  <grid>
+    <columns>
+      <column />
+      <column flex="1"/>
+    </columns>
+    <rows>
+      <row>
+        <label id="label-id" control="id" value="newscript.id" localize="value"/>
+        <textbox id="id"/>
+      </row>
+      <row>
+        <label id="label-name" control="name" value="newscript.name" localize="value"/>
+        <textbox id="name"/>
+      </row>
+      <row>
+        <label id="label-namespace" control="namespace" value="newscript.namespace" localize="value"/>
+        <textbox id="namespace"/>
+      </row>
+      <row>
+        <label id="label-description" control="description" value="newscript.description" localize="value"/>
+        <textbox id="description"/>
+      </row>
+      <row>
+        <label id="label-includes" control="includes" value="newscript.includes" localize="value"/>
+        <textbox id="includes" multiline="true" rows="4" cols="60"/>
+      </row>
+      <row>
+        <label id="label-excludes" control="excludes" value="newscript.excludes" localize="value"/>
+        <textbox id="excludes" multiline="true" rows="4" cols="60"/>
+      </row>
+    </rows>
+  </grid>
 </dialog>

From 017c8f28a7c8a7e51d1a838c9f9be749f8af60ef Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 15:55:50 +0200
Subject: [PATCH 242/829] Newscript: Add a "generate id" button

---
 assets/generate.svg               | 118 ++++++++++++++++++++++++++++++
 extension/content/js/newscript.js |  26 ++++++-
 extension/content/newscript.xul   |   4 +-
 extension/skin/generate.png       | Bin 0 -> 793 bytes
 extension/skin/newscript.css      |   6 ++
 5 files changed, 149 insertions(+), 5 deletions(-)
 create mode 100644 assets/generate.svg
 create mode 100644 extension/skin/generate.png
 create mode 100644 extension/skin/newscript.css

diff --git a/assets/generate.svg b/assets/generate.svg
new file mode 100644
index 00000000..8566d1b9
--- /dev/null
+++ b/assets/generate.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.1 "
+   sodipodi:docname="generate.svg"
+   inkscape:export-filename="C:\Users\MaierMan\workspace\scriptish\assets\generate.png"
+   inkscape:export-xdpi="32"
+   inkscape:export-ydpi="32">
+  <title
+     id="title2999">Generate button (hashtag)</title>
+  <defs
+     id="defs2987">
+    <filter
+       id="filter3246"
+       inkscape:label="Drop shadow"
+       width="1.5"
+       height="1.5"
+       x="-.25"
+       y="-.25">
+      <feGaussianBlur
+         id="feGaussianBlur3248"
+         in="SourceAlpha"
+         stdDeviation="1"
+         result="blur" />
+      <feColorMatrix
+         id="feColorMatrix3250"
+         result="bluralpha"
+         type="matrix"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.45 0 " />
+      <feOffset
+         id="feOffset3252"
+         in="bluralpha"
+         dx="1"
+         dy="1"
+         result="offsetBlur" />
+      <feMerge
+         id="feMerge3254">
+        <feMergeNode
+           id="feMergeNode3256"
+           in="offsetBlur" />
+        <feMergeNode
+           id="feMergeNode3258"
+           in="SourceGraphic" />
+      </feMerge>
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="-3.4876239"
+     inkscape:cy="10.370898"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="878"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Generate button (hashtag)</dc:title>
+        <dc:date>2011/06/28</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Nils Maier</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>CC-0 (Public domain)</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       style="font-size:24.89369774px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#1a1a1a;fill-opacity:1;stroke:none;filter:url(#filter3246);font-family:Sans"
+       id="text2993"
+       transform="matrix(0.85803232,0,0,0.85803232,0.94167533,0.51672597)">
+      <path
+         d="m 13.602795,11.539069 -2.710593,0 L 10.442462,16 l -1.7989588,0 0.4497397,-4.460931 -3.0995571,0 L 5.5439462,16 l -1.7989587,0 0.4497397,-4.460931 -2.5890418,0 0,-1.5801665 2.7470584,0 0.4375845,-4.2542941 -2.5647315,0 0,-1.5801664 2.7227482,0 0.4132743,-4.01119148 1.7746483,0 -0.4011191,4.01119148 3.1117122,0 0.4132743,-4.01119148 1.798959,0 -0.42543,4.01119148 2.613352,0 0,1.5801664 -2.771368,0 -0.42543,4.2542941 2.552577,0 z M 9.2634147,9.9589025 9.6888441,5.7046084 l -3.1117123,0 -0.4254294,4.2542941 z"
+         style="font-variant:normal;font-stretch:normal;fill:#1a1a1a;font-family:Consolas;-inkscape-font-specification:Consolas"
+         id="path2986"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 5880d8b9..961ef0d4 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -1,3 +1,4 @@
+Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/prefmanager.js");
 Components.utils.import("resource://scriptish/scriptish.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_createUserScriptSource.js");
@@ -22,10 +23,27 @@ window.addEventListener("load", function() {
   $("id").value = Scriptish_prefRoot.getValue("newscript_id", "");
   $("namespace").value = Scriptish_prefRoot.getValue("newscript_namespace", "");
 
-  // default the includes with the current page's url
-  var content = window.opener.document.getElementById("content");
-  if (content)
-    $("includes").value = content.selectedBrowser.contentWindow.location.href;
+  (function considerLocation() {
+    if (!window.opener.gBrowser) {
+      return;
+    }
+    let contentLocation = window.opener.gBrowser.selectedBrowser.contentWindow.location;
+    $("includes").value = contentLocation.href;
+    if (!contentLocation.host) {
+      return;
+    }
+    let host = contentLocation.host;
+
+    let generateIdButton = $('generate-id');
+    generateIdButton.hidden = false;
+    generateIdButton.addEventListener("command", function generateId() {
+      let gid = contentLocation.host
+      gid += "-" + Services.uuid.generateUUID().toString().slice(1, -1);
+      gid += "@" + ($("namespace").value || "scriptish").replace(/^@/, "");
+      $("id").value = gid;
+    }, false);
+
+  })();
 }, false);
 
 function doInstall() {
diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index e0439e66..6d86551e 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://scriptish/skin/newscript.css" type="text/css"?>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     id="scriptish"
     buttons="accept,cancel"
@@ -13,11 +13,13 @@
     <columns>
       <column />
       <column flex="1"/>
+      <column />
     </columns>
     <rows>
       <row>
         <label id="label-id" control="id" value="newscript.id" localize="value"/>
         <textbox id="id"/>
+        <toolbarbutton id="generate-id" hidden="true"/>
       </row>
       <row>
         <label id="label-name" control="name" value="newscript.name" localize="value"/>
diff --git a/extension/skin/generate.png b/extension/skin/generate.png
new file mode 100644
index 0000000000000000000000000000000000000000..49520969fa7a069ec763d60879a7e43b86b9ce9c
GIT binary patch
literal 793
zcmV+!1LpjRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H103UQkSaeirbZlh+M`dnha$$63AYyfNbZ>4TC}?4GXmnv`DY~jz
z?EnA(5p+dZbU}4=Xm4@=PHAj&AWdOuWpc7bwI%=n02p*dSad^jWnpw_Z*Cw|X>DZy
zGB7bQFEBPQGB`G>53K+I0xC&FK~y-6Ws@;z6hRb*zc(|xcV|LKcEh>ZA}R_2J291|
z1hlfSwy?9bwY9NIYh#m25epFnL9nv7uuuydE0YVkpdq=v+ufOGkvYAbuY2&`|Nrm*
zXGB$*mWT+@$@Bb%wf5Tn{{9Ydl4aQy=iF`Y{k!3C_+3@o>5k!S3DC9H-gnMD0aBo2
zjJf5U+YTXIn&0``M0N{wM5I*J!zqA>tOJb4<3qs2*?#~cVt_7?0jnZ%UR8eqD?mR2
z_^PT}U>WGf9Yj?T5trxr^)yXCL@_-;RdpPRIwIm!^#stmuD6E6;U`sXT^vyF{hs%J
zJA|;5rs+fP{a5e(d%z?~axaA7+qQjfj5+q+?*XUo#}ouefaN4fHp{Zqe!u?=xBzSv
zMe(yJijTlWU@6Xus-AH)08OvgTLlOq>;e_g7-O;!!a?jSpw-AcJ;4DBz_PXWGC<q5
zzk#gV?Uq1CRgWTj4IBf_RJs5QMNzyEk((mofDSNLRUace2Q;c$hY;Qj27?E{NL6*J
zz&B0v${6#-7_()q-K^_+2RJsyY&hrcG)?ms_y&BA=Q3-ejV$Z^e*g8_+FAo#1=h1H
zdt8>KE-o(K1#+MVSXD(;Pd$iIYhY}QSpg1!BVcT;&7-M5;_bE0e4zOhS`k?R2EYXH
z#+VFfMx)U#;AfX-Q-ITlQB5Y3M<IkNvQgLdQ)}(ZsK_%{GWVTL1l5^g8<X;?`X9g_
X<j4Tz=-5p>00000NkvXXu0mjfY+zHP

literal 0
HcmV?d00001

diff --git a/extension/skin/newscript.css b/extension/skin/newscript.css
new file mode 100644
index 00000000..6bbc307b
--- /dev/null
+++ b/extension/skin/newscript.css
@@ -0,0 +1,6 @@
+@import url(chrome://global/skin/);
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#generate-id {
+  list-style-image: url(generate.png);
+}

From 5463a0e109746462f8a793fb6b887d42f4f9fc7d Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 16:11:42 +0200
Subject: [PATCH 243/829] Newscript: Remove unused <label id>s

---
 extension/content/newscript.xul | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index 6d86551e..955e3121 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -17,28 +17,28 @@
     </columns>
     <rows>
       <row>
-        <label id="label-id" control="id" value="newscript.id" localize="value"/>
+        <label control="id" value="newscript.id" localize="value"/>
         <textbox id="id"/>
         <toolbarbutton id="generate-id" hidden="true"/>
       </row>
       <row>
-        <label id="label-name" control="name" value="newscript.name" localize="value"/>
+        <label control="name" value="newscript.name" localize="value"/>
         <textbox id="name"/>
       </row>
       <row>
-        <label id="label-namespace" control="namespace" value="newscript.namespace" localize="value"/>
+        <label control="namespace" value="newscript.namespace" localize="value"/>
         <textbox id="namespace"/>
       </row>
       <row>
-        <label id="label-description" control="description" value="newscript.description" localize="value"/>
+        <label control="description" value="newscript.description" localize="value"/>
         <textbox id="description"/>
       </row>
       <row>
-        <label id="label-includes" control="includes" value="newscript.includes" localize="value"/>
+        <label control="includes" value="newscript.includes" localize="value"/>
         <textbox id="includes" multiline="true" rows="4" cols="60"/>
       </row>
       <row>
-        <label id="label-excludes" control="excludes" value="newscript.excludes" localize="value"/>
+        <label control="excludes" value="newscript.excludes" localize="value"/>
         <textbox id="excludes" multiline="true" rows="4" cols="60"/>
       </row>
     </rows>

From dbbee273c40787842dce2d828639a3dfef390481 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 16:55:36 +0200
Subject: [PATCH 244/829] createUserScriptSource should support any @key.

Also it should not have to care about what data type a specfic
@key-value and simply support a more generic approach
---
 extension/content/tests/runTests.js           |  9 ++-
 .../testScriptishCreateUserScriptSource.js    | 36 +++++++++
 .../utils/Scriptish_createUserScriptSource.js | 78 +++++++++++--------
 3 files changed, 90 insertions(+), 33 deletions(-)
 create mode 100644 extension/content/tests/testScriptishCreateUserScriptSource.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 82a6aad7..1facbdab 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -9,6 +9,12 @@ QUnit.url = function(params) {
   return "about:scriptish?test" + querystring;
 }
 
+function importModule(m, ctx) {
+  var _ = ctx || {};
+  Cu.import(m, _);
+  return _;
+}
+
 function runTests() {
   var tools = {};
   Q.chain(
@@ -18,9 +24,10 @@ function runTests() {
     function() include("tests/testToolsMenuItem.js"),
     function() include("tests/testIsGMable.js"),
     function() include("tests/testGetConfig.js"),
+    function() include("tests/testScriptishConvert2RegExp.js"),
+    function() include("tests/testScriptishCreateUserScriptSource.js"),
     function() include("tests/testScriptishEnabled.js"),
     function() include("tests/testScriptishUpdateSecurely.js"),
-    function() include("tests/testScriptishConvert2RegExp.js"),
     function() include("tests/testScriptishMemoize.js"),
     function() include("tests/testScriptishLogger.js"),
     function() include("tests/testTimeout.js"),
diff --git a/extension/content/tests/testScriptishCreateUserScriptSource.js b/extension/content/tests/testScriptishCreateUserScriptSource.js
new file mode 100644
index 00000000..fc479f87
--- /dev/null
+++ b/extension/content/tests/testScriptishCreateUserScriptSource.js
@@ -0,0 +1,36 @@
+module("CreateUserScriptSource");
+
+test("check", function() {
+  var _ = importModule("resource://scriptish/utils/Scriptish_createUserScriptSource.js");
+  var src;
+
+  src = _.Scriptish_createUserScriptSource({
+    id: "simple"
+  }, "");
+  src = src.replace(/\r\n/g,"\n");
+  equal(src, "// ==UserScript==\n// @id             simple\n// ==/UserScript==\n");
+
+  src = _.Scriptish_createUserScriptSource({
+    id: "mixed",
+    plain_a: ["a", "b", "c"],
+    mixed_a: [1, 1.2, "foo"],
+    plain: "abc",
+    bool: true,
+    bool_f: false
+  }, "content");
+  src = src.replace(/\r\n/g,"\n");
+  equal(src, "// ==UserScript==\n// @id             mixed\n// @plain_a        a\n// @plain_a        b\n// @plain_a        c\n// @mixed_a        1\n// @mixed_a        1.2\n// @mixed_a        foo\n// @plain          abc\n// @bool\n// ==/UserScript==\n\ncontent\n");
+});
+
+test("invalid ids", function() {
+  var _ = importModule("resource://scriptish/utils/Scriptish_createUserScriptSource.js");
+
+  ok(_.Scriptish_createUserScriptSource({id:"ok"}), "string");
+  raises(function() _.Scriptish_createUserScriptSource({}), "no id");
+  raises(function() _.Scriptish_createUserScriptSource({id: null}), "null");
+  raises(function() _.Scriptish_createUserScriptSource({id: 1}), "int");
+  raises(function() _.Scriptish_createUserScriptSource({id: 1.1}), "float");
+  raises(function() _.Scriptish_createUserScriptSource({id: true}), "bool");
+  raises(function() _.Scriptish_createUserScriptSource({id: undefined}), "undefined");
+  raises(function() _.Scriptish_createUserScriptSource({id: ["abc"]}), "array");
+});
diff --git a/extension/modules/utils/Scriptish_createUserScriptSource.js b/extension/modules/utils/Scriptish_createUserScriptSource.js
index 54f512d9..582925d7 100644
--- a/extension/modules/utils/Scriptish_createUserScriptSource.js
+++ b/extension/modules/utils/Scriptish_createUserScriptSource.js
@@ -4,44 +4,58 @@ Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
 function Scriptish_createUserScriptSource(aHeader, aContent) {
   var script = ["// ==UserScript=="];
-  var tmpAry, val, i;
 
-  if (aHeader.id)
-    script.push("// @id             "+aHeader.id);
-  else
+  function push(k, v) {
+
+    // Arrays
+    if (v.forEach) {
+      for each (let vv in v) {
+        push(k, vv);
+      }
+      return;
+    }
+
+    let pk = k.toString();
+    while (pk.length < 14) {
+      pk += " ";
+    }
+
+    // booleans
+    if (typeof v == "boolean") {
+      if (v) {
+        script.push("// @" + k);
+      }
+      return;
+    }
+
+    // XPCOM URIs
+    if (v instanceof Ci.nsIURI) {
+      v = v.spec;
+    }
+
+    // The rest
+    script.push("// @" + pk + " " + v.toString());
+  }
+
+  if (!aHeader.id || typeof aHeader.id != "string") {
     throw new Error(Scriptish_stringBundle("newscript.noID"));
+  }
+  // push the id first, always
+  push("id", aHeader.id);
+  delete aHeader.id;
 
-  if (aHeader.name)
-    script.push("// @name           "+aHeader.name);
-  else
-    throw new Error(Scriptish_stringBundle("newscript.noName"));
-
-  if (aHeader.namespace)
-    script.push("// @namespace      "+aHeader.namespace);
-
-  if (aHeader.description)
-    script.push("// @description    "+aHeader.description);
-
-  if (aHeader.noframes
-      || (typeof aHeader.noframes == "string" && "" == aHeader.noframes))
-    script.push("// @noframes");
-
-  if (tmpAry = aHeader.matches)
-    for (i = 0; val = tmpAry[i++];)
-      script.push("// @match          "+val);
-
-  if (tmpAry = aHeader.includes)
-    for (i = 0; val = tmpAry[i++];)
-      script.push("// @include        "+val);
-
-  if (tmpAry = aHeader.excludes)
-    for (i = 0; val = tmpAry[i++];)
-      script.push("// @exclude        "+val);
+  for (let [k,v] in Iterator(aHeader)) {
+    push(k, v);
+  }
 
   script.push("// ==/UserScript==");
+  script.push("");
+
+  if (aContent) {
+    script.push(aContent.toString());
+    script.push("");
+  }
 
-  if (aContent)
-    script.push(aContent);
 
   return script.join(Services.appinfo.OS == "WINNT" ? "\r\n" : "\n");
 }

From 922768817eab12b2278348e56de7b981fe53bc7f Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 17:04:26 +0200
Subject: [PATCH 245/829] Newscript: support @author

---
 extension/content/js/newscript.js           | 5 ++++-
 extension/content/newscript.xul             | 4 ++++
 extension/locale/de/scriptish.properties    | 1 +
 extension/locale/en-US/scriptish.properties | 1 +
 extension/locale/es-ES/scriptish.properties | 1 +
 extension/locale/ja-JP/scriptish.properties | 1 +
 extension/locale/pt-BR/scriptish.properties | 1 +
 extension/locale/ru-RU/scriptish.properties | 1 +
 extension/locale/sv-SE/scriptish.properties | 1 +
 9 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 961ef0d4..3d227a04 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -22,6 +22,7 @@ window.addEventListener("load", function() {
   // load defaults
   $("id").value = Scriptish_prefRoot.getValue("newscript_id", "");
   $("namespace").value = Scriptish_prefRoot.getValue("newscript_namespace", "");
+  $("author").value = Scriptish_prefRoot.getValue("newscript_author", "");
 
   (function considerLocation() {
     if (!window.opener.gBrowser) {
@@ -80,8 +81,9 @@ function doInstall() {
     // and fire up the editor!
     tools.Scriptish_openInEditor(script, window);
 
-    // persist namespace value
+    // persist values
     Scriptish_prefRoot.setValue("newscript_namespace", script.namespace);
+    Scriptish_prefRoot.setValue("newscript_author", script.author);
   })
 
   return true;
@@ -93,6 +95,7 @@ function createScriptSource() {
     id: $("id").value,
     name: $("name").value,
     namespace: $("namespace").value,
+    author: $("author").value,
     description: $("description").value,
     includes: $("includes").value ? $("includes").value.match(/.+/g) : [],
     excludes: $("excludes").value ? $("excludes").value.match(/.+/g) : []
diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index 955e3121..7290f774 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -29,6 +29,10 @@
         <label control="namespace" value="newscript.namespace" localize="value"/>
         <textbox id="namespace"/>
       </row>
+      <row>
+        <label control="author" value="newscript.author" localize="value"/>
+        <textbox id="author"/>
+      </row>
       <row>
         <label control="description" value="newscript.description" localize="value"/>
         <textbox id="description"/>
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index faf82ed1..3b25262d 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -62,6 +62,7 @@ menuitem.manage=Benutzerskripte verwalten
 menuitem.new=Neues Benutzerskript
 moving.dependency=Verschiebe Abhängigkeitsdatei von
 moving.script=Verschiebe Benutzerskript von
+newscript.author=Autor
 newscript.description=Beschreibung
 newscript.excludes=Ausnahmen (eine pro Zeile)
 newscript.exists=Ein Benutzerskript mit diesem Namen existiert bereits.\nÜberschreiben?
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 5f3a68b2..ad45585f 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -62,6 +62,7 @@ menuitem.manage=Manage User Scripts
 menuitem.new=New User Script
 moving.dependency=Moving dependency file from
 moving.script=Moving script file from
+newscript.author=Author
 newscript.description=Description
 newscript.excludes=Excludes (One per line)
 newscript.exists=A script with that name is already installed.\nOK to overwrite?
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 8fc7509b..4411f75b 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -62,6 +62,7 @@ menuitem.manage=Gestionar scripts de usuario
 menuitem.new=Nuevo script de usuario
 moving.dependency=
 moving.script=
+newscript.author=
 newscript.description=Descripción
 newscript.excludes=Exclusiones (una por línea)
 newscript.exists=Ya hay instalado un script con ese nombre.\n¿Sobreescribir?
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 507d9290..41358da0 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -62,6 +62,7 @@ menuitem.manage=ユーザースクリプトを管理
 menuitem.new=新たなユーザースクリプト
 moving.dependency=依存関係ファイルを次から移動：
 moving.script=スクリプトを次から移動：
+newscript.author=
 newscript.description=説明
 newscript.excludes=@exclude（スクリプトを実行したくない URL を１行１つずつ列挙）
 newscript.exists=その名前のスクリプトは既にインストールされています。\n上書きしますか？
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 07604c93..5448ca84 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -62,6 +62,7 @@ menuitem.manage=Gerenciar scripts de usuário
 menuitem.new=Novo script de usuário
 moving.dependency=Movendo arquivo de dependência:
 moving.script=Movendo arquivo de script:
+newscript.author=
 newscript.description=Descrição
 newscript.excludes=Exclusões (uma por linha)
 newscript.exists=Um script com esse nome já está instalado.\nDeseja substituir?
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 03b26b15..efb9d890 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -62,6 +62,7 @@ menuitem.manage=Управление скриптами
 menuitem.new=Новый скрипт
 moving.dependency=
 moving.script=
+newscript.author=
 newscript.description=Описание
 newscript.excludes=Исключать страницы (Одно правило на строчку)
 newscript.exists=Скрипт с таким именем уже установлен.\nПерезаписать?
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 67205918..b992822e 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -62,6 +62,7 @@ menuitem.manage=Hantera användarskript
 menuitem.new=Nytt användarskript
 moving.dependency=Flyttar beroendefil från
 moving.script=Flyttar skriptfil från
+newscript.author=
 newscript.description=Beskrivning
 newscript.excludes=Undantagna (ett per rad)
 newscript.exists=Ett skript med samma namn är redan installerat.\nVill du ersätta det?

From 081b88216676ef02b8dc9d8c623bf2106fee851f Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 18:30:13 +0200
Subject: [PATCH 246/829] Scratchpad integration: Make the code comprehensible

Also allow other extensions to check/use `Scratchpad.saveAsUserscript`
---
 extension/content/js/scratchpad.js | 24 ++++++++++--------------
 extension/content/scratchpad.xul   | 13 ++++++++++---
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/extension/content/js/scratchpad.js b/extension/content/js/scratchpad.js
index 428aacae..1897d8df 100644
--- a/extension/content/js/scratchpad.js
+++ b/extension/content/js/scratchpad.js
@@ -1,29 +1,25 @@
-(function(inc, tools) {
+(function(inc, _) {
+  "use strict";
   inc("resource://scriptish/utils/Scriptish_stringBundle.js", tools);
 
   function $(aID) document.getElementById(aID);
 
+  this.saveAsUserscript = function() {
+    let content = $('scratchpad-textbox').value;
+    this.browserWindow.Scriptish_BrowserUIM.newUserScript(content);
+  };
+
   window.addEventListener("DOMContentLoaded", function init() {
     window.removeEventListener("DOMContentLoaded", init, false);
-    // command
-    $("sp-cmd-scriptish-savetouserscript").setAttribute("oncommand",
-        "Scratchpad.browserWindow.Scriptish_BrowserUIM.newUserScript(document.getElementById('scratchpad-textbox').value);");
-
     // key
-    var tmp = $("sp-key-scriptish-savetouserscript")
+    var tmp = $("sp-key-scriptish-saveasuserscript")
     tmp.setAttribute("key",
         tools.Scriptish_stringBundle("scratchpad.saveAsUserScript.ak"));
     tmp.setAttribute("modifiers", "accel");
-    tmp.setAttribute("command", "sp-cmd-scriptish-savetouserscript");
 
     // menuitem
-    tmp = $("sp-menu-scriptish-savetouserscript");
+    tmp = $("sp-cmd-scriptish-saveasuserscript");
     tmp.setAttribute("label",
         tools.Scriptish_stringBundle("scratchpad.saveAsUserScript"));
-    tmp.setAttribute("accesskey",
-        tools.Scriptish_stringBundle("scratchpad.saveAsUserScript.ak"));
-    tmp.setAttribute("key", "sp-key-scriptish-savetouserscript");
-    tmp.setAttribute("command", "sp-cmd-scriptish-savetouserscript");
-    $("sp-menu-filepopup").insertBefore(tmp, $("sp-menu-saveas").nextSibling);
   }, false);
-})(Components.utils.import, {});
+}).call(Scratchpad, Components.utils.import, {});
diff --git a/extension/content/scratchpad.xul b/extension/content/scratchpad.xul
index d6bf7ad1..a1c4ad13 100644
--- a/extension/content/scratchpad.xul
+++ b/extension/content/scratchpad.xul
@@ -5,14 +5,21 @@
   <script type="application/x-javascript" src="chrome://scriptish/content/js/scratchpad.js"/>
 
   <commandset id="sp-commandset">
-    <command id="sp-cmd-scriptish-savetouserscript"/>
+    <command id="sp-cmd-scriptish-saveasuserscript"
+      oncommand="Scratchpad.saveAsUserscript();"/>
   </commandset>
 
   <keyset id="sp-keyset">
-    <key id="sp-key-scriptish-savetouserscript"/>
+    <key id="sp-key-scriptish-saveasuserscript"
+      command="sp-cmd-scriptish-saveasuserscript"
+      />
   </keyset>
 
   <menupopup id="sp-menu-filepopup">
-    <menuitem id="sp-menu-scriptish-savetouserscript"/>
+    <menuitem id="sp-menu-scriptish-saveasuserscript"
+      command="sp-cmd-scriptish-saveasuserscript"
+      key="sp-key-scriptish-saveasuserscript"
+      insertafter="sp-menu-saveas"
+      />
   </menupopup>
 </overlay>

From ee8f36ec04313dbc1a130249ddff164b2f63372a Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 28 Jun 2011 13:34:35 -0500
Subject: [PATCH 247/829] minor fix: tools undefined in scratchpad.js

---
 extension/content/js/scratchpad.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/scratchpad.js b/extension/content/js/scratchpad.js
index 1897d8df..cee9be05 100644
--- a/extension/content/js/scratchpad.js
+++ b/extension/content/js/scratchpad.js
@@ -1,4 +1,4 @@
-(function(inc, _) {
+(function(inc, tools) {
   "use strict";
   inc("resource://scriptish/utils/Scriptish_stringBundle.js", tools);
 

From cadacd0f5a72410e1892953bed1616c8708e3d71 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 28 Jun 2011 13:34:57 -0500
Subject: [PATCH 248/829] minor: adding a semicolon

---
 extension/content/js/newscript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 3d227a04..2d01e03d 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -38,7 +38,7 @@ window.addEventListener("load", function() {
     let generateIdButton = $('generate-id');
     generateIdButton.hidden = false;
     generateIdButton.addEventListener("command", function generateId() {
-      let gid = contentLocation.host
+      let gid = contentLocation.host;
       gid += "-" + Services.uuid.generateUUID().toString().slice(1, -1);
       gid += "@" + ($("namespace").value || "scriptish").replace(/^@/, "");
       $("id").value = gid;

From 0769e83e6ea5a7e4c8e05339c4fbc742310d4004 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 28 Jun 2011 13:56:07 -0500
Subject: [PATCH 249/829] Correcting include/exclude metadata headers in new
 user script creation. Issue introduced by
 dbbee273c40787842dce2d828639a3dfef390481

---
 extension/content/js/newscript.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 2d01e03d..487f958a 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -97,8 +97,8 @@ function createScriptSource() {
     namespace: $("namespace").value,
     author: $("author").value,
     description: $("description").value,
-    includes: $("includes").value ? $("includes").value.match(/.+/g) : [],
-    excludes: $("excludes").value ? $("excludes").value.match(/.+/g) : []
+    include: $("includes").value ? $("includes").value.match(/.+/g) : [],
+    exclude: $("excludes").value ? $("excludes").value.match(/.+/g) : []
   }
   try {
     return Scriptish_createUserScriptSource(header, scriptContent);

From ceb3d6159ee101f3b3397cb6215c7ae8b0e6b817 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 21:29:15 +0200
Subject: [PATCH 250/829] Make gone script disappear after access attempt

---
 extension/modules/script/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 69962d71..e2418a12 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -607,7 +607,7 @@ Script.prototype = {
     }
     catch (ex) {
       if (!this.fileExists()) {
-        this.uninstallProcess();
+        this.uninstall();
       }
     }
     return false;

From fc45a6177b46f6da7dd56d7bf142c2a12df11a36 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 28 Jun 2011 23:34:12 +0200
Subject: [PATCH 251/829] Newscript: Validate that name and id are provided

If no name or id are given, accepting the dialog will fail and the
corresponding fields will be highlighted.
Also, the required fields got a placeholder text now, asking the user to
specifiy the text.

(Note: Not using HTML5 Form validation here, as this does not work
reliably when intermixed with XUL)
---
 extension/content/js/newscript.js           | 25 ++++++++++++++++++++-
 extension/content/newscript.xul             |  4 ++--
 extension/locale/de/scriptish.properties    |  2 ++
 extension/locale/en-US/scriptish.properties |  2 ++
 extension/locale/es-ES/scriptish.properties |  2 ++
 extension/locale/ja-JP/scriptish.properties |  2 ++
 extension/locale/pt-BR/scriptish.properties |  2 ++
 extension/locale/ru-RU/scriptish.properties |  2 ++
 extension/locale/sv-SE/scriptish.properties |  2 ++
 extension/skin/newscript.css                | 16 +++++++++++++
 10 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 487f958a..ae68954c 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -6,6 +6,8 @@ Components.utils.import("resource://scriptish/utils/Scriptish_localizeDOM.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
 var $ = function(aID) document.getElementById(aID);
+var $$ = function(q) document.querySelector(q);
+var $$$ = function(q) document.querySelectorAll(q);
 
 Scriptish_localizeOnLoad(this);
 
@@ -17,7 +19,17 @@ try {
 } catch(e) {}
 
 window.addEventListener("load", function() {
-  $("scriptish").addEventListener("dialogaccept", function() doInstall(), false);
+  $("scriptish").addEventListener("dialogaccept", function(evt) {
+    try {
+      if (doInstall()) {
+        return true;
+      }
+    } catch (e) {}
+
+    evt.preventDefault();
+    evt.stopProgapation();
+    return false;
+  }, false);
 
   // load defaults
   $("id").value = Scriptish_prefRoot.getValue("newscript_id", "");
@@ -48,6 +60,17 @@ window.addEventListener("load", function() {
 }, false);
 
 function doInstall() {
+  // validate some
+  var ok = Array.reduce($$$("*[required]"), function(p,v) {
+    var vok = !!v.value;
+    v.setAttribute("invalid", !vok);
+    return p & vok;
+  }, true);
+
+  if (!ok) {
+    return false;
+  }
+
   var tools = {};
   Components.utils.import("resource://scriptish/utils/Scriptish_openInEditor.js", tools);
   Components.utils.import("resource://scriptish/utils/Scriptish_getTempFile.js", tools);
diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index 7290f774..0950aa86 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -18,12 +18,12 @@
     <rows>
       <row>
         <label control="id" value="newscript.id" localize="value"/>
-        <textbox id="id"/>
+        <textbox id="id" placeholder="newscript.missing.id" localize="placeholder" required="true"/>
         <toolbarbutton id="generate-id" hidden="true"/>
       </row>
       <row>
         <label control="name" value="newscript.name" localize="value"/>
-        <textbox id="name"/>
+        <textbox id="name" placeholder="newscript.missing.name" localize="placeholder" required="true"/>
       </row>
       <row>
         <label control="namespace" value="newscript.namespace" localize="value"/>
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 3b25262d..01a404ce 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -68,6 +68,8 @@ newscript.excludes=Ausnahmen (eine pro Zeile)
 newscript.exists=Ein Benutzerskript mit diesem Namen existiert bereits.\nÜberschreiben?
 newscript.id=ID
 newscript.includes=Einschlüsse (einer pro Zeile)
+newscript.missing.id=Bitte eine ID angeben.
+newscript.missing.name=Bitte einen Namen angeben. Der Name wird im Add-on Manager angezeigt.
 newscript.name=Name
 newscript.namespace=Namensraum
 newscript.noID=Bitte gültige ID für Ihr Benutzerskript angeben.
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index ad45585f..6b044341 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -69,6 +69,8 @@ newscript.exists=A script with that name is already installed.\nOK to overwrite?
 newscript.id=ID
 newscript.includes=Includes (One per line)
 newscript.name=Name
+newscript.missing.id=Please provide an ID.
+newscript.missing.name=Please provide a name. The name will be shown within the add-on manager.
 newscript.namespace=Namespace
 newscript.noID=Please provide a valid ID for your script.
 newscript.noName=Please provide a name for your script.
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 4411f75b..35c025f3 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -68,6 +68,8 @@ newscript.excludes=Exclusiones (una por línea)
 newscript.exists=Ya hay instalado un script con ese nombre.\n¿Sobreescribir?
 newscript.id=ID
 newscript.includes=Inclusiones (Una por línea)
+newscript.missing.id=
+newscript.missing.name=
 newscript.name=Nombre
 newscript.namespace=Espacio de nombres
 newscript.noID=Por favor, introduzca un ID válido para su script.
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 41358da0..3e1ea590 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -68,6 +68,8 @@ newscript.excludes=@exclude（スクリプトを実行したくない URL を１
 newscript.exists=その名前のスクリプトは既にインストールされています。\n上書きしますか？
 newscript.id=
 newscript.includes=@include（スクリプトを実行したい URL を１行１つずつ列挙）
+newscript.missing.id=
+newscript.missing.name=
 newscript.name=名前
 newscript.namespace=名前空間（URI）
 newscript.noID=スクリプトに正しい ID を指定してください
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 5448ca84..8b63db63 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -68,6 +68,8 @@ newscript.excludes=Exclusões (uma por linha)
 newscript.exists=Um script com esse nome já está instalado.\nDeseja substituir?
 newscript.id=Identificador
 newscript.includes=Inclusões (uma por linha)
+newscript.missing.id=
+newscript.missing.name=
 newscript.name=Nome
 newscript.namespace=Espaço de nomes
 newscript.noID=Por favor, informe um identificador válido para o seu script.
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index efb9d890..a035b4b3 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -68,6 +68,8 @@ newscript.excludes=Исключать страницы (Одно правило
 newscript.exists=Скрипт с таким именем уже установлен.\nПерезаписать?
 newscript.id=
 newscript.includes=Включать страницы (Одно правило на строчку)
+newscript.missing.id=
+newscript.missing.name=
 newscript.name=Имя
 newscript.namespace=
 newscript.noID=Пожалуйста, введите идентификатор скрипта
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index b992822e..c9100e38 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -68,6 +68,8 @@ newscript.excludes=Undantagna (ett per rad)
 newscript.exists=Ett skript med samma namn är redan installerat.\nVill du ersätta det?
 newscript.id=ID
 newscript.includes=Inkluderade (ett per rad)
+newscript.missing.id=
+newscript.missing.name=
 newscript.name=Namn
 newscript.namespace=Namnområde
 newscript.noID=Var vänlig ange ett giltigt ID för ditt skript.
diff --git a/extension/skin/newscript.css b/extension/skin/newscript.css
index 6bbc307b..4b645679 100644
--- a/extension/skin/newscript.css
+++ b/extension/skin/newscript.css
@@ -1,5 +1,21 @@
 @import url(chrome://global/skin/);
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+row {
+  /* some more white space, so that the invalid borders don't overlap */
+  margin-bottom: 2px;
+  margin-bottom: 4px;
+}
+
+textbox {
+  margin-left: 1em;
+  min-width: 44em;
+}
+
+*[required][invalid="true"] {
+  box-shadow: 0pt 0pt 1.5px 1px red;
+}
 
 #generate-id {
   list-style-image: url(generate.png);

From 52800cb7bbb7e0112e19104f07b2a7cfcc56b735 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 29 Jun 2011 16:22:18 +0200
Subject: [PATCH 252/829] Newscript: generate-id button should now consume a
 whole column

Also fixes: first instance of the dialog in a session was right-cropped before
due to showing the generate-button only late in the game in a new column
(gecko issue).
---
 extension/content/js/newscript.js | 4 +++-
 extension/content/newscript.xul   | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index ae68954c..637e99a2 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -18,7 +18,9 @@ try {
       .GetString(0);
 } catch(e) {}
 
-window.addEventListener("load", function() {
+addEventListener("DOMContentLoaded", function init() {
+  removeEventListener("DOMContentLoaded", init, false);
+
   $("scriptish").addEventListener("dialogaccept", function(evt) {
     try {
       if (doInstall()) {
diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index 0950aa86..a727a383 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -13,13 +13,14 @@
     <columns>
       <column />
       <column flex="1"/>
-      <column />
     </columns>
     <rows>
       <row>
         <label control="id" value="newscript.id" localize="value"/>
-        <textbox id="id" placeholder="newscript.missing.id" localize="placeholder" required="true"/>
-        <toolbarbutton id="generate-id" hidden="true"/>
+        <hbox>
+          <textbox id="id" placeholder="newscript.missing.id" localize="placeholder" required="true"/>
+          <toolbarbutton id="generate-id" hidden="true"/>
+        </hbox>
       </row>
       <row>
         <label control="name" value="newscript.name" localize="value"/>

From 39d596050f838b1b1af3ce6233c45f96076e455e Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 29 Jun 2011 09:51:33 -0500
Subject: [PATCH 253/829] Don't wrap 'New User Script' includes/excludes to the
 next line.

---
 extension/content/newscript.xul | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index a727a383..ddbcadf2 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -40,11 +40,11 @@
       </row>
       <row>
         <label control="includes" value="newscript.includes" localize="value"/>
-        <textbox id="includes" multiline="true" rows="4" cols="60"/>
+        <textbox id="includes" multiline="true" wrap="off" rows="4" cols="60"/>
       </row>
       <row>
         <label control="excludes" value="newscript.excludes" localize="value"/>
-        <textbox id="excludes" multiline="true" rows="4" cols="60"/>
+        <textbox id="excludes" multiline="true" wrap="off" rows="4" cols="60"/>
       </row>
     </rows>
   </grid>

From 9a4ff7bd6dfc63b80d1cb0fd17e28efe3af630fd Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 29 Jun 2011 09:52:11 -0500
Subject: [PATCH 254/829] Make it easier to add additional @include's to a New
 User Script.

---
 extension/content/js/newscript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 637e99a2..97464894 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -43,7 +43,7 @@ addEventListener("DOMContentLoaded", function init() {
       return;
     }
     let contentLocation = window.opener.gBrowser.selectedBrowser.contentWindow.location;
-    $("includes").value = contentLocation.href;
+    $("includes").value = contentLocation.href + "\n";
     if (!contentLocation.host) {
       return;
     }

From 186a377736440a829e4a6b4a4b15f04ce9857ba5 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 29 Jun 2011 10:07:04 -0500
Subject: [PATCH 255/829] Closes #384 Standardize on 'Add-ons Manager', as that
 is what Mozilla uses. (cherry picked from commit
 86094b14b98bb3ca3b3a0cc5abefdd66068e54ea)

---
 extension/content/options.xul               | 2 +-
 extension/locale/de/scriptish.properties    | 4 ++--
 extension/locale/en-US/scriptish.properties | 4 ++--
 extension/locale/es-ES/scriptish.properties | 2 +-
 extension/locale/ja-JP/scriptish.properties | 2 +-
 extension/locale/pt-BR/scriptish.properties | 2 +-
 extension/locale/ru-RU/scriptish.properties | 2 +-
 extension/locale/sv-SE/scriptish.properties | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index 906db590..15ee5acd 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -47,7 +47,7 @@
     </groupbox>
 
     <groupbox>
-      <caption label="options.addonManager" localize="label"/>
+      <caption label="options.addonsManager" localize="label"/>
       <checkbox preference="pref-enableCopyDownloadURL" label="options.enableCopyDownloadURL" localize="label"/>
     </groupbox>
   </prefpane>
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 01a404ce..b3b26c01 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -69,7 +69,7 @@ newscript.exists=Ein Benutzerskript mit diesem Namen existiert bereits.\nÜbersc
 newscript.id=ID
 newscript.includes=Einschlüsse (einer pro Zeile)
 newscript.missing.id=Bitte eine ID angeben.
-newscript.missing.name=Bitte einen Namen angeben. Der Name wird im Add-on Manager angezeigt.
+newscript.missing.name=Bitte einen Namen angeben. Der Name wird im Add-ons Manager angezeigt.
 newscript.name=Name
 newscript.namespace=Namensraum
 newscript.noID=Bitte gültige ID für Ihr Benutzerskript angeben.
@@ -82,7 +82,7 @@ options.title=Scriptish Einstellungen
 options.pane.main=Allgemein
 options.pane.excludes=Globale Ausnahmen
 options.pane.advanced=Erweitert
-options.addonManager=Add-ons-Manager
+options.addonsManager=Add-ons-Manager
 options.alsoUninstallPrefs=Wenn ein Benutzerskript entfernt wird, dann auch seine Einstellungen entfernen
 options.cache=Cache
 options.cache.enabled=Benutzerskripte zwischenspeichern
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 6b044341..4e0ff4b0 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -70,7 +70,7 @@ newscript.id=ID
 newscript.includes=Includes (One per line)
 newscript.name=Name
 newscript.missing.id=Please provide an ID.
-newscript.missing.name=Please provide a name. The name will be shown within the add-on manager.
+newscript.missing.name=Please provide a name. The name will be shown within the Add-ons Manager.
 newscript.namespace=Namespace
 newscript.noID=Please provide a valid ID for your script.
 newscript.noName=Please provide a name for your script.
@@ -82,7 +82,7 @@ options.title=Scriptish Options
 options.pane.main=Main
 options.pane.excludes=Global Excludes
 options.pane.advanced=Advanced
-options.addonManager=Add-on Manager
+options.addonsManager=Add-ons Manager
 options.alsoUninstallPrefs=When uninstalling a script, also remove its preferences
 options.cache=Cache
 options.cache.enabled=Cache user scripts
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 35c025f3..0b0650c1 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -82,7 +82,7 @@ options.title=
 options.pane.main=
 options.pane.excludes=Exclusiones globales
 options.pane.advanced=
-options.addonManager=Gestor de extensiones
+options.addonsManager=Gestor de extensiones
 options.alsoUninstallPrefs=Al desinstalar un script, borrar también sus preferencias
 options.cache=
 options.cache.enabled=
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 3e1ea590..d0507523 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -82,7 +82,7 @@ options.title=
 options.pane.main=
 options.pane.excludes=
 options.pane.advanced=
-options.addonManager=アドオンマネージャ
+options.addonsManager=アドオンマネージャ
 options.alsoUninstallPrefs=スクリプトをアンインストールする時、その設定も削除する
 options.cache=
 options.cache.enabled=
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 8b63db63..271c109c 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -82,7 +82,7 @@ options.title=
 options.pane.main=
 options.pane.excludes=Exclusões globais
 options.pane.advanced=
-options.addonManager=Gerenciador de complementos
+options.addonsManager=Gerenciador de complementos
 options.alsoUninstallPrefs=Ao desinstalar um script, remover também as suas preferências
 options.cache=
 options.cache.enabled=
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index a035b4b3..6575bfc9 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -82,7 +82,7 @@ options.title=
 options.pane.main=
 options.pane.excludes=Глобальные исключения
 options.pane.advanced=
-options.addonManager=Менеджер Дополнений
+options.addonsManager=Менеджер Дополнений
 options.alsoUninstallPrefs=Удалять также ассоциированные настройки
 options.cache=
 options.cache.enabled=
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index c9100e38..637bb165 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -82,7 +82,7 @@ options.title=
 options.pane.main=
 options.pane.excludes=Globala undantag
 options.pane.advanced=
-options.addonManager=Tilläggshanteraren
+options.addonsManager=Tilläggshanteraren
 options.alsoUninstallPrefs=Vid avinstallation av ett skript, ta även bort dess inställningar
 options.cache=
 options.cache.enabled=

From eb595a00542587148c451c7a196f587972245e96 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 29 Jun 2011 10:29:47 -0500
Subject: [PATCH 256/829] minor change: Use the internal '_run-at' when
 updating from a new script.  Otherwise it will be set to the 'defaultRunAt'
 value.

---
 extension/modules/script/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index e2418a12..3636381c 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -657,7 +657,7 @@ Script.prototype = {
     this._contributors = newScript._contributors;
     this._description = newScript._description;
     this._jsversion = newScript._jsversion;
-    this["_run-at"] = newScript.runAt;
+    this["_run-at"] = newScript["_run-at"];
     this._noframes = newScript._noframes;
     this._version = newScript._version;
 

From 1d83f7f1dd0b621823bb30450ea45f9dfebc6cb0 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 29 Jun 2011 08:45:34 -0700
Subject: [PATCH 257/829] test: clicking the toolbar button to enable/disable

---
 .../tests/testToolbarbutton/testTBB.js        | 61 +++++++++++++++++++
 .../tests/testToolbarbutton/testTBBExists.js  |  4 ++
 2 files changed, 65 insertions(+)
 create mode 100644 tests/mozmill-tests/tests/testToolbarbutton/testTBB.js

diff --git a/tests/mozmill-tests/tests/testToolbarbutton/testTBB.js b/tests/mozmill-tests/tests/testToolbarbutton/testTBB.js
new file mode 100644
index 00000000..9fd56062
--- /dev/null
+++ b/tests/mozmill-tests/tests/testToolbarbutton/testTBB.js
@@ -0,0 +1,61 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Scriptish mozmill test suite.
+ *
+ * The Initial Developer of the Original Code is Erik Vold.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Erik Vold <erikvvold@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+Components.utils.import("resource://scriptish/scriptish.js");
+
+var setupModule = function(module) {
+  module.controller = mozmill.getBrowserController();
+}
+
+// Test that the element with ID 'scriptish-button' can be found.
+var testToolbarButton = function() {
+  var status = Scriptish.enabled;
+  var tbb = (new elementslib.ID(controller.window.document, "scriptish-button"));
+  var tbbm = controller.window.document.getElementById("scriptish-tb-popup");
+  controller.click(tbb);
+  controller.assert(function() (!status == Scriptish.enabled), "Scriptish is disabled");
+  controller.assert(function() (tbbm.state == "closed"), "Menu is closed");
+  controller.click(tbb);
+  controller.assert(function() (status == Scriptish.enabled), "Scriptish is enabled");
+  controller.assert(function() (tbbm.state == "closed"), "Menu is closed");
+  // below this line is WIP.
+  controller.rightClick(tbb);
+  controller.assert(function() (status == Scriptish.enabled), "Scriptish is still enabled");
+  /*controller.waitFor(function() {
+    return (tbbm.state == "open" || tbbm.state == "showing");
+  }, "Menu is open", 500, 2);*/
+};
+
diff --git a/tests/mozmill-tests/tests/testToolbarbutton/testTBBExists.js b/tests/mozmill-tests/tests/testToolbarbutton/testTBBExists.js
index e679b327..94af51d4 100644
--- a/tests/mozmill-tests/tests/testToolbarbutton/testTBBExists.js
+++ b/tests/mozmill-tests/tests/testToolbarbutton/testTBBExists.js
@@ -43,4 +43,8 @@ var testToolbarButtonExists = function() {
   controller.waitFor(function() {
     return (new elementslib.ID(controller.window.document, "scriptish-button")).exists();
   }, "Scriptish toolbar button should be found", 2000);
+
+  controller.waitFor(function() {
+    return (new elementslib.ID(controller.window.document, "scriptish-tb-popup")).exists();
+  }, "Scriptish toolbar button should be found", 2000);
 }

From 2f887727d883e85a1bc3474f9c57fbea4ba5e33a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 29 Jun 2011 18:36:29 +0200
Subject: [PATCH 258/829] Optimize convert2RegExp

This new version is 30%+ (Aurora6) faster and (usually) performs fewer
allocations.
---
 extension/content/tests/runTests.js           |  8 +++
 .../tests/testScriptishConvert2RegExp.js      | 22 +++++---
 .../modules/utils/Scriptish_convert2RegExp.js | 55 +++++--------------
 3 files changed, 37 insertions(+), 48 deletions(-)

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 1facbdab..b4538207 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -15,6 +15,14 @@ function importModule(m, ctx) {
   return _;
 }
 
+function checkExports(m, exports) {
+  deepEqual(
+    Object.keys(importModule(m)),
+    exports,
+    "Correct exports"
+    );
+}
+
 function runTests() {
   var tools = {};
   Q.chain(
diff --git a/extension/content/tests/testScriptishConvert2RegExp.js b/extension/content/tests/testScriptishConvert2RegExp.js
index 00fd5c14..8044a6a4 100644
--- a/extension/content/tests/testScriptishConvert2RegExp.js
+++ b/extension/content/tests/testScriptishConvert2RegExp.js
@@ -1,20 +1,25 @@
-
-Components.utils.import("resource://scriptish/utils/Scriptish_convert2RegExp.js");
-
 module("Scriptish_convert2RegExp");
 
+test("exports", function() {
+  checkExports(
+    "resource://scriptish/utils/Scriptish_convert2RegExp.js",
+    ["Scriptish_convert2RegExp"]
+    );
+});
+
 test("Regular @includes", 5, function() {
+  var c2r = importModule("resource://scriptish/utils/Scriptish_convert2RegExp.js").Scriptish_convert2RegExp;
   var url = "https://google.com/";
-  var regExp = Scriptish_convert2RegExp("https://google.com/*");
+  var regExp = c2r("https://google.com/*");
   equal(
     regExp.toString(),
     "/^https:\\/\\/google\\.com\\/.*$/i",
     "Regular @include"
   );
-  equal(regExp.isTLD, undefined, "should not be a tld");
+  equal(regExp.isTLD, false, "should not be a tld");
   ok(regExp.test(url));
 
-  regExp = Scriptish_convert2RegExp("https?://google.tld/*");
+  regExp = c2r("https?://google.tld/*");
   equal(
     regExp.toString(),
     "/^https\\?:\\/\\/google\\.tld\\/.*$/i",
@@ -24,8 +29,9 @@ test("Regular @includes", 5, function() {
 });
 
 test("Regular Exp @includes", 5, function() {
+  var c2r = importModule("resource://scriptish/utils/Scriptish_convert2RegExp.js").Scriptish_convert2RegExp;
   var url = "http://google.com/";
-  var regExp = Scriptish_convert2RegExp("/https?:\/\/google\\.com\/.*/i");
+  var regExp = c2r("/https?:\/\/google\\.com\/.*/i");
   equal(
     regExp.toString(),
     "/https?:\\/\\/google\\.com\\/.*/i",
@@ -33,7 +39,7 @@ test("Regular Exp @includes", 5, function() {
   );
   ok(regExp.test("http://GOOGLE.COM/"));
 
-  var regExp = Scriptish_convert2RegExp("/https?:\/\/google\\.com\/.*/");
+  var regExp = c2r("/https?:\/\/google\\.com\/.*/");
   equal(
     regExp.toString(),
     "/https?:\\/\\/google\\.com\\/.*/",
diff --git a/extension/modules/utils/Scriptish_convert2RegExp.js b/extension/modules/utils/Scriptish_convert2RegExp.js
index ea3e2a56..848b1fe3 100644
--- a/extension/modules/utils/Scriptish_convert2RegExp.js
+++ b/extension/modules/utils/Scriptish_convert2RegExp.js
@@ -1,49 +1,24 @@
 var EXPORTED_SYMBOLS = ["Scriptish_convert2RegExp"];
 
-// Mighty TLD Check
-const tldChk = new RegExp("^(\\^(?:[^/]*)(?://)?(?:[^/]*))(\\\\\\.tld)((?:/.*)?)$");
+const RE_REGEXP = /^\/(.*)\/(i)?$/;
+const RE_ESCAPE = /[{}()\[\]\\^$.?]/g;
+const RE_WILD = /\*/g;
+const RE_TLD = /^(\^(?:[^\/]*)(?:\/\/)?(?:[^\/]*))(\\\.tld)((?:\/.*)?\$)$/;
 
-// Converts simple pattern notation to a regular expression.
-// thanks AdBlock! http://www.mozdev.org/source/browse/adblock/adblock/
 function Scriptish_convert2RegExp(aPattern, aNoTLD) {
-  var s = aPattern+"";
-  var res = "^";
+  var s = aPattern.toString().trim();
 
-  var regExpChk = /^\/(.*)\/(i)?\n?$/.exec(s);
-  if (regExpChk) return new RegExp(regExpChk[1], regExpChk[2]);
-
-  for (var i = 0 ; i < s.length; i++) {
-    switch(s[i]) {
-      case "*":
-        res += ".*";
-        break;
-      case ".":
-      case "?":
-      case "^":
-      case "$":
-      case "+":
-      case "{":
-      case "}":
-      case "[":
-      case "]":
-      case "|":
-      case "(":
-      case ")":
-      case "\\":
-        res += "\\" + s[i];
-        break;
-      case " ":
-      case "\n":
-        break;
-      default:
-        res += s[i];
-        break;
-    }
+  // Already a regexp?
+  var m = s.match(RE_REGEXP);
+  if (m) {
+    return new RegExp(m[1], m[2]);
   }
 
-  var regExp = new RegExp(res+"$", "i");
-  if (!aNoTLD && tldChk.test(res))
-    regExp.isTLD = true;
-
+  var res = "^" + s
+    .replace(RE_ESCAPE, "\\$&")
+    .replace(RE_WILD, ".*")
+    + "$";
+  var regExp = new RegExp(res, "i");
+  regExp.isTLD = !aNoTLD && RE_TLD.test(res);
   return regExp;
 }

From b658b0cdca14b53bd70e5aaea3defe311a220326 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 29 Jun 2011 09:57:49 -0700
Subject: [PATCH 259/829] test: Scriptish_getTLDURL

---
 extension/content/tests/runTests.js               |  1 +
 extension/content/tests/testScriptishGetTLDURL.js | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 extension/content/tests/testScriptishGetTLDURL.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 1facbdab..d656b0cb 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -27,6 +27,7 @@ function runTests() {
     function() include("tests/testScriptishConvert2RegExp.js"),
     function() include("tests/testScriptishCreateUserScriptSource.js"),
     function() include("tests/testScriptishEnabled.js"),
+    function() include("tests/testScriptishGetTLDURL.js"),
     function() include("tests/testScriptishUpdateSecurely.js"),
     function() include("tests/testScriptishMemoize.js"),
     function() include("tests/testScriptishLogger.js"),
diff --git a/extension/content/tests/testScriptishGetTLDURL.js b/extension/content/tests/testScriptishGetTLDURL.js
new file mode 100644
index 00000000..b7a60a4b
--- /dev/null
+++ b/extension/content/tests/testScriptishGetTLDURL.js
@@ -0,0 +1,14 @@
+
+Components.utils.import("resource://scriptish/utils/Scriptish_getTLDURL.js");
+
+module("Scriptish_getTLDURL");
+
+test("General", 7, function() {
+  equal(Scriptish_getTLDURL("http://erikvold.com"), "http://erikvold.tld/");
+  equal(Scriptish_getTLDURL("http://erikvold.tld"), "http://erikvold.tld/");
+  equal(Scriptish_getTLDURL("http://erikvold.com?test"), "http://erikvold.tld/?test");
+  equal(Scriptish_getTLDURL("http://erikvold.com/"), "http://erikvold.tld/");
+  equal(Scriptish_getTLDURL("http://images.google.com"), "http://images.google.tld/");
+  equal(Scriptish_getTLDURL("https://images.google.com:90/test?a=b"), "https://images.google.tld:90/test?a=b");
+  equal(Scriptish_getTLDURL("http://test.images.google.com/test"), "http://test.images.google.tld/test");
+});

From 82480df244cefdd62b2a4c68c6e7271c8d4beb80 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 29 Jun 2011 12:26:14 -0500
Subject: [PATCH 260/829] Adding a few more availability checks.

---
 extension/content/tests/testAvailability.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/extension/content/tests/testAvailability.js b/extension/content/tests/testAvailability.js
index b98d00a8..e293107c 100644
--- a/extension/content/tests/testAvailability.js
+++ b/extension/content/tests/testAvailability.js
@@ -5,6 +5,7 @@ var tools = {};
 
 (function(Cu) {
 Cu.import("resource://scriptish/constants.js");
+Cu.import("resource://scriptish/utils/q.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_alert.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_convert2RegExp.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_createUserScriptSource.js", tools);
@@ -25,9 +26,11 @@ Cu.import("resource://scriptish/utils/Scriptish_getWindowIDs.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_getWriteStream.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_installUri.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_launchApplicationWithDoc.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_localizeDOM.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_memoize.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_notification.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_openInEditor.js", tools);
+Cu.import("resource://scriptish/utils/Scriptish_openInTab.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js", tools);
 Cu.import("resource://scriptish/third-party/MatchPattern.js", tools);
 Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js", tools);
@@ -41,8 +44,9 @@ test("Scriptish", function() {
   });
 
 test("Utils", function() {
-  expect(24);
+  expect(28);
 
+  equals(typeof(tools.Q), "object", "has Q");
   equals(typeof(tools.Scriptish_alert), "function", "has Scriptish_alert");
   equals(typeof(tools.Scriptish_convert2RegExp), "function", "has Scriptish_convert2RegExp");
   equals(typeof(tools.Scriptish_createUserScriptSource), "function", "has Scriptish_createUserScriptSource");
@@ -63,9 +67,12 @@ test("Utils", function() {
   equals(typeof(tools.Scriptish_getWriteStream), "function", "has Scriptish_getWriteStream");
   equals(typeof(tools.Scriptish_installUri), "function", "has Scriptish_installUri");
   equals(typeof(tools.Scriptish_launchApplicationWithDoc), "function", "has Scriptish_launchApplicationWithDoc");
+  equals(typeof(tools.Scriptish_localizeOnLoad), "function", "has Scriptish_localizeOnLoad");
+  equals(typeof(tools.Scriptish_localizeSubtree), "function", "has Scriptish_localizeSubtree");
   equals(typeof(tools.Scriptish_memoize), "function", "has Scriptish_memoize");
   equals(typeof(tools.Scriptish_notification), "function", "has Scriptish_notification");
   equals(typeof(tools.Scriptish_openInEditor), "function", "has Scriptish_openInEditor");
+  equals(typeof(tools.Scriptish_openInTab), "function", "has Scriptish_openInTab");
   equals(typeof(tools.Scriptish_stringBundle), "function", "has Scriptish_stringBundle");
 });
 

From c608aacf9bedeae02038e00e69959dda2326a806 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 29 Jun 2011 20:34:45 +0200
Subject: [PATCH 261/829] Add functionality to merge patterns into a single
 RegExp

The (somewhat) optimizing pattern merger originates from my work on
DownThemAll! where matching/filtering many thousands of links in a go
against tens or hundreds of patterns is a performance problem.
It could potentially tuned to optimize far more, but you have to weight
"compile" time vs. runtime for patterns.
(The Adblock Plus pattern aatcher would be an alternative, but the
patterns have a (slightly) different syntax, and performance relies on
well-crafted patterns)
regexpmerger.jsm works like this:

- If there just a pattern then return it.
- If there are more patterns then build longest prefix groups (without
  breaking subgroups).
- If the longest prefix group does not contain enough elements then
  break
- Merge the patterns within the longest prefix group and replace them in
  the pattern set with the merge results
- Repeat.

Various tools are build around around regexpmerger.jsm:

- Wrapper functions (Scriptish_mergeRegExps.js) to have a nice
  Scriptish-eque API. Includes a naive merge implementation as a
  fallback should anybody want to drop regexpmerger.jsm again.
- The PatternCollection utility class, that manages patterns and lazily
  merges the patterns once requested and not yet cached.

A first consumer of PatternCollection, and by this pattern merging, is
global exclude management and matching.
---
 extension/content/tests/runTests.js           |   3 +-
 .../content/tests/testPatternCollection.js    |  73 ++++++
 extension/modules/config/config.js            |  30 +--
 .../modules/third-party/regexpmerger.jsm      | 248 ++++++++++++++++++
 extension/modules/utils/PatternCollection.js  |  46 ++++
 .../modules/utils/Scriptish_mergeRegExps.js   |  22 ++
 6 files changed, 400 insertions(+), 22 deletions(-)
 create mode 100644 extension/content/tests/testPatternCollection.js
 create mode 100644 extension/modules/third-party/regexpmerger.jsm
 create mode 100644 extension/modules/utils/PatternCollection.js
 create mode 100644 extension/modules/utils/Scriptish_mergeRegExps.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index b4538207..e8525cbc 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -30,8 +30,9 @@ function runTests() {
     function() include("tests/testCachedResource.js"),
     function() include("tests/testCryptoHash.js"),
     function() include("tests/testToolsMenuItem.js"),
-    function() include("tests/testIsGMable.js"),
     function() include("tests/testGetConfig.js"),
+    function() include("tests/testIsGMable.js"),
+    function() include("tests/testPatternCollection.js"),
     function() include("tests/testScriptishConvert2RegExp.js"),
     function() include("tests/testScriptishCreateUserScriptSource.js"),
     function() include("tests/testScriptishEnabled.js"),
diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
new file mode 100644
index 00000000..e8eb49b6
--- /dev/null
+++ b/extension/content/tests/testPatternCollection.js
@@ -0,0 +1,73 @@
+module("Pattern Collection");
+
+test("exports", function() checkExports(
+    "resource://scriptish/utils/PatternCollection.js",
+    ["PatternCollection"]
+    ));
+
+test("empty", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  equal(pc.test(""), false, "empty");
+  equal(pc.test("foo"), false, "string");
+});
+
+test("plain", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("foo");
+  deepEqual(pc.patterns, ["foo"], "patterns");
+  deepEqual(pc._regs.map(function(e) e.source), ["^foo$"], "regs");
+  equal(pc.merged.source, "^foo$", "merged");
+  equal(pc.test("foo"), true, "foo");
+  equal(pc.test("bar"), false, "bar");
+  equal(pc.test("foobar"), false, "foobar");
+});
+
+test("wild", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("foo*");
+  deepEqual(pc.patterns, ["foo*"], "patterns");
+  deepEqual(pc._regs.map(function(e) e.source), ["^foo.*$"], "regs");
+  equal(pc.merged.source, "^foo.*$", "merged");
+  equal(pc.test("foo"), true, "foo");
+  equal(pc.test("bar"), false, "bar");
+  equal(pc.test("foobar"), true, "foobar");
+});
+
+test("merged", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("foobar*");
+  pc.addPattern("foobaz*");
+  deepEqual(pc.patterns, ["foobar*", "foobaz*"], "patterns");
+  deepEqual(pc._regs.map(function(e) e.source), ["^foobar.*$", "^foobaz.*$"], "regs");
+  equal(pc.merged.source, "^fooba(?:r.*$|z.*$)", "merged");
+  equal(pc.test("foo"), false, "foo");
+  equal(pc.test("fooba"), false, "foobar");
+  equal(pc.test("foobar"), true, "foobar");
+  equal(pc.test("foobar1"), true, "foobar1");
+  equal(pc.test("foobaz2"), true, "foobaz2");
+});
+
+test("merged2", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("foo");
+  pc.addPattern("foobar*");
+  pc.addPattern("foobaz*");
+  deepEqual(pc.patterns, ["foo", "foobar*", "foobaz*"], "patterns");
+  deepEqual(pc._regs.map(function(e) e.source), ["^foo$", "^foobar.*$", "^foobaz.*$"], "regs");
+  equal(pc.merged.source, "^foo(?:$|bar.*$|baz.*$)", "merged");
+  equal(pc.test("foo"), true, "foo");
+  equal(pc.test("fooba"), false, "foobar");
+  equal(pc.test("foobar"), true, "foobar");
+  equal(pc.test("foobar1"), true, "foobar1");
+  equal(pc.test("foobaz2"), true, "foobaz2");
+});
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index de26836d..baa952f3 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -9,11 +9,11 @@ inc("resource://scriptish/constants.js");
 inc("resource://scriptish/logging.js");
 inc("resource://scriptish/prefmanager.js");
 inc("resource://scriptish/scriptish.js");
+inc("resource://scriptish/utils/PatternCollection.js");
 inc("resource://scriptish/utils/Scriptish_getContents.js");
 inc("resource://scriptish/utils/Scriptish_getWriteStream.js");
 inc("resource://scriptish/utils/Scriptish_getProfileFile.js");
 inc("resource://scriptish/utils/Scriptish_stringBundle.js");
-inc("resource://scriptish/utils/Scriptish_convert2RegExp.js");
 inc("resource://scriptish/utils/Scriptish_cryptoHash.js");
 inc("resource://scriptish/third-party/Timer.js");
 inc("resource://scriptish/script/script.js");
@@ -25,8 +25,7 @@ function Config(aBaseDir) {
   this.timer = new Timer();
   this._observers = [];
   this._saveTimer = null;
-  this._excludes = [];
-  this._excludeRegExps = [];
+  this._excludes = new PatternCollection();
   this._scripts = [];
   this._scriptFoldername = aBaseDir;
 
@@ -154,7 +153,7 @@ Config.prototype = {
         Scriptish_getContents(file, 0, function(str) {
           self._blocklist = Instances.json.decode(str);
           self._blocklistHash = Scriptish_cryptoHash(str);
-      
+
           // block scripts
           self._blockScripts();
         });
@@ -409,29 +408,18 @@ Config.prototype = {
     }
   },
 
-  get excludes() this._excludes.concat(),
+  get excludes() this._excludes.patterns,
   set excludes(excludes) {
-    this._excludes = [];
-    this._excludeRegExps = [];
-    this.addExclude(excludes)
-  },
-  get excludeRegExps() this._excludeRegExps.concat(),
-  addExclude: function(excludes) {
-    if (!excludes) return;
-    excludes = (typeof excludes == "string") ? [excludes] : excludes;
-    for (let [, exclude] in Iterator(excludes)) {
-      this._excludes.push(exclude);
-      this._excludeRegExps.push(Scriptish_convert2RegExp(exclude));
-    }
+    this._excludes.clear();
+    this._excludes.addPatterns(excludes);
   },
-
+  addExclude: function(excludes) this._excludes.addPatterns(excludes),
   get scripts() this._scripts.concat(),
   getMatchingScripts: function(testFunc, urls) {
-    var globalExcludes = this._excludeRegExps;
     for (var i = urls.length - 1; ~i; i--) {
-      let url = urls[i];
-      if (globalExcludes.some(function(reg) reg.test(url)))
+      if (this._excludes.test(urls[i])) {
         return [];
+      }
     }
     return this.scripts.filter(testFunc);
   },
diff --git a/extension/modules/third-party/regexpmerger.jsm b/extension/modules/third-party/regexpmerger.jsm
new file mode 100644
index 00000000..474d1c68
--- /dev/null
+++ b/extension/modules/third-party/regexpmerger.jsm
@@ -0,0 +1,248 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is DownThemAll! RegExp optimizing merger
+ *
+ * The Initial Developer of the Original Code is Nils Maier
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Nils Maier <MaierMan@web.de>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+"use strict";
+
+const EXPORTED_SYMBOLS = ['merge'];
+
+const RE_GROUPSTRIP = /\(.*\)/g;
+
+/**
+ * Return a good prefix, with no bracket mismatches
+ *
+ * @param string Calculate the prefix from
+ * @returns {String} Calculated prefix
+ */
+function killInvalidBrackets(string) {
+  let c = 0; // (
+  let C = 0; // [
+  let good = -1; // store last good position
+  for (let i = 0; i < string.length; ++i) {
+    let ch = string[i];
+    if (ch == "\\") {
+      // step over escaping
+      ++i;
+      continue;
+    }
+    if (ch == '(') {
+      if (!C) {
+        // not in a character class []
+        if (!c) {
+          // not open yet
+          good = i - 1;
+        }
+        ++c;
+      }
+      continue
+    }
+    if (ch == ')') {
+      if (!C) {
+        // not in a character class
+        --c;
+        if (c < 0) {
+          // cannot be valid and negative at the same time
+          // At this point the regex would be bad
+          break;
+        }
+        if (!c && !C) {
+          // all closed
+          good = i;
+        }
+      }
+      continue;
+    }
+    if (ch == '[') {
+      if (!C && !c) {
+        // last good (nothing open)
+        good = i - 1;
+      }
+      ++C;
+    }
+    if (ch == ']') {
+      --C;
+      if (C < 0) {
+        // cannot be valid and negative at the same time
+        break;
+      }
+      if (!C && !c) {
+        // all closed now
+        good = i;
+      }
+    }
+  }
+  if (c == 0 && C == 0) {
+    // all closed, use whole string
+    return string;
+  }
+  if (good >= 0) {
+    // something is bad, but we got a good position
+    return string.substring(0, good + 1);
+  }
+  // whole string is invalid
+  return "";
+}
+
+/**
+ * Recursively determine the the largest group with a common prefix
+ * The group is guaranteed to contain at least 3 items
+ *
+ * @param patterns Patterns to process. Must be sorted.
+ * @param low Optional. Low bound. Default = 0
+ * @param high Optional. High bound. Default = patterns.length
+ * @param level Optional. Recursion level. Default = length
+ */
+function largestPrefixGroup(patterns, low, high, level) {
+  level = level || 0;
+  low = low || 0;
+  high = high || patterns.length;
+
+  // split patterns in heading char and tails
+  let heads = patterns.map(function(p) p.charAt(0));
+  let tails = patterns.map(function(p) p.substring(1));
+
+  let besti = -1;
+  let beste = 0;
+  let bestc = 0;
+
+  for (let i = low; i < high - 1; ++i) {
+    let allgood = true;
+    for (let e = i + 1; e < high; ++e) {
+      if (heads[i] == heads[e]) {
+        continue;
+      }
+
+      // mismatched!
+      let c = e - i;
+      if (bestc < c) {
+        bestc = c;
+        beste = e;
+        besti = i;
+      }
+      allgood = false;
+      break;
+    }
+    if (allgood) {
+      let c = high - i;
+      if (bestc < c) {
+        bestc = c;
+        besti = i;
+        beste = high;
+      }
+    }
+  }
+
+  if (bestc < Math.min(4, Math.max(2, patterns.length))) {
+    // at least 3 items in the group are required
+    return [0,0,0];
+  }
+
+  let head = heads[besti];
+
+  if (tails.some(function(p) p.length == 0)) {
+    return [besti, beste, head];
+  }
+  let [nlow, nhigh, np] = largestPrefixGroup(tails, besti, beste, level + 1);
+  if (nhigh) {
+    let rv = head + np;
+    if (!level) {
+      // root level needs to check for bracket mismatches
+      // this might cause the group to get smaller than it has to be
+      // Consumers should/will account for this
+      rv = killInvalidBrackets(rv);
+    }
+    return [nlow, nhigh, rv];
+  }
+  return [besti, beste, head];
+}
+
+/**
+ * Merge prefix group with set of patterns according to bounds and prefix
+ *
+ * @param patterns Set of patterns
+ * @param low Lower bound
+ * @param high Higher bound
+ * @param prefix Prefix of the group
+ */
+function mergePatterns(patterns, low, high, prefix) {
+  let pl = prefix.length;
+  // slice the largest group, and chop of the common prefix
+  let lg = patterns.splice(low, high - low).map(function(p) p.substring(pl));
+  // build a prefix pattern
+  let lgp = lg
+    .map(function(p) {
+      if (p.replace(RE_GROUPSTRIP, '').indexOf('|') == -1) {
+        return p;
+      }
+      return "(?:" + p + ")";
+    })
+    .join("|");
+  if (prefix) {
+    patterns.push(prefix + "(?:" + lgp + ")");
+  }
+  else {
+    patterns.push(lgp);
+  }
+  // need to return sorted as largestPrefixGroup relies on sorting
+  return patterns.sort();
+}
+
+/**
+ * Merge patterns with optimizations (prefixes)
+ * @param patterns Patterns to merge
+ * @returns {String} Resulting merged and optimized pattern
+ */
+function merge(patterns) {
+  patterns = patterns.slice(0).sort();
+  if (patterns.length < 2) {
+    return patterns[0];
+  }
+
+  for (;;) {
+    let [i, e, head] = largestPrefixGroup(patterns);
+    if (!e) {
+      // no common prefix found in (remaining) patterns
+      break;
+    }
+    patterns = mergePatterns(patterns, i, e, head);
+  }
+  if (patterns.length == 1) {
+    // already merge to a single pattern
+    return patterns[0];
+  }
+  // not yet a single pattern (i.e. not all patterns shared a common prefix)
+  // merge without a prefix to get s aingle pattern
+  return mergePatterns(patterns, 0, patterns.length, "")[0];
+}
diff --git a/extension/modules/utils/PatternCollection.js b/extension/modules/utils/PatternCollection.js
new file mode 100644
index 00000000..387df44f
--- /dev/null
+++ b/extension/modules/utils/PatternCollection.js
@@ -0,0 +1,46 @@
+"use strict";
+const EXPORTED_SYMBOLS = ["PatternCollection"];
+
+Components.utils.import("resource://scriptish/utils/Scriptish_convert2RegExp.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_mergeRegExps.js");
+
+function PatternCollection() {
+  this._patterns = [];
+  this._regs = [];
+}
+PatternCollection.prototype = {
+  addPattern: function(pattern) {
+    this._patterns.push(pattern);
+    this._regs.push(Scriptish_convert2RegExp(pattern));
+    this._merged = null;
+  },
+  addPatterns: function(patterns) {
+    if (!patterns.forEach) {
+      this.addPattern(patterns);
+      return;
+    }
+    for (var [,p] in Iterator(patterns)) {
+      this.addPattern(p);
+    }
+  },
+  clear: function() {
+    this._patterns.splice(0);
+    this._regs.splice(0);
+  },
+  get patterns() this._patterns.concat(),
+  get merged() {
+    if (!this._merged) {
+      if (!this._regs.length) {
+        // No patterns -> always test |false|
+        // Do not merge, or we'll create an empty expression
+        // that will always test |true|
+        this._merged = {test: function() false};
+      }
+      else {
+        this._merged = Scriptish_mergeRegExps(this._regs);
+      }
+    }
+    return this._merged;
+  },
+  test: function(s) this.merged.test(s)
+};
diff --git a/extension/modules/utils/Scriptish_mergeRegExps.js b/extension/modules/utils/Scriptish_mergeRegExps.js
new file mode 100644
index 00000000..749f5002
--- /dev/null
+++ b/extension/modules/utils/Scriptish_mergeRegExps.js
@@ -0,0 +1,22 @@
+"use strict";
+const EXPORTED_SYMBOLS = ["Scriptish_mergeRegExpStrings", "Scriptish_mergeRegExps"];
+
+try {
+  Components.utils.import("resource://scriptish/third-party/regexpmerger.jsm");
+}
+catch (ex) {
+  var merge = function merge_naive(patterns) {
+    return patterns
+      .map(function(r) '(?:' + r + ')')
+      .join('|')
+      .replace(/\//g, '\\/');
+  };
+}
+
+function Scriptish_mergeRegExpStrings(strs) {
+  return new RegExp(merge(strs), "i");
+}
+
+function Scriptish_mergeRegExps(regs) {
+  return Scriptish_mergeRegExpStrings([r.source for ([,r] in Iterator(regs))]);
+}

From e00dfa9e03583272dde0ee9fd4322c34b8918588 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 29 Jun 2011 21:29:39 +0200
Subject: [PATCH 262/829] PatternCollection: Properly support Magic TLD domain
 tests

---
 .../content/tests/testPatternCollection.js    | 19 ++++++++++
 extension/modules/utils/PatternCollection.js  | 37 +++++++++++++------
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index e8eb49b6..b6e276d8 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -71,3 +71,22 @@ test("merged2", function() {
   equal(pc.test("foobar1"), true, "foobar1");
   equal(pc.test("foobaz2"), true, "foobaz2");
 });
+
+test("tld", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("http://google.tld/*");
+  pc.addPattern("http://yahoo.tld/*");
+  pc.addPattern("http://bing.com/*");
+  pc.addPattern("http://mozilla.com/*");
+  deepEqual(pc._regs.map(function(e) e.source), ["^http:\\/\\/bing\\.com\\/.*$", "^http:\\/\\/mozilla\\.com\\/.*$"], "regs");
+  deepEqual(pc._regsTLD.map(function(e) e.source), ["^http:\\/\\/google\\.tld\\/.*$", "^http:\\/\\/yahoo\\.tld\\/.*$"], "regsTLD");
+  equal(pc.merged.source, "^http:\\/\\/(?:bing\\.com\\/.*$|mozilla\\.com\\/.*$)", "merged");
+  equal(pc.mergedTLD.source, "^http:\\/\\/(?:google\\.tld\\/.*$|yahoo\\.tld\\/.*$)", "mergedTLD");
+  equal(pc.test("http://mozilla.com/"), true, "moco");
+  equal(pc.test("http://mozilla.org/"), false, "mofo");
+  equal(pc.test("http://google.de/"), true, "g.de");
+  equal(pc.test("http://google.com/"), true, "g.com");
+  equal(pc.test("http://google.co.uk/"), true, "g.co.uk");
+});
diff --git a/extension/modules/utils/PatternCollection.js b/extension/modules/utils/PatternCollection.js
index 387df44f..6c6e56df 100644
--- a/extension/modules/utils/PatternCollection.js
+++ b/extension/modules/utils/PatternCollection.js
@@ -2,17 +2,20 @@
 const EXPORTED_SYMBOLS = ["PatternCollection"];
 
 Components.utils.import("resource://scriptish/utils/Scriptish_convert2RegExp.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_getTLDURL.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_mergeRegExps.js");
 
 function PatternCollection() {
   this._patterns = [];
   this._regs = [];
+  this._regsTLD = [];
 }
 PatternCollection.prototype = {
   addPattern: function(pattern) {
     this._patterns.push(pattern);
-    this._regs.push(Scriptish_convert2RegExp(pattern));
-    this._merged = null;
+    var r = Scriptish_convert2RegExp(pattern);
+    (r.isTLD ? this._regsTLD : this._regs).push(r);
+    this._merged = this._mergedTLD = null;
   },
   addPatterns: function(patterns) {
     if (!patterns.forEach) {
@@ -26,21 +29,31 @@ PatternCollection.prototype = {
   clear: function() {
     this._patterns.splice(0);
     this._regs.splice(0);
+    this._regsTLD.splice(0);
+    this._merged = this._mergedTLD = null;
   },
   get patterns() this._patterns.concat(),
+  _merge: function(regs) {
+    if (!regs.length) {
+      // No patterns -> always test |false|
+      // Do not merge, or we'll create an empty expression
+      // that will always test |true|
+      return {test: function() false};
+    }
+    return Scriptish_mergeRegExps(regs);
+  },
   get merged() {
     if (!this._merged) {
-      if (!this._regs.length) {
-        // No patterns -> always test |false|
-        // Do not merge, or we'll create an empty expression
-        // that will always test |true|
-        this._merged = {test: function() false};
-      }
-      else {
-        this._merged = Scriptish_mergeRegExps(this._regs);
-      }
+      this._merged = this._merge(this._regs);
     }
     return this._merged;
   },
-  test: function(s) this.merged.test(s)
+  get mergedTLD() {
+    if (!this._mergedTLD) {
+      this._mergedTLD = this._merge(this._regsTLD);
+    }
+    return this._mergedTLD;
+  },
+  test: function(url) this.merged.test(url) ||
+    (!!this._regsTLD.length && this.mergedTLD.test(Scriptish_getTLDURL(url)))
 };

From b3c0b1ca9c2308c9ebe08fa72e8f7af47d6cbdb9 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 29 Jun 2011 21:35:17 +0200
Subject: [PATCH 263/829] PatternCollection: test .clear()

---
 .../content/tests/testPatternCollection.js    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index b6e276d8..ca7616a3 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -90,3 +90,24 @@ test("tld", function() {
   equal(pc.test("http://google.com/"), true, "g.com");
   equal(pc.test("http://google.co.uk/"), true, "g.co.uk");
 });
+
+test("clear", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("http://google.tld/*");
+  pc.addPattern("http://yahoo.tld/*");
+  pc.addPattern("http://bing.com/*");
+  pc.addPattern("http://mozilla.com/*");
+  equal(pc.merged.source, "^http:\\/\\/(?:bing\\.com\\/.*$|mozilla\\.com\\/.*$)", "merged");
+  equal(pc.mergedTLD.source, "^http:\\/\\/(?:google\\.tld\\/.*$|yahoo\\.tld\\/.*$)", "mergedTLD");
+  pc.clear();
+  deepEqual(pc.patterns, [], "cleared patterns");
+  deepEqual(pc._regs, [], "cleared regs");
+  deepEqual(pc._regsTLD, [], "cleared regs");
+  equal(pc._merged, null, "cleared _merge");
+  equal(pc._mergedTLD, null, "cleared _mergeTLD");
+  equal(pc.merged.source, undefined, "cleared merged");
+  equal(pc.mergedTLD.source, undefined, "cleared mergedTLD");
+  equal(pc.test("http://mozilla.com/"), false, "no matches");
+});

From 1cd8c7bbbc232a7dabf3e3a8a0e8d428b248a0b3 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 29 Jun 2011 22:13:11 +0200
Subject: [PATCH 264/829] Make Script includes/excludes use PatternCollection

---
 extension/modules/script/script.js | 88 +++++++++++++++---------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 3636381c..3d64e887 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -8,6 +8,7 @@ Cu.import("resource://scriptish/constants.js");
 Cu.import("resource://scriptish/prefmanager.js");
 Cu.import("resource://scriptish/logging.js");
 Cu.import("resource://scriptish/scriptish.js");
+Cu.import("resource://scriptish/utils/PatternCollection.js");
 Cu.import("resource://scriptish/utils/Scriptish_getUriFromFile.js");
 Cu.import("resource://scriptish/utils/Scriptish_getContents.js");
 Cu.import("resource://scriptish/utils/Scriptish_getTLDURL.js");
@@ -72,13 +73,11 @@ function Script(config) {
   this._enabled = true;
   this.needsUninstall = false;
   this.domains = [];
-  this._includes = [];
-  this._excludes = [];
+  this._includes = new PatternCollection();
+  this._excludes = new PatternCollection();
   this._matches = [];
-  this._includeRegExps = [];
-  this._excludeRegExps = [];
-  this.user_includes = [];
-  this.user_excludes = [];
+  this._user_includes = new PatternCollection();
+  this._user_excludes = new PatternCollection();
   this._delay = null;
   this.priority = 0;
   this._requires = [];
@@ -321,23 +320,17 @@ Script.prototype = {
   },
 
   matchesURL: function(aURL) {
-    function testI(regExp) (
-        (regExp.isTLD) ? regExp.test(Scriptish_getTLDURL(aURL)) : regExp.test(aURL));
-    function testII(aMatchPattern) aMatchPattern.doMatch(aURL);
-
     // check if the domain is ok
     if (!this.matchesDomain(aURL)) return false;
 
     // check if script @includes/@excludes are disabled
     if (this.includesDisabled)
-      return this._user_includeRegExps.some(testI)
-          && !this._user_excludeRegExps.some(testI);
-
-    let includes = this._user_includeRegExps.concat(this._includeRegExps);
-    let excludes = this._user_excludeRegExps.concat(this._excludeRegExps);
+      return this._user_includes.test(aURL)
+          && !this._user_excludes.test(aURL);
 
-    return (includes.some(testI) || this._matches.some(testII))
-        && !excludes.some(testI);
+    return this._all_includes.test(aURL)
+      || this._matches.some(function(m) m.doMatch(aURL))
+      && !this._excludes.test(aURL);
   },
 
   get id() {
@@ -413,35 +406,44 @@ Script.prototype = {
     this._delay = ((val || val === 0) && val > 0) ? val : null;
   },
 
-  get includes() this._includes.concat(),
-  get excludes() this._excludes.concat(),
-  get user_includes() this._user_includes.concat(),
-  getUserIncStr: function(type) this["_user_" + (type || "include") + "s"].join("\n"),
-  get user_excludes() this._user_excludes.concat(),
+  get includes() this._includes.patterns,
+  get excludes() this._excludes.patterns,
+  get user_includes() this._user_includes.patterns,
+  get user_excludes() this._user_excludes.patterns,
+  getUserIncStr: function(type) this["_user_" + (type || "include") + "s"].patterns.join("\n"),
   set user_includes(aPatterns) {
-    this._user_includes = [];
-    this._user_includeRegExps = [];
-    this.addInclude(aPatterns, true)
+    this._user_includes.clear();
+    this.addInclude(aPatterns, true);
   },
   set user_excludes(aPatterns) {
-    this._user_excludes = [];
-    this._user_excludeRegExps = [];
+    this._user_excludes.clear();
     this.addExclude(aPatterns, true)
   },
   get matches() this._matches.concat(),
-  addInclude: function(aPattern, aUserVal) (
-    this.addPattern(((aUserVal) ? "_user" : "") + "_include", aPattern)),
-  addExclude: function(aPattern, aUserVal) (
-    this.addPattern(((aUserVal) ? "_user" : "") + "_exclude", aPattern)),
-  addPattern: function(aPrefix, aPattern) {
-    if (!aPattern) return;
-    var patterns = (typeof aPattern == "string") ? [aPattern] : aPattern;
-    for (let [, pattern] in Iterator(patterns)) {
-      this[aPrefix + "s"].push(pattern);
-      this[aPrefix + "RegExps"].push(Scriptish_convert2RegExp(pattern));
+  addInclude: function(aPattern, aUserVal) {
+    this[aUserVal ? "_user_includes" : "_includes"].addPatterns(aPattern);
+    this.__all_includes = null;
+  },
+  addExclude: function(aPattern, aUserVal) {
+    this[aUserVal ? "_user_excludes" : "_excludes"].addPatterns(aPattern);
+    this.__all_excludes = null;
+  },
+  get _all_includes() {
+    if (!this.__all_includes) {
+      this.__all_includes = new PatternCollection();
+      this.__all_includes.addPatterns(this._includes.patterns);
+      this.__all_includes.addPatterns(this._user_includes.patterns);
     }
+    return this.__all_includes;
+  },
+  get _all_excludes() {
+    if (!this.__all_excludes) {
+      this.__all_excludes = new PatternCollection();
+      this.__all_excludes.addPatterns(this._excludes.patterns);
+      this.__all_excludes.addPatterns(this._user_excludes.patterns);
+    }
+    return this.__all_excludes;
   },
-
   get requires() this._requires.concat(),
   get resources() this._resources.concat(),
   get noframes() this._noframes,
@@ -641,8 +643,6 @@ Script.prototype = {
     this.domains = newScript.domains;
     this._includes = newScript._includes;
     this._excludes = newScript._excludes;
-    this._includeRegExps = newScript._includeRegExps;
-    this._excludeRegExps = newScript._excludeRegExps;
     this._matches = newScript._matches;
     this._delay = newScript._delay;
     this.priority = newPriority;
@@ -706,11 +706,11 @@ Script.prototype = {
   toJSON: function() ({
     contributors: this._contributors,
     domains: this.domains,
-    includes: this._includes,
-    excludes: this._excludes,
+    includes: this._includes.patterns,
+    excludes: this._excludes.patterns,
     matches: this._matches.map(function(match) match.pattern),
-    user_includes: this._user_includes,
-    user_excludes: this._user_excludes,
+    user_includes: this._user_includes.patterns,
+    user_excludes: this._user_excludes.patterns,
     screenshots: this._screenshots.map(function(screenshot) ({
       url: screenshot.url,
       thumbnailURL: screenshot.thumbnailURL

From 76482a2a79520c5ead234509487f6984ed8168b6 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 29 Jun 2011 22:24:08 +0200
Subject: [PATCH 265/829] Remove now unused modules from imports

---
 extension/modules/script/script.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 3d64e887..c904e174 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -11,8 +11,6 @@ Cu.import("resource://scriptish/scriptish.js");
 Cu.import("resource://scriptish/utils/PatternCollection.js");
 Cu.import("resource://scriptish/utils/Scriptish_getUriFromFile.js");
 Cu.import("resource://scriptish/utils/Scriptish_getContents.js");
-Cu.import("resource://scriptish/utils/Scriptish_getTLDURL.js");
-Cu.import("resource://scriptish/utils/Scriptish_convert2RegExp.js");
 Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 Cu.import("resource://scriptish/script/cachedresource.js");
 Cu.import("resource://scriptish/script/scriptinstaller.js");

From 4960e217f99626faf862e1d490fc13f33d26d316 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 29 Jun 2011 20:17:36 -0700
Subject: [PATCH 266/829] <em:version>0.1.2</em:version>

---
 extension/install.rdf |  2 +-
 update.rdf            | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 0945110d..66d17645 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -28,7 +28,7 @@
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
-    <em:version>0.1.2pre</em:version>
+    <em:version>0.1.2</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://github.com/erikvold/scriptish</em:homepageURL>
diff --git a/update.rdf b/update.rdf
index bc44386e..8342e2a3 100644
--- a/update.rdf
+++ b/update.rdf
@@ -6,23 +6,23 @@
       <RDF:Seq>
         <RDF:li>
           <RDF:Description>
-            <em:version>0.1.1</em:version>
+            <em:version>0.1.2</em:version>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-                <em:minVersion>4.0b5pre</em:minVersion>
+                <em:minVersion>4.0</em:minVersion>
                 <em:maxVersion>7.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.xpi</em:updateLink>
-                <em:updateHash>sha1:3f04004e1785cb19de68281788649f5bf88ef838</em:updateHash>
+                <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.2.xpi</em:updateLink>
+                <em:updateHash>sha1:66d989425a66c23d5fde71bd347f3eeabdf08150</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
                 <em:minVersion>2.1a3</em:minVersion>
-                <em:maxVersion>2.1.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.xpi</em:updateLink>
-                <em:updateHash>sha1:3f04004e1785cb19de68281788649f5bf88ef838</em:updateHash>
+                <em:maxVersion>2.2.*</em:maxVersion>
+                <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.2.xpi</em:updateLink>
+                <em:updateHash>sha1:66d989425a66c23d5fde71bd347f3eeabdf08150</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
           </RDF:Description>
@@ -30,6 +30,6 @@
       </RDF:Seq>
     </em:updates>
 
-    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAAPzS8oVq4PiKYgoFiNxBx2ycYzP1XcBU9M1X2oEosvE3T6d1660ooRRRt88dzZOSfGWvq5s9ebD6v5QF7m7/PvxSHzWDY/Sp08kV6oqWz+k7Y+88qg9Nbr0cyqUT3KBE5LOlpgaSiuh4f2ujlyHrsft/p5gThtNgOPfVR72JI3G</em:signature>
+    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAKZ2vuVHpL2Fi82I4J6hQhX94lreD6FClbs9aeTusEfmYO2vuyXeiCPhppLNSL0sLu1lCaAx078AR9oGaCN/h5dtAZcYb9t7DUnutTrjPRrSEiQCqkCM44tky5NffQmWw+wavzRmIHiem2DJdXo1y1RLOqTBvmNUGheU4iHSDtF7</em:signature>
   </RDF:Description>
 </RDF:RDF>

From 70b8c954a5ce162d7b71f0d2e42fad8238d88eca Mon Sep 17 00:00:00 2001
From: zbinlin <zbinlin@gmail.com>
Date: Wed, 29 Jun 2011 21:47:06 -0700
Subject: [PATCH 267/829] Edited
 extension/modules/utils/Scriptish_localizeDOM.js via GitHub

---
 extension/modules/utils/Scriptish_localizeDOM.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/utils/Scriptish_localizeDOM.js b/extension/modules/utils/Scriptish_localizeDOM.js
index 5fa02e6c..bc50c864 100644
--- a/extension/modules/utils/Scriptish_localizeDOM.js
+++ b/extension/modules/utils/Scriptish_localizeDOM.js
@@ -3,7 +3,7 @@
 const EXPORTED_SYMBOLS = ["Scriptish_localizeSubtree", "Scriptish_localizeOnLoad"];
 
 Components.utils.import("resource://scriptish/logging.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringbundle.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
 function Scriptish_localizeOnLoad(window) {
   window.addEventListener("DOMContentLoaded", function localize() {

From 2747ce4a5e8196c7d7a89820e250bfedb134c990 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 29 Jun 2011 22:24:34 -0700
Subject: [PATCH 268/829] <em:version>0.1.3a1pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 66d17645..58dedfcf 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -28,7 +28,7 @@
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
-    <em:version>0.1.2</em:version>
+    <em:version>0.1.3a1pre</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://github.com/erikvold/scriptish</em:homepageURL>

From 9157972ad18de5fa41817c41d6b7e8bce37b2364 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 30 Jun 2011 00:22:47 -0700
Subject: [PATCH 269/829] Closes #253 use pop up notification for after install
 notification

---
 extension/modules/addonprovider.js            | 25 ++++++++++++++--
 .../modules/utils/Scriptish_notification.js   |  2 +-
 .../utils/Scriptish_popupNotification.js      | 30 +++++++++++++++++++
 extension/skin/browser.css                    |  4 +++
 4 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_popupNotification.js

diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index e7f1bff2..2620892e 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -3,6 +3,7 @@ Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/scriptish.js");
 Components.utils.import("resource://scriptish/logging.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_notification.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_popupNotification.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
 const Scriptish_ScriptProvider = {
@@ -18,7 +19,17 @@ const Scriptish_ScriptProvider = {
       var msg = "'" + script.name;
       if (script.version) msg += " " + script.version;
       msg += "' " + Scriptish_stringBundle("statusbar.installed");
-      Scriptish_notification(msg, null, null, function() Scriptish.openManager());
+      var callback = function() Scriptish.openManager();
+
+      Scriptish_popupNotification({
+        id: "scriptish-install-popup-notification",
+        message: msg,
+        mainAction: {
+          label: "Open User Scripts Manager",
+          accessKey: "O",
+          callback: callback
+        }
+      });
       break;
     case "scriptish-script-edit-enabling":
       AddonManagerPrivate.callAddonListeners(
@@ -42,7 +53,17 @@ const Scriptish_ScriptProvider = {
       msg += "' " + (("scriptish-script-updated" == aTopic)
           ? Scriptish_stringBundle("statusbar.updated")
           : Scriptish_stringBundle("statusbar.modified"));
-      Scriptish_notification(msg, null, null, function() Scriptish.openManager());
+      var callback = function() Scriptish.openManager();
+
+      Scriptish_popupNotification({
+        id: "scriptish-install-popup-notification",
+        message: msg,
+        mainAction: {
+          label: "Open User Scripts Manager",
+          accessKey: "O",
+          callback: callback
+        }
+      });
       break;
     case "scriptish-script-uninstalling":
       AddonManagerPrivate.callAddonListeners("onUninstalling", script, false);
diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index bba572a6..e29f4059 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -16,7 +16,7 @@ function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
         aIconURL || "chrome://scriptish/skin/scriptish32.png",
         aTitle || "Scriptish", aMsg+"", !!callback, "", callback || null);
     } catch (e) {}
-  }, 0);
+  });
 };
 
 function Observer(aCallback) {
diff --git a/extension/modules/utils/Scriptish_popupNotification.js b/extension/modules/utils/Scriptish_popupNotification.js
new file mode 100644
index 00000000..c4f55cf9
--- /dev/null
+++ b/extension/modules/utils/Scriptish_popupNotification.js
@@ -0,0 +1,30 @@
+
+var EXPORTED_SYMBOLS = ["Scriptish_popupNotification"];
+Components.utils.import("resource://scriptish/constants.js");
+Components.utils.import("resource://scriptish/scriptish.js");
+Components.utils.import("resource://scriptish/prefmanager.js");
+Components.utils.import("resource://scriptish/logging.js");
+Components.utils.import("resource://gre/modules/PopupNotifications.jsm");
+
+function Scriptish_popupNotification(options) {
+  if (Scriptish_prefRoot.getValue("disableNotifications"))
+    return Scriptish_log(aMsg);
+
+  timeout(function() {
+      var win = Scriptish.getMostRecentWindow();
+      win.PopupNotifications.show(
+        win.gBrowser.selectedBrowser,
+        options.id,
+        options.message,
+        null, /* anchor ID */
+        {
+          label: options.mainAction.label,
+          accessKey: options.mainAction.accessKey,
+          callback: function() {
+            options.mainAction.callback();
+          }
+        },
+        null  /* secondary action */
+      );
+  });
+};
diff --git a/extension/skin/browser.css b/extension/skin/browser.css
index 22d4ed9f..5b3648c1 100644
--- a/extension/skin/browser.css
+++ b/extension/skin/browser.css
@@ -14,3 +14,7 @@ toolbar[iconsize="small"] #scriptish-button {
 toolbar[iconsize="small"] #scriptish-button[scriptish-disabled] {
 	list-style-image: url("chrome://scriptish/skin/scriptish16_disabled.png");
 }
+
+.popup-notification-icon[popupid="scriptish-install-popup-notification"] {
+  list-style-image: url("chrome://scriptish/skin/scriptish64.png");
+}

From 26a0c58d16a994d8e36b9cb10267e8b6d675bdc9 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 30 Jun 2011 15:56:34 +0200
Subject: [PATCH 270/829] Test PatternCollection: correct messages
 s/foobar/fooba/

---
 extension/content/tests/testPatternCollection.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index ca7616a3..223f1a75 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -49,7 +49,7 @@ test("merged", function() {
   deepEqual(pc._regs.map(function(e) e.source), ["^foobar.*$", "^foobaz.*$"], "regs");
   equal(pc.merged.source, "^fooba(?:r.*$|z.*$)", "merged");
   equal(pc.test("foo"), false, "foo");
-  equal(pc.test("fooba"), false, "foobar");
+  equal(pc.test("fooba"), false, "fooba");
   equal(pc.test("foobar"), true, "foobar");
   equal(pc.test("foobar1"), true, "foobar1");
   equal(pc.test("foobaz2"), true, "foobaz2");
@@ -66,7 +66,7 @@ test("merged2", function() {
   deepEqual(pc._regs.map(function(e) e.source), ["^foo$", "^foobar.*$", "^foobaz.*$"], "regs");
   equal(pc.merged.source, "^foo(?:$|bar.*$|baz.*$)", "merged");
   equal(pc.test("foo"), true, "foo");
-  equal(pc.test("fooba"), false, "foobar");
+  equal(pc.test("fooba"), false, "fooba");
   equal(pc.test("foobar"), true, "foobar");
   equal(pc.test("foobar1"), true, "foobar1");
   equal(pc.test("foobaz2"), true, "foobaz2");

From 08e3bc99677c9b1a965cd97a3a20d9c997a71cfa Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 30 Jun 2011 15:58:25 +0200
Subject: [PATCH 271/829] Fix excludes not correctly considered

---
 extension/modules/script/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index c904e174..2f848a5d 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -326,8 +326,8 @@ Script.prototype = {
       return this._user_includes.test(aURL)
           && !this._user_excludes.test(aURL);
 
-    return this._all_includes.test(aURL)
-      || this._matches.some(function(m) m.doMatch(aURL))
+    return (this._all_includes.test(aURL)
+      || this._matches.some(function(m) m.doMatch(aURL)))
       && !this._excludes.test(aURL);
   },
 

From 73cf6041a5e13206c644c4628d1dbb56eb82824c Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 30 Jun 2011 16:00:44 +0200
Subject: [PATCH 272/829] addIncludes, etc. supports array arguments

---
 extension/modules/script/script.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 2f848a5d..ed2f5048 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1104,10 +1104,10 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
 
   script.domains = aSkeleton.domains;
   aSkeleton.contributors.forEach(script.addContributor.bind(script));
-  aSkeleton.includes.forEach(function(i) script.addInclude(i));
-  aSkeleton.excludes.forEach(function(i) script.addExclude(i));
-  aSkeleton.user_includes.forEach(function(i) script.addInclude(i, true));
-  aSkeleton.user_excludes.forEach(function(i) script.addExclude(i, true));
+  script.addInclude(aSkeleton.includes);
+  script.addExclude(aSkeleton.excludes);
+  script.addInclude(aSkeleton.user_includes, true);
+  script.addExclude(aSkeleton.user_excludes, true);
   aSkeleton.matches.forEach(function(i) script._matches.push(new MatchPattern(i)));
   aSkeleton.requires.forEach(function(i) {
     var scriptRequire = new ScriptRequire(script);

From 3b6812bc97e69f7fbc07746e7675806cfafb632c Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 30 Jun 2011 16:04:15 +0200
Subject: [PATCH 273/829] Must consider _all_excludes not just _excludes

---
 extension/modules/script/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index ed2f5048..9a1d926e 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -328,7 +328,7 @@ Script.prototype = {
 
     return (this._all_includes.test(aURL)
       || this._matches.some(function(m) m.doMatch(aURL)))
-      && !this._excludes.test(aURL);
+      && !this._all_excludes.test(aURL);
   },
 
   get id() {

From 885165a9e8a098405199caadfed0ffc2641d5d32 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 30 Jun 2011 09:05:00 -0500
Subject: [PATCH 274/829] Updating ja-JP with a few modifications from k2jp
 (BabelZilla).

---
 extension/locale/ja-JP/scriptish.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index d0507523..d5b7ab24 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -42,8 +42,8 @@ install.requires=
 install.resources=
 install.showScriptSource=スクリプトのソースを表示
 install.title=ユーザースクリプトのインストール
-install.warning1=悪意のあるスクリプトはあなたの知らぬ間にプライバシーを侵害していることがあります
-install.warning2=信頼できる場所からのみスクリプトをインストールすべきです
+install.warning1=悪意のあるスクリプトはプライバシーを侵害したり、知らぬ間にあなたに代わり動作したりすることがあります
+install.warning2=スクリプトは信頼できる場所からのみインストールすべきです
 menu.commands=ユーザースクリプトのコマンド…
 menu.commands.ak=C
 menu.install=ユーザースクリプトをインストール…
@@ -123,7 +123,7 @@ scriptOptions.excludes=
 scriptOptions.disableScriptIncludes=スクリプト内 include を無効にし、この指定のみを利用
 statusbar.enabled=有効
 statusbar.enabled.ak=E
-statusbar.installed=のインストールに成功しました
+statusbar.installed=は正常にインストールされました
 statusbar.modified=は変更されました
 statusbar.noScripts=このページ用スクリプトはありません！
 statusbar.updated=は正常に更新されました

From 96f75f40529a3e617d50f30e4bf74bb76667987a Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 30 Jun 2011 10:02:59 -0500
Subject: [PATCH 275/829] Updating sv-SE with modifications by Lakrits
 (BabelZilla).

---
 extension/locale/sv-SE/scriptish.properties | 80 ++++++++++-----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 637bb165..f84d3e32 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -1,4 +1,4 @@
-copyDownloadURL=Kopiera hämtnings-URL
+copyDownloadURL=Kopiera hämtningsadress
 copyDownloadURL.ak=K
 edit=Redigera
 edit.ak=e
@@ -62,14 +62,14 @@ menuitem.manage=Hantera användarskript
 menuitem.new=Nytt användarskript
 moving.dependency=Flyttar beroendefil från
 moving.script=Flyttar skriptfil från
-newscript.author=
+newscript.author=Skapat av
 newscript.description=Beskrivning
 newscript.excludes=Undantagna (ett per rad)
 newscript.exists=Ett skript med samma namn är redan installerat.\nVill du ersätta det?
 newscript.id=ID
 newscript.includes=Inkluderade (ett per rad)
-newscript.missing.id=
-newscript.missing.name=
+newscript.missing.id=Var vänlig ange ett ID.
+newscript.missing.name=Var vänlig ange ett namn. Namnet kommer att visas i tilläggshanteraren.
 newscript.name=Namn
 newscript.namespace=Namnområde
 newscript.noID=Var vänlig ange ett giltigt ID för ditt skript.
@@ -78,46 +78,46 @@ nothing.timedOut=ingenting (tidsgränsen uppnåddes)
 openFolder=Öppna mapp
 openFolder.ak=Ö
 options=Inställningar
-options.title=
-options.pane.main=
+options.title=Inställningar för Scriptish
+options.pane.main=Allmänt
 options.pane.excludes=Globala undantag
-options.pane.advanced=
+options.pane.advanced=Avancerat
 options.addonsManager=Tilläggshanteraren
 options.alsoUninstallPrefs=Vid avinstallation av ett skript, ta även bort dess inställningar
-options.cache=
-options.cache.enabled=
+options.cache=Cache
+options.cache.enabled=Cachelagra användarskript
 options.changeEditor=Byt redigeringsprogram
 options.editor=Redigeringsprogram
-options.editor.notset=
-options.enabledSchemes.main=
-options.enabledSchemes.advanced=
-options.enabledSchemes.about=
-options.enabledSchemes.chrome=
-options.enabledSchemes.data=
-options.enabledSchemes.file=
-options.enabledSchemes.ftp=
-options.enabledSchemes.http=
-options.enabledSchemes.unmht=
-options.enabledSchemes.securityRemark=
-options.enabledSchemes.securityRemark2=
-options.excludes.empty=
-options.excludes.desc=
-options.excludes.remark=
-options.enableCopyDownloadURL=Aktivera kopiering av hämtnings-URL
-options.logging=
-options.logChrome=
-options.notifications=
-options.notifications.disable=
-options.requireBuiltInCerts=
+options.editor.notset=Inget redigeringsprogram har valts
+options.enabledSchemes.main=Protokoll
+options.enabledSchemes.advanced=Ytterligare protokoll
+options.enabledSchemes.about=about-protokoll (internt)
+options.enabledSchemes.chrome=chrome-protokoll (internt)
+options.enabledSchemes.data=dataprotokoll
+options.enabledSchemes.file=filprotokoll (lokala filer)
+options.enabledSchemes.ftp=FTP-protokoll
+options.enabledSchemes.http=HTTP/HTTPS-protokoll
+options.enabledSchemes.unmht=UNMHT-protokoll (format för Mozilla Archive)
+options.enabledSchemes.securityRemark=Alla ytterligare protokoll kan ha full åtkomst till systemet.
+options.enabledSchemes.securityRemark2=Därmed utgör de en säkerhetsrisk tillsammans med ej betrodda skript!
+options.excludes.empty=Inga globala undantag har angivits
+options.excludes.desc=Globala undantag kommer att åsidosätta alla skript och användardefinierade regler
+options.excludes.remark=(Du kan ange ett undantag per rad)
+options.enableCopyDownloadURL=Aktivera kopiering av hämtningsadress
+options.logging=Loggning
+options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felonsolen
+options.notifications=Aviseringar
+options.notifications.disable=Inaktivera glidande aviseringar om skriptändringar
+options.requireBuiltInCerts=Säker uppdatering kräver användning av inbyggda certifikat
 options.requireSecured=Kräv att användarskript uppdateras via HTTPS
-options.translation=
-options.translation.useEnglish=
-options.update.security=
-options.useDownloadURL=Använd hämtnings-URL:en för uppdateringar om ingen uppdaterings-URL finns angiven
-reinstall=
+options.translation=Översättning
+options.translation.useEnglish=Använd alltid engelska
+options.update.security=Uppdateringssäkerhet
+options.useDownloadURL=Använd hämtningsadressen för uppdateringar om ingen uppdaterings-URL finns angiven
+reinstall=Ominstallera
 saving=Sparar
-scratchpad.saveAsUserScript=
-scratchpad.saveAsUserScript.ak=
+scratchpad.saveAsUserScript=Spara som användarskript
+scratchpad.saveAsUserScript.ak=p
 scriptOptions.includes=Inkluderade av användaren:
 scriptOptions.excludes=Undantagna av användaren:
 scriptOptions.disableScriptIncludes=Inaktivera detta skripts inkluderade mönster och använd endast de användardefinierade mönstren.
@@ -131,6 +131,6 @@ tooltip.loading=Läser in…
 Uninstall=Avinstallera
 Update=Uppdatera
 userscripts=Användarskript
-userscripts.get=
-userscripts.noneInstalled=
-warning.returnfrommain=
+userscripts.get=Hämta användarskript
+userscripts.noneInstalled=Du har inga användarskript installerade
+warning.returnfrommain=Att "gå tillbaka" från huvudområdet stöds som regel inte. Du bör åtgärda det i ditt användarskript.

From d227bc77aea6250ec9cc570185a44c1bf74288e5 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 30 Jun 2011 19:10:55 -0500
Subject: [PATCH 276/829] Updating ja-JP with modifications by k2jp
 (BabelZilla).

---
 extension/locale/ja-JP/scriptish.properties | 116 ++++++++++----------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index d5b7ab24..5f62736c 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -3,8 +3,8 @@ copyDownloadURL.ak=C
 edit=編集
 edit.ak=E
 editor.couldNotLaunch=エディタの起動に失敗しました
-editor.pleasePickExecutable=ユーザースクリプト編集用の実行可能アプリケーションを選択してください
-editor.prompt=まず、好みのエディタを指定してください
+editor.pleasePickExecutable=ユーザースクリプト編集用アプリケーションを指定してください
+editor.prompt=まず、使いたいエディタを選択してください
 error.api.clipboard.type=は GM_setClipboard がサポートしてない型です
 error.api.noResourceWithName=名前付きリソースがありません
 error.api.noSecondArgValue=２番目の引数が指定されていません： 値
@@ -14,14 +14,14 @@ error.api.unsafeAccess=Scriptish アクセス違反： unsafeWindow は以下を
 error.charset=不正な文字セットが指定されました
 error.dependency.loading=依存関係の読み込みでエラーが発生しました
 error.dependency.local=セキュリティ例外： ローカル及び chrome URL へのリクエストは禁止されています
-error.dependency.serverReturned=エラー！ サーバーは以下を返しました　
+error.dependency.serverReturned=エラー！ サーバーからの返答：
 error.hash.algorithm=不正なハッシュ・アルゴリズムが指定されました
-error.icon.dataURL=不正なデータです： @icon 用の URL　
+error.icon.dataURL=不正なデータ： @icon 用 URL　
 error.icon.notImage=エラー！ @icon が画像の MIME タイプではありません
 error.icon.URL=@icon の URL が不正です
 error.isInvalidValue=は不正な値です
-error.matchPattern.rules=@match のパターンがルールに適合していません
-error.matchPattern.rules.file=ファイルスキームの @match のパターンがルールに適合していません
+error.matchPattern.rules=@match のパターンが不適合です
+error.matchPattern.rules.file=ファイル・スキームの @match パターンが不適合です
 error.notSupported.Firefox=はこのバージョンの Firefox でサポートされていません
 error.openingFile=ファイルを開くことが出来ませんでした
 error.pattern.parsing=パターンをパースできませんでした
@@ -42,8 +42,8 @@ install.requires=
 install.resources=
 install.showScriptSource=スクリプトのソースを表示
 install.title=ユーザースクリプトのインストール
-install.warning1=悪意のあるスクリプトはプライバシーを侵害したり、知らぬ間にあなたに代わり動作したりすることがあります
-install.warning2=スクリプトは信頼できる場所からのみインストールすべきです
+install.warning1=悪意のあるスクリプトはあなたの知らぬ間にプライバシーを侵害することがあります
+install.warning2=信頼できる場所からのみスクリプトをインストールすべきです
 menu.commands=ユーザースクリプトのコマンド…
 menu.commands.ak=C
 menu.install=ユーザースクリプトをインストール…
@@ -59,78 +59,78 @@ menu.title=Scriptish
 menu.title.ak=S
 menuitem.install=このユーザースクリプトをインストール…
 menuitem.manage=ユーザースクリプトを管理
-menuitem.new=新たなユーザースクリプト
+menuitem.new=新規ユーザースクリプト
 moving.dependency=依存関係ファイルを次から移動：
 moving.script=スクリプトを次から移動：
-newscript.author=
-newscript.description=説明
-newscript.excludes=@exclude（スクリプトを実行したくない URL を１行１つずつ列挙）
-newscript.exists=その名前のスクリプトは既にインストールされています。\n上書きしますか？
-newscript.id=
-newscript.includes=@include（スクリプトを実行したい URL を１行１つずつ列挙）
-newscript.missing.id=
-newscript.missing.name=
-newscript.name=名前
-newscript.namespace=名前空間（URI）
+newscript.author=スクリプトの作者
+newscript.description=スクリプトの詳細
+newscript.excludes=exclude（スクリプトを実行したくない URL を１行１つずつ列挙：ワイルドカード「＊」又は正規表現も可能）
+newscript.exists=同じ名前のスクリプトが既にインストールされています。\n上書きしますか？
+newscript.id=ID（Scriptish がこのスクリプトを一意に識別する為の文字列）
+newscript.includes=include（スクリプトを実行したい URL を１行１つずつ列挙：ワイルドカード「＊」又は正規表現も可能）
+newscript.name=スクリプト名
+newscript.missing.id=ID を指定してください
+newscript.missing.name=スクリプト名を指定してください。アドオン・マネージャー内での表示で使用します
+newscript.namespace=名前空間（グルーピングする為に使用。スクリプト名と組み合わせて Scriptish の「ID」のように使用するものもある）
 newscript.noID=スクリプトに正しい ID を指定してください
 newscript.noName=スクリプトに名前をつけてください
 nothing.timedOut=なし（タイムアウト）
 openFolder=フォルダを開く
 openFolder.ak=O
 options=オプション
-options.title=
-options.pane.main=
+options.title=Scriptish オプション
+options.pane.main=メイン
 options.pane.excludes=
-options.pane.advanced=
-options.addonsManager=アドオンマネージャ
+options.pane.advanced=詳細
+options.addonsManager=アドオン・マネージャー
 options.alsoUninstallPrefs=スクリプトをアンインストールする時、その設定も削除する
-options.cache=
-options.cache.enabled=
+options.cache=キャッシュ
+options.cache.enabled=ユーザースクリプトをキャッシュする
 options.changeEditor=エディタを変更する
 options.editor=エディタ
-options.editor.notset=
-options.enabledSchemes.main=
-options.enabledSchemes.advanced=
-options.enabledSchemes.about=
-options.enabledSchemes.chrome=
-options.enabledSchemes.data=
-options.enabledSchemes.file=
-options.enabledSchemes.ftp=
-options.enabledSchemes.http=
-options.enabledSchemes.unmht=
-options.enabledSchemes.securityRemark=
-options.enabledSchemes.securityRemark2=
-options.excludes.empty=
-options.excludes.desc=
-options.excludes.remark=
+options.editor.notset=エディタは指定されていません
+options.enabledSchemes.main=利用プロトコル
+options.enabledSchemes.advanced=利用プロトコルの追加
+options.enabledSchemes.about=about プロトコル（内部）
+options.enabledSchemes.chrome=chrome プロトコル（内部）
+options.enabledSchemes.data=データ・プロトコル
+options.enabledSchemes.file=ファイル・プロトコル（ローカルファイル）
+options.enabledSchemes.ftp=ftp プロトコル
+options.enabledSchemes.http=http/https プロトコル
+options.enabledSchemes.unmht=unmht プロトコル（Mozilla Archive フォーマット）
+options.enabledSchemes.securityRemark=追加したプロトコルによりシステムへのフルアクセスが可能になることがあります
+options.enabledSchemes.securityRemark2=つまり、信用できないスクリプトと併用すると相当なセキュリティ・リスク！
+options.excludes.empty=global excludes が指定されていません
+options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先されます
+options.excludes.remark=（１行１つずつ指定）
 options.enableCopyDownloadURL=ダウンロード URL のコピーを有効にする
-options.logging=
-options.logChrome=
-options.notifications=
-options.notifications.disable=
-options.requireBuiltInCerts=
+options.logging=ログ
+options.logChrome=重大ではないエクステンションのメッセージもエラーコンソールに出力する
+options.notifications=通知
+options.notifications.disable=スクリプト変更時の通知を無効にする
+options.requireBuiltInCerts=安全なアップデートには built-in 証明書の利用が必要です
 options.requireSecured=ユーザースクリプトが HTTPS で更新されるようにする
-options.translation=
-options.translation.useEnglish=
-options.update.security=
-options.useDownloadURL=更新用 URL がない場合、ダウンロード URL を使用する
-reinstall=
+options.translation=翻訳
+options.translation.useEnglish=常に英語を使用
+options.update.security=更新に関するセキュリティ
+options.useDownloadURL=更新用 URL が指定されていない場合はダウンロード URL を更新に利用する
+reinstall=再インストール
 saving=保存
-scratchpad.saveAsUserScript=
-scratchpad.saveAsUserScript.ak=
+scratchpad.saveAsUserScript=ユーザースクリプトとして保存
+scratchpad.saveAsUserScript.ak=U
 scriptOptions.includes=
 scriptOptions.excludes=
-scriptOptions.disableScriptIncludes=スクリプト内 include を無効にし、この指定のみを利用
+scriptOptions.disableScriptIncludes=スクリプト内 include を無効にし、ユーザー指定のみを利用
 statusbar.enabled=有効
 statusbar.enabled.ak=E
-statusbar.installed=は正常にインストールされました
+statusbar.installed=のインストールに成功しました
 statusbar.modified=は変更されました
-statusbar.noScripts=このページ用スクリプトはありません！
+statusbar.noScripts=このページ用のスクリプトはありません！
 statusbar.updated=は正常に更新されました
 tooltip.loading=読み込み中…
 Uninstall=アンインストール
 Update=更新
 userscripts=ユーザースクリプト
-userscripts.get=
-userscripts.noneInstalled=
-warning.returnfrommain=
+userscripts.get=ユーザースクリプトを取得
+userscripts.noneInstalled=ユーザースクリプトがインストールされていません
+warning.returnfrommain=メインスコープからの"リターン"はサポートされてないので修正する必要があります。

From 3a2dcc02a5b1b37f01be6f3eb18dee931232b774 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 30 Jun 2011 22:04:46 -0700
Subject: [PATCH 277/829] <em:version>0.1.3</em:version>

---
 extension/install.rdf |  2 +-
 update.rdf            | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 58dedfcf..669cfd54 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -28,7 +28,7 @@
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
-    <em:version>0.1.3a1pre</em:version>
+    <em:version>0.1.3</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://github.com/erikvold/scriptish</em:homepageURL>
diff --git a/update.rdf b/update.rdf
index 8342e2a3..40454b7d 100644
--- a/update.rdf
+++ b/update.rdf
@@ -6,14 +6,14 @@
       <RDF:Seq>
         <RDF:li>
           <RDF:Description>
-            <em:version>0.1.2</em:version>
+            <em:version>0.1.3</em:version>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>4.0</em:minVersion>
                 <em:maxVersion>7.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.2.xpi</em:updateLink>
-                <em:updateHash>sha1:66d989425a66c23d5fde71bd347f3eeabdf08150</em:updateHash>
+                <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.3.xpi</em:updateLink>
+                <em:updateHash>sha1:310fc77a9fe8ef89adb6cbfa6cb2914c9381536b</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
             <em:targetApplication>
@@ -21,8 +21,8 @@
                 <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
                 <em:minVersion>2.1a3</em:minVersion>
                 <em:maxVersion>2.2.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.2.xpi</em:updateLink>
-                <em:updateHash>sha1:66d989425a66c23d5fde71bd347f3eeabdf08150</em:updateHash>
+                <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.3.xpi</em:updateLink>
+                <em:updateHash>sha1:310fc77a9fe8ef89adb6cbfa6cb2914c9381536b</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
           </RDF:Description>
@@ -30,6 +30,6 @@
       </RDF:Seq>
     </em:updates>
 
-    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAKZ2vuVHpL2Fi82I4J6hQhX94lreD6FClbs9aeTusEfmYO2vuyXeiCPhppLNSL0sLu1lCaAx078AR9oGaCN/h5dtAZcYb9t7DUnutTrjPRrSEiQCqkCM44tky5NffQmWw+wavzRmIHiem2DJdXo1y1RLOqTBvmNUGheU4iHSDtF7</em:signature>
+    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBADKiVpuXGg62/aYVOBJbNhkNMD2t2baNcxQJPMLitMArMrlOVyvFF9nbOrbeS+sa9RRgo4HLvC5LW4ZgaNIwGxFRMDDEttQ3rueZ1ZYK3EZ8PK8TjiwRh+/s+uyMaFz7i+hSzSoPAzDTe21wTebWMwwteKKmomT3Sa29wPOM4KUQ</em:signature>
   </RDF:Description>
 </RDF:RDF>

From 1dc846cd6f671ef2026078b08d472ca56aecfe98 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 30 Jun 2011 22:09:00 -0700
Subject: [PATCH 278/829] <em:version>0.1.4a1pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 669cfd54..e55d5221 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -28,7 +28,7 @@
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
-    <em:version>0.1.3</em:version>
+    <em:version>0.1.4a1pre</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://github.com/erikvold/scriptish</em:homepageURL>

From cb5bebb43e713e838545034f09d648787466ec92 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 1 Jul 2011 11:57:41 -0700
Subject: [PATCH 279/829] Revert "Use a more reliable way to retrieve URL
 params in QUnit."

This reverts commit 2f93d7da46fa8ce4921a3894265322e21f03f9b6.
---
 extension/content/js/third-party/qunit/qunit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/third-party/qunit/qunit.js b/extension/content/js/third-party/qunit/qunit.js
index a95f1a7f..5d72dcc3 100644
--- a/extension/content/js/third-party/qunit/qunit.js
+++ b/extension/content/js/third-party/qunit/qunit.js
@@ -449,8 +449,8 @@ var config = {
 
 // Load paramaters
 (function() {
-	var location = window.location || { href: "", protocol: "file:" },
-		params = ( location.href.split( "?" )[ 1 ] || "" ).split( "&" ),
+	var location = window.location || { search: "", protocol: "file:" },
+		params = location.search.slice( 1 ).split( "&" ),
 		length = params.length,
 		urlParams = {},
 		current;

From 357a0987107377e0efbdead8b60ebb6b77edfb98 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 1 Jul 2011 13:51:15 -0700
Subject: [PATCH 280/829] loading QUnit with a fake window object since it
 doesn't handle about: urls well..

---
 extension/content/aboutScriptish.html  |  1 -
 extension/content/js/aboutScriptish.js |  3 --
 extension/content/tests/runTests.js    | 51 ++++++++++++++++++++++----
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index f70f2ee0..fcec647e 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -6,7 +6,6 @@
   <link rel="icon" href="../skin/scriptish16.png"/>
   <link rel="stylesheet" href="js/third-party/qunit/qunit.css" type="text/css" media="screen"/>
   <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
-  <script src="js/third-party/qunit/qunit.js"></script>
   <script src="js/aboutScriptish.js"></script>
   <script src="js/third-party/html/html.js"></script>
 </head>
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index 0e9eb7bc..696f814f 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -1,8 +1,5 @@
 const Cu = Components.utils;
 
-QUnit.config.urlbase = "about:scriptish";
-QUnit.config.autostart = false; // prevents QUnit from auto starting onload
-
 function $(aID) document.getElementById(aID);
 function include(aSrc) {
   var deferred = Q.defer();
diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index d656b0cb..aaefdbe2 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -1,13 +1,48 @@
 
-QUnit.url = function(params) {
-  var querystring = "";
-  for (var key in params) {
-    if (!params[key]) continue;
-    querystring += "&" + encodeURIComponent(key) + "=" +
-        encodeURIComponent(params[key]);
+// Import QUnit
+(function() {
+  var fakeWindow = {
+    window: fakeWindow,
+    document: document,
+    get location() {return {
+      href: window.location.href,
+      "search": window.location.href.split("?")[1],
+      protocol: window.location.protocol
+    }},
+    navigator: window.navigator,
+    set location(loc) window.location = loc,
+    setTimeout: window.setTimeout.bind(window),
+    clearTimeout: window.clearTimeout.bind(window),
+    addEventListener: window.addEventListener.bind(window)
+  };
+  var fakeWindowKeys = [];
+  for (var key in fakeWindow) fakeWindowKeys.push(key);
+
+  // Load QUnit
+  Services.scriptloader.loadSubScript(
+      "chrome://scriptish/content/js/third-party/qunit/qunit.js", fakeWindow);
+
+  var {QUnit} = fakeWindow;
+
+  QUnit.config.urlbase = "about:scriptish";
+  QUnit.config.autostart = false; // prevents QUnit from auto starting onload
+
+  QUnit.url = function(params) {
+    var querystring = "";
+    for (var key in params) {
+      if (!params[key]) continue;
+      querystring += "&" + encodeURIComponent(key) + "=" +
+          encodeURIComponent(params[key]);
+    }
+    return "about:scriptish?test" + querystring;
   }
-  return "about:scriptish?test" + querystring;
-}
+
+  // export QUnit variables
+  for (var key in fakeWindow) {
+    if (~fakeWindowKeys.indexOf(key)) continue;
+    window[key] = fakeWindow[key];
+  }
+})();
 
 function importModule(m, ctx) {
   var _ = ctx || {};

From 17aa97c20a2490d1f387dc2ce1b723ed058e8708 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 1 Jul 2011 14:48:40 -0700
Subject: [PATCH 281/829] minor performance tweak: '.length = 0' is ~2x faster
 than '.splice(0)' on Firefox

---
 extension/modules/utils/PatternCollection.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/modules/utils/PatternCollection.js b/extension/modules/utils/PatternCollection.js
index 6c6e56df..96847521 100644
--- a/extension/modules/utils/PatternCollection.js
+++ b/extension/modules/utils/PatternCollection.js
@@ -27,9 +27,9 @@ PatternCollection.prototype = {
     }
   },
   clear: function() {
-    this._patterns.splice(0);
-    this._regs.splice(0);
-    this._regsTLD.splice(0);
+    this._patterns.length = 0;
+    this._regs.length = 0;
+    this._regsTLD.length = 0;
     this._merged = this._mergedTLD = null;
   },
   get patterns() this._patterns.concat(),

From 423b1d8fcf75180209c5e82b8b3d4f64138096ba Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 1 Jul 2011 15:11:36 -0700
Subject: [PATCH 282/829] removing a couple unnecessary tests

---
 extension/content/tests/testPatternCollection.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index 223f1a75..35b900a5 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -105,9 +105,7 @@ test("clear", function() {
   deepEqual(pc.patterns, [], "cleared patterns");
   deepEqual(pc._regs, [], "cleared regs");
   deepEqual(pc._regsTLD, [], "cleared regs");
-  equal(pc._merged, null, "cleared _merge");
-  equal(pc._mergedTLD, null, "cleared _mergeTLD");
-  equal(pc.merged.source, undefined, "cleared merged");
-  equal(pc.mergedTLD.source, undefined, "cleared mergedTLD");
+  strictEqual(pc._merged, null, "cleared _merge");
+  strictEqual(pc._mergedTLD, null, "cleared _mergeTLD");
   equal(pc.test("http://mozilla.com/"), false, "no matches");
 });

From dea54f0818338768109f731c1556289900c5f916 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 1 Jul 2011 15:32:34 -0700
Subject: [PATCH 283/829] removing seemingly unused try/catch

---
 extension/modules/utils/Scriptish_mergeRegExps.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/extension/modules/utils/Scriptish_mergeRegExps.js b/extension/modules/utils/Scriptish_mergeRegExps.js
index 749f5002..064dce13 100644
--- a/extension/modules/utils/Scriptish_mergeRegExps.js
+++ b/extension/modules/utils/Scriptish_mergeRegExps.js
@@ -1,17 +1,7 @@
 "use strict";
 const EXPORTED_SYMBOLS = ["Scriptish_mergeRegExpStrings", "Scriptish_mergeRegExps"];
 
-try {
-  Components.utils.import("resource://scriptish/third-party/regexpmerger.jsm");
-}
-catch (ex) {
-  var merge = function merge_naive(patterns) {
-    return patterns
-      .map(function(r) '(?:' + r + ')')
-      .join('|')
-      .replace(/\//g, '\\/');
-  };
-}
+Components.utils.import("resource://scriptish/third-party/regexpmerger.jsm");
 
 function Scriptish_mergeRegExpStrings(strs) {
   return new RegExp(merge(strs), "i");

From 7fa4f75aa2cad0968d4ec11aec7a70d37ad2fb14 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 1 Jul 2011 15:36:19 -0700
Subject: [PATCH 284/829] renaming regexpmerger.jsm to regespmerger.js b/c some
 software doesn't recognize jsm (like Github :[)

---
 .../modules/third-party/{regexpmerger.jsm => regexpmerger.js}   | 0
 extension/modules/utils/Scriptish_mergeRegExps.js               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename extension/modules/third-party/{regexpmerger.jsm => regexpmerger.js} (100%)

diff --git a/extension/modules/third-party/regexpmerger.jsm b/extension/modules/third-party/regexpmerger.js
similarity index 100%
rename from extension/modules/third-party/regexpmerger.jsm
rename to extension/modules/third-party/regexpmerger.js
diff --git a/extension/modules/utils/Scriptish_mergeRegExps.js b/extension/modules/utils/Scriptish_mergeRegExps.js
index 064dce13..8452f128 100644
--- a/extension/modules/utils/Scriptish_mergeRegExps.js
+++ b/extension/modules/utils/Scriptish_mergeRegExps.js
@@ -1,7 +1,7 @@
 "use strict";
 const EXPORTED_SYMBOLS = ["Scriptish_mergeRegExpStrings", "Scriptish_mergeRegExps"];
 
-Components.utils.import("resource://scriptish/third-party/regexpmerger.jsm");
+Components.utils.import("resource://scriptish/third-party/regexpmerger.js");
 
 function Scriptish_mergeRegExpStrings(strs) {
   return new RegExp(merge(strs), "i");

From 6e6417c47708300356ffcd7c588c9a0c9fc95151 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 1 Jul 2011 20:38:25 -0700
Subject: [PATCH 285/829] test: adding reg exp @include to 'merged' test of the
 'Pattern Collection' QUnit test module

---
 extension/content/tests/testPatternCollection.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index 35b900a5..8027c1d1 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -43,16 +43,22 @@ test("merged", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 
   var pc = new PatternCollection();
-  pc.addPattern("foobar*");
-  pc.addPattern("foobaz*");
-  deepEqual(pc.patterns, ["foobar*", "foobaz*"], "patterns");
-  deepEqual(pc._regs.map(function(e) e.source), ["^foobar.*$", "^foobaz.*$"], "regs");
-  equal(pc.merged.source, "^fooba(?:r.*$|z.*$)", "merged");
+  var patterns = ["foobar*", "foobaz*", "/^foobax$/"];
+  pc.addPattern(patterns[0]);
+  pc.addPattern(patterns[1]);
+  pc.addPattern(patterns[2]);
+  deepEqual(pc.patterns, patterns, "patterns");
+  deepEqual(
+      pc._regs.map(function(e) e.source),
+      ["^foobar.*$", "^foobaz.*$", "^foobax$"],
+      "regs");
+  equal(pc.merged.source, "^fooba(?:r.*$|x$|z.*$)", "merged");
   equal(pc.test("foo"), false, "foo");
   equal(pc.test("fooba"), false, "fooba");
   equal(pc.test("foobar"), true, "foobar");
   equal(pc.test("foobar1"), true, "foobar1");
   equal(pc.test("foobaz2"), true, "foobaz2");
+  equal(pc.test("foobax"), true, "foobax");
 });
 
 test("merged2", function() {

From bb61b815ef972ad77ec1d44a55f59641026ae26e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 1 Jul 2011 20:47:31 -0700
Subject: [PATCH 286/829] minor: don't sort an array with length < 2

---
 extension/modules/third-party/regexpmerger.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index 474d1c68..513750af 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -225,11 +225,14 @@ function mergePatterns(patterns, low, high, prefix) {
  * @returns {String} Resulting merged and optimized pattern
  */
 function merge(patterns) {
-  patterns = patterns.slice(0).sort();
+  patterns = patterns.slice(0);
+
   if (patterns.length < 2) {
     return patterns[0];
   }
 
+  patterns.sort();
+
   for (;;) {
     let [i, e, head] = largestPrefixGroup(patterns);
     if (!e) {
@@ -238,10 +241,12 @@ function merge(patterns) {
     }
     patterns = mergePatterns(patterns, i, e, head);
   }
+
   if (patterns.length == 1) {
     // already merge to a single pattern
     return patterns[0];
   }
+
   // not yet a single pattern (i.e. not all patterns shared a common prefix)
   // merge without a prefix to get s aingle pattern
   return mergePatterns(patterns, 0, patterns.length, "")[0];

From b6efbe3ab49d6825a9f5255665ac06f90c2ad2e7 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 1 Jul 2011 21:20:27 -0700
Subject: [PATCH 287/829] minor: reduced 2 '.length' lookups to 1 and made some
 comment edits

---
 extension/modules/third-party/regexpmerger.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index 513750af..d773b608 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -154,6 +154,7 @@ function largestPrefixGroup(patterns, low, high, level) {
       allgood = false;
       break;
     }
+
     if (allgood) {
       let c = high - i;
       if (bestc < c) {
@@ -174,6 +175,7 @@ function largestPrefixGroup(patterns, low, high, level) {
   if (tails.some(function(p) p.length == 0)) {
     return [besti, beste, head];
   }
+
   let [nlow, nhigh, np] = largestPrefixGroup(tails, besti, beste, level + 1);
   if (nhigh) {
     let rv = head + np;
@@ -185,6 +187,7 @@ function largestPrefixGroup(patterns, low, high, level) {
     }
     return [nlow, nhigh, rv];
   }
+
   return [besti, beste, head];
 }
 
@@ -242,12 +245,13 @@ function merge(patterns) {
     patterns = mergePatterns(patterns, i, e, head);
   }
 
-  if (patterns.length == 1) {
-    // already merge to a single pattern
+  let len = patterns.length;
+  if (len == 1) {
+    // already merged in to a single pattern
     return patterns[0];
   }
 
   // not yet a single pattern (i.e. not all patterns shared a common prefix)
-  // merge without a prefix to get s aingle pattern
-  return mergePatterns(patterns, 0, patterns.length, "")[0];
+  // merge without a prefix to get a single pattern
+  return mergePatterns(patterns, 0, len, "")[0];
 }

From 1db7c04d79b8c20898ca3e61c83e3427eede73a4 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 11:15:48 -0700
Subject: [PATCH 288/829] Minor changes to regexpmerger.js:

- standardizing terms on 'prefix' instead of interchangeably using terms like 'rv' and 'head'
- added a TODO that I need to look at closer
- minor comment edits
- adding a few minor comments
- only reference string.length once
- minor style changes
---
 extension/modules/third-party/regexpmerger.js | 76 +++++++++++--------
 1 file changed, 45 insertions(+), 31 deletions(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index d773b608..f754678e 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -41,22 +41,27 @@ const EXPORTED_SYMBOLS = ['merge'];
 const RE_GROUPSTRIP = /\(.*\)/g;
 
 /**
- * Return a good prefix, with no bracket mismatches
+ * Return a good prefix, without out bracket mismatches
  *
  * @param string Calculate the prefix from
- * @returns {String} Calculated prefix
+ * @returns {String} Calculated safe prefix without out bracket mismatches
  */
 function killInvalidBrackets(string) {
-  let c = 0; // (
-  let C = 0; // [
-  let good = -1; // store last good position
-  for (let i = 0; i < string.length; ++i) {
+  let c = 0; // num of unclosed (
+  let C = 0; // num of unclosed [
+  let good = -1; // last good position
+  let strLen = string.length;
+
+  for (let i = 0; i < strLen; ++i) {
     let ch = string[i];
+
     if (ch == "\\") {
       // step over escaping
       ++i;
       continue;
     }
+
+    // ()
     if (ch == '(') {
       if (!C) {
         // not in a character class []
@@ -66,11 +71,11 @@ function killInvalidBrackets(string) {
         }
         ++c;
       }
-      continue
+      continue;
     }
     if (ch == ')') {
       if (!C) {
-        // not in a character class
+        // not in a character class []
         --c;
         if (c < 0) {
           // cannot be valid and negative at the same time
@@ -84,6 +89,8 @@ function killInvalidBrackets(string) {
       }
       continue;
     }
+
+    // []
     if (ch == '[') {
       if (!C && !c) {
         // last good (nothing open)
@@ -103,6 +110,7 @@ function killInvalidBrackets(string) {
       }
     }
   }
+
   if (c == 0 && C == 0) {
     // all closed, use whole string
     return string;
@@ -111,6 +119,7 @@ function killInvalidBrackets(string) {
     // something is bad, but we got a good position
     return string.substring(0, good + 1);
   }
+
   // whole string is invalid
   return "";
 }
@@ -133,9 +142,9 @@ function largestPrefixGroup(patterns, low, high, level) {
   let heads = patterns.map(function(p) p.charAt(0));
   let tails = patterns.map(function(p) p.substring(1));
 
-  let besti = -1;
-  let beste = 0;
-  let bestc = 0;
+  let besti = -1; // best starting match
+  let beste = 0;  // best ending match
+  let bestc = 0; // num of matches
 
   for (let i = low; i < high - 1; ++i) {
     let allgood = true;
@@ -178,14 +187,14 @@ function largestPrefixGroup(patterns, low, high, level) {
 
   let [nlow, nhigh, np] = largestPrefixGroup(tails, besti, beste, level + 1);
   if (nhigh) {
-    let rv = head + np;
+    let prefix = head + np;
     if (!level) {
       // root level needs to check for bracket mismatches
       // this might cause the group to get smaller than it has to be
       // Consumers should/will account for this
-      rv = killInvalidBrackets(rv);
+      prefix = killInvalidBrackets(prefix);
     }
-    return [nlow, nhigh, rv];
+    return [nlow, nhigh, prefix];
   }
 
   return [besti, beste, head];
@@ -194,30 +203,35 @@ function largestPrefixGroup(patterns, low, high, level) {
 /**
  * Merge prefix group with set of patterns according to bounds and prefix
  *
- * @param patterns Set of patterns
- * @param low Lower bound
- * @param high Higher bound
- * @param prefix Prefix of the group
+ * @param patterns {array} Set of patterns
+ * @param low {int} Lower bound
+ * @param high {int} Higher bound
+ * @param prefix {string} Prefix of the group
+ * @return 
  */
 function mergePatterns(patterns, low, high, prefix) {
   let pl = prefix.length;
-  // slice the largest group, and chop of the common prefix
+
+  // splice the prefix group, and chop off the common prefix
   let lg = patterns.splice(low, high - low).map(function(p) p.substring(pl));
+
   // build a prefix pattern
-  let lgp = lg
-    .map(function(p) {
-      if (p.replace(RE_GROUPSTRIP, '').indexOf('|') == -1) {
-        return p;
-      }
-      return "(?:" + p + ")";
-    })
-    .join("|");
+  let lgp = lg.map(function(p) {
+    // strip out group expressions so that their inner '|'s are ignored
+    // TODO: atm "() | ()".replace(RE_GROUPSTRIP, '') == "" is bad
+    if (p.replace(RE_GROUPSTRIP, '').indexOf('|') == -1) {
+      return p;
+    }
+
+    return "(?:" + p + ")";
+  }).join("|");
+
   if (prefix) {
     patterns.push(prefix + "(?:" + lgp + ")");
-  }
-  else {
+  } else {
     patterns.push(lgp);
   }
+
   // need to return sorted as largestPrefixGroup relies on sorting
   return patterns.sort();
 }
@@ -237,12 +251,12 @@ function merge(patterns) {
   patterns.sort();
 
   for (;;) {
-    let [i, e, head] = largestPrefixGroup(patterns);
+    let [i, e, prefix] = largestPrefixGroup(patterns);
     if (!e) {
       // no common prefix found in (remaining) patterns
       break;
     }
-    patterns = mergePatterns(patterns, i, e, head);
+    patterns = mergePatterns(patterns, i, e, prefix);
   }
 
   let len = patterns.length;

From ff2516849036578022406cb11af267f07cad5283 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 12:47:42 -0700
Subject: [PATCH 289/829] minor edit in regexpmerger.js

---
 extension/modules/third-party/regexpmerger.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index f754678e..a890b809 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -44,7 +44,7 @@ const RE_GROUPSTRIP = /\(.*\)/g;
  * Return a good prefix, without out bracket mismatches
  *
  * @param string Calculate the prefix from
- * @returns {String} Calculated safe prefix without out bracket mismatches
+ * @returns {String} Calculated safe prefix without bracket mismatches
  */
 function killInvalidBrackets(string) {
   let c = 0; // num of unclosed (

From 7c75624836903793a5cad38edca9ef224c91d755 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 12:48:21 -0700
Subject: [PATCH 290/829] @returns -> @return

---
 extension/modules/third-party/regexpmerger.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index a890b809..6d878760 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -44,7 +44,7 @@ const RE_GROUPSTRIP = /\(.*\)/g;
  * Return a good prefix, without out bracket mismatches
  *
  * @param string Calculate the prefix from
- * @returns {String} Calculated safe prefix without bracket mismatches
+ * @return {String} Calculated safe prefix without bracket mismatches
  */
 function killInvalidBrackets(string) {
   let c = 0; // num of unclosed (

From d85e986f132568011ec62a70128ace32f47e0d8e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 12:52:31 -0700
Subject: [PATCH 291/829] adding a @return note for the mergePatterns function
 in regexpmerger.js

---
 extension/modules/third-party/regexpmerger.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index 6d878760..97d3b4dc 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -207,7 +207,8 @@ function largestPrefixGroup(patterns, low, high, level) {
  * @param low {int} Lower bound
  * @param high {int} Higher bound
  * @param prefix {string} Prefix of the group
- * @return 
+ * @return {array} mutated & reduced patterns array where the patterns specified
+ *                 by the low & high params are merged.
  */
 function mergePatterns(patterns, low, high, prefix) {
   let pl = prefix.length;

From 9c606a3311d16c880c8a8dbd0bf7ea0a94f93f6d Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 13:01:37 -0700
Subject: [PATCH 292/829] minor: editing comments in mergePatterns func of
 regexpmerger.js

---
 extension/modules/third-party/regexpmerger.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index 97d3b4dc..e7203859 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -213,11 +213,11 @@ function largestPrefixGroup(patterns, low, high, level) {
 function mergePatterns(patterns, low, high, prefix) {
   let pl = prefix.length;
 
-  // splice the prefix group, and chop off the common prefix
-  let lg = patterns.splice(low, high - low).map(function(p) p.substring(pl));
+  // splice the patterns to be merged, and chop off their common prefix
+  let tails = patterns.splice(low, high - low).map(function(p) p.substring(pl));
 
-  // build a prefix pattern
-  let lgp = lg.map(function(p) {
+  // build a tail pattern
+  let tail = tails.map(function(p) {
     // strip out group expressions so that their inner '|'s are ignored
     // TODO: atm "() | ()".replace(RE_GROUPSTRIP, '') == "" is bad
     if (p.replace(RE_GROUPSTRIP, '').indexOf('|') == -1) {
@@ -227,10 +227,11 @@ function mergePatterns(patterns, low, high, prefix) {
     return "(?:" + p + ")";
   }).join("|");
 
+  // add merged pattern
   if (prefix) {
-    patterns.push(prefix + "(?:" + lgp + ")");
+    patterns.push(prefix + "(?:" + tail + ")");
   } else {
-    patterns.push(lgp);
+    patterns.push(tail);
   }
 
   // need to return sorted as largestPrefixGroup relies on sorting

From 3681d81231e7a97b7f8c59deb291e95255a82f91 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 13:35:11 -0700
Subject: [PATCH 293/829] /^foobax$/ -> /^foobax$/i

---
 extension/content/tests/testPatternCollection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index 8027c1d1..c2e1057f 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -43,7 +43,7 @@ test("merged", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 
   var pc = new PatternCollection();
-  var patterns = ["foobar*", "foobaz*", "/^foobax$/"];
+  var patterns = ["foobar*", "foobaz*", "/^foobax$/i"];
   pc.addPattern(patterns[0]);
   pc.addPattern(patterns[1]);
   pc.addPattern(patterns[2]);

From 7d28e02b1747e4864fe95bfb06424bddc11886cf Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 13:58:21 -0700
Subject: [PATCH 294/829] removing a unnecessary wrapping in regexpmerger.js

---
 extension/modules/third-party/regexpmerger.js | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index e7203859..c76414f2 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -19,6 +19,7 @@
  *
  * Contributor(s):
  *   Nils Maier <MaierMan@web.de>
+ *   Erik Vold <erikvvold@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -38,8 +39,6 @@
 
 const EXPORTED_SYMBOLS = ['merge'];
 
-const RE_GROUPSTRIP = /\(.*\)/g;
-
 /**
  * Return a good prefix, without out bracket mismatches
  *
@@ -217,15 +216,7 @@ function mergePatterns(patterns, low, high, prefix) {
   let tails = patterns.splice(low, high - low).map(function(p) p.substring(pl));
 
   // build a tail pattern
-  let tail = tails.map(function(p) {
-    // strip out group expressions so that their inner '|'s are ignored
-    // TODO: atm "() | ()".replace(RE_GROUPSTRIP, '') == "" is bad
-    if (p.replace(RE_GROUPSTRIP, '').indexOf('|') == -1) {
-      return p;
-    }
-
-    return "(?:" + p + ")";
-  }).join("|");
+  let tail = tails.join("|");
 
   // add merged pattern
   if (prefix) {

From 07570bc98acc788e82c97ef55c6a535920cf7cfb Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 15:31:44 -0700
Subject: [PATCH 295/829] test: merging a regexp @include without a leading '^'
 with normal @includes

---
 .../content/tests/testPatternCollection.js    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index c2e1057f..90348b65 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -64,6 +64,29 @@ test("merged", function() {
 test("merged2", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 
+  var pc = new PatternCollection();
+  var patterns = ["foobar*", "foobaz*", "/foobax$/i"];
+  pc.addPattern(patterns[0]);
+  pc.addPattern(patterns[1]);
+  pc.addPattern(patterns[2]);
+  deepEqual(pc.patterns, patterns, "patterns");
+  deepEqual(
+      pc._regs.map(function(e) e.source),
+      ["^foobar.*$", "^foobaz.*$", "foobax$"],
+      "regs");
+  equal(pc.merged.source, "^foobar.*$|^foobaz.*$|foobax$", "merged");
+  equal(pc.test("foo"), false, "foo");
+  equal(pc.test("fooba"), false, "fooba");
+  equal(pc.test("foobar"), true, "foobar");
+  equal(pc.test("foobar1"), true, "foobar1");
+  equal(pc.test("foobaz2"), true, "foobaz2");
+  equal(pc.test("123foobaz"), false, "123foobaz");
+  equal(pc.test("123foobax"), true, "123foobax");
+});
+
+test("merged3", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
   var pc = new PatternCollection();
   pc.addPattern("foo");
   pc.addPattern("foobar*");

From fea9899a31f2aca3eb970b11a5511ecd72acf8c4 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 15:45:27 -0700
Subject: [PATCH 296/829] removing some unnecessary brackets in RE_TLD w/in
 Scriptish_convert2RegExp.js

---
 extension/modules/utils/Scriptish_convert2RegExp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/utils/Scriptish_convert2RegExp.js b/extension/modules/utils/Scriptish_convert2RegExp.js
index 848b1fe3..43d03de1 100644
--- a/extension/modules/utils/Scriptish_convert2RegExp.js
+++ b/extension/modules/utils/Scriptish_convert2RegExp.js
@@ -3,7 +3,7 @@ var EXPORTED_SYMBOLS = ["Scriptish_convert2RegExp"];
 const RE_REGEXP = /^\/(.*)\/(i)?$/;
 const RE_ESCAPE = /[{}()\[\]\\^$.?]/g;
 const RE_WILD = /\*/g;
-const RE_TLD = /^(\^(?:[^\/]*)(?:\/\/)?(?:[^\/]*))(\\\.tld)((?:\/.*)?\$)$/;
+const RE_TLD = /^\^[^\/]*(?:\/\/)?[^\/]*\\\.tld(?:\/.*)?\$$/;
 
 function Scriptish_convert2RegExp(aPattern, aNoTLD) {
   var s = aPattern.toString().trim();

From 54f7c8c7f8f0df5ff4ecbdf19097268e14d09bc6 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 16:39:39 -0700
Subject: [PATCH 297/829] using RE_REGEXP.test(str) instead of
 str.match(RE_REGEXP) which is slower.

---
 extension/modules/utils/Scriptish_convert2RegExp.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/extension/modules/utils/Scriptish_convert2RegExp.js b/extension/modules/utils/Scriptish_convert2RegExp.js
index 43d03de1..8b97c605 100644
--- a/extension/modules/utils/Scriptish_convert2RegExp.js
+++ b/extension/modules/utils/Scriptish_convert2RegExp.js
@@ -9,10 +9,7 @@ function Scriptish_convert2RegExp(aPattern, aNoTLD) {
   var s = aPattern.toString().trim();
 
   // Already a regexp?
-  var m = s.match(RE_REGEXP);
-  if (m) {
-    return new RegExp(m[1], m[2]);
-  }
+  if (RE_REGEXP.test(s)) return new RegExp(RegExp.$1, RegExp.$2);
 
   var res = "^" + s
     .replace(RE_ESCAPE, "\\$&")

From 2cb0ec13295c0e4ac597d2f316cef326650f6f09 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 18:55:09 -0700
Subject: [PATCH 298/829] test: adding some failing tests based on comments in
 https://github.com/erikvold/scriptish/pull/386

---
 .../content/tests/testPatternCollection.js    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index 90348b65..3dcc9eea 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -101,6 +101,41 @@ test("merged3", function() {
   equal(pc.test("foobaz2"), true, "foobaz2");
 });
 
+test("merged4", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("/foobar/i");
+  pc.addPattern("/foo|bar/i");
+  pc.addPattern("/foo|baz/i");
+
+  equal(pc.test("fo"), false, "fo");
+  equal(pc.test("foo"), true, "foo");
+  equal(pc.test("foob"), true, "foob");
+  equal(pc.test("foobar"), true, "foobar");
+  equal(pc.test("ba"), false, "ba");
+  equal(pc.test("bar"), true, "bar");
+  equal(pc.test("bar1"), true, "bar1");
+  equal(pc.test("baz"), true, "baz");
+});
+
+test("merged5", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("/fo(o)bar/i");
+  pc.addPattern("/fo(o)|(baz)/i");
+
+  equal(pc.test("fo"), false, "fo");
+  equal(pc.test("foo"), true, "foo");
+  equal(pc.test("foob"), true, "foob");
+  equal(pc.test("foobar"), true, "foobar");
+  equal(pc.test("ba"), false, "ba");
+  equal(pc.test("bar"), false, "bar");
+  equal(pc.test("baz1"), true, "baz1");
+  equal(pc.test("baz"), true, "baz");
+});
+
 test("tld", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 

From 3363622ac0ce734315a0294bc419044c5b23c92c Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 01:53:07 +0200
Subject: [PATCH 299/829] Pull newest regexpmerger.js upstream

---
 extension/modules/third-party/regexpmerger.js | 129 +++++++++++++-----
 1 file changed, 97 insertions(+), 32 deletions(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index c76414f2..ac415f0e 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -39,19 +39,26 @@
 
 const EXPORTED_SYMBOLS = ['merge'];
 
+const RE_GROUPSTRIP = /\(.*\)/g;
+
+/**
+ * Array filter function to create an unique array
+ * @usage arr.filter(unique_filter, {});
+ */
+function unique_filter(e) !((e in this) || (this[e] = null));
+
 /**
- * Return a good prefix, without out bracket mismatches
+ * Return a good prefix, with no bracket mismatches
  *
- * @param string Calculate the prefix from
+ * @param {String} Calculate the prefix from
  * @return {String} Calculated safe prefix without bracket mismatches
  */
 function killInvalidBrackets(string) {
   let c = 0; // num of unclosed (
   let C = 0; // num of unclosed [
   let good = -1; // last good position
-  let strLen = string.length;
 
-  for (let i = 0; i < strLen; ++i) {
+  for (let i = 0, e = string.length; i < e; ++i) {
     let ch = string[i];
 
     if (ch == "\\") {
@@ -74,7 +81,7 @@ function killInvalidBrackets(string) {
     }
     if (ch == ')') {
       if (!C) {
-        // not in a character class []
+        // not in a character class
         --c;
         if (c < 0) {
           // cannot be valid and negative at the same time
@@ -114,6 +121,7 @@ function killInvalidBrackets(string) {
     // all closed, use whole string
     return string;
   }
+
   if (good >= 0) {
     // something is bad, but we got a good position
     return string.substring(0, good + 1);
@@ -123,14 +131,49 @@ function killInvalidBrackets(string) {
   return "";
 }
 
+/**
+ * Splits a pattern into individual alternates, if any
+ * @param {String} pattern Pattern to process
+ * @param {Array} rv Result array patterns will be pushed to
+ */
+function splitAlternates(pattern, rv) {
+  if (!pattern || pattern.replace(RE_GROUPSTRIP).indexOf("|") == -1) {
+    rv.push(pattern);
+    return;
+  }
+  let open = 0, cur = "";
+  for (let i = 0, e = pattern.length; i < e; ++i) {
+    let c = pattern[i];
+    if (c == "\\") {
+      cur += c + pattern[++i];
+    }
+    else if (c == "(" || c == "[") {
+      cur += c;
+      ++open;
+    }
+    else if (c == ")" || c == "]") {
+      cur += c;
+      --open;
+    }
+    else if (!open && c == "|") {
+      rv.push(cur);
+      cur = "";
+    }
+    else {
+      cur += c;
+    }
+  }
+  rv.push(cur);
+}
+
 /**
  * Recursively determine the the largest group with a common prefix
  * The group is guaranteed to contain at least 3 items
  *
- * @param patterns Patterns to process. Must be sorted.
- * @param low Optional. Low bound. Default = 0
- * @param high Optional. High bound. Default = patterns.length
- * @param level Optional. Recursion level. Default = length
+ * @param {Array} patterns Patterns to process. Must be sorted.
+ * @param {int} low Optional. Low bound. Default = 0
+ * @param {int} high Optional. High bound. Default = patterns.length
+ * @param {int} level Optional. Recursion level. Default = length
  */
 function largestPrefixGroup(patterns, low, high, level) {
   level = level || 0;
@@ -142,11 +185,12 @@ function largestPrefixGroup(patterns, low, high, level) {
   let tails = patterns.map(function(p) p.substring(1));
 
   let besti = -1; // best starting match
-  let beste = 0;  // best ending match
+  let beste = 0; // best ending match
   let bestc = 0; // num of matches
 
   for (let i = low; i < high - 1; ++i) {
     let allgood = true;
+
     for (let e = i + 1; e < high; ++e) {
       if (heads[i] == heads[e]) {
         continue;
@@ -178,15 +222,15 @@ function largestPrefixGroup(patterns, low, high, level) {
     return [0,0,0];
   }
 
-  let head = heads[besti];
+  let prefix = heads[besti];
 
   if (tails.some(function(p) p.length == 0)) {
-    return [besti, beste, head];
+    return [besti, beste, prefix];
   }
 
   let [nlow, nhigh, np] = largestPrefixGroup(tails, besti, beste, level + 1);
   if (nhigh) {
-    let prefix = head + np;
+    prefix += np;
     if (!level) {
       // root level needs to check for bracket mismatches
       // this might cause the group to get smaller than it has to be
@@ -196,34 +240,40 @@ function largestPrefixGroup(patterns, low, high, level) {
     return [nlow, nhigh, prefix];
   }
 
-  return [besti, beste, head];
+  return [besti, beste, prefix];
 }
 
 /**
  * Merge prefix group with set of patterns according to bounds and prefix
  *
- * @param patterns {array} Set of patterns
- * @param low {int} Lower bound
- * @param high {int} Higher bound
- * @param prefix {string} Prefix of the group
- * @return {array} mutated & reduced patterns array where the patterns specified
- *                 by the low & high params are merged.
+ * @param {Array} patterns Set of patterns
+ * @param {int} low Lower bound
+ * @param {int} high Higher bound
+ * @param {String} prefix Prefix of the group
+ * @return {Array} mutated & reduced patterns array where the patterns
+ *                  specified by the low & high params are merged.
  */
 function mergePatterns(patterns, low, high, prefix) {
   let pl = prefix.length;
 
-  // splice the patterns to be merged, and chop off their common prefix
+  // splice the patterns to be merged, chop off their common prefix and join
   let tails = patterns.splice(low, high - low).map(function(p) p.substring(pl));
 
-  // build a tail pattern
-  let tail = tails.join("|");
+  // if there is an empty tail, then we can omit the whole group
+  let newpattern = "";
+  if (tails.indexOf("") == -1) {
+    newpattern = tails.join("|");
+  }
 
-  // add merged pattern
-  if (prefix) {
-    patterns.push(prefix + "(?:" + tail + ")");
-  } else {
-    patterns.push(tail);
+  if (prefix && newpattern) {
+    newpattern = prefix + "(?:" + newpattern + ")";
   }
+  else if (prefix) {
+    newpattern = prefix;
+  }
+
+  // Add the merged pattern
+  patterns.push(newpattern);
 
   // need to return sorted as largestPrefixGroup relies on sorting
   return patterns.sort();
@@ -231,16 +281,31 @@ function mergePatterns(patterns, low, high, prefix) {
 
 /**
  * Merge patterns with optimizations (prefixes)
- * @param patterns Patterns to merge
+ * @param {Array} patterns Patterns to merge
  * @returns {String} Resulting merged and optimized pattern
  */
 function merge(patterns) {
-  patterns = patterns.slice(0);
+  if (patterns.length < 2) {
+    return patterns[0];
+  }
 
+  // Copy patterns and make unique
+  patterns = patterns.filter(unique_filter, {});
+  if (patterns.length < 2) {
+    return patterns[0];
+  }
+
+  // split patterns into pieces by top-level alternates
+  let newpatterns = [];
+  for (let [,p] in Iterator(patterns)) {
+    splitAlternates(p, newpatterns);
+  }
+  patterns = newpatterns.filter(unique_filter, {});
   if (patterns.length < 2) {
     return patterns[0];
   }
 
+  // Good to go
   patterns.sort();
 
   for (;;) {
@@ -254,11 +319,11 @@ function merge(patterns) {
 
   let len = patterns.length;
   if (len == 1) {
-    // already merged in to a single pattern
+    // already merged into a single pattern
     return patterns[0];
   }
 
   // not yet a single pattern (i.e. not all patterns shared a common prefix)
-  // merge without a prefix to get a single pattern
+  // merge without a prefix to get single pattern
   return mergePatterns(patterns, 0, len, "")[0];
 }

From 9a2994b1e3ce9c184aced6a83937ecca415a5bd1 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 19:15:40 -0700
Subject: [PATCH 300/829] merge( ["fo(o)bar", "fo(o)|(baz)"] ) ==
 "fo(o)(?:bar||(baz))"

---
 extension/modules/third-party/regexpmerger.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index ac415f0e..fa692ab6 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -39,8 +39,6 @@
 
 const EXPORTED_SYMBOLS = ['merge'];
 
-const RE_GROUPSTRIP = /\(.*\)/g;
-
 /**
  * Array filter function to create an unique array
  * @usage arr.filter(unique_filter, {});
@@ -137,7 +135,7 @@ function killInvalidBrackets(string) {
  * @param {Array} rv Result array patterns will be pushed to
  */
 function splitAlternates(pattern, rv) {
-  if (!pattern || pattern.replace(RE_GROUPSTRIP).indexOf("|") == -1) {
+  if (!pattern) {
     rv.push(pattern);
     return;
   }

From e48637be26e7ae414abc5797ed717aea99cc567b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 19:33:43 -0700
Subject: [PATCH 301/829] test: @include /toString/i is failing atm

---
 extension/content/tests/testPatternCollection.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index 3dcc9eea..bbd91aec 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -136,6 +136,18 @@ test("merged5", function() {
   equal(pc.test("baz"), true, "baz");
 });
 
+test("merged6", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("/a/i");
+  pc.addPattern("/toString/i");
+
+  equal(pc.test("fo"), false, "fo");
+  equal(pc.test("a"), true, "a");
+  equal(pc.test("toString"), true, "toString");
+});
+
 test("tld", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 

From 37e881d126022f68010cfe2211d92b9d56da2778 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 19:35:40 -0700
Subject: [PATCH 302/829] bug fix: @include /toString/i was failing, now works

---
 extension/modules/third-party/regexpmerger.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index fa692ab6..3ca0d6dc 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -41,7 +41,7 @@ const EXPORTED_SYMBOLS = ['merge'];
 
 /**
  * Array filter function to create an unique array
- * @usage arr.filter(unique_filter, {});
+ * @usage arr.filter(unique_filter, {__proto__: null});
  */
 function unique_filter(e) !((e in this) || (this[e] = null));
 
@@ -288,7 +288,7 @@ function merge(patterns) {
   }
 
   // Copy patterns and make unique
-  patterns = patterns.filter(unique_filter, {});
+  patterns = patterns.filter(unique_filter, {__proto__: null});
   if (patterns.length < 2) {
     return patterns[0];
   }
@@ -298,7 +298,7 @@ function merge(patterns) {
   for (let [,p] in Iterator(patterns)) {
     splitAlternates(p, newpatterns);
   }
-  patterns = newpatterns.filter(unique_filter, {});
+  patterns = newpatterns.filter(unique_filter, {__proto__: null});
   if (patterns.length < 2) {
     return patterns[0];
   }

From 71a1a307e84ae66741ea89364ae11094d843653e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 21:25:07 -0700
Subject: [PATCH 303/829] test: adding 3 failing tests for PatternCollection

---
 .../content/tests/testPatternCollection.js    | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index bbd91aec..d46b58a0 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -148,6 +148,57 @@ test("merged6", function() {
   equal(pc.test("toString"), true, "toString");
 });
 
+test("merged7", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("/fo[\(o]bar/i");
+  pc.addPattern("/fo[\(o]|(baz)/i");
+
+  equal(pc.test("fo"), false, "fo");
+  equal(pc.test("foo"), true, "foo");
+  equal(pc.test("foob"), true, "foob");
+  equal(pc.test("foobar"), true, "foobar");
+  equal(pc.test("ba"), false, "ba");
+  equal(pc.test("bar"), false, "bar");
+  equal(pc.test("baz1"), true, "baz1");
+  equal(pc.test("baz"), true, "baz");
+});
+
+test("merged8", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("/fo[\(o]bar/i");
+  pc.addPattern("/fo[\(o]|(baz)/i");
+
+  equal(pc.test("fo"), false, "fo");
+  equal(pc.test("foo"), true, "foo");
+  equal(pc.test("foob"), true, "foob");
+  equal(pc.test("foobar"), true, "foobar");
+  equal(pc.test("ba"), false, "ba");
+  equal(pc.test("bar"), false, "bar");
+  equal(pc.test("baz1"), true, "baz1");
+  equal(pc.test("baz"), true, "baz");
+});
+
+test("merged9", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("/fo[(((((((o]bar/i");
+  pc.addPattern("/fo[(((((((o]|(baz)/i");
+
+  equal(pc.test("fo"), false, "fo");
+  equal(pc.test("foo"), true, "foo");
+  equal(pc.test("foob"), true, "foob");
+  equal(pc.test("foobar"), true, "foobar");
+  equal(pc.test("ba"), false, "ba");
+  equal(pc.test("bar"), false, "bar");
+  equal(pc.test("baz1"), true, "baz1");
+  equal(pc.test("baz"), true, "baz");
+});
+
 test("tld", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 

From 2a32551b58a8e5ce118e1280f3395b7d248a5b2e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 21:26:46 -0700
Subject: [PATCH 304/829] bug fix: adding fix in regexpmerger.js for 3 tests
 added in prev commit

---
 extension/modules/third-party/regexpmerger.js | 54 ++++++++++++-------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index 3ca0d6dc..c1b8ee35 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -139,26 +139,42 @@ function splitAlternates(pattern, rv) {
     rv.push(pattern);
     return;
   }
-  let open = 0, cur = "";
+
+  let c = 0; // num of unclosed (
+  let C = 0; // num of unclosed [
+  let cur = ""; // current alternate
   for (let i = 0, e = pattern.length; i < e; ++i) {
-    let c = pattern[i];
-    if (c == "\\") {
-      cur += c + pattern[++i];
-    }
-    else if (c == "(" || c == "[") {
-      cur += c;
-      ++open;
-    }
-    else if (c == ")" || c == "]") {
-      cur += c;
-      --open;
-    }
-    else if (!open && c == "|") {
-      rv.push(cur);
-      cur = "";
-    }
-    else {
-      cur += c;
+    let char = pattern[i];
+
+    switch (char) {
+    case "\\":
+      cur += char + pattern[++i];
+      continue;
+    case "(":
+      if (!C) ++c;
+      cur += char;
+      continue;
+    case ")":
+      --c;
+      cur += char;
+      continue;
+    case "[":
+      if (!C) ++C;
+      cur += char;
+      continue;
+    case "]":
+      if (C) --C;
+      cur += char;
+      continue;
+    case "|":
+      if (!c && !C) {
+        rv.push(cur);
+        cur = "";
+        continue;
+      }
+    default:
+      cur += char;
+      continue;
     }
   }
   rv.push(cur);

From ab5125b086d31ea907b8fca951cdedaefd019bc8 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 22:57:42 -0700
Subject: [PATCH 305/829] test: [((((] type reg exp fail to merge properly

---
 .../content/tests/testPatternCollection.js      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index d46b58a0..ac4dd4b7 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -199,6 +199,23 @@ test("merged9", function() {
   equal(pc.test("baz"), true, "baz");
 });
 
+test("merged10", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("/fo[(((((((o))]bar/i");
+  pc.addPattern("/fo[(((((((o))]|(baz)/i");
+
+  equal(pc.test("fo"), false, "fo");
+  equal(pc.test("foo"), true, "foo");
+  equal(pc.test("foob"), true, "foob");
+  equal(pc.test("foobar"), true, "foobar");
+  equal(pc.test("ba"), false, "ba");
+  equal(pc.test("bar"), false, "bar");
+  equal(pc.test("baz1"), true, "baz1");
+  equal(pc.test("baz"), true, "baz");
+});
+
 test("tld", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 

From 661dd35254b8709ac7aff6a900c64440eed4b526 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 2 Jul 2011 22:59:22 -0700
Subject: [PATCH 306/829] bug fix: fix for [(((] type of reg exp

---
 extension/modules/third-party/regexpmerger.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index c1b8ee35..e0af5052 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -155,15 +155,15 @@ function splitAlternates(pattern, rv) {
       cur += char;
       continue;
     case ")":
-      --c;
+      if (!C) --c;
       cur += char;
       continue;
     case "[":
-      if (!C) ++C;
+      ++C;
       cur += char;
       continue;
     case "]":
-      if (C) --C;
+      --C;
       cur += char;
       continue;
     case "|":

From fc0b6940aa109748523451b866c51b9730523dba Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 00:26:41 -0700
Subject: [PATCH 307/829] Adding test for TLD @includes and case sensitive reg
 exp @includes, and supporting case sensitive @includes again

---
 .../content/tests/testPatternCollection.js    | 43 ++++++++++++++++++-
 extension/modules/utils/PatternCollection.js  | 36 +++++++++++-----
 2 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index ac4dd4b7..24b59c1f 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -21,11 +21,25 @@ test("plain", function() {
   deepEqual(pc.patterns, ["foo"], "patterns");
   deepEqual(pc._regs.map(function(e) e.source), ["^foo$"], "regs");
   equal(pc.merged.source, "^foo$", "merged");
+  equal(pc._hasTLD, false, "hasTLD");
   equal(pc.test("foo"), true, "foo");
   equal(pc.test("bar"), false, "bar");
   equal(pc.test("foobar"), false, "foobar");
 });
 
+test("tld", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var tldPattern = "http://google.tld/test";
+  var pc = new PatternCollection();
+  pc.addPattern(tldPattern);
+  deepEqual(pc.patterns, [tldPattern], "patterns");
+  deepEqual(pc._regsTLD.map(function(e) e.source), ["^http:\\/\\/google\\.tld\\/test$"], "regsTLD");
+  equal(pc._hasTLD, true, "hasTLD");
+  equal(pc.test("http://google.com/test"), true, "http://google.com/test");
+  equal(pc.test("http://google.net/test"), true, "http://google.net/test");
+});
+
 test("wild", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 
@@ -61,7 +75,7 @@ test("merged", function() {
   equal(pc.test("foobax"), true, "foobax");
 });
 
-test("merged2", function() {
+test("merged2 with reg exp", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 
   var pc = new PatternCollection();
@@ -84,6 +98,33 @@ test("merged2", function() {
   equal(pc.test("123foobax"), true, "123foobax");
 });
 
+test("merged2 with sensitive reg exp", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  var patterns = ["foobar*", "foobaz*", "/foobax$/"];
+  pc.addPattern(patterns[0]);
+  pc.addPattern(patterns[1]);
+  pc.addPattern(patterns[2]);
+  deepEqual(pc.patterns, patterns, "patterns");
+  deepEqual(
+      pc._regs.map(function(e) e.source),
+      ["^foobar.*$", "^foobaz.*$"],
+      "regs");
+  deepEqual(
+      pc._regsSensitives.map(function(e) e.source),
+      ["foobax$"],
+      "regs");
+  equal(pc.mergedSensitives.source, "foobax$", "merged");
+  equal(pc.test("foo"), false, "foo");
+  equal(pc.test("fooba"), false, "fooba");
+  equal(pc.test("foobar"), true, "foobar");
+  equal(pc.test("foobar1"), true, "foobar1");
+  equal(pc.test("foobaz2"), true, "foobaz2");
+  equal(pc.test("123foobaz"), false, "123foobaz");
+  equal(pc.test("123foobax"), true, "123foobax");
+});
+
 test("merged3", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 
diff --git a/extension/modules/utils/PatternCollection.js b/extension/modules/utils/PatternCollection.js
index 96847521..104d37e0 100644
--- a/extension/modules/utils/PatternCollection.js
+++ b/extension/modules/utils/PatternCollection.js
@@ -5,16 +5,29 @@ Components.utils.import("resource://scriptish/utils/Scriptish_convert2RegExp.js"
 Components.utils.import("resource://scriptish/utils/Scriptish_getTLDURL.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_mergeRegExps.js");
 
+const FAKE_REGEXP = {test: function() false};
+
 function PatternCollection() {
   this._patterns = [];
   this._regs = [];
   this._regsTLD = [];
+  this._regsSensitives = [];
 }
 PatternCollection.prototype = {
+  _hasTLD: false,
   addPattern: function(pattern) {
     this._patterns.push(pattern);
     var r = Scriptish_convert2RegExp(pattern);
-    (r.isTLD ? this._regsTLD : this._regs).push(r);
+    if (r.isTLD) {
+      this._regsTLD.push(r);
+      this._hasTLD = true;
+    } else {
+      if (r.ignoreCase)
+        this._regs.push(r);
+      else
+        this._regsSensitives.push(r);
+    }
+
     this._merged = this._mergedTLD = null;
   },
   addPatterns: function(patterns) {
@@ -28,8 +41,8 @@ PatternCollection.prototype = {
   },
   clear: function() {
     this._patterns.length = 0;
-    this._regs.length = 0;
-    this._regsTLD.length = 0;
+    this._regs.length = this._regsSensitives = this._regsTLD.length = 0;
+    delete this._hasTLD;
     this._merged = this._mergedTLD = null;
   },
   get patterns() this._patterns.concat(),
@@ -38,22 +51,25 @@ PatternCollection.prototype = {
       // No patterns -> always test |false|
       // Do not merge, or we'll create an empty expression
       // that will always test |true|
-      return {test: function() false};
+      return FAKE_REGEXP;
     }
     return Scriptish_mergeRegExps(regs);
   },
   get merged() {
-    if (!this._merged) {
+    if (!this._merged)
       this._merged = this._merge(this._regs);
-    }
     return this._merged;
   },
+  get mergedSensitives() {
+    if (!this._mergedSensitives)
+      this._mergedSensitives = this._merge(this._regsSensitives);
+    return this._mergedSensitives;
+  },
   get mergedTLD() {
-    if (!this._mergedTLD) {
+    if (!this._mergedTLD)
       this._mergedTLD = this._merge(this._regsTLD);
-    }
     return this._mergedTLD;
   },
-  test: function(url) this.merged.test(url) ||
-    (!!this._regsTLD.length && this.mergedTLD.test(Scriptish_getTLDURL(url)))
+  test: function(url) this.merged.test(url) || this.mergedSensitives.test(url)
+      || (!!this._hasTLD && this.mergedTLD.test(Scriptish_getTLDURL(url)))
 };

From 9755cc25f858476b8448fa95eaba22e64beae000 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 00:48:13 -0700
Subject: [PATCH 308/829] adding test that merged reg exps have the correct
 flags

---
 extension/content/tests/testPatternCollection.js  |  3 +++
 extension/modules/utils/PatternCollection.js      |  8 ++++----
 extension/modules/utils/Scriptish_mergeRegExps.js | 10 ++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index 24b59c1f..4cb0bbf5 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -21,6 +21,7 @@ test("plain", function() {
   deepEqual(pc.patterns, ["foo"], "patterns");
   deepEqual(pc._regs.map(function(e) e.source), ["^foo$"], "regs");
   equal(pc.merged.source, "^foo$", "merged");
+  equal(pc.merged.ignoreCase, true, "ignoreCase");
   equal(pc._hasTLD, false, "hasTLD");
   equal(pc.test("foo"), true, "foo");
   equal(pc.test("bar"), false, "bar");
@@ -35,6 +36,7 @@ test("tld", function() {
   pc.addPattern(tldPattern);
   deepEqual(pc.patterns, [tldPattern], "patterns");
   deepEqual(pc._regsTLD.map(function(e) e.source), ["^http:\\/\\/google\\.tld\\/test$"], "regsTLD");
+  equal(pc.mergedTLD.ignoreCase, true, "ignoreCase");
   equal(pc._hasTLD, true, "hasTLD");
   equal(pc.test("http://google.com/test"), true, "http://google.com/test");
   equal(pc.test("http://google.net/test"), true, "http://google.net/test");
@@ -116,6 +118,7 @@ test("merged2 with sensitive reg exp", function() {
       ["foobax$"],
       "regs");
   equal(pc.mergedSensitives.source, "foobax$", "merged");
+  equal(pc.mergedSensitives.ignoreCase, false, "ignoreCase");
   equal(pc.test("foo"), false, "foo");
   equal(pc.test("fooba"), false, "fooba");
   equal(pc.test("foobar"), true, "foobar");
diff --git a/extension/modules/utils/PatternCollection.js b/extension/modules/utils/PatternCollection.js
index 104d37e0..f5667ee4 100644
--- a/extension/modules/utils/PatternCollection.js
+++ b/extension/modules/utils/PatternCollection.js
@@ -46,18 +46,18 @@ PatternCollection.prototype = {
     this._merged = this._mergedTLD = null;
   },
   get patterns() this._patterns.concat(),
-  _merge: function(regs) {
+  _merge: function(regs, flags) {
     if (!regs.length) {
       // No patterns -> always test |false|
       // Do not merge, or we'll create an empty expression
       // that will always test |true|
       return FAKE_REGEXP;
     }
-    return Scriptish_mergeRegExps(regs);
+    return Scriptish_mergeRegExps(regs, flags);
   },
   get merged() {
     if (!this._merged)
-      this._merged = this._merge(this._regs);
+      this._merged = this._merge(this._regs, "i");
     return this._merged;
   },
   get mergedSensitives() {
@@ -67,7 +67,7 @@ PatternCollection.prototype = {
   },
   get mergedTLD() {
     if (!this._mergedTLD)
-      this._mergedTLD = this._merge(this._regsTLD);
+      this._mergedTLD = this._merge(this._regsTLD, "i");
     return this._mergedTLD;
   },
   test: function(url) this.merged.test(url) || this.mergedSensitives.test(url)
diff --git a/extension/modules/utils/Scriptish_mergeRegExps.js b/extension/modules/utils/Scriptish_mergeRegExps.js
index 8452f128..48cf2206 100644
--- a/extension/modules/utils/Scriptish_mergeRegExps.js
+++ b/extension/modules/utils/Scriptish_mergeRegExps.js
@@ -3,10 +3,8 @@ const EXPORTED_SYMBOLS = ["Scriptish_mergeRegExpStrings", "Scriptish_mergeRegExp
 
 Components.utils.import("resource://scriptish/third-party/regexpmerger.js");
 
-function Scriptish_mergeRegExpStrings(strs) {
-  return new RegExp(merge(strs), "i");
-}
+function Scriptish_mergeRegExpStrings(strs, flags) (
+    new RegExp(merge(strs), flags || ""))
 
-function Scriptish_mergeRegExps(regs) {
-  return Scriptish_mergeRegExpStrings([r.source for ([,r] in Iterator(regs))]);
-}
+function Scriptish_mergeRegExps(regs, flags) (
+    Scriptish_mergeRegExpStrings([r.source for ([,r] in Iterator(regs))], flags))

From c0f7b1ff90c5765a4d148a08b736b82247f3f680 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 18:45:04 +0200
Subject: [PATCH 309/829] bind GM_log to the console

Also add a prefix (script.id) to any log messages.
"Hide" the aux functions behind a no-enum __noSuchMethod__, so that
feature-testing for Firebug may still work
---
 extension/components/scriptish.js        | 19 +----
 extension/modules/api.js                 | 10 ---
 extension/modules/api/GM_ScriptLogger.js | 11 ---
 extension/modules/api/GM_console.js      | 91 ++++++++++++++++++++----
 4 files changed, 80 insertions(+), 51 deletions(-)
 delete mode 100644 extension/modules/api/GM_ScriptLogger.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index bb3f27ff..6838f1b9 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -12,7 +12,6 @@ Cu.import("resource://scriptish/scriptish.js");
 Cu.import("resource://scriptish/third-party/Timer.js");
 Cu.import("resource://scriptish/utils/Scriptish_alert.js");
 Cu.import("resource://scriptish/utils/Scriptish_getBrowserForContentWindow.js");
-Cu.import("resource://scriptish/utils/Scriptish_getFirebugConsole.js");
 Cu.import("resource://scriptish/utils/Scriptish_getWindowIDs.js");
 Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
@@ -326,20 +325,7 @@ ScriptishService.prototype = {
     let unsafeContentWin = wrappedContentWin.wrappedJSObject;
     let tools = {};
     Cu.import("resource://scriptish/api.js", tools);
-
-    tools.console = (function getConsole() {
-      let rv = Scriptish_getFirebugConsole(wrappedContentWin, chromeWin);
-      if (rv) {
-        return rv;
-      }
-      if (wrappedContentWin.console) {
-        return wrappedContentWin.console;
-      }
-      rv = {};
-      Cu.import("resource://scriptish/api/GM_console.js", rv);
-      return rv.GM_console(script);
-    })();
-
+    Cu.import("resource://scriptish/api/GM_console.js", tools);
 
     let delays = [];
     let winID = Scriptish_getWindowIDs(wrappedContentWin).innerID;
@@ -358,7 +344,8 @@ ScriptishService.prototype = {
 
       // add GM_* API to sandbox
       for (var funcName in GM_API) sandbox[funcName] = GM_API[funcName];
-      sandbox.console = tools.console;
+      sandbox.console = tools.GM_console(script, wrappedContentWin, chromeWin);
+      sandbox.GM_log = sandbox.console.log.bind(sandbox.console);
 
       sandbox.unsafeWindow = unsafeContentWin;
       sandbox.__proto__ = wrappedContentWin;
diff --git a/extension/modules/api.js b/extension/modules/api.js
index e1b2f5a1..412bef0e 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -73,14 +73,6 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
     }
     return _resources;
   }
-  function getLogger() {
-    if (!_logger) {
-      var tools = {};
-      Cu.import("resource://scriptish/api/GM_ScriptLogger.js", tools);
-      _logger = new tools.GM_ScriptLogger(aScript);
-    }
-    return _logger;
-  }
 
   this.GM_addStyle = function GM_addStyle(css) {
     var head = document.getElementsByTagName("head")[0];
@@ -102,8 +94,6 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
     return doc;
   }
 
-  this.GM_log = function GM_log() getLogger().log.apply(getLogger(), arguments)
-
   this.GM_notification =
       function GM_notification(aMsg, aTitle, aIcon, aCallback) {
     if (!GM_apiLeakCheck("GM_notification")) return;
diff --git a/extension/modules/api/GM_ScriptLogger.js b/extension/modules/api/GM_ScriptLogger.js
deleted file mode 100644
index e6b1e8bf..00000000
--- a/extension/modules/api/GM_ScriptLogger.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var EXPORTED_SYMBOLS = ["GM_ScriptLogger"];
-Components.utils.import("resource://scriptish/logging.js");
-
-function GM_ScriptLogger(script) {
-  var namespace = script.namespace;
-  if (namespace.substring(namespace.length - 1) != "/") namespace += "/";
-  this.prefix = [namespace, script.name, ": "].join("");
-}
-GM_ScriptLogger.prototype.log = function(message) {
-  Scriptish_log(this.prefix + message, true);
-}
diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index ca697abd..4b4d0b73 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -1,18 +1,81 @@
+"use strict";
 var EXPORTED_SYMBOLS = ["GM_console"];
-Components.utils.import("resource://scriptish/api/GM_ScriptLogger.js");
+
+const Cu = Components.utils;
+Cu.import("resource://scriptish/logging.js");
+Cu.import("resource://scriptish/utils/Scriptish_getFirebugConsole.js");
+
+// moz-4: log, warn, error, info
+// moz-5: debug (alias to log)
+// moz-6: trace (callstack)
+const log_functions = ["log", "debug", "warn", "error", "info", "trace"];
 
 // based on http://www.getfirebug.com/firebug/firebugx.js
-const keys = [
-    "debug", "warn", "error", "info", "assert", "dir", "dirxml",
-    "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile",
-    "profileEnd"];
-
-function GM_console(script) {
-  for (var i = keys.length - 1, key; key = keys[i--];)
-    this[key] = function() {};
-
-  // Important to use this private variable so that user scripts can't make
-  // this call something else by redefining <this> or <logger>.
-  var logger = new GM_ScriptLogger(script);
-  this.log = function() { logger.log(Array.slice(arguments).join("\n")); };
+const aux_functions = ["assert", "dir", "dirxml", "group", "groupEnd", "time",
+                        "timeEnd", "count", "profile", "profileEnd"
+                        ];
+
+function getConsoleFor(contentWindow, chromeWindow) {
+
+  let rv = Scriptish_getFirebugConsole(contentWindow, chromeWindow);
+  if (rv) {
+    return rv;
+  }
+
+  if (contentWindow.console) {
+    return contentWindow.console;
+  }
+
+  return {
+    log: function() Scriptish_log(Array.slice(arguments).join(" "), true),
+    trace: function() {
+      let msg = "";
+
+      // Skip the top two frames
+      let stack = Components.stack.caller;
+      if (stack && (stack = stack.caller)) {
+        for (let i = 0; i < 10 && stack; ++i, stack = stack.caller) {
+          msg += "\n" + stack.filename + ":" + stack.lineNumber;
+        }
+      }
+      Scriptish_log(Array.slice(arguments).join(" ") + msg, true);
+    }
+  };
+}
+
+function GM_console(script, contentWindow, chromeWindow) {
+  const _console = getConsoleFor(contentWindow, chromeWindow);
+  const console = {};
+  const prefix = "[" + script.id + "]";
+
+  // Wrap log functions
+  // Redirect any missing log function to .log
+  for (let i = 0, e = log_functions.length; i < e; ++i) {
+    let fn = log_functions[i];
+    if (fn in _console) {
+      console[fn] = _console[fn].bind(_console, prefix);
+    }
+    else {
+      console[fn] = console.log.bind(console);
+    }
+  }
+
+  // Wrap aux functions
+  for (let i = 0, e = aux_functions.length; i < e; ++i) {
+    let fn = aux_functions[i];
+    if (fn in console) {
+      console[fn] = _console[fn].bind(_console);
+    }
+  }
+  Object.defineProperty(console, "__noSuchMethod__", {
+    value: function(id, args) {
+      if (aux_functions.indexOf(id) != -1) {
+        let fn = _console[id] || (function() {});
+        return fn.apply(_console, args);
+      }
+      throw new Error("No such method");
+    }
+  });
+
+  return console;
 }

From ed01808a867cee9958531e64c096b0045f93bd45 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 19:38:40 +0200
Subject: [PATCH 310/829] Implement console.trace always when it is missing

---
 extension/modules/api/GM_console.js | 30 ++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index 4b4d0b73..fe87be6f 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -27,19 +27,7 @@ function getConsoleFor(contentWindow, chromeWindow) {
   }
 
   return {
-    log: function() Scriptish_log(Array.slice(arguments).join(" "), true),
-    trace: function() {
-      let msg = "";
-
-      // Skip the top two frames
-      let stack = Components.stack.caller;
-      if (stack && (stack = stack.caller)) {
-        for (let i = 0; i < 10 && stack; ++i, stack = stack.caller) {
-          msg += "\n" + stack.filename + ":" + stack.lineNumber;
-        }
-      }
-      Scriptish_log(Array.slice(arguments).join(" ") + msg, true);
-    }
+    log: function() Scriptish_log(Array.slice(arguments).join(" "), true)
   };
 }
 
@@ -55,6 +43,22 @@ function GM_console(script, contentWindow, chromeWindow) {
     if (fn in _console) {
       console[fn] = _console[fn].bind(_console, prefix);
     }
+    else if (fn == "trace") {
+      console.trace = function() {
+        let args = Array.slice(arguments);
+        let msg = "";
+
+        // Skip the top two frames
+        let stack = Components.stack.caller;
+        if (stack && (stack = stack.caller)) {
+          for (let i = 0; i < 10 && stack; ++i, stack = stack.caller) {
+            msg += "\n[@" + stack.filename + ":" + stack.lineNumber + "]";
+          }
+          args.push(msg);
+        }
+        console.log.apply(console, args);
+      };
+    }
     else {
       console[fn] = console.log.bind(console);
     }

From 46a4f559b4df2b7128d3ae53c836299e7579b43e Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 19:49:37 +0200
Subject: [PATCH 311/829] Account for empty script.id

Shouldn't be possible actually, but whatever :p
---
 extension/modules/api/GM_console.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index fe87be6f..2ffe4606 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -34,7 +34,7 @@ function getConsoleFor(contentWindow, chromeWindow) {
 function GM_console(script, contentWindow, chromeWindow) {
   const _console = getConsoleFor(contentWindow, chromeWindow);
   const console = {};
-  const prefix = "[" + script.id + "]";
+  const prefix = "[" + (script.id || "Scriptish") + "]";
 
   // Wrap log functions
   // Redirect any missing log function to .log

From 3d4fe03ff82e13847400dfc3d1963f525562ad5c Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 20:38:58 +0200
Subject: [PATCH 312/829] regexpmerge: new upstream

---
 extension/modules/third-party/regexpmerger.js | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index e0af5052..0bcedf75 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -41,7 +41,7 @@ const EXPORTED_SYMBOLS = ['merge'];
 
 /**
  * Array filter function to create an unique array
- * @usage arr.filter(unique_filter, {__proto__: null});
+ * @usage arr.filter(unique_filter, Object.create(null));
  */
 function unique_filter(e) !((e in this) || (this[e] = null));
 
@@ -146,35 +146,33 @@ function splitAlternates(pattern, rv) {
   for (let i = 0, e = pattern.length; i < e; ++i) {
     let char = pattern[i];
 
-    switch (char) {
-    case "\\":
+    if (char == "\\") {
       cur += char + pattern[++i];
-      continue;
-    case "(":
+    }
+    else if (char == "(") {
       if (!C) ++c;
       cur += char;
-      continue;
-    case ")":
+    }
+    else if (char == ")") {
       if (!C) --c;
       cur += char;
-      continue;
-    case "[":
+    }
+    else if (char == "[") {
       ++C;
       cur += char;
-      continue;
-    case "]":
+    }
+    else if (char == "]") {
       --C;
       cur += char;
-      continue;
-    case "|":
-      if (!c && !C) {
+    }
+    else {
+      if (char == "|" && !c && !C) {
         rv.push(cur);
         cur = "";
-        continue;
       }
-    default:
-      cur += char;
-      continue;
+      else {
+        cur += char;
+      }
     }
   }
   rv.push(cur);
@@ -304,7 +302,7 @@ function merge(patterns) {
   }
 
   // Copy patterns and make unique
-  patterns = patterns.filter(unique_filter, {__proto__: null});
+  patterns = patterns.filter(unique_filter, Object.create(null));
   if (patterns.length < 2) {
     return patterns[0];
   }
@@ -314,7 +312,7 @@ function merge(patterns) {
   for (let [,p] in Iterator(patterns)) {
     splitAlternates(p, newpatterns);
   }
-  patterns = newpatterns.filter(unique_filter, {__proto__: null});
+  patterns = newpatterns.filter(unique_filter, Object.create(null));
   if (patterns.length < 2) {
     return patterns[0];
   }

From 3d7f152e6c56715c567cacda8c909cadcb23dc86 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 21:01:45 +0200
Subject: [PATCH 313/829] Lazy loading of console/GM_log

---
 extension/components/scriptish.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 6838f1b9..b8b7f40a 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -325,7 +325,6 @@ ScriptishService.prototype = {
     let unsafeContentWin = wrappedContentWin.wrappedJSObject;
     let tools = {};
     Cu.import("resource://scriptish/api.js", tools);
-    Cu.import("resource://scriptish/api/GM_console.js", tools);
 
     let delays = [];
     let winID = Scriptish_getWindowIDs(wrappedContentWin).innerID;
@@ -344,8 +343,16 @@ ScriptishService.prototype = {
 
       // add GM_* API to sandbox
       for (var funcName in GM_API) sandbox[funcName] = GM_API[funcName];
-      sandbox.console = tools.GM_console(script, wrappedContentWin, chromeWin);
-      sandbox.GM_log = sandbox.console.log.bind(sandbox.console);
+      sandbox.__defineGetter__("console", function() {
+        delete sandbox.console;
+        var _m = {};
+        Cu.import("resource://scriptish/api/GM_console.js", _m);
+        return (sandbox.console = _m.GM_console(script, wrappedContentWin, chromeWin));
+      });
+      sandbox.__defineGetter__("GM_log", function() {
+        delete sandbox.GM_log;
+        return (sandbox.GM_log = sandbox.console.log.bind(sandbox.console));
+      });
 
       sandbox.unsafeWindow = unsafeContentWin;
       sandbox.__proto__ = wrappedContentWin;

From 09af5c46d737c63650856a8d6847982a25ddc4c5 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 21:34:02 +0200
Subject: [PATCH 314/829] Add lazyImport, for lazy (and cached) module loading

---
 extension/modules/constants.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 7914a04d..329770a4 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = [
     "Cc", "Ci", "Cr", "AddonManager", "AddonManagerPrivate", "NetUtil", "XPCOMUtils",
-    "Services", "Instances", "timeout"];
+    "Services", "Instances", "lazyImport", "timeout"];
 
 const {classes: Cc, interfaces: Ci, results: Cr} = Components;
 const global = this;
@@ -88,6 +88,24 @@ XPCOMUtils.defineLazyServiceGetter(
     Services, "uuid", "@mozilla.org/uuid-generator;1",
     "nsIUUIDGenerator");
 
+const _lazyModules = {};
+function lazyImport(obj, resource, symbols) {
+  if (!(resource in _lazyModules)) {
+    XPCOMUtils.defineLazyGetter(
+      _lazyModules,
+      resource,
+      function() {
+        let _m = {};
+        Components.utils.import(resource, _m);
+        return _m;
+      });
+  }
+  for (let i = 0, e = symbols.length; i < e; ++i) {
+    let s = symbols[i];
+    XPCOMUtils.defineLazyGetter(obj, s, function() _lazyModules[resource][s]);
+  }
+}
+
 function timeout(cb, delay) {
   var callback = function() cb.call(null);
   delay = delay || 0;

From bc4b3cfa0345e378b5a494401d969d669ecc6501 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 21:55:16 +0200
Subject: [PATCH 315/829] Use lazyImport in components/scriptish.js

---
 extension/components/scriptish.js | 34 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index b8b7f40a..f8b644c2 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -10,10 +10,13 @@ Cu.import("resource://scriptish/constants.js");
 Cu.import("resource://scriptish/logging.js");
 Cu.import("resource://scriptish/scriptish.js");
 Cu.import("resource://scriptish/third-party/Timer.js");
-Cu.import("resource://scriptish/utils/Scriptish_alert.js");
 Cu.import("resource://scriptish/utils/Scriptish_getBrowserForContentWindow.js");
 Cu.import("resource://scriptish/utils/Scriptish_getWindowIDs.js");
-Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
+lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
+lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
 
 const {nsIContentPolicy: CP, nsIDOMXPathResult: XPATH_RESULT} = Ci;
 const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "complete"];
@@ -123,13 +126,12 @@ ScriptishService.prototype = {
     let self = this;
     let tools = {};
     let winClosed = false;
-    Cu.import("resource://scriptish/prefmanager.js", tools);
 
     function shouldNotRun() (
       winClosed || !Scriptish.enabled || !Scriptish.isGreasemonkeyable(href));
 
     // check if there are any modified scripts
-    if (tools.Scriptish_prefRoot.getValue("enableScriptRefreshing"))
+    if (Scriptish_prefRoot.getValue("enableScriptRefreshing"))
       Scriptish.getConfig(function(config) config.updateModifiedScripts(function(script) {
         if (shouldNotRun()
             || !isScriptRunnable(script, href, safeWin === safeWin.top))
@@ -324,7 +326,6 @@ ScriptishService.prototype = {
     let script;
     let unsafeContentWin = wrappedContentWin.wrappedJSObject;
     let tools = {};
-    Cu.import("resource://scriptish/api.js", tools);
 
     let delays = [];
     let winID = Scriptish_getWindowIDs(wrappedContentWin).innerID;
@@ -335,23 +336,21 @@ ScriptishService.prototype = {
     for (var i = 0; script = scripts[i++];) {
       sandbox = new Cu.Sandbox(wrappedContentWin);
 
-      let GM_API = new tools.GM_API(
+      let GM_api = new GM_API(
           script, url, winID, wrappedContentWin, unsafeContentWin, chromeWin);
 
       // hack XPathResult since that is so commonly used
       sandbox.XPathResult = XPATH_RESULT;
 
       // add GM_* API to sandbox
-      for (var funcName in GM_API) sandbox[funcName] = GM_API[funcName];
-      sandbox.__defineGetter__("console", function() {
-        delete sandbox.console;
-        var _m = {};
-        Cu.import("resource://scriptish/api/GM_console.js", _m);
-        return (sandbox.console = _m.GM_console(script, wrappedContentWin, chromeWin));
+      for (var funcName in GM_api) {
+        sandbox[funcName] = GM_api[funcName];
+      }
+      XPCOMUtils.defineLazyGetter(sandbox, "console", function() {
+        return GM_console(script, wrappedContentWin, chromeWin);
       });
-      sandbox.__defineGetter__("GM_log", function() {
-        delete sandbox.GM_log;
-        return (sandbox.GM_log = sandbox.console.log.bind(sandbox.console));
+      XPCOMUtils.defineLazyGetter(sandbox, "GM_log", function() {
+        return sandbox.console.log.bind(sandbox.console);
       });
 
       sandbox.unsafeWindow = unsafeContentWin;
@@ -421,6 +420,9 @@ ScriptishService.prototype = {
     }
   }
 }
-Cu.import("resource://scriptish/utils/Scriptish_installUri.js", ScriptishService.prototype);
+lazyImport(ScriptishService.prototype,
+           "resource://scriptish/utils/Scriptish_installUri.js",
+           ["Scriptish_installUri"]
+           );
 
 var NSGetFactory = XPCOMUtils.generateNSGetFactory([ScriptishService]);

From 4addf2f5a9d74b9919b086ef7dea7c6b851c7140 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 21:57:14 +0200
Subject: [PATCH 316/829] Lazy module and script-instance loading

---
 extension/modules/api.js | 68 +++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 40 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 412bef0e..7e4476e8 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -3,9 +3,16 @@ var EXPORTED_SYMBOLS = ["GM_API", "GM_apiSafeCallback"];
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 Cu.import("resource://scriptish/logging.js");
-Cu.import("resource://scriptish/utils/Scriptish_notification.js");
 Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
-Cu.import("resource://scriptish/utils/Scriptish_openInTab.js");
+
+lazyImport(this, "resource://scriptish/utils/Scriptish_cryptoHash.js", ["Scriptish_cryptoHash"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_notification.js", ["Scriptish_notification"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_openInTab.js", ["Scriptish_openInTab"]);
+
+lazyImport(this, "resource://scriptish/api/GM_ScriptStorage.js", ["GM_ScriptStorage"]);
+lazyImport(this, "resource://scriptish/api/GM_xmlhttpRequester.js", ["GM_xmlhttpRequester"]);
+lazyImport(this, "resource://scriptish/api/GM_Resources.js", ["GM_Resources"]);
+lazyImport(this, "resource://scriptish/api/GM_setClipboard.js", ["GM_setClipboard"]);
 
 const moduleFilename = Components.stack.filename;
 const NS_XHTML = "http://www.w3.org/1999/xhtml";
@@ -48,31 +55,16 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
   var Scriptish_BrowserUI = aChromeWin.Scriptish_BrowserUI;
   var windowID = aWinID;
 
-  function getXmlhttpRequester() {
-    if (!_xmlhttpRequester) {
-      var tools = {};
-      Cu.import("resource://scriptish/api/GM_xmlhttpRequester.js", tools);
-      _xmlhttpRequester = new tools.GM_xmlhttpRequester(
-          aUnsafeContentWin, aURL, aScript);
-    }
-    return _xmlhttpRequester;
-  }
-  function getStorage() {
-    if (!_storage) {
-      var tools = {};
-      Cu.import("resource://scriptish/api/GM_ScriptStorage.js", tools);
-      _storage = new tools.GM_ScriptStorage(aScript);
-    }
-    return _storage;
-  }
-  function getResources() {
-    if (!_resources) {
-      var tools = {};
-      Cu.import("resource://scriptish/api/GM_Resources.js", tools);
-      _resources = new tools.GM_Resources(aScript);
-    }
-    return _resources;
-  }
+  var lazyLoaders = {};
+  XPCOMUtils.defineLazyGetter(lazyLoaders, "xmlhttpRequester", function() {
+    return new GM_xmlhttpRequester(aUnsafeContentWin, aURL, aScript);
+  });
+  XPCOMUtils.defineLazyGetter(lazyLoaders, "storage", function() {
+    return new GM_ScriptStorage(aScript);
+  });
+  XPCOMUtils.defineLazyGetter(lazyLoaders, "resources", function() {
+    return new GM_Resources(aScript);
+  });
 
   this.GM_addStyle = function GM_addStyle(css) {
     var head = document.getElementsByTagName("head")[0];
@@ -107,28 +99,28 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
 
   this.GM_setValue = function GM_setValue() {
     if (!GM_apiLeakCheck("GM_setValue")) return;
-    return getStorage().setValue.apply(getStorage(), arguments);
+    return lazyLoaders.storage.setValue.apply(getStorage(), arguments);
   }
   this.GM_getValue = function GM_getValue() {
     if (!GM_apiLeakCheck("GM_getValue")) return;
-    return getStorage().getValue.apply(getStorage(), arguments);
+    return lazyLoaders.storage.getValue.apply(getStorage(), arguments);
   }
   this.GM_deleteValue = function GM_deleteValue() {
     if (!GM_apiLeakCheck("GM_deleteValue")) return;
-    return getStorage().deleteValue.apply(getStorage(), arguments);
+    return lazyLoaders.storage.deleteValue.apply(getStorage(), arguments);
   }
   this.GM_listValues = function GM_listValues() {
     if (!GM_apiLeakCheck("GM_listValues")) return;
-    return getStorage().listValues.apply(getStorage(), arguments);
+    return lazyLoaders.storage.listValues.apply(getStorage(), arguments);
   }
 
   this.GM_getResourceURL = function GM_getResourceURL() {
     if (!GM_apiLeakCheck("GM_getResourceURL")) return;
-    return getResources().getResourceURL.apply(getResources(), arguments)
+    return lazyLoaders.resources.getResourceURL.apply(getResources(), arguments)
   }
   this.GM_getResourceText = function GM_getResourceText() {
     if (!GM_apiLeakCheck("GM_getResourceText")) return;
-    return getResources().getResourceText.apply(getResources(), arguments)
+    return lazyLoaders.resources.getResourceText.apply(getResources(), arguments)
   }
 
   this.GM_getMetadata = function(aKey, aLocalVal) {
@@ -171,7 +163,7 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
 
   this.GM_xmlhttpRequest = function GM_xmlhttpRequest() {
     if (!GM_apiLeakCheck("GM_xmlhttpRequest")) return;
-    let xhr = getXmlhttpRequester();
+    let xhr = lazyLoaders.xmlhttpRequester;
     return xhr.contentStartRequest.apply(xhr, arguments);
   }
 
@@ -215,9 +207,7 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
 
   this.GM_cryptoHash = function GM_cryptoHash() {
     if (!GM_apiLeakCheck("GM_cryptoHash")) return;
-    var tools = {};
-    Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
-    return tools.Scriptish_cryptoHash.apply(null, arguments);
+    return Scriptish_cryptoHash.apply(null, arguments);
   }
 }
 
@@ -228,7 +218,5 @@ GM_API.prototype.GM_updatingEnabled = true;
 
 GM_API.prototype.GM_setClipboard = function GM_setClipboard() {
   if (!GM_apiLeakCheck("GM_setClipboard")) return;
-  var tools = {};
-  Cu.import("resource://scriptish/api/GM_setClipboard.js", tools);
-  tools.GM_setClipboard.apply(null, arguments);
+  GM_setClipboard.apply(null, arguments);
 }

From 8a3db75330fd7f2a11bb5fa9b92da0536850a67a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 21:58:15 +0200
Subject: [PATCH 317/829] GM_xmlhttpRequest: make method optional (default to
 "GET")

---
 extension/modules/api/GM_xmlhttpRequester.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index e4d8a925..d9cf2b39 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -139,7 +139,12 @@ GM_xmlhttpRequester.prototype.chromeStartRequest =
   if (details.mozBackgroundRequest) req.mozBackgroundRequest = true;
 
   req.open(
-      details.method, safeUrl, true, details.user || "", details.password || "");
+      details.method || "GET",
+      safeUrl,
+      true,
+      details.user || "",
+      details.password || ""
+      );
 
   if (details.overrideMimeType) req.overrideMimeType(details.overrideMimeType);
 

From 0d8a4ece014a0a2cbed1e4e493b8f4c4279c6f97 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 22:03:46 +0200
Subject: [PATCH 318/829] Lazify and cleanup import in GM_xmlhttpRequester

---
 extension/modules/api/GM_xmlhttpRequester.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index d9cf2b39..83a9ad37 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -1,9 +1,8 @@
 var EXPORTED_SYMBOLS = ["GM_xmlhttpRequester"];
 (function(inc){
-  inc("resource://scriptish/constants.js");
-  inc("resource://scriptish/logging.js");
-  inc("resource://scriptish/utils/Scriptish_stringBundle.js");
   inc("resource://scriptish/api.js");
+  inc("resource://scriptish/constants.js");
+  lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
 })(Components.utils.import)
 
 const MIME_JSON = /^(application|text)\/(?:x-)?json/i;

From ef2f4f49e1af01e98cbc20e433539bbc6e1ebe26 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 22:26:06 +0200
Subject: [PATCH 319/829] Localize "Open User Scripts Manager"

---
 extension/locale/de/scriptish.properties    | 2 ++
 extension/locale/en-US/scriptish.properties | 2 ++
 extension/locale/es-ES/scriptish.properties | 2 ++
 extension/locale/ja-JP/scriptish.properties | 2 ++
 extension/locale/pt-BR/scriptish.properties | 2 ++
 extension/locale/ru-RU/scriptish.properties | 2 ++
 extension/locale/sv-SE/scriptish.properties | 2 ++
 extension/modules/addonprovider.js          | 8 ++++----
 8 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index b3b26c01..80907a31 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -77,6 +77,8 @@ newscript.noName=Bitte Namen für Ihr Benutzerskript angeben.
 nothing.timedOut=Nichts (Zeitüberschreitung)
 openFolder=Ordner öffnen
 openFolder.ak=O
+openUserScriptsManager=Benutzerskript-Manager öffnen
+openUserScriptsManager.ak=B
 options=Optionen
 options.title=Scriptish Einstellungen
 options.pane.main=Allgemein
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 4e0ff4b0..6f49181b 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -77,6 +77,8 @@ newscript.noName=Please provide a name for your script.
 nothing.timedOut=nothing (timed out)
 openFolder=Open Folder
 openFolder.ak=O
+openUserScriptsManager=Open User Scripts Manager
+openUserScriptsManager.ak=O
 options=Options
 options.title=Scriptish Options
 options.pane.main=Main
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 0b0650c1..1f357a1f 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -77,6 +77,8 @@ newscript.noName=Por favor, introduzca un nombre para su script.
 nothing.timedOut=
 openFolder=Abrir carpeta
 openFolder.ak=A
+openUserScriptsManager=
+openUserScriptsManager.ak=
 options=Opciones
 options.title=
 options.pane.main=
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 5f62736c..c3a88259 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -77,6 +77,8 @@ newscript.noName=スクリプトに名前をつけてください
 nothing.timedOut=なし（タイムアウト）
 openFolder=フォルダを開く
 openFolder.ak=O
+openUserScriptsManager=
+openUserScriptsManager.ak=
 options=オプション
 options.title=Scriptish オプション
 options.pane.main=メイン
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 271c109c..c5dabdc7 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -77,6 +77,8 @@ newscript.noName=Por favor, informe um nome para o seu script.
 nothing.timedOut=nada (excedido o tempo limite)
 openFolder=Abrir pasta
 openFolder.ak=A
+openUserScriptsManager=
+openUserScriptsManager.ak=
 options=Opções
 options.title=
 options.pane.main=
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 6575bfc9..b60ef3fd 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -77,6 +77,8 @@ newscript.noName=Пожалуйста, задайте имя скрипта.
 nothing.timedOut=
 openFolder=Открыть папку скрипта.
 openFolder.ak=
+openUserScriptsManager=
+openUserScriptsManager.ak=
 options=Настройки
 options.title=
 options.pane.main=
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index f84d3e32..fb120008 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -77,6 +77,8 @@ newscript.noName=Var vänlig ange ett namn på ditt skript.
 nothing.timedOut=ingenting (tidsgränsen uppnåddes)
 openFolder=Öppna mapp
 openFolder.ak=Ö
+openUserScriptsManager=
+openUserScriptsManager.ak=
 options=Inställningar
 options.title=Inställningar för Scriptish
 options.pane.main=Allmänt
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index 2620892e..a4eab141 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -25,8 +25,8 @@ const Scriptish_ScriptProvider = {
         id: "scriptish-install-popup-notification",
         message: msg,
         mainAction: {
-          label: "Open User Scripts Manager",
-          accessKey: "O",
+          label: Scriptish_stringBundle("openUserScriptsManager"),
+          accessKey: Scriptish_stringBundle("openUserScriptsManager.ak"),
           callback: callback
         }
       });
@@ -59,8 +59,8 @@ const Scriptish_ScriptProvider = {
         id: "scriptish-install-popup-notification",
         message: msg,
         mainAction: {
-          label: "Open User Scripts Manager",
-          accessKey: "O",
+          label: Scriptish_stringBundle("openUserScriptsManager"),
+          accessKey: Scriptish_stringBundle("openUserScriptsManager.ak"),
           callback: callback
         }
       });

From 8f7d5387ddd9acbb763342ef700b9e55daeaca30 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 15:26:37 -0700
Subject: [PATCH 320/829] test: adding a couple tests for lazyImport

---
 extension/content/tests/runTests.js       | 16 ++++++++-------
 extension/content/tests/testLazyImport.js | 25 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 extension/content/tests/testLazyImport.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index a80dd987..e5a50a8e 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -50,18 +50,20 @@ function importModule(m, ctx) {
   return _;
 }
 
-function checkExports(m, exports) {
-  deepEqual(
-    Object.keys(importModule(m)),
-    exports,
-    "Correct exports"
-    );
-}
+function checkExports(m, exports) (
+    deepEqual(Object.keys(importModule(m)), exports, "Correct exports"))
+
+function contains(ary, vals) (vals.forEach(function(val) (
+    ok(!!~ary.indexOf(val), JSON.stringify(ary) + " contains " + val))))
+
+function checkExported(m, exported) (
+    contains(Object.keys(importModule(m)), exported))
 
 function runTests() {
   var tools = {};
   Q.chain(
     function() include("tests/testAvailability.js"),
+    function() include("tests/testLazyImport.js"),
     function() include("tests/testCachedResource.js"),
     function() include("tests/testCryptoHash.js"),
     function() include("tests/testToolsMenuItem.js"),
diff --git a/extension/content/tests/testLazyImport.js b/extension/content/tests/testLazyImport.js
new file mode 100644
index 00000000..7ed8af0d
--- /dev/null
+++ b/extension/content/tests/testLazyImport.js
@@ -0,0 +1,25 @@
+module("Lazy Import");
+
+test("exports", 1, function() checkExported(
+    "resource://scriptish/constants.js", ["lazyImport"]));
+
+test("import DNE", 3, function() {
+  var lazyImport = importModule("resource://scriptish/constants.js").lazyImport;
+  var o = {};
+  var imports = ["a", "b"];
+  raises(function() {
+    lazyImport(o, "resource://scriptish/DNE", imports);
+    contains(imports, Object.keys(o));
+    strictEqual(o.a, undefined, "a is not defined");
+  }, "importing and using a module that DNE should throw");
+});
+
+test("import exists",/* any,*/ function() {
+  var lazyImport = importModule("resource://scriptish/constants.js").lazyImport;
+  var o = {};
+  lazyImport(o, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
+  ok(typeof o.Scriptish_stringBundle == "function");
+  for (var k in o)
+    ok((k == "Scriptish_stringBundle") ? true : false,
+        "only Scriptish_stringBundle should have been exported");
+});

From d558ab5881daebebcd09fd2a1921a419979b2cca Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 15:31:22 -0700
Subject: [PATCH 321/829] minor: changing the loop in lazyImport to use a
 method ~5% faster on FF, also fewer chars.

---
 extension/modules/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 329770a4..726fc1a0 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -100,7 +100,7 @@ function lazyImport(obj, resource, symbols) {
         return _m;
       });
   }
-  for (let i = 0, e = symbols.length; i < e; ++i) {
+  for (let i = symbols.length; ~--i;) {
     let s = symbols[i];
     XPCOMUtils.defineLazyGetter(obj, s, function() _lazyModules[resource][s]);
   }

From 3b7bda4a354355a00f269ec9e24582b67dea19a5 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 15:33:33 -0700
Subject: [PATCH 322/829] allow about:scriptish?tests which I type often by
 mistake

---
 extension/content/js/aboutScriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index 696f814f..eebfdadb 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -18,7 +18,7 @@ Cu.import("resource://scriptish/constants.js");
 
   // Show about:scriptish?test
   var params = window.location.href.split("?")[1];
-  if (/(?:^|&)test(?:&|=|$)/i.test(params)) {
+  if (/(?:^|&)tests?(?:&|=|$)/i.test(params)) {
     Cu.import("resource://scriptish/utils/q.js");
     include("tests/runTests.js").then(function() {
       $("main").style.display = "none";

From 432358c38eda4d0fe611080aab0767417f3f9dc7 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 22:29:43 +0200
Subject: [PATCH 323/829] Clean up import list: addonprovider.js

---
 extension/modules/addonprovider.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index a4eab141..d5f7a74f 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -1,10 +1,9 @@
 var EXPORTED_SYMBOLS = [];
 Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/scriptish.js");
-Components.utils.import("resource://scriptish/logging.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_notification.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_popupNotification.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+
+lazyImport(this, "resource://scriptish/utils/Scriptish_popupNotification.js", ["Scriptish_popupNotification"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
 
 const Scriptish_ScriptProvider = {
   observe: function(aSubject, aTopic, aData) Scriptish.getConfig(function(config) {

From c9874e24a54a2fb5d29cc9e9a1005b909d47aa56 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 22:32:44 +0200
Subject: [PATCH 324/829] Clean up import list: logging.js

---
 extension/modules/logging.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/extension/modules/logging.js b/extension/modules/logging.js
index 611c4934..3c0f7839 100644
--- a/extension/modules/logging.js
+++ b/extension/modules/logging.js
@@ -1,10 +1,8 @@
 var EXPORTED_SYMBOLS = ["Scriptish_logError", "Scriptish_logScriptError", "Scriptish_log"];
 
 const Cu = Components.utils;
-(function(inc){
-  inc("resource://scriptish/constants.js");
-  inc("resource://scriptish/prefmanager.js");
-})(Cu.import)
+Cu.import("resource://scriptish/constants.js");
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 
 // Utility to create an error message in the log without throwing an error.
 function Scriptish_logError(aErr, opt_warn, fileName, lineNumber) {

From 69fc6783a0257d6cb689689712495f1c12f07b9f Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 22:33:18 +0200
Subject: [PATCH 325/829] Clean up import list: menucommander.js

---
 extension/modules/menucommander.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension/modules/menucommander.js b/extension/modules/menucommander.js
index e28ce6d7..bf4483f7 100644
--- a/extension/modules/menucommander.js
+++ b/extension/modules/menucommander.js
@@ -2,7 +2,6 @@ var EXPORTED_SYMBOLS = ["Scriptish_MenuCommander"];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/logging.js");
 
 function Scriptish_MenuCommander(aDoc) {
   this.doc = aDoc;

From 0f7f339f3db29c2f59d1e5abe7da5b7728449477 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 22:34:14 +0200
Subject: [PATCH 326/829] Clean up import list: prefmanager.js

---
 extension/modules/prefmanager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/prefmanager.js b/extension/modules/prefmanager.js
index 9acdc9b0..92d45310 100644
--- a/extension/modules/prefmanager.js
+++ b/extension/modules/prefmanager.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = ["Scriptish_prefRoot", "Scriptish_PrefManager"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
 
 const MIN_INT_32 = -0x80000000;
 const MAX_INT_32 = 0x7FFFFFFF;

From 217e37035488a2c876609a5afcaf5c6fbe98f84d Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 22:36:19 +0200
Subject: [PATCH 327/829] Clean up import list: GM_setClipboard.js

---
 extension/modules/api/GM_setClipboard.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extension/modules/api/GM_setClipboard.js b/extension/modules/api/GM_setClipboard.js
index e60d45bb..45e346d0 100644
--- a/extension/modules/api/GM_setClipboard.js
+++ b/extension/modules/api/GM_setClipboard.js
@@ -1,8 +1,9 @@
 var EXPORTED_SYMBOLS = ["GM_setClipboard"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
+
 function GM_setClipboard(aData, aType) {
   if (aType && aType != "text")
-    throw "'" + aType + "' " + Scriptish_stringBundle("error.api.clipboard.type");
+    throw new Error("'" + aType + "' " + Scriptish_stringBundle("error.api.clipboard.type"));
   Services.cb.copyString(aData);
 }

From 5354f0b2620b74184c693cccb3b2583a910cb748 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 22:37:29 +0200
Subject: [PATCH 328/829] Clean up import list: GM_xmlhttpRequester.js

---
 extension/modules/api/GM_xmlhttpRequester.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 83a9ad37..6ed0539e 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -1,9 +1,8 @@
 var EXPORTED_SYMBOLS = ["GM_xmlhttpRequester"];
-(function(inc){
-  inc("resource://scriptish/api.js");
-  inc("resource://scriptish/constants.js");
-  lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
-})(Components.utils.import)
+
+Components.utils.import("resource://scriptish/api.js");
+Components.utils.import("resource://scriptish/constants.js");
+lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
 
 const MIME_JSON = /^(application|text)\/(?:x-)?json/i;
 

From 32304361e5f44f283b1e0e57a763c47227777904 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 22:39:47 +0200
Subject: [PATCH 329/829] Clean up import list: browser.js

---
 extension/modules/content/browser.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/extension/modules/content/browser.js b/extension/modules/content/browser.js
index aff7c9bd..83372bfc 100644
--- a/extension/modules/content/browser.js
+++ b/extension/modules/content/browser.js
@@ -2,9 +2,7 @@ var EXPORTED_SYMBOLS = ["Scriptish_BrowserUIM"];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/logging.js");
-Cu.import("resource://scriptish/scriptish.js");
-Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 
 const ICON_16_ON = "chrome://scriptish/skin/scriptish16.png";
 const ICON_16_OFF = "chrome://scriptish/skin/scriptish16_disabled.png";

From b102f271a6f15f650f29bb7cb971fb0530c7e789 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 22:52:55 +0200
Subject: [PATCH 330/829] Clean up import list and hiddenDOMWindow use:
 scriptresource.js

---
 extension/modules/script/scriptresource.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/extension/modules/script/scriptresource.js b/extension/modules/script/scriptresource.js
index 273450b6..f3e21e54 100644
--- a/extension/modules/script/scriptresource.js
+++ b/extension/modules/script/scriptresource.js
@@ -1,7 +1,7 @@
 var EXPORTED_SYMBOLS = ["ScriptResource"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_getBinaryContents.js");
 Components.utils.import("resource://scriptish/script/scriptdependency.js");
+lazyImport(this, "resource://scriptish/utils/Scriptish_getBinaryContents.js", ["Scriptish_getBinaryContents"]);
 
 function ScriptResource() {
   ScriptDependency.apply(this, arguments);
@@ -11,7 +11,6 @@ ScriptResource.prototype = new ScriptDependency();
 ScriptResource.prototype.constructor = ScriptResource;
 ScriptResource.prototype.__defineGetter__("name", function() this._name);
 ScriptResource.prototype.__defineGetter__("dataContent", function() {
-  var win = Services.ass.hiddenDOMWindow;
   var binaryContents = Scriptish_getBinaryContents(this._file);
   var mimetype = this._mimetype;
 
@@ -19,5 +18,5 @@ ScriptResource.prototype.__defineGetter__("dataContent", function() {
     mimetype += ";charset=" + this._charset;
 
   return "data:" + mimetype + ";base64," +
-      win.encodeURIComponent(win.btoa(binaryContents));
+      encodeURIComponent(btoa(binaryContents));
 });

From feca4336237ff8f73fce818333d5e8a8f7bf745c Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 3 Jul 2011 22:55:20 +0200
Subject: [PATCH 331/829] Clean up import list: scriptinstaller.js

---
 extension/modules/script/scriptinstaller.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/extension/modules/script/scriptinstaller.js b/extension/modules/script/scriptinstaller.js
index dbb9e5d9..c8473486 100644
--- a/extension/modules/script/scriptinstaller.js
+++ b/extension/modules/script/scriptinstaller.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = ["ScriptInstall"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/logging.js");
+lazyImport(this, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
 
 // Implements https://developer.mozilla.org/en/Addons/Add-on_Manager/AddonInstall
 function ScriptInstall(aScript) {
@@ -62,11 +62,9 @@ ScriptInstall.prototype = {
   get existingAddon() this._script,
   addon: null,
   install: function() {
-    var tools = {};
-    Components.utils.import("resource://scriptish/config/configdownloader.js", tools);
     this.changed("DownloadStarted");
     this.scriptDownloader =
-        tools.Scriptish_configDownloader.startUpdateScript(
+        Scriptish_configDownloader.startUpdateScript(
             this._script.cleanUpdateURL, this);
   },
   cancel: function() {

From e1e9c8884c97116bbe5cda99ba8e7b7ade2755fa Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 16:15:36 -0700
Subject: [PATCH 332/829] using a faster loop when uninstalling user scripts
 when leaving EM

---
 extension/modules/config/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index baa952f3..662284ad 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -379,7 +379,7 @@ Config.prototype = {
 
   uninstallScripts: function() {
     let scripts = this._scripts;
-    for (var i = scripts.length - 1; i >= 0; i--) {
+    for (var i = scripts.length; ~--i;) {
       let script = scripts[i];
       if (script.needsUninstall) {
         this._scripts.splice(i, 1);

From e44777d0ccf7cadf6255f440cf62b21539dfa834 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 3 Jul 2011 19:37:50 -0500
Subject: [PATCH 333/829] minor correction to an error message in logging.js

---
 extension/modules/logging.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/logging.js b/extension/modules/logging.js
index 3c0f7839..c9d94283 100644
--- a/extension/modules/logging.js
+++ b/extension/modules/logging.js
@@ -37,7 +37,7 @@ function Scriptish_logScriptError(aError, aWindow, aFileURL, aId) {
         .outerWindowID;
     }
     catch (ex) {
-      throw new Error("failed to get window id window id");
+      throw new Error("failed to get window id");
     }
 
     // defaults

From 66dbb50d426dac443b80835b1eab05d1f15713d0 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 02:51:32 +0200
Subject: [PATCH 334/829] Report failed lazyImport loads

---
 extension/modules/constants.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 726fc1a0..9021a268 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -96,7 +96,13 @@ function lazyImport(obj, resource, symbols) {
       resource,
       function() {
         let _m = {};
-        Components.utils.import(resource, _m);
+        try {
+          Components.utils.import(resource, _m);
+        }
+        catch (ex) {
+          Components.utils.reportError("Failed to import resource: " + resource);
+          throw ex;
+        }
         return _m;
       });
   }

From f5089fdd3dc7e185d1c3964ef86a6f62a4440b71 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 02:52:10 +0200
Subject: [PATCH 335/829] Add lazyUtil helper

---
 extension/modules/constants.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 9021a268..0de9c7f8 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = [
     "Cc", "Ci", "Cr", "AddonManager", "AddonManagerPrivate", "NetUtil", "XPCOMUtils",
-    "Services", "Instances", "lazyImport", "timeout"];
+    "Services", "Instances", "lazyImport", "lazyUtil", "timeout"];
 
 const {classes: Cc, interfaces: Ci, results: Cr} = Components;
 const global = this;
@@ -111,6 +111,10 @@ function lazyImport(obj, resource, symbols) {
     XPCOMUtils.defineLazyGetter(obj, s, function() _lazyModules[resource][s]);
   }
 }
+function lazyUtil(obj, name) lazyImport(obj,
+                                        "resource://scriptish/utils/Scriptish_" + name + ".js",
+                                        ["Scriptish_" + name]
+                                        );
 
 function timeout(cb, delay) {
   var callback = function() cb.call(null);

From 22b235829b98a27d375bd87c45dc660192c4a10f Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 02:57:03 +0200
Subject: [PATCH 336/829] Use lazyImport/lazyUtil everywhere

lazyImport is (usually) faster, even when the lazy load happens right afterwards
Closes #400
---
 extension/components/scriptish.js             | 15 +++++-----
 extension/content/js/browser.js               | 26 +++++++++--------
 extension/modules/addonprovider.js            |  6 ++--
 extension/modules/api.js                      | 11 +++----
 extension/modules/api/GM_setClipboard.js      |  2 +-
 extension/modules/api/GM_xmlhttpRequester.js  |  4 +--
 extension/modules/config/config.js            | 29 ++++++++++---------
 extension/modules/config/configdownloader.js  |  2 +-
 extension/modules/constants.js                |  5 ++--
 extension/modules/prefmanager.js              |  2 +-
 extension/modules/script/cachedresource.js    |  4 +--
 extension/modules/script/script.js            | 29 ++++++++++---------
 extension/modules/script/scriptdependency.js  | 16 +++++-----
 extension/modules/script/scriptdownloader.js  | 18 +++++++-----
 extension/modules/script/scripticon.js        |  7 ++---
 extension/modules/script/scriptresource.js    |  4 +--
 extension/modules/scriptish.js                |  4 +--
 .../utils/Scriptish_ExtendedStringBundle.js   |  2 +-
 .../utils/Scriptish_createUserScriptSource.js |  2 +-
 .../modules/utils/Scriptish_cryptoHash.js     |  2 +-
 .../utils/Scriptish_getBinaryContents.js      |  2 +-
 .../Scriptish_getBrowserForContentWindow.js   |  1 +
 .../modules/utils/Scriptish_getContents.js    |  6 ++--
 .../modules/utils/Scriptish_getEditor.js      |  8 ++---
 .../modules/utils/Scriptish_getTLDURL.js      |  2 +-
 .../modules/utils/Scriptish_getWindowIDs.js   |  2 +-
 .../modules/utils/Scriptish_installUri.js     |  2 +-
 .../modules/utils/Scriptish_localizeDOM.js    |  2 +-
 .../modules/utils/Scriptish_notification.js   |  4 +--
 .../modules/utils/Scriptish_openInEditor.js   | 10 +++----
 .../modules/utils/Scriptish_openInTab.js      |  2 +-
 .../utils/Scriptish_popupNotification.js      |  8 ++---
 32 files changed, 123 insertions(+), 116 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index f8b644c2..ab6743fc 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -7,16 +7,17 @@ const fileURLPrefix = "chrome://scriptish/content/scriptish.js -> ";
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/logging.js");
-Cu.import("resource://scriptish/scriptish.js");
-Cu.import("resource://scriptish/third-party/Timer.js");
-Cu.import("resource://scriptish/utils/Scriptish_getBrowserForContentWindow.js");
-Cu.import("resource://scriptish/utils/Scriptish_getWindowIDs.js");
 
-lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
-lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
 lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError"]);
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
+lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
+
+lazyUtil(this, "getBrowserForContentWindow");
+lazyUtil(this, "getWindowIDs");
+lazyUtil(this, "stringBundle");
 
 const {nsIContentPolicy: CP, nsIDOMXPathResult: XPATH_RESULT} = Ci;
 const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "complete"];
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index daf1febe..92a5156a 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -2,21 +2,23 @@ var Scriptish_BrowserUI = {
   menuCommanders: [],
   currentMenuCommander: null
 };
-var Scriptish_BrowserUIM;
 
 (function(inc, tools){
-inc("resource://scriptish/content/browser.js");
-inc("resource://scriptish/prefmanager.js");
-inc("resource://scriptish/scriptish.js");
-inc("resource://scriptish/utils/Scriptish_installUri.js");
-inc("resource://scriptish/utils/Scriptish_openInEditor.js");
-inc("resource://scriptish/utils/Scriptish_getURLsForContentWindow.js");
-inc("resource://scriptish/utils/Scriptish_getWindowIDs.js");
-inc("resource://scriptish/utils/Scriptish_stringBundle.js");
-inc("resource://scriptish/config/configdownloader.js");
-inc("resource://scriptish/menucommander.js");
-inc("resource://scriptish/logging.js");
 inc("resource://scriptish/constants.js", tools);
+const {lazyImport, lazyUtil} = tools;
+
+lazyImport(window, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(window, "resource://scriptish/content/browser.js", ["Scriptish_BrowserUIM"]);
+lazyImport(window, "resource://scriptish/menucommander.js", ["Scriptish_MenuCommander"]);
+lazyImport(window, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(window, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
+
+lazyUtil(window, "installUri");
+lazyUtil(window, "openInEditor");
+lazyUtil(window, "stringBundle");
+lazyUtil(window, "getURLsForContentWindow");
+lazyUtil(window, "getWindowIDs");
+
 var Ci = tools.Ci;
 var Services = tools.Services;
 var gmSvc = Services.scriptish;
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index d5f7a74f..b82f43d0 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -1,9 +1,9 @@
 var EXPORTED_SYMBOLS = [];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/scriptish.js");
 
-lazyImport(this, "resource://scriptish/utils/Scriptish_popupNotification.js", ["Scriptish_popupNotification"]);
-lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyUtil(this, "popupNotification");
+lazyUtil(this, "stringBundle");
 
 const Scriptish_ScriptProvider = {
   observe: function(aSubject, aTopic, aData) Scriptish.getConfig(function(config) {
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 7e4476e8..e2d1be17 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -2,12 +2,13 @@ var EXPORTED_SYMBOLS = ["GM_API", "GM_apiSafeCallback"];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/logging.js");
-Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
-lazyImport(this, "resource://scriptish/utils/Scriptish_cryptoHash.js", ["Scriptish_cryptoHash"]);
-lazyImport(this, "resource://scriptish/utils/Scriptish_notification.js", ["Scriptish_notification"]);
-lazyImport(this, "resource://scriptish/utils/Scriptish_openInTab.js", ["Scriptish_openInTab"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError"]);
+
+lazyUtil(this, "cryptoHash");
+lazyUtil(this, "notification");
+lazyUtil(this, "openInTab");
+lazyUtil(this, "stringBundle");
 
 lazyImport(this, "resource://scriptish/api/GM_ScriptStorage.js", ["GM_ScriptStorage"]);
 lazyImport(this, "resource://scriptish/api/GM_xmlhttpRequester.js", ["GM_xmlhttpRequester"]);
diff --git a/extension/modules/api/GM_setClipboard.js b/extension/modules/api/GM_setClipboard.js
index 45e346d0..527830e8 100644
--- a/extension/modules/api/GM_setClipboard.js
+++ b/extension/modules/api/GM_setClipboard.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = ["GM_setClipboard"];
 Components.utils.import("resource://scriptish/constants.js");
-lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
+lazyUtil(this, "stringBundle");
 
 function GM_setClipboard(aData, aType) {
   if (aType && aType != "text")
diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 6ed0539e..854ea4d3 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -1,8 +1,8 @@
 var EXPORTED_SYMBOLS = ["GM_xmlhttpRequester"];
 
-Components.utils.import("resource://scriptish/api.js");
 Components.utils.import("resource://scriptish/constants.js");
-lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
+lazyImport(this, "resource://scriptish/api.js", ["GM_apiSafeCallback"]);
+lazyUtil(this, "stringBundle");
 
 const MIME_JSON = /^(application|text)\/(?:x-)?json/i;
 
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 662284ad..6f66faf5 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -4,20 +4,21 @@ const SCRIPTISH_CONFIG_XML = "scriptish-config.xml";
 const SCRIPTISH_CONFIG_JSON = "scriptish-config.json";
 const SCRIPTISH_BLOCKLIST = "scriptish-blocklist.json";
 
-(function(inc) {
-inc("resource://scriptish/constants.js");
-inc("resource://scriptish/logging.js");
-inc("resource://scriptish/prefmanager.js");
-inc("resource://scriptish/scriptish.js");
-inc("resource://scriptish/utils/PatternCollection.js");
-inc("resource://scriptish/utils/Scriptish_getContents.js");
-inc("resource://scriptish/utils/Scriptish_getWriteStream.js");
-inc("resource://scriptish/utils/Scriptish_getProfileFile.js");
-inc("resource://scriptish/utils/Scriptish_stringBundle.js");
-inc("resource://scriptish/utils/Scriptish_cryptoHash.js");
-inc("resource://scriptish/third-party/Timer.js");
-inc("resource://scriptish/script/script.js");
-})(Components.utils.import);
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/utils/PatternCollection.js", ["PatternCollection"]);
+lazyImport(this, "resource://scriptish/script/script.js", ["Script"]);
+lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
+
+lazyUtil(this, "cryptoHash");
+lazyUtil(this, "getContents");
+lazyUtil(this, "getProfileFile");
+lazyUtil(this, "getWriteStream");
+lazyUtil(this, "stringBundle");
 
 function Config(aBaseDir) {
   var self = this;
diff --git a/extension/modules/config/configdownloader.js b/extension/modules/config/configdownloader.js
index a00fae4a..cda3f7ff 100644
--- a/extension/modules/config/configdownloader.js
+++ b/extension/modules/config/configdownloader.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = ["Scriptish_configDownloader"];
-Components.utils.import("resource://scriptish/script/scriptdownloader.js");
 Components.utils.import("resource://scriptish/constants.js");
+lazyImport(this, "resource://scriptish/script/scriptdownloader.js", ["ScriptDownloader"]);
 
 var Scriptish_configDownloader = {
   startInstall: function(aURI, aWin) {
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 0de9c7f8..76fc055f 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -116,6 +116,7 @@ function lazyUtil(obj, name) lazyImport(obj,
                                         ["Scriptish_" + name]
                                         );
 
+lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
 function timeout(cb, delay) {
   var callback = function() cb.call(null);
   delay = delay || 0;
@@ -125,9 +126,7 @@ function timeout(cb, delay) {
   }
 
   if (!global.setTimeout) {
-    let tools = {};
-    Components.utils.import("resource://scriptish/third-party/Timer.js", tools);
-    global.setTimeout = (new tools.Timer()).setTimeout;
+    global.setTimeout = (new Timer()).setTimeout;
   }
 
   setTimeout(callback, delay);
diff --git a/extension/modules/prefmanager.js b/extension/modules/prefmanager.js
index 92d45310..075a2b3d 100644
--- a/extension/modules/prefmanager.js
+++ b/extension/modules/prefmanager.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = ["Scriptish_prefRoot", "Scriptish_PrefManager"];
 Components.utils.import("resource://scriptish/constants.js");
-lazyImport(this, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
+lazyUtil(this, "stringBundle");
 
 const MIN_INT_32 = -0x80000000;
 const MAX_INT_32 = 0x7FFFFFFF;
diff --git a/extension/modules/script/cachedresource.js b/extension/modules/script/cachedresource.js
index 687a2d96..963e04c5 100644
--- a/extension/modules/script/cachedresource.js
+++ b/extension/modules/script/cachedresource.js
@@ -1,8 +1,8 @@
 var EXPORTED_SYMBOLS = ["CachedResource"];
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/prefmanager.js");
-Cu.import("resource://scriptish/utils/Scriptish_getContents.js");
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyUtil(this, "getContents");
 
 var useCache = Scriptish_prefRoot.getValue("cache.enabled");
 Scriptish_prefRoot.watch("cache.enabled", function() {
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 9a1d926e..b7ec4991 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -5,20 +5,21 @@ const valueSplitter = /(\S+)(?:\s+([^\r\f\n]+))?/;
 const Cu = Components.utils;
 Cu.import("resource://gre/modules/CertUtils.jsm");
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/prefmanager.js");
-Cu.import("resource://scriptish/logging.js");
-Cu.import("resource://scriptish/scriptish.js");
-Cu.import("resource://scriptish/utils/PatternCollection.js");
-Cu.import("resource://scriptish/utils/Scriptish_getUriFromFile.js");
-Cu.import("resource://scriptish/utils/Scriptish_getContents.js");
-Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
-Cu.import("resource://scriptish/script/cachedresource.js");
-Cu.import("resource://scriptish/script/scriptinstaller.js");
-Cu.import("resource://scriptish/script/scripticon.js");
-Cu.import("resource://scriptish/script/scriptrequire.js");
-Cu.import("resource://scriptish/script/scriptresource.js");
-Cu.import("resource://scriptish/third-party/MatchPattern.js");
-Cu.import("resource://scriptish/config/configdownloader.js");
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish_logError"]);
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/script/cachedresource.js", ["CachedResource"]);
+lazyImport(this, "resource://scriptish/utils/PatternCollection.js", ["PatternCollection"]);
+lazyImport(this, "resource://scriptish/script/scriptinstaller.js", ["ScriptInstaller"]);
+lazyImport(this, "resource://scriptish/script/scripticon.js", ["ScriptIcon"]);
+lazyImport(this, "resource://scriptish/script/scriptrequire.js", ["ScriptRequire"]);
+lazyImport(this, "resource://scriptish/script/scriptresource.js", ["ScriptResource"]);
+lazyImport(this, "resource://scriptish/third-party/MatchPattern.js", ["MatchPattern"]);
+lazyImport(this, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
+
+lazyUtil(this, "getUriFromFile");
+lazyUtil(this, "getContents");
+lazyUtil(this, "stringBundle");
 
 const metaRegExp = /\/\/[ \t]*(?:==\/?UserScript==|\@\S+(?:[ \t]+(?:[^\r\f\n]+))?)/g;
 const nonIdChars = /[^\w@\.\-_]+/g; // any char matched by this is not valid
diff --git a/extension/modules/script/scriptdependency.js b/extension/modules/script/scriptdependency.js
index 6cafa7fc..6b72998b 100644
--- a/extension/modules/script/scriptdependency.js
+++ b/extension/modules/script/scriptdependency.js
@@ -1,12 +1,12 @@
 var EXPORTED_SYMBOLS = ["ScriptDependency"];
-(function(inc) {
-inc("resource://scriptish/constants.js");
-inc("resource://scriptish/logging.js");
-inc("resource://scriptish/utils/Scriptish_getUriFromFile.js");
-inc("resource://scriptish/utils/Scriptish_getContents.js");
-inc("resource://scriptish/utils/Scriptish_stringBundle.js");
-inc("resource://scriptish/script/cachedresource.js");
-})(Components.utils.import)
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
+lazyImport(this, "resource://scriptish/script/cachedresource.js", ["CachedResource"]);
+
+lazyUtil(this, "getUriFromFile");
+lazyUtil(this, "getContents");
+lazyUtil(this, "stringBundle");
 
 function ScriptDependency(aScript) {
   this._script = aScript;
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 9d1d16eb..0d2404d6 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -3,14 +3,16 @@ var EXPORTED_SYMBOLS = ["ScriptDownloader"];
 const Cu = Components.utils;
 Cu.import("resource://gre/modules/CertUtils.jsm");
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/logging.js");
-Cu.import("resource://scriptish/prefmanager.js");
-Cu.import("resource://scriptish/scriptish.js");
-Cu.import("resource://scriptish/script/script.js");
-Cu.import("resource://scriptish/script/scripticon.js");
-Cu.import("resource://scriptish/utils/Scriptish_alert.js");
-Cu.import("resource://scriptish/utils/Scriptish_getWriteStream.js");
-Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish_logError"]);
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/script/script.js", ["Script"]);
+lazyImport(this, "resource://scriptish/script/scripticon.js", ["ScriptIcon"]);
+
+lazyUtil(this, "alert");
+lazyUtil(this, "getWriteStream");
+lazyUtil(this, "stringBundle");
 
 function ScriptDownloader(uri, contentWin) {
   this.uri_ = uri || null;
diff --git a/extension/modules/script/scripticon.js b/extension/modules/script/scripticon.js
index e65e7dcd..f872ec68 100644
--- a/extension/modules/script/scripticon.js
+++ b/extension/modules/script/scripticon.js
@@ -1,9 +1,8 @@
 var EXPORTED_SYMBOLS = ["ScriptIcon"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/logging.js");
-Components.utils.import("resource://scriptish/script/scriptdependency.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_getUriFromFile.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+lazyImport(this, "resource://scriptish/script/scriptdependency.js", ["ScriptDependency"]);
+lazyUtil(this, "getUriFromFile");
+lazyUtil(this, "stringBundle");
 
 function ScriptIcon() {
   ScriptDependency.apply(this, arguments);
diff --git a/extension/modules/script/scriptresource.js b/extension/modules/script/scriptresource.js
index f3e21e54..8c3a7e79 100644
--- a/extension/modules/script/scriptresource.js
+++ b/extension/modules/script/scriptresource.js
@@ -1,7 +1,7 @@
 var EXPORTED_SYMBOLS = ["ScriptResource"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/script/scriptdependency.js");
-lazyImport(this, "resource://scriptish/utils/Scriptish_getBinaryContents.js", ["Scriptish_getBinaryContents"]);
+lazyImport(this, "resource://scriptish/script/scriptdependency.js", ["ScriptDependency"]);
+lazyUtil(this, "getBinaryContents");
 
 function ScriptResource() {
   ScriptDependency.apply(this, arguments);
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 3f558427..117b1827 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -1,8 +1,8 @@
 var EXPORTED_SYMBOLS = ["Scriptish"];
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/prefmanager.js");
-Cu.import("resource://scriptish/logging.js");
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
 function setStatus() (enabled = Scriptish_prefRoot.getValue("enabled", true));
 function notifyStatusChg(aVal) (
diff --git a/extension/modules/utils/Scriptish_ExtendedStringBundle.js b/extension/modules/utils/Scriptish_ExtendedStringBundle.js
index acbb2748..3225dc58 100644
--- a/extension/modules/utils/Scriptish_ExtendedStringBundle.js
+++ b/extension/modules/utils/Scriptish_ExtendedStringBundle.js
@@ -1,5 +1,5 @@
 var EXPORTED_SYMBOLS = ["Scriptish_ExtendedStringBundle"];
-Components.utils.import("resource://scriptish/logging.js");
+
 function Scriptish_ExtendedStringBundle(aBase) {
   this.basebundle = aBase;
   this.strings = {};
diff --git a/extension/modules/utils/Scriptish_createUserScriptSource.js b/extension/modules/utils/Scriptish_createUserScriptSource.js
index 582925d7..d3c0543c 100644
--- a/extension/modules/utils/Scriptish_createUserScriptSource.js
+++ b/extension/modules/utils/Scriptish_createUserScriptSource.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = ["Scriptish_createUserScriptSource"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+lazyUtil(this, "stringBundle");
 
 function Scriptish_createUserScriptSource(aHeader, aContent) {
   var script = ["// ==UserScript=="];
diff --git a/extension/modules/utils/Scriptish_cryptoHash.js b/extension/modules/utils/Scriptish_cryptoHash.js
index 8bd358d4..662385dc 100644
--- a/extension/modules/utils/Scriptish_cryptoHash.js
+++ b/extension/modules/utils/Scriptish_cryptoHash.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = ["Scriptish_cryptoHash"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+lazyUtil(this, "stringBundle");
 
 // this tells updateFromStream to read the entire string 
 const PR_UINT32_MAX = 0xffffffff;
diff --git a/extension/modules/utils/Scriptish_getBinaryContents.js b/extension/modules/utils/Scriptish_getBinaryContents.js
index 150395cc..8afa0270 100644
--- a/extension/modules/utils/Scriptish_getBinaryContents.js
+++ b/extension/modules/utils/Scriptish_getBinaryContents.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = ["Scriptish_getBinaryContents"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_getUriFromFile.js");
+lazyUtil(this, "getUriFromFile");
 
 function Scriptish_getBinaryContents(aFile) {
   var channel = Services.io.newChannelFromURI(Scriptish_getUriFromFile(aFile));
diff --git a/extension/modules/utils/Scriptish_getBrowserForContentWindow.js b/extension/modules/utils/Scriptish_getBrowserForContentWindow.js
index 5922dbf1..b7059edb 100644
--- a/extension/modules/utils/Scriptish_getBrowserForContentWindow.js
+++ b/extension/modules/utils/Scriptish_getBrowserForContentWindow.js
@@ -1,5 +1,6 @@
 var EXPORTED_SYMBOLS = ["Scriptish_getBrowserForContentWindow"];
 Components.utils.import("resource://scriptish/constants.js");
+
 function Scriptish_getBrowserForContentWindow(aWin) {
   // enumerate through browser windows
   let browserEnumerator = Services.wm.getEnumerator("navigator:browser");
diff --git a/extension/modules/utils/Scriptish_getContents.js b/extension/modules/utils/Scriptish_getContents.js
index a4f7326c..bec7e59c 100644
--- a/extension/modules/utils/Scriptish_getContents.js
+++ b/extension/modules/utils/Scriptish_getContents.js
@@ -1,8 +1,8 @@
 var EXPORTED_SYMBOLS = ["Scriptish_getContents"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/logging.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_getUriFromFile.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError"]);
+lazyUtil(this, "getUriFromFile");
+lazyUtil(this, "stringBundle");
 
 try {
   // only available when the HUD console is shipped
diff --git a/extension/modules/utils/Scriptish_getEditor.js b/extension/modules/utils/Scriptish_getEditor.js
index bbb3e88d..a7e128e5 100644
--- a/extension/modules/utils/Scriptish_getEditor.js
+++ b/extension/modules/utils/Scriptish_getEditor.js
@@ -2,10 +2,10 @@ var EXPORTED_SYMBOLS = ["Scriptish_getEditor"];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/prefmanager.js");
-Cu.import("resource://scriptish/logging.js");
-Cu.import("resource://scriptish/utils/Scriptish_alert.js");
-Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
+lazyUtil(this, "alert");
+lazyUtil(this, "stringBundle");
 
 const Scriptish_getEditor = function(parentWindow, change) {
   var editorPath = Scriptish_prefRoot.getValue("editor");
diff --git a/extension/modules/utils/Scriptish_getTLDURL.js b/extension/modules/utils/Scriptish_getTLDURL.js
index bfe1a56e..eafccbce 100644
--- a/extension/modules/utils/Scriptish_getTLDURL.js
+++ b/extension/modules/utils/Scriptish_getTLDURL.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = ["Scriptish_getTLDURL"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_memoize.js");
+lazyUtil(this, "memoize");
 
 const Scriptish_getTLDURL = Scriptish_memoize(function(aURL) {
   let tldURL = aURL;
diff --git a/extension/modules/utils/Scriptish_getWindowIDs.js b/extension/modules/utils/Scriptish_getWindowIDs.js
index ce4566b4..53335e13 100644
--- a/extension/modules/utils/Scriptish_getWindowIDs.js
+++ b/extension/modules/utils/Scriptish_getWindowIDs.js
@@ -1,5 +1,5 @@
 var EXPORTED_SYMBOLS = ["Scriptish_getWindowIDs"];
-Components.utils.import("resource://scriptish/constants.js");
+const Ci = Components.interfaces;
 
 function Scriptish_getWindowIDs(aWin) {
   let utils = aWin.QueryInterface(Ci.nsIInterfaceRequestor)
diff --git a/extension/modules/utils/Scriptish_installUri.js b/extension/modules/utils/Scriptish_installUri.js
index e5d8c7a6..5f89a4d8 100644
--- a/extension/modules/utils/Scriptish_installUri.js
+++ b/extension/modules/utils/Scriptish_installUri.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = ["Scriptish_installUri"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/config/configdownloader.js");
+lazyImport(this, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
 
 function Scriptish_installUri(aURI, aWin) {
   // docs for nsicontentpolicy say we're not supposed to block, so short timer.
diff --git a/extension/modules/utils/Scriptish_localizeDOM.js b/extension/modules/utils/Scriptish_localizeDOM.js
index bc50c864..12ec0387 100644
--- a/extension/modules/utils/Scriptish_localizeDOM.js
+++ b/extension/modules/utils/Scriptish_localizeDOM.js
@@ -3,7 +3,7 @@
 const EXPORTED_SYMBOLS = ["Scriptish_localizeSubtree", "Scriptish_localizeOnLoad"];
 
 Components.utils.import("resource://scriptish/logging.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+lazyUtil(this, "stringBundle");
 
 function Scriptish_localizeOnLoad(window) {
   window.addEventListener("DOMContentLoaded", function localize() {
diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index e29f4059..b24d60d1 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -1,7 +1,7 @@
 var EXPORTED_SYMBOLS = ["Scriptish_notification"];
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/prefmanager.js");
-Components.utils.import("resource://scriptish/logging.js");
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
 function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
   if (Scriptish_prefRoot.getValue("disableNotifications"))
diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index 38bbd619..0903935b 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -2,11 +2,11 @@ var EXPORTED_SYMBOLS = ["Scriptish_openInEditor"];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/prefmanager.js");
-Cu.import("resource://scriptish/utils/Scriptish_getEditor.js");
-Cu.import("resource://scriptish/utils/Scriptish_launchApplicationWithDoc.js");
-Cu.import("resource://scriptish/utils/Scriptish_alert.js");
-Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyUtil(this, "getEditor");
+lazyUtil(this, "launchApplicationWithDoc");
+lazyUtil(this, "alert");
+lazyUtil(this, "stringBundle");
 
 function Scriptish_openInEditor(script, parentWindow) {
   var file = script.editFile;
diff --git a/extension/modules/utils/Scriptish_openInTab.js b/extension/modules/utils/Scriptish_openInTab.js
index 2223da96..314eb4a2 100644
--- a/extension/modules/utils/Scriptish_openInTab.js
+++ b/extension/modules/utils/Scriptish_openInTab.js
@@ -2,7 +2,7 @@ var EXPORTED_SYMBOLS = ["Scriptish_openInTab"];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/scriptish.js");
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 
 function Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin) {
   aChromeWin = aChromeWin || Scriptish.getMostRecentWindow();
diff --git a/extension/modules/utils/Scriptish_popupNotification.js b/extension/modules/utils/Scriptish_popupNotification.js
index c4f55cf9..e502b977 100644
--- a/extension/modules/utils/Scriptish_popupNotification.js
+++ b/extension/modules/utils/Scriptish_popupNotification.js
@@ -1,10 +1,10 @@
 
 var EXPORTED_SYMBOLS = ["Scriptish_popupNotification"];
-Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/scriptish.js");
-Components.utils.import("resource://scriptish/prefmanager.js");
-Components.utils.import("resource://scriptish/logging.js");
 Components.utils.import("resource://gre/modules/PopupNotifications.jsm");
+Components.utils.import("resource://scriptish/constants.js");
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
 function Scriptish_popupNotification(options) {
   if (Scriptish_prefRoot.getValue("disableNotifications"))

From 5b7d7d3694d8002419dd42e7249c3d6705454bef Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 03:14:24 +0200
Subject: [PATCH 337/829] Add tests for lazyUtil

---
 extension/content/tests/testLazyImport.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/extension/content/tests/testLazyImport.js b/extension/content/tests/testLazyImport.js
index 7ed8af0d..7360e7d5 100644
--- a/extension/content/tests/testLazyImport.js
+++ b/extension/content/tests/testLazyImport.js
@@ -19,7 +19,23 @@ test("import exists",/* any,*/ function() {
   var o = {};
   lazyImport(o, "resource://scriptish/utils/Scriptish_stringBundle.js", ["Scriptish_stringBundle"]);
   ok(typeof o.Scriptish_stringBundle == "function");
-  for (var k in o)
-    ok((k == "Scriptish_stringBundle") ? true : false,
-        "only Scriptish_stringBundle should have been exported");
+  deepEqual(Object.keys(o), ["Scriptish_stringBundle"], "only Scriptish_stringBundle should have been exported");
+});
+
+test("lazyUtil DNE",/* any,*/ function() {
+  var lazyImport = importModule("resource://scriptish/constants.js").lazyImport;
+  raises(function() {
+    var o = {};
+    lazyUtil(o, "DNE");
+    deepEqual(Object.keys(o), ["Scriptish_DNE"]);
+    o.Scriptish_DNE();
+  });
+});
+
+test("lazyUtil exists",/* any,*/ function() {
+  var lazyImport = importModule("resource://scriptish/constants.js").lazyImport;
+  var o = {};
+  lazyUtil(o, "stringBundle");
+  ok(typeof o.Scriptish_stringBundle == "function");
+  deepEqual(Object.keys(o), ["Scriptish_stringBundle"], "only Scriptish_stringBundle should have been exported");
 });

From 7a3bf92e7d60d6106a51212ea3f37ad70aeb595d Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 19:41:05 -0700
Subject: [PATCH 338/829] minor: gitkthis._hasTLD -> this._hasTLD since _hasTLD
 will always be a boolean.

---
 extension/modules/utils/PatternCollection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/utils/PatternCollection.js b/extension/modules/utils/PatternCollection.js
index f5667ee4..a96e45a4 100644
--- a/extension/modules/utils/PatternCollection.js
+++ b/extension/modules/utils/PatternCollection.js
@@ -71,5 +71,5 @@ PatternCollection.prototype = {
     return this._mergedTLD;
   },
   test: function(url) this.merged.test(url) || this.mergedSensitives.test(url)
-      || (!!this._hasTLD && this.mergedTLD.test(Scriptish_getTLDURL(url)))
+      || (this._hasTLD && this.mergedTLD.test(Scriptish_getTLDURL(url)))
 };

From d72589f5caee3c6b2acf73285c93e5028b1e975b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 19:42:57 -0700
Subject: [PATCH 339/829] bug fix: changed @includes were not being picked up.

---
 extension/modules/script/script.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index b7ec4991..b8235b56 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -628,6 +628,7 @@ Script.prototype = {
     Scriptish.notify(
         this, "scriptish-script-updated", {saved: true, reloadUI: true});
   },
+
   updateFromNewScript: function(newScript, scriptInjector) {
     var tools = {};
     Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
@@ -642,6 +643,8 @@ Script.prototype = {
     this.domains = newScript.domains;
     this._includes = newScript._includes;
     this._excludes = newScript._excludes;
+    delete this.__all_includes;
+    delete this.__all_excludes;
     this._matches = newScript._matches;
     this._delay = newScript._delay;
     this.priority = newPriority;

From 9a3abd27152164b21e10d0e9084931144fcb073f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 20:06:46 -0700
Subject: [PATCH 340/829] bug fix: when a script was modified the cached
 content was being parsed

---
 extension/modules/config/config.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 6f66faf5..b933c089 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -446,10 +446,11 @@ Config.prototype = {
       if (!script.isModified()) continue;
 
       let theScript = script;
-      theScript.getTextContent(function(content) {
+      Scriptish_getContents(script._file, 0, function(content) {
         let parsedScript = self.parse(
             content,
-            theScript._downloadURL && NetUtil.newURI(theScript._downloadURL), theScript);
+            theScript._downloadURL && NetUtil.newURI(theScript._downloadURL),
+            theScript);
         theScript.updateFromNewScript(parsedScript, scriptInjector);
       });
     }

From d1d26d6e1540eb12bef5b34da4a08cc802495b1e Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 3 Jul 2011 22:08:54 -0500
Subject: [PATCH 341/829] fixing 'lazyImport undefined' in
 Scriptish_localizeDOM.js

---
 extension/modules/utils/Scriptish_localizeDOM.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extension/modules/utils/Scriptish_localizeDOM.js b/extension/modules/utils/Scriptish_localizeDOM.js
index 12ec0387..53a65cf3 100644
--- a/extension/modules/utils/Scriptish_localizeDOM.js
+++ b/extension/modules/utils/Scriptish_localizeDOM.js
@@ -2,7 +2,9 @@
 
 const EXPORTED_SYMBOLS = ["Scriptish_localizeSubtree", "Scriptish_localizeOnLoad"];
 
-Components.utils.import("resource://scriptish/logging.js");
+Components.utils.import("resource://scriptish/constants.js");
+
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyUtil(this, "stringBundle");
 
 function Scriptish_localizeOnLoad(window) {

From 11fce06e8124a474b19cd0fbc9dfb26eb7a9009c Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 20:24:24 -0700
Subject: [PATCH 342/829] Closes #349 improving no scripts message by providing
 a reason why there are no scripts

---
 extension/components/scriptish.js           | 23 ++++++-----
 extension/content/browser.xul               |  3 +-
 extension/content/js/browser.js             | 45 +++++++++++++++------
 extension/locale/de/scriptish.properties    |  4 +-
 extension/locale/en-US/scriptish.properties |  4 +-
 extension/locale/es-ES/scriptish.properties |  3 +-
 extension/locale/ja-JP/scriptish.properties |  4 +-
 extension/locale/pt-BR/scriptish.properties |  4 +-
 extension/locale/ru-RU/scriptish.properties |  4 +-
 extension/locale/sv-SE/scriptish.properties |  4 +-
 extension/modules/config/config.js          | 10 +----
 11 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index ab6743fc..f2ee6e12 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -23,12 +23,11 @@ const {nsIContentPolicy: CP, nsIDOMXPathResult: XPATH_RESULT} = Ci;
 const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "complete"];
 
 function isScriptRunnable(script, url, topWin) {
-  let chk = !(!topWin && script.noframes)
+  return !(!topWin && script.noframes)
       && !script.delayInjection
       && script.enabled
       && !script.needsUninstall
       && script.matchesURL(url);
-  return chk;
 }
 
 let windows = {};
@@ -96,7 +95,7 @@ ScriptishService.prototype = {
     delete windows[aWinID];
   },
 
-  docReady: function(safeWin, chromeWin) {
+  docReady: function(safeWin, chromeWin) Scriptish.getConfig((function(config) {
     if (!Scriptish.enabled || !chromeWin) return;
 
     let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
@@ -132,8 +131,8 @@ ScriptishService.prototype = {
       winClosed || !Scriptish.enabled || !Scriptish.isGreasemonkeyable(href));
 
     // check if there are any modified scripts
-    if (Scriptish_prefRoot.getValue("enableScriptRefreshing"))
-      Scriptish.getConfig(function(config) config.updateModifiedScripts(function(script) {
+    if (Scriptish_prefRoot.getValue("enableScriptRefreshing")) {
+       config.updateModifiedScripts(function(script) {
         if (shouldNotRun()
             || !isScriptRunnable(script, href, safeWin === safeWin.top))
           return;
@@ -165,9 +164,10 @@ ScriptishService.prototype = {
           break;
         }
         inject();
-      }));
+      });
+    }
 
-    // if the focused tab's window is loading, then attach menuCommander
+    // if the focused tab's window is the one loading, then attach menuCommander
     if (safeWin === gBrowser.selectedBrowser.contentWindow) {
       if (gmBrowserUI.currentMenuCommander)
         gmBrowserUI.currentMenuCommander.detach();
@@ -175,6 +175,9 @@ ScriptishService.prototype = {
           gmBrowserUI.getCommander(currentInnerWindowID).attach();
     }
 
+    // if the url is a excluded url then stop
+    if (config.isURLExcluded(href)) return;
+
     // find matching scripts
     this.initScripts(href, safeWin, function(scripts) {
       if (scripts["document-end"].length || scripts["document-idle"].length) {
@@ -210,7 +213,7 @@ ScriptishService.prototype = {
         self.docUnload(currentInnerWindowID, gmBrowserUI);
       });
     });
-  },
+  }).bind(this)),
 
   docUnload: function(aWinID, aGMBrowserUI) {
     let menuCmders = aGMBrowserUI.menuCommanders;
@@ -234,9 +237,7 @@ ScriptishService.prototype = {
           || (safeWin.frameElement && safeWin.frameElement.src))
           || "";
 
-      if (!href) {
-        return; // wait for it :p
-      }
+      if (!href) return; // wait for it :p
       safeWin.removeEventListener("DOMContentLoaded", _frame_loader, false);
       self.docReady(safeWin, chromeWin);
 
diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index 416a3058..a981e412 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -9,7 +9,6 @@
     <broadcaster id="scriptish-options-brd"/>
     <broadcaster id="scriptish-tb-popup-brd"/>
     <broadcaster id="scriptish-button-brd"/>
-    <broadcaster id="scriptish-tb-no-scripts-brd"/>
     <broadcaster id="scriptish-tb-cmds-brd"/>
     <broadcaster id="scriptish-tb-new-us-brd"/>
     <broadcaster id="scriptish-tb-show-us-brd"/>
@@ -45,7 +44,7 @@
         class="toolbarbutton-1 chromeclass-toolbar-additional"
         label="Scriptish">
       <menupopup id="scriptish-tb-popup" observes="scriptish-tb-popup-brd">
-        <menuitem id="scriptish-tb-no-scripts" observes="scriptish-tb-no-scripts-brd"/>
+        <menuitem id="scriptish-tb-no-scripts"/>
         <menuseparator id="scriptish-tb-no-scripts-sep"/>
         <menu id="scriptish-tb-cmds" observes="scriptish-tb-cmds-brd" disabled="false"><menupopup/></menu>
         <menuseparator/>
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 92a5156a..63d54fcb 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -31,9 +31,6 @@ Scriptish_BrowserUI.tbBtnSetup = function() {
   $("scriptish-button-brd").setAttribute(
       "onclick", "Scriptish_BrowserUIM.onIconClick(event)");
 
-  $("scriptish-tb-no-scripts-brd").setAttribute(
-      "label", Scriptish_stringBundle("statusbar.noScripts"));
-
   var sbCmdsEle = $("scriptish-tb-cmds-brd");
   sbCmdsEle.setAttribute("label", Scriptish_stringBundle("menu.commands"));
   sbCmdsEle.setAttribute("accesskey",
@@ -307,16 +304,20 @@ function Scriptish_popupClicked(aEvt) {
   }
 }
 
+/**
+ * Handles a Scriptish menu popup event
+ */
 function Scriptish_showPopup(aEvent) Scriptish.getConfig(function(config) {
   var $ = function(aID) document.getElementById(aID);
   Scriptish_BrowserUI.reattachMenuCmds();
 
-  function scriptsMatching(urls) {
-    function testMatchURLs(script) {
-      return urls.some(function(url) script.matchesURL(url));
-    }
+  function okURL(url) (
+      (Scriptish.isGreasemonkeyable(url) && !config.isURLExcluded(url)));
 
-    return config.getMatchingScripts(testMatchURLs, urls).sort(function(a,b) {
+  function scriptsMatching(urls) {
+    return config.getMatchingScripts(function testMatchURLs(script) {
+      return urls.some(function(url) okURL(url) && script.matchesURL(url));
+    }).sort(function(a,b) {
       a = a.name.toLocaleLowerCase(), b = b.name.toLocaleLowerCase();
       return a.localeCompare(b);
     });
@@ -344,8 +345,13 @@ function Scriptish_showPopup(aEvent) Scriptish.getConfig(function(config) {
   }
 
   var urls = Scriptish_getURLsForContentWindow(getBrowser().contentWindow);
-  var runsOnTop = scriptsMatching([urls.shift()]); // first url = top window
-  var runsFramed = scriptsMatching(urls); // remainder are all its subframes
+  var url = urls.shift();
+
+  // first url = top window
+  var runsOnTop = scriptsMatching([url]);
+
+  // remainder are all its subframes
+  var runsFramed = scriptsMatching(urls);
 
   // drop all runsFramed scripts already present in runsOnTop
   for (var i = 0; i < runsOnTop.length; i++) {
@@ -357,7 +363,8 @@ function Scriptish_showPopup(aEvent) Scriptish.getConfig(function(config) {
   }
 
   // build the new list of scripts
-  if (runsFramed.length) {
+  var frameScriptLen = runsFramed.length;
+  if (frameScriptLen) {
     runsFramed.forEach(appendScriptToPopup);
     if (runsOnTop.length) { // only add the separator if there is stuff below
       var separator = document.createElement("menuseparator");
@@ -367,6 +374,18 @@ function Scriptish_showPopup(aEvent) Scriptish.getConfig(function(config) {
   }
   runsOnTop.forEach(appendScriptToPopup);
 
-  $("scriptish-tb-no-scripts").collapsed =
-      !!(runsFramed.length + runsOnTop.length);
+  let (menuitem = $("scriptish-tb-no-scripts")) {
+    let collapsed = menuitem.collapsed = !!(frameScriptLen + runsOnTop.length);
+    if (collapsed) return;
+
+    // determine the correct label
+    let label;
+    if (config.isURLExcluded(url))
+      label = Scriptish_stringBundle("statusbar.noScripts.excluded");
+    else if (!Scriptish.isGreasemonkeyable(url))
+      label = Scriptish_stringBundle("statusbar.noScripts.scheme");
+    else
+      label = Scriptish_stringBundle("statusbar.noScripts.notfound");
+    menuitem.setAttribute("label", label);
+  }
 })
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 80907a31..46a03c05 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -127,7 +127,9 @@ statusbar.enabled=Aktiviert
 statusbar.enabled.ak=K
 statusbar.installed=erfolgreich installiert
 statusbar.modified=geändert
-statusbar.noScripts=Keine Benutzerskripte für diese Seite!
+statusbar.noScripts.excluded=
+statusbar.noScripts.notfound=Keine Benutzerskripte für diese Seite!
+statusbar.noScripts.scheme=
 statusbar.updated=erfolgreich aktualisiert
 tooltip.loading=Lade...
 Uninstall=Entfernen
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 6f49181b..9e69f4ee 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -127,7 +127,9 @@ statusbar.enabled=Enabled
 statusbar.enabled.ak=E
 statusbar.installed=installed successfully
 statusbar.modified=modified
-statusbar.noScripts=No scripts for page!
+statusbar.noScripts.excluded=Page is excluded!
+statusbar.noScripts.notfound=No scripts for page!
+statusbar.noScripts.scheme=Scheme is disabled!
 statusbar.updated=updated successfully
 tooltip.loading=Loading...
 Uninstall=Uninstall
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 1f357a1f..3e68be5a 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -127,7 +127,8 @@ statusbar.enabled=Activado
 statusbar.enabled.ak=A
 statusbar.installed=instalado con éxito
 statusbar.modified=modificado
-statusbar.noScripts=¡No hay scripts para esta página!
+statusbar.noScripts.excluded=
+statusbar.noScripts.notfound=¡No hay scripts para esta página!
 statusbar.updated=actualizado con éxito
 tooltip.loading=Cargando...
 Uninstall=Desinstalar
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index c3a88259..123a3dc2 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -127,7 +127,9 @@ statusbar.enabled=有効
 statusbar.enabled.ak=E
 statusbar.installed=のインストールに成功しました
 statusbar.modified=は変更されました
-statusbar.noScripts=このページ用のスクリプトはありません！
+statusbar.noScripts.excluded=
+statusbar.noScripts.notfound=このページ用のスクリプトはありません！
+statusbar.noScripts.scheme=
 statusbar.updated=は正常に更新されました
 tooltip.loading=読み込み中…
 Uninstall=アンインストール
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index c5dabdc7..c725d3d4 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -127,7 +127,9 @@ statusbar.enabled=Ativado
 statusbar.enabled.ak=A
 statusbar.installed=instalado com sucesso
 statusbar.modified=modificado
-statusbar.noScripts=Nenhum script para esta página!
+statusbar.noScripts.excluded=
+statusbar.noScripts.notfound=Nenhum script para esta página!
+statusbar.noScripts.scheme=
 statusbar.updated=atualizado com sucesso
 tooltip.loading=Carregando...
 Uninstall=Desinstalação
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index b60ef3fd..8fd5b850 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -127,7 +127,9 @@ statusbar.enabled=Включено
 statusbar.enabled.ak=
 statusbar.installed=успешно установлен
 statusbar.modified=изменен
-statusbar.noScripts=Нет скриптов для страницы!
+statusbar.noScripts.excluded=
+statusbar.noScripts.notfound=Нет скриптов для страницы!
+statusbar.noScripts.scheme=
 statusbar.updated=успешно обновлен(ы)
 tooltip.loading=Грузим ...
 Uninstall=Удалить
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index fb120008..f912f166 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -127,7 +127,9 @@ statusbar.enabled=Aktiverat
 statusbar.enabled.ak=A
 statusbar.installed=har installerats
 statusbar.modified=har ändrats
-statusbar.noScripts=Inga skript för sidan!
+statusbar.noScripts.excluded=
+statusbar.noScripts.notfound=Inga skript för sidan!
+statusbar.noScripts.scheme=
 statusbar.updated=har uppdaterats
 tooltip.loading=Läser in…
 Uninstall=Avinstallera
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index b933c089..05d317e9 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -416,14 +416,8 @@ Config.prototype = {
   },
   addExclude: function(excludes) this._excludes.addPatterns(excludes),
   get scripts() this._scripts.concat(),
-  getMatchingScripts: function(testFunc, urls) {
-    for (var i = urls.length - 1; ~i; i--) {
-      if (this._excludes.test(urls[i])) {
-        return [];
-      }
-    }
-    return this.scripts.filter(testFunc);
-  },
+  isURLExcluded: function(url) this._excludes.test(url),
+  getMatchingScripts: function(testFunc) this.scripts.filter(testFunc),
   sortScripts: function() this._scripts.sort(function(a, b) b.priority - a.priority),
   injectScript: function(script) {
     var unsafeWin = this.wrappedContentWin.wrappedJSObject;

From 52865fb137a1c9723b011dc342765897b4c830b3 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 3 Jul 2011 22:31:27 -0500
Subject: [PATCH 343/829] adding missing  key to es-ES

---
 extension/locale/es-ES/scriptish.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 3e68be5a..ac415980 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -129,6 +129,7 @@ statusbar.installed=instalado con éxito
 statusbar.modified=modificado
 statusbar.noScripts.excluded=
 statusbar.noScripts.notfound=¡No hay scripts para esta página!
+statusbar.noScripts.scheme=
 statusbar.updated=actualizado con éxito
 tooltip.loading=Cargando...
 Uninstall=Desinstalar

From 201f5a89c7bfe1e09bcacd2f96242485ed7d217c Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 22:06:51 -0700
Subject: [PATCH 344/829] minor: making constants out of reg exp that check if
 url is a user script url, or if content is html content

---
 extension/components/scriptish.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index f2ee6e12..d2a1f6df 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -22,6 +22,11 @@ lazyUtil(this, "stringBundle");
 const {nsIContentPolicy: CP, nsIDOMXPathResult: XPATH_RESULT} = Ci;
 const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "complete"];
 
+// If the file was previously cached it might have been given a number after
+// .user, like gmScript.user-12.js
+const RE_USERSCRIPT = /\.user(?:-\d+)?\.js$/;
+const RE_CONTENTTYPE = /text\/html/i;
+
 function isScriptRunnable(script, url, topWin) {
   return !(!topWin && script.noframes)
       && !script.delayInjection
@@ -112,10 +117,9 @@ ScriptishService.prototype = {
     }
 
     // Show the scriptish install banner if the user is navigating to a .user.js
-    // file in a top-level tab.  If the file was previously cached it might have
-    // been given a number after .user, like gmScript.user-12.js
-    if (safeWin === safeWin.top && href.match(/\.user(?:-\d+)?\.js$/)
-        && !/text\/html/i.test(safeWin.document.contentType)) {
+    // file in a top-level tab.
+    if (safeWin === safeWin.top && href.match(RE_USERSCRIPT)
+        && !RE_CONTENTTYPE.test(safeWin.document.contentType)) {
       gmBrowserUI.showInstallBanner(
           gBrowser.getBrowserForDocument(safeWin.document));
     }

From d8c2f0728a3d510be80a5257819ee902705ab0d9 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 4 Jul 2011 00:12:36 -0500
Subject: [PATCH 345/829] Closes #402 Only utilize the Web Console when it is
 visible.

Reference:  http://mxr.mozilla.org/mozilla-central/source/toolkit/components/console/hudservice/HUDService.jsm#1886
---
 extension/modules/api/GM_console.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index 2ffe4606..fd180734 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -2,6 +2,7 @@
 var EXPORTED_SYMBOLS = ["GM_console"];
 
 const Cu = Components.utils;
+Cu.import("resource://gre/modules/HUDService.jsm");
 Cu.import("resource://scriptish/logging.js");
 Cu.import("resource://scriptish/utils/Scriptish_getFirebugConsole.js");
 
@@ -16,14 +17,18 @@ const aux_functions = ["assert", "dir", "dirxml", "group", "groupEnd", "time",
                         ];
 
 function getConsoleFor(contentWindow, chromeWindow) {
-
   let rv = Scriptish_getFirebugConsole(contentWindow, chromeWindow);
   if (rv) {
     return rv;
   }
 
-  if (contentWindow.console) {
-    return contentWindow.console;
+  let hudID = HUDService.getHudIdByWindow(contentWindow);
+  let hud = HUDService.getHeadsUpDisplay(hudID);
+  if (hud) {
+    let hudShowing = hud.style.height != 0;
+    if (hudShowing && contentWindow.console) {
+      return contentWindow.console;
+    }
   }
 
   return {

From 8c690ac5434bfcd10afa28d339d9d78bc8cce7c9 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 4 Jul 2011 00:16:06 -0500
Subject: [PATCH 346/829] Remove focus from the first textbox so it's
 placeholder can be seen.

---
 extension/content/js/newscript.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 97464894..2dd43cb5 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -21,6 +21,9 @@ try {
 addEventListener("DOMContentLoaded", function init() {
   removeEventListener("DOMContentLoaded", init, false);
 
+  // remove focus from the first textbox
+  $("scriptish").focus();
+
   $("scriptish").addEventListener("dialogaccept", function(evt) {
     try {
       if (doInstall()) {

From fbfe05af631da6da32faac2d24c0da8370b03d25 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 4 Jul 2011 00:27:17 -0500
Subject: [PATCH 347/829] simplifying d8c2f0728a3d510be80a5257819ee902705ab0d9

---
 extension/modules/api/GM_console.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index fd180734..81a76a29 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -22,13 +22,9 @@ function getConsoleFor(contentWindow, chromeWindow) {
     return rv;
   }
 
-  let hudID = HUDService.getHudIdByWindow(contentWindow);
-  let hud = HUDService.getHeadsUpDisplay(hudID);
-  if (hud) {
-    let hudShowing = hud.style.height != 0;
-    if (hudShowing && contentWindow.console) {
-      return contentWindow.console;
-    }
+  let hud = HUDService.getHeadsUpDisplay(HUDService.getHudIdByWindow(contentWindow));
+  if (hud && hud.style.height != 0 && contentWindow.console) {
+    return contentWindow.console;
   }
 
   return {

From 16b63334cad98ab2098646b00f76bc64e198ec92 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 22:56:31 -0700
Subject: [PATCH 348/829] href.match(RE_USERSCRIPT) -> RE_USERSCRIPT.test(href)

---
 extension/components/scriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index d2a1f6df..52aada77 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -118,7 +118,7 @@ ScriptishService.prototype = {
 
     // Show the scriptish install banner if the user is navigating to a .user.js
     // file in a top-level tab.
-    if (safeWin === safeWin.top && href.match(RE_USERSCRIPT)
+    if (safeWin === safeWin.top && RE_USERSCRIPT.test(href)
         && !RE_CONTENTTYPE.test(safeWin.document.contentType)) {
       gmBrowserUI.showInstallBanner(
           gBrowser.getBrowserForDocument(safeWin.document));

From 6eec2be403e63bb381ee4fc67831a758afc95d10 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 23:19:02 -0700
Subject: [PATCH 349/829] removing a redundant line and adding a comment

---
 extension/components/scriptish.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 52aada77..0873694e 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -131,6 +131,7 @@ ScriptishService.prototype = {
     let tools = {};
     let winClosed = false;
 
+    // rechecks values that can change at any moment
     function shouldNotRun() (
       winClosed || !Scriptish.enabled || !Scriptish.isGreasemonkeyable(href));
 
@@ -238,8 +239,7 @@ ScriptishService.prototype = {
     safeWin.addEventListener("DOMContentLoaded", function _frame_loader() {
       // not perfect, but anyway
       let href = (safeWin.location.href
-          || (safeWin.frameElement && safeWin.frameElement.src))
-          || "";
+          || (safeWin.frameElement && safeWin.frameElement.src));
 
       if (!href) return; // wait for it :p
       safeWin.removeEventListener("DOMContentLoaded", _frame_loader, false);

From 09417a544a69c2617e25954861fec3835875fb4a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 3 Jul 2011 23:32:18 -0700
Subject: [PATCH 350/829] minor style changes

---
 extension/components/scriptish.js | 40 +++++++++++++------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 0873694e..85e2ab68 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -14,6 +14,7 @@ lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
 lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_installUri.js", ["Scriptish_installUri"]);
 
 lazyUtil(this, "getBrowserForContentWindow");
 lazyUtil(this, "getWindowIDs");
@@ -54,13 +55,15 @@ function ScriptishService() {
 }
 
 ScriptishService.prototype = {
-  classDescription:  DESCRIPTION,
-  classID:           CLASSID,
-  contractID:        CONTRACTID,
-  _xpcom_categories: [{category: "content-policy",
-                       entry: CONTRACTID,
-                       value: CONTRACTID,
-                       service: true}],
+  classDescription: DESCRIPTION,
+  classID: CLASSID,
+  contractID: CONTRACTID,
+  _xpcom_categories: [{
+    category: "content-policy",
+    entry: CONTRACTID,
+    value: CONTRACTID,
+    service: true
+  }],
   QueryInterface: XPCOMUtils.generateQI([
       Ci.nsISupports, Ci.nsISupportsWeakReference, Ci.nsIContentPolicy]),
 
@@ -128,7 +131,6 @@ ScriptishService.prototype = {
 
     let unsafeWin = safeWin.wrappedJSObject;
     let self = this;
-    let tools = {};
     let winClosed = false;
 
     // rechecks values that can change at any moment
@@ -282,7 +284,7 @@ ScriptishService.prototype = {
         && this._reg_userjs.test(cl.spec)
         && !this.ignoreNextScript_ && !this.isTempScript(cl)) {
       this.ignoreNextScript_ = false;
-      this.Scriptish_installUri(cl, ctx.contentWindow);
+      Scriptish_installUri(cl, ctx.contentWindow);
       return CP.REJECT_REQUEST;
     }
 
@@ -328,10 +330,7 @@ ScriptishService.prototype = {
   injectScripts: function(scripts, url, winID, wrappedContentWin, chromeWin) {
     if (0 >= scripts.length) return;
     let self = this;
-    let sandbox;
-    let script;
     let unsafeContentWin = wrappedContentWin.wrappedJSObject;
-    let tools = {};
 
     let delays = [];
     let winID = Scriptish_getWindowIDs(wrappedContentWin).innerID;
@@ -339,8 +338,8 @@ ScriptishService.prototype = {
       for (let [, id] in Iterator(delays)) self.timer.clearTimeout(id);
     });
 
-    for (var i = 0; script = scripts[i++];) {
-      sandbox = new Cu.Sandbox(wrappedContentWin);
+    for (var i = 0, script; script = scripts[i++];) {
+      let sandbox = new Cu.Sandbox(wrappedContentWin);
 
       let GM_api = new GM_API(
           script, url, winID, wrappedContentWin, unsafeContentWin, chromeWin);
@@ -386,13 +385,11 @@ ScriptishService.prototype = {
           fileURL = req.fileURL;
           Cu.evalInSandbox(
               req.textContent + "\n", aSandbox, jsVer, fileURLPrefix+fileURL, 1);
-        }
-        catch (ex) {
+        } catch (ex) {
           Scriptish_logScriptError(ex, aWindow, fileURL);
         }
       }
-    }
-    catch (e) {
+    } catch (e) {
       return Scriptish_logError(e, 0, fileURL, e.lineNumber);
     }
 
@@ -420,15 +417,10 @@ ScriptishService.prototype = {
         Cu.evalInSandbox(
             "(function(){"+src+"})()", aSandbox, jsVer, fileURLPrefix+fileURL, 1);
       }
-    }
-    catch (e) {
+    } catch (e) {
       Scriptish_logScriptError(e, aWindow, fileURL, aScript.id);
     }
   }
 }
-lazyImport(ScriptishService.prototype,
-           "resource://scriptish/utils/Scriptish_installUri.js",
-           ["Scriptish_installUri"]
-           );
 
 var NSGetFactory = XPCOMUtils.generateNSGetFactory([ScriptishService]);

From 9932f478e73e57822ae86a2b844e48e8e5557270 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 15:24:30 +0200
Subject: [PATCH 351/829] Revert "simplifying
 d8c2f0728a3d510be80a5257819ee902705ab0d9"

This reverts commit fbfe05af631da6da32faac2d24c0da8370b03d25.
---
 extension/modules/api/GM_console.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index 81a76a29..fd180734 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -22,9 +22,13 @@ function getConsoleFor(contentWindow, chromeWindow) {
     return rv;
   }
 
-  let hud = HUDService.getHeadsUpDisplay(HUDService.getHudIdByWindow(contentWindow));
-  if (hud && hud.style.height != 0 && contentWindow.console) {
-    return contentWindow.console;
+  let hudID = HUDService.getHudIdByWindow(contentWindow);
+  let hud = HUDService.getHeadsUpDisplay(hudID);
+  if (hud) {
+    let hudShowing = hud.style.height != 0;
+    if (hudShowing && contentWindow.console) {
+      return contentWindow.console;
+    }
   }
 
   return {

From a78830614b23f1f8bdcb5c83eac536d39633f060 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 15:24:41 +0200
Subject: [PATCH 352/829] Revert "Closes #402 Only utilize the Web Console when
 it is visible."

This reverts commit d8c2f0728a3d510be80a5257819ee902705ab0d9.
---
 extension/modules/api/GM_console.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index fd180734..2ffe4606 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -2,7 +2,6 @@
 var EXPORTED_SYMBOLS = ["GM_console"];
 
 const Cu = Components.utils;
-Cu.import("resource://gre/modules/HUDService.jsm");
 Cu.import("resource://scriptish/logging.js");
 Cu.import("resource://scriptish/utils/Scriptish_getFirebugConsole.js");
 
@@ -17,18 +16,14 @@ const aux_functions = ["assert", "dir", "dirxml", "group", "groupEnd", "time",
                         ];
 
 function getConsoleFor(contentWindow, chromeWindow) {
+
   let rv = Scriptish_getFirebugConsole(contentWindow, chromeWindow);
   if (rv) {
     return rv;
   }
 
-  let hudID = HUDService.getHudIdByWindow(contentWindow);
-  let hud = HUDService.getHeadsUpDisplay(hudID);
-  if (hud) {
-    let hudShowing = hud.style.height != 0;
-    if (hudShowing && contentWindow.console) {
-      return contentWindow.console;
-    }
+  if (contentWindow.console) {
+    return contentWindow.console;
   }
 
   return {

From 702381b897816e8bb06df874c03513f704f047fe Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 15:41:53 +0200
Subject: [PATCH 353/829] Make GM_log log to the Error Console again (also to
 the Web Console).

This is controlled by the pref `logToErrorConsole`, which defaults to
true for now.
Closes #402
---
 extension/components/scriptish.js           |  8 ++++++++
 extension/defaults/preferences/scriptish.js |  1 +
 extension/modules/api/GM_ScriptLogger.js    | 11 +++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 extension/modules/api/GM_ScriptLogger.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 85e2ab68..4bf6b015 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -13,6 +13,7 @@ lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scri
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
+lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
 lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_installUri.js", ["Scriptish_installUri"]);
 
@@ -355,6 +356,13 @@ ScriptishService.prototype = {
         return GM_console(script, wrappedContentWin, chromeWin);
       });
       XPCOMUtils.defineLazyGetter(sandbox, "GM_log", function() {
+        if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
+          var logger = new GM_ScriptLogger(script);
+          return function() {
+            logger.log(Array.slice(arguments).join(" "));
+            sandbox.console.log.apply(sandbox.console, arguments);
+          }
+        }
         return sandbox.console.log.bind(sandbox.console);
       });
 
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 1b8cb973..63e8127c 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -21,3 +21,4 @@ pref("extensions.scriptish.update.uso.interval", 86400);
 pref("extensions.scriptish.update.uso.lastFetch", 0);
 pref("extensions.scriptish.useDefaultLocale", false);
 pref("extensions.scriptish.useDownloadURLForUpdateURL", false);
+pref("extensions.scriptish.logToErrorConsole", true);
diff --git a/extension/modules/api/GM_ScriptLogger.js b/extension/modules/api/GM_ScriptLogger.js
new file mode 100644
index 00000000..e6b1e8bf
--- /dev/null
+++ b/extension/modules/api/GM_ScriptLogger.js
@@ -0,0 +1,11 @@
+var EXPORTED_SYMBOLS = ["GM_ScriptLogger"];
+Components.utils.import("resource://scriptish/logging.js");
+
+function GM_ScriptLogger(script) {
+  var namespace = script.namespace;
+  if (namespace.substring(namespace.length - 1) != "/") namespace += "/";
+  this.prefix = [namespace, script.name, ": "].join("");
+}
+GM_ScriptLogger.prototype.log = function(message) {
+  Scriptish_log(this.prefix + message, true);
+}

From 634abb8c92e4020c0ebbdefe5a3fe039ae9777fd Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 15:50:41 +0200
Subject: [PATCH 354/829] Add UI for the logToErrorConsole pref to the Advanced
 prefpane

---
 extension/content/options.xul               | 2 ++
 extension/locale/de/scriptish.properties    | 1 +
 extension/locale/en-US/scriptish.properties | 1 +
 extension/locale/es-ES/scriptish.properties | 1 +
 extension/locale/ja-JP/scriptish.properties | 1 +
 extension/locale/pt-BR/scriptish.properties | 1 +
 extension/locale/ru-RU/scriptish.properties | 1 +
 extension/locale/sv-SE/scriptish.properties | 1 +
 8 files changed, 9 insertions(+)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index 15ee5acd..f3671a3d 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -70,6 +70,7 @@
       <preference id="pref-enabledSchemes-unmht" name="extensions.scriptish.enabledSchemes.unmht" type="bool"/>
       <preference id="pref-enabledSchemes-about" name="extensions.scriptish.enabledSchemes.about" type="bool"/>
       <preference id="pref-logChrome" name="extensions.scriptish.logChrome" type="bool"/>
+      <preference id="pref-logToErrorConsole" name="extensions.scriptish.logToErrorConsole" type="bool"/>
       <preference id="pref-update-requireSecured" name="extensions.scriptish.update.requireSecured" type="bool"/>
       <preference id="pref-update-requireBuiltInCerts" name="extensions.scriptish.update.requireBuiltInCerts" type="bool"/>
     </preferences>
@@ -111,6 +112,7 @@
     <groupbox>
       <caption label="options.logging" localize="label"/>
       <checkbox preference="pref-logChrome" label="options.logChrome" localize="label"/>
+      <checkbox preference="pref-logToErrorConsole" label="options.logToErrorConsole" localize="label"/>
     </groupbox>
     <groupbox>
       <caption label="options.update.security" localize="label"/>
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 46a03c05..55b31bbd 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -108,6 +108,7 @@ options.excludes.remark=(Sie können eine Ausnahme pro Zeile spezifizieren)
 options.enableCopyDownloadURL=Kopieren der Download-URL aktivieren
 options.logging=Protokoll
 options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole protokollieren
+options.logToErrorConsole=GM_log benutzt die Fehlerkonsole
 options.notifications=Benachrichtigungen
 options.notifications.disable=Benachrichtungen bei Benutzerskript-Änderungen deaktivieren
 options.requireBuiltInCerts=Sichere Aktualisierungen müssen eingebaute Zertifikate nutzen
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 9e69f4ee..b7e8f9c7 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -108,6 +108,7 @@ options.excludes.remark=(You may specify one exclude per line)
 options.enableCopyDownloadURL=Enable copying of download URL
 options.logging=Logging
 options.logChrome=Log non-critical extension messages to the Error Console
+options.logToErrorConsole=GM_log uses the Error Console
 options.notifications=Notifications
 options.notifications.disable=Disable sliding notifications on script changes
 options.requireBuiltInCerts=Secure update requires using built-in certificates
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index ac415980..548bdda1 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -108,6 +108,7 @@ options.excludes.remark=
 options.enableCopyDownloadURL=Activar copia del URL de descarga
 options.logging=
 options.logChrome=
+options.logToErrorConsole=
 options.notifications=
 options.notifications.disable=
 options.requireBuiltInCerts=
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 123a3dc2..10753212 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -108,6 +108,7 @@ options.excludes.remark=（１行１つずつ指定）
 options.enableCopyDownloadURL=ダウンロード URL のコピーを有効にする
 options.logging=ログ
 options.logChrome=重大ではないエクステンションのメッセージもエラーコンソールに出力する
+options.logToErrorConsole=
 options.notifications=通知
 options.notifications.disable=スクリプト変更時の通知を無効にする
 options.requireBuiltInCerts=安全なアップデートには built-in 証明書の利用が必要です
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index c725d3d4..00ade60b 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -108,6 +108,7 @@ options.excludes.remark=
 options.enableCopyDownloadURL=Habilitar cópia do endereço de download
 options.logging=
 options.logChrome=
+options.logToErrorConsole=
 options.notifications=
 options.notifications.disable=
 options.requireBuiltInCerts=
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 8fd5b850..4f00e70c 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -108,6 +108,7 @@ options.excludes.remark=
 options.enableCopyDownloadURL=Включить копирование URL для загрузки
 options.logging=
 options.logChrome=
+options.logToErrorConsole=
 options.notifications=
 options.notifications.disable=
 options.requireBuiltInCerts=
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index f912f166..8814a883 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -108,6 +108,7 @@ options.excludes.remark=(Du kan ange ett undantag per rad)
 options.enableCopyDownloadURL=Aktivera kopiering av hämtningsadress
 options.logging=Loggning
 options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felonsolen
+options.logToErrorConsole=
 options.notifications=Aviseringar
 options.notifications.disable=Inaktivera glidande aviseringar om skriptändringar
 options.requireBuiltInCerts=Säker uppdatering kräver användning av inbyggda certifikat

From 03f3d7bd29bd62a0b83f68395cc9784413891d55 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 16:11:49 +0200
Subject: [PATCH 355/829] Restructure options dialog to take less height.

Closes #406
---
 extension/content/options.xul               |  92 ++++++++++----------
 extension/locale/de/scriptish.properties    |   1 +
 extension/locale/en-US/scriptish.properties |   1 +
 extension/locale/es-ES/scriptish.properties |   1 +
 extension/locale/ja-JP/scriptish.properties |   1 +
 extension/locale/pt-BR/scriptish.properties |   1 +
 extension/locale/ru-RU/scriptish.properties |   1 +
 extension/locale/sv-SE/scriptish.properties |   1 +
 extension/skin/options.css                  |   7 ++
 extension/skin/options.png                  | Bin 6150 -> 6780 bytes
 10 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index f3671a3d..e1b39c0b 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -20,7 +20,6 @@
       <preference id="pref-editor" name="extensions.scriptish.editor" type="unichar"/>
       <preference id="pref-uninstallPreferences" name="extensions.scriptish.uninstallPreferences" type="bool"/>
       <preference id="pref-useDownloadURLForUpdateURL" name="extensions.scriptish.useDownloadURLForUpdateURL" type="bool"/>
-      <preference id="pref-enableCopyDownloadURL" name="extensions.scriptish.enableCopyDownloadURL" type="bool"/>
     </preferences>
 
     <groupbox>
@@ -45,7 +44,22 @@
       <caption label="Update" localize="label"/>
       <checkbox preference="pref-useDownloadURLForUpdateURL" label="options.useDownloadURL" localize="label"/>
     </groupbox>
+  </prefpane>
 
+  <prefpane id="pane-ui" label="options.pane.ui" localize="label">
+    <preferences>
+      <preference id="pref-disableNotifications" name="extensions.scriptish.disableNotifications" type="bool"/>
+      <preference id="pref-enableCopyDownloadURL" name="extensions.scriptish.enableCopyDownloadURL" type="bool"/>
+      <preference id="pref-useDefaultLocale" name="extensions.scriptish.useDefaultLocale" type="bool"/>
+    </preferences>
+    <groupbox>
+      <caption label="options.notifications" localize="label"/>
+      <checkbox preference="pref-disableNotifications" label="options.notifications.disable" localize="label"/>
+    </groupbox>
+    <groupbox>
+      <caption label="options.translation" localize="label"/>
+      <checkbox preference="pref-useDefaultLocale" label="options.translation.useEnglish" localize="label"/>
+    </groupbox>
     <groupbox>
       <caption label="options.addonsManager" localize="label"/>
       <checkbox preference="pref-enableCopyDownloadURL" label="options.enableCopyDownloadURL" localize="label"/>
@@ -63,8 +77,6 @@
   <prefpane id="pane-advanced" label="options.pane.advanced" localize="label">
     <preferences>
       <preference id="pref-cache-enabled" name="extensions.scriptish.cache.enabled" type="bool"/>
-      <preference id="pref-disableNotifications" name="extensions.scriptish.disableNotifications" type="bool"/>
-      <preference id="pref-useDefaultLocale" name="extensions.scriptish.useDefaultLocale" type="bool"/>
       <preference id="pref-enabledSchemes-file" name="extensions.scriptish.enabledSchemes.file" type="bool"/>
       <preference id="pref-enabledSchemes-chrome" name="extensions.scriptish.enabledSchemes.chrome" type="bool"/>
       <preference id="pref-enabledSchemes-unmht" name="extensions.scriptish.enabledSchemes.unmht" type="bool"/>
@@ -75,50 +87,36 @@
       <preference id="pref-update-requireBuiltInCerts" name="extensions.scriptish.update.requireBuiltInCerts" type="bool"/>
     </preferences>
 
-    <groupbox>
-      <caption label="options.cache" localize="label"/>
-      <checkbox preference="pref-cache-enabled" label="options.cache.enabled" localize="label"/>
-    </groupbox>
-    <groupbox>
-      <caption label="options.notifications" localize="label"/>
-      <checkbox preference="pref-disableNotifications" label="options.notifications.disable" localize="label"/>
-    </groupbox>
-    <groupbox>
-      <caption label="options.translation" localize="label"/>
-      <checkbox preference="pref-useDefaultLocale" label="options.translation.useEnglish" localize="label"/>
-    </groupbox>
-    <groupbox id="enabledschemes-advanced">
-      <caption label="options.enabledSchemes.advanced" localize="label"/>
-      <grid>
-        <columns>
-          <column flex="1"/>
-          <column flex="1"/>
-        </columns>
-        <rows>
-          <row>
-            <checkbox preference="pref-enabledSchemes-file" label="options.enabledSchemes.file" localize="label"/>
-            <checkbox preference="pref-enabledSchemes-chrome" label="options.enabledSchemes.chrome" localize="label"/>
-          </row>
-          <row>
-            <checkbox preference="pref-enabledSchemes-unmht" label="options.enabledSchemes.unmht" localize="label"/>
-            <checkbox preference="pref-enabledSchemes-about" label="options.enabledSchemes.about" localize="label"/>
-          </row>
-        </rows>
-      </grid>
-      <separator class="thin"/>
-      <label class="remark" control="enabledschemes-advanced" value="options.enabledSchemes.securityRemark" localize="value"/>
-      <label class="remark" control="enabledschemes-advanced" value="options.enabledSchemes.securityRemark2" localize="value"/>
-    </groupbox>
-    <groupbox>
-      <caption label="options.logging" localize="label"/>
-      <checkbox preference="pref-logChrome" label="options.logChrome" localize="label"/>
-      <checkbox preference="pref-logToErrorConsole" label="options.logToErrorConsole" localize="label"/>
-    </groupbox>
-    <groupbox>
-      <caption label="options.update.security" localize="label"/>
-      <checkbox preference="pref-update-requireSecured" label="options.requireSecured" localize="label"/>
-      <checkbox preference="pref-update-requireBuiltInCerts" label="options.requireBuiltInCerts" localize="label"/>
-    </groupbox>
+    <tabbox>
+      <tabs>
+        <tab label="options.cache" localize="label"/>
+        <tab label="options.enabledSchemes.advanced" localize="label" />
+        <tab label="options.logging" localize="label" />
+        <tab label="options.update.security" localize="label"/>
+      </tabs>
+      <tabpanels>
+        <tabpanel>
+          <checkbox preference="pref-cache-enabled" label="options.cache.enabled" localize="label"/>
+        </tabpanel>
+        <tabpanel>
+          <checkbox preference="pref-enabledSchemes-file" label="options.enabledSchemes.file" localize="label"/>
+          <checkbox preference="pref-enabledSchemes-chrome" label="options.enabledSchemes.chrome" localize="label"/>
+          <checkbox preference="pref-enabledSchemes-unmht" label="options.enabledSchemes.unmht" localize="label"/>
+          <checkbox preference="pref-enabledSchemes-about" label="options.enabledSchemes.about" localize="label"/>
+          <separator class="thin"/>
+          <label class="remark" control="enabledschemes-advanced" value="options.enabledSchemes.securityRemark" localize="value"/>
+          <label class="remark" control="enabledschemes-advanced" value="options.enabledSchemes.securityRemark2" localize="value"/>
+        </tabpanel>
+        <tabpanel>
+          <checkbox preference="pref-logChrome" label="options.logChrome" localize="label"/>
+          <checkbox preference="pref-logToErrorConsole" label="options.logToErrorConsole" localize="label"/>
+        </tabpanel>
+        <tabpanel>
+          <checkbox preference="pref-update-requireSecured" label="options.requireSecured" localize="label"/>
+          <checkbox preference="pref-update-requireBuiltInCerts" label="options.requireBuiltInCerts" localize="label"/>
+        </tabpanel>
+      </tabpanels>
+    </tabbox>
   </prefpane>
 
   <script type="application/x-javascript" src="chrome://scriptish/content/js/options.js"/>
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 55b31bbd..4cfc4428 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -82,6 +82,7 @@ openUserScriptsManager.ak=B
 options=Optionen
 options.title=Scriptish Einstellungen
 options.pane.main=Allgemein
+options.pane.ui=Benutzeroberfläche
 options.pane.excludes=Globale Ausnahmen
 options.pane.advanced=Erweitert
 options.addonsManager=Add-ons-Manager
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index b7e8f9c7..8988ddb2 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -82,6 +82,7 @@ openUserScriptsManager.ak=O
 options=Options
 options.title=Scriptish Options
 options.pane.main=Main
+options.pane.ui=User Interface
 options.pane.excludes=Global Excludes
 options.pane.advanced=Advanced
 options.addonsManager=Add-ons Manager
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 548bdda1..f4cc2c43 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -82,6 +82,7 @@ openUserScriptsManager.ak=
 options=Opciones
 options.title=
 options.pane.main=
+options.pane.ui=
 options.pane.excludes=Exclusiones globales
 options.pane.advanced=
 options.addonsManager=Gestor de extensiones
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 10753212..6ce7037d 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -82,6 +82,7 @@ openUserScriptsManager.ak=
 options=オプション
 options.title=Scriptish オプション
 options.pane.main=メイン
+options.pane.ui=
 options.pane.excludes=
 options.pane.advanced=詳細
 options.addonsManager=アドオン・マネージャー
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 00ade60b..914ed58b 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -82,6 +82,7 @@ openUserScriptsManager.ak=
 options=Opções
 options.title=
 options.pane.main=
+options.pane.ui=
 options.pane.excludes=Exclusões globais
 options.pane.advanced=
 options.addonsManager=Gerenciador de complementos
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 4f00e70c..6bfa8e7a 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -82,6 +82,7 @@ openUserScriptsManager.ak=
 options=Настройки
 options.title=
 options.pane.main=
+options.pane.ui=
 options.pane.excludes=Глобальные исключения
 options.pane.advanced=
 options.addonsManager=Менеджер Дополнений
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 8814a883..7d62a747 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -82,6 +82,7 @@ openUserScriptsManager.ak=
 options=Inställningar
 options.title=Inställningar för Scriptish
 options.pane.main=Allmänt
+options.pane.ui=
 options.pane.excludes=Globala undantag
 options.pane.advanced=Avancerat
 options.addonsManager=Tilläggshanteraren
diff --git a/extension/skin/options.css b/extension/skin/options.css
index bc1df4ba..1efeb20d 100644
--- a/extension/skin/options.css
+++ b/extension/skin/options.css
@@ -7,6 +7,9 @@ radio[pane] {
 radio[pane="pane-main"] {
   -moz-image-region: rect(0px, 32px, 32px, 0px);
 }
+radio[pane="pane-ui"] {
+  -moz-image-region: rect(0px, 128px, 32px, 96px);
+}
 radio[pane="pane-excludes"] {
   -moz-image-region: rect(0px, 64px, 32px, 32px);
 }
@@ -23,3 +26,7 @@ description {
   font-style: italic;
   font-size: x-small;
 }
+
+tabpanel {
+  -moz-box-orient: vertical;
+}
diff --git a/extension/skin/options.png b/extension/skin/options.png
index 78d233e3e0ebed51ba0421dcd01c04b23dc6f277..bca1cf44ee218fa145e5261684459cced211a5fc 100644
GIT binary patch
literal 6780
zcmV-?8iVDDP)<h;3K|Lk000e1NJLTq004jh001Be1^@s6+9Gfz00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+<eJAhpP02%B_L_t(|UhP|VSQPix9($n}6%!R3iU>+H
zV&cs;)tj5#n0s@R+~iAcipIneTbdP7RMembL<H$YK<Q1ofFMY(O7FcRunm?X?)lCc
z7+l&e81p>eAKyOD?^)QHotd5YJ?}Z^{r!ev#`{uZCMmzK{O;nzi!aSPIxlF(z8QYZ
zd&~#pJ&dgV&F9Y5bl$Kb+WF;|<17{|_}YtMCOysZ&6JflUSGE^++It|&X{4AKFu-y
z|2tB5VEX3i|5E-*xk%}p5=_*a2#hY%H}*3<j2ff*EN<2nMMW)-zx}PEr@b9|ySpLZ
z&8^c;LnG`A!%QB}@$FWwyc(mY*CJ|dh31kHxVdRlg|VXI>hT;y*1n(reAeOk)f+;6
zb64RvM=v=1k>k3!xSYlT&v=~vBiA(iyQ`VC%s%GP0O%a}^nL(`8g7^OS|&S^jg^!%
z-8XNp=;`PHiA2JV$B!RFO?-Sek|1QPN?^NkrCFw(9lx`)6U1UMI|R+maPzg-#!Z5M
z?moWk-#_Rb`*^SZ0Kq^1<?O^?FWDve#pgj#auFQA>XP*RaifXc&;Q}{Rn>h4X2<rO
zGhZg}me6(rUiu}$f7sv7{(cGc;yrlO`xts~bU*5auAWEG+5HH_-96CJ)dRW3C6H5C
z3|R$5&@AYHW_~+Mrm>uR?EAdSY#R}LBEbJJvCK%|sxeb1uA2Dzv{$B``uK-WQjZ(y
zb!_@{lO^suaI?4zFjZ1o<?;60<rMiW_#Gm6+*r#JfJRkpY!?C>ERO_86thfwdjSW2
zhfn}wkqA1FRD2@A8*hw>1Rv};HW|U+x&JroDt${Y_~yt3*Ux@BGmWnI%U{ncow4>R
zjL58j=$vZ!-6^1O=SdSK+P3HP)oDkJ?Ooj?Q^CSByz0mERy%(-w34Y_f0O{C&TbHj
zyFt*=^(PWQoteXY!;}sq!Ou)Jvw@k*0=bl#G-3G!o!KAFKD6Z5B_ZnP)rISv*TJVJ
zK9yt_<^qkV#JjL~(~|Ad%)6|lq%jD5ek;HyI?(%)BJ`%lLT_&`J1Xzq?Luh}!gMf<
zKy*A?4Gr`Aj*cw&G#>i6Le7FIQ1azJp`Fizb|e?CsR>-iKmr7R@_+W9in`)?2VA2c
zz!lF(`0CJar|3N295!5O<r~e5&8vsRqDF8DP2}y;zp|3H{q&pFsnFyCC~E3}guH4v
zY-AsWBp4F`VpG!KS&XJXMFHs7EobIU{c7s5na5^|2Z-<$lg7Nk{5<oUnSS#Q&TCm@
zv<S3Zv|xkp26kxMX@i58;{XAO1lx~%XU`GfGQ%u(f9tLCZj4ek@&!DAPhW;!4F-Bv
zGSInJ5qeT$;nAZ<?5K!}>O>_77)k;=P0ec$936#&!JiEGRT#*a%Rs>w{{#`Q?Fk9q
zdaHtpO<59%vj4>;mylkc_yX{b%LPlHXpz2!n}?B0a7Hjne@f{?$gFIGnCvRByA_jh
z)h*N`I4Mt5(9jN*Z9Nc?R@D3BdCM>4$t)=V$v%PKOOoF!!QYB<--B|GQs0R(-+>V>
z!Uz|L#K1$DZ{-Q$VXFX|9`c~RsTFD)TcEnWnLWmzLx5$>9E|Qwiti}yR@$pnJZd_?
zl(52K#Q*_T8m^SYr6sV@UtC!Vjcv`KYkd3)cT*g(LKoK5^ns6351(y>$Nk`UsWZ^A
zf&r1XB6KCkKu=E(JIW#>J2Be*ITF~fUTvP`<TMQY2lEhoBtRMxAbAc0`P=>jA|x7(
z)`kXf)Yc9h3Jym81nx6b0F@&q&KX{@*>D@>J}jdQLQ{(&Dys^TOPb++6%TT1g^*h>
zf(KP?kX6+R#Z8@1&3_C<jU8a)b0_1#c?%WpczaHp4jfzhyhH%X_XOTeSI<8*o(Taa
zubI4l&L?wDJ^%gl*JtmVeNS<>V&nAv(<Re%r@`ctlb=-o(uE-YO`XAW7iWRCoAv+!
zFbzmD^B!Pf(gLFH4t5+gJamA&0nRVI6yDvR_t|{Ec^Mn|1K=-bfUm{?Z?z(bF?|pL
zy0JSby?vXMz|UdL8jCDvXVF09`=abGoD4(3Pn^xb{Vi{>;0uL9b~wHAN`^EL2>y;w
z_UT7p<o_4JpGVsc89Ul|$L7GDtZKNMQwsqpCE$8D8|*^Uz#=dStV2@R|HCrNA+@{}
zs(6o}P6Uus%>z@nP#Zc17KHP#F#PX61M>*16?P0I9ZLX=d;*VNT=Coc7!{zall{$I
zU0v+oVsQs5f*7KsqruV95$x>jz}ngxEG#U*%*^cBD8SV9Q$JTeuM888PZ$+!X$6>i
zdMYfoTnsOHts4NIO97gun(*zB?d}M=k(0l3=)KJN#x37}@FsT?s8^5I*Kgr|^y88|
z=z4WNh$-?Bd;x;rwv2(6r3^G{Dnds>G)n-wA*JEr;ye$JLEz{1gP$oC`2>F2%No#D
zUOE7NrjwJ{YRQsa+;t%MYFO~qn0iLR?>9mLBR~DHv7^0(cT{a?S_uRq@Q&dbVC)?O
zCcbfS)juAt1tfxXa0=LkrGr!CeYhE&1$VNmAr~1yX&^8@x7OrFpuMSENV@mkObALU
z07HA<ns0S~R~x1PQUnOksD}DxKD4$xguMKGXu`Us0TrvQtuKYOV}b1N?++I)TwsAW
zH#Y|Z0|Pj6<OoZEnijzy>;lx71q#0^NMy-8ZJTsr5-hS<1nYg)4+EYfz>5wqQj7S?
zzz<%=Ou$q!NDA#WHI1?z9eJbxRO~$}&V}}k^Phl^1ZYA6G%R7DZj~a4;-mW`qKhr|
z*n$rue<=7VDElLUpC1_5WrHaM`=o*EpjJ=c66F^QKA-q}@WQC~zLx_bsU_f>P{@K!
z;M?C$hd}&{ia(P7f`$%E1$>AvY=GeOGIrna%t|&rWLFCy8TU&rZiMuTR){aC$2#H;
zY&~+}*iZsct4H8bAh7qK_Yp>ZH>9PdK5Kt~jwjzEn6+<~%sj7fPGOMLbAS(h*YVN;
zYz6-<uMl$3)HKd=bmX%?9*e#1qFmr330e^RW)A$t3{)>-plYQe2$2L&1%5z4r|qg$
zKGNXRwV~`U`s(n78z%1I2z)L|dIdybG?V1B;Csb_2Yw!hK*#0PKu}_?#Pd$7&?h=W
z7?D;i$*OFHe5?iH5%7?Va=4pY2U$pfY$QoWMH|HC)q+b{GW>AH?8euJ3>OV00QLDq
zfXDdzFZks^W?>DKl@zkzvuQ!f8yN5f&=cT%0WlVf<O#HMEupvz_#K_l*4_!NSU9!_
zJD|2z2(@EXhk1MEIgh9S#~7IX`)pY6g;DQ=mA<Ue-w7!FU1_g80?>9O!DS)=SMhfh
z=0MBK^ZO#dAN)#H2FeyPP`W}9_;FDKk)MSHAIW|?7JL->Nh8R9zQ4cNZq+KUq2P1Z
zhJF6zFMc_vd(AtF7mCpwom&eI{j%>Fn}?Cy1h?XIBxkKXJolZuwgn5kg;?b;#6EwE
zp}mji?X)6EPMr{vut2<v-%T!|E`bMe82Q&j5_sE=UDU-Ea#%}9Ad|5}1Yq-hHz}JK
zrM}P5;W~t8(ISpHJ*a%C@*_$700|Iy2FF~ZxuD~%BOiPzV$Az$-ubZ*fcC+3V3O_R
zB;YE3aX~gT=)Ay2J_mlu0tO1_V{50Tz{>uZ!1wbLqe<j38u-%Jcf#D&g`}UNpCaEr
zERB`;fVgaI>n!v}`z`1J=mjO_^=4v6kcebSLIO}>7=hixX-jvP(Y{9@Q{)oB1pfYO
zNsyLP38lpaeFW(55USg|p+eLJWx_5f7IZ>BPYgM29gx}54yn!Ukk}-Gn0f(3)bb$&
zi%>sQC6BTeaKY=aD{LA=eW1oDVZPQTr*6vHDQ`|aIkk@f{opGbDvuj{QV7+(s@KO#
z0G0%+R+%CR_*CrC5a(w@^-C{6IYvH#UxeW2zraB5^9&0<_4*X~sr`|kKBVBw^Ys;D
z+vqL}eDwAwpu_hZ%Cm;COK@i7gGz9_n}Y@4JvQf)>>F5lpb;tib;`ocD<-QF(h&G`
zlzw`@jRZiqFcXijf#-Sdvmeh4s(}b(a`K1(VvPI_jC_$u2m&FWB>>kVRwDQW@SQpV
zgd@nIH9QEyTEic`2yZ-(JA!=!!M<MH%mQwi-w0;84PcVf0GG1rWfK5r_+EVe#Phrv
zdNY98$s{u?navXpU>DF2{#5;`u+9Ukd~cNfagL>jmqyCFaYMJGRA0?@b{23Ie|ugQ
zl&^hZ%;0nFUapT%2j={nvd&KvJLv7l8=$>w<rmElPAOvhe2RRk_7jSlASfZXcmFx_
zcjf(#-TGJF^^DHwO(|`G`_+7QL?D^mvA8sH4doxZ;!?QxtVKN590L<b1hN2gHW8p*
z+zz`@0g`jdp|mugB>-0+h%m>CI(tCaKLp|);3IMP9o@jg(T1b7y^9?!NS249PG}Z(
zLK6*vST+Gv52>CXG{bj*k#OMCySjt=xPj-0vi#)o0(m!Xr0rzw=6ib!spX@BPni1v
ziZti4k)Pck`Q-9Z<R??ke`z_}>T%%b`TG<2qe?G#PL%v^|HJ}_z+V1dUR|HVhml2n
zJ{5pe?R!S12~qy#&Uj*<uWI9eR~TPNU4jVmupJ~5DJZoRys^8u8Fe3QgOlKZp>;QR
zegc^aHX;BU`62=E(GhLqx3L81!D5fyHUxYw`U!kbjDA-n9f9vq)C@KSP4EzbH$??7
z&aQ_>c?3}TPUYueeSd%S&$=*6Huzqs3NnVefx3uU@}%V&3mML!-;b%lA6>sLuG(+G
zRxb~8{xI;700~Hd1XTrSh>95K^>aKu+a0vEE##f=l%+>EMSXNm72DorprjJ$Ho>WE
zpHDr#S9CfOz)CIwa8^*&(kDt7gG4H55JN#@Cj_C7;GbBCDJ2`Oho^((t$5gT&T0?=
zs9GnGg(&-5O=2Jk(?|)<?hyf~(r33xMLtD;0M;75*j^F=+z@<{e<A?Mzg2!80j{9@
z8;ykk6E!9-nsIPOk96ffLANgjXgX;QCx9H#SweXB4NYTB3Dy;}<pIHMC-5-^+(Nf+
z5cv81;E&|;#XZMB>?{Ui7AQd7op2Bc1nju)?A&g@W{tV5b8kI*(LwL3OS}=z>N$rc
z@?($)Waf~=XOAWi_4(xMW3?|g1)$0Eu48aQ@4bRXC~EG4yt;PQSFjCE1Oq!i{!bU}
z3b&syiQls0*q{_Ztr~$$k<Y`(Z{s1b{R%+SzZ?Mw_>rW)O-lL)$v+m04SX@wVzDUK
zBvSrT*?N**f91cMNx}&p&zS}@#}9r#@Eifw+OH)u=*6)RfQ@`j&4AK~h~eO)^veQ2
zTA6`6N;qCnfSSnLz~}SXfg}*wtzK;=>-^vA8BIX>ehzcEhCNQ~khdR-{rvUFOzZ#}
z;X!2!7}|NuEdmc-viI`Fxr1a(Bc-i9Y!T=ZkqNqHt{G@HX`tiy+y^^!hZTX;rxQTZ
z;PVB2MIiO~w2go#*{8^-yzhh2PtxCp-2qkljwt<<>yM;V!OnZ-Q1MU%{|GC9*Mst)
zxKSXV00`3bsh>`@WxitSnT?FjoNwmrUSzI1m;kaOe+cj#0XDdAfGO*y$XzzZfiErl
zt$uDmk)P8KzO==g{*oFbtx#bjp94Q!k%2G;25!$&fU1Z-67YCDNOy1$;?gkFv5?T*
zBg~fwkcv0=W^^_>eC25JU@lK9?ET5ma@02PyW_v>*#^Y*hTpG*95jV0c)e&1*MNO!
z3LLm#>np1bq=g(K_4z~qGI&^Zz=Dq|eopoYd~3}0^%&v1;>zKph$0qf0-OU~`fs@k
zF!TbI-&6kZMb{VQ6JRvp>2r_1G3VnsyJg*cR`xYD1IzB*>E?3&XyB94lfE7czT!e?
zPD_S3H5E4UBl^J)naM!l3<iScDnP~UFqQ!1qo>;13T?HtOh&toAI_L69=v309F|fb
zE@|$BDn0_3RRca~@5Z4D<f6$FoR}{;W8vnBO0fkMV<G1Jg(&-54jI{d+6BZ(g0W>x
zFK=VPr_|vdn+p!uO&HkU5`Vl;-}wFSk17s5KY>hBxMb1{9nu~FSM5`tCt0s<ZHLk(
zAq)Cg#<&SEQFG$P_3r5SNw<AN6<`eD69E?PT6k`>8{Z%Kf#uQB;{u<n_8U`^;O<ft
zHu5>}Z%t>wcNznJvlXB`ER-bxjT9>@0d^O-3}NtV&lywAlV&c#k?AE+h*P;VrAxDV
zxtPPlv5F5x6(EO?Odgv5$5u~bi`BlBZ<O$QaH7QLUN%tVr=#Ro;EZ5lqZmTaO{7U8
znm@Sa9|!t2e(>p!XM^AU_Ryep2=dkhavlNYcHPu!_$;beW~4te1;CWBe67RUrz1dr
z<Z}wJ<lvGK%^)`NwX}jNVqyk?U(hf6LtVa%{>Yb})}>;vAvqBu7OOxIMm~Y>hv0ip
zWx#U^j#&y&h9qdk1)?;PEiCxh9vVqg0H<nCdq-zLNs|~VTDzeDB|ID5v_k9vD3ZzB
zkH(RJCJTW~tztq^15mYpub_d=`9zkAwm$HQ47S0^aMdRUu6W0S8Ttt(IGOa5(RFxd
z+pqE`WBM;n+9N2(oIV=3WBGjC3V;Mq*S67?Je2|rA;9tz%SSYWtd=f4fK$4iT(3{E
zKUVOw-P{BPAtCKt#b1|{2qCH}gTQy2%)m_?uF48f5*h+6EiLQ_KX|b9>YO>7I1=nX
zdu<u6;j6ia9Y9D@-Xn95+p(8j0?qy7vTCxB01wd6A&|-6Cy6J6hx&YK^@=fFl(zIB
z_<gcZkx$^CwDPXmu4iJt{e)@k;VU;E=~?-}R$Y^tceehzY%H}1?IZ0Gj78>U?K36<
z*m~I;#H8PQaPo@&xhWb`^w(Y=q5zZ*q|?9%DPX<Jde~^bQL^26yF}Xr34~-&KdU~X
z8RVp+lZEB}z|3Bun&OBS@6gE4aBv_gH@8+(^Ue<n>fkE=+QbA1T&Mz`82#=T{RF<t
zBnF%&VoK1`93Vh_B}VA#)zQ*G^e^D_!FQbKxyCN?yy)m_l2}m3`T{h?n}&rKRrUmQ
zUVR7K=Tqd<XEb|AIiF<zs`p*^R_`)fZ@l;25haxUE$?hQ=!4+z94q)70XUC9R)Ht2
z0HcvWE&+Z%|I05A1y5G)l-8Dky`Ka8Z1aoceWUk5%RmdXOtoO$^>v`*t^+zAI<U@h
z9cW$Ff;Uayl<ao-L1G?yO%k7-DB+8RpnLteggOA~23B2MB^=2NLZc>FfD0bDRlHUE
zw+-|6hk=hvzR4=48$>C@X8CfTf}kKV6?-&lkOaQ-RR)1i1V}or%M#$>!-r6jnF+X}
z$XXT{xROW7*eM_`5hsFZ?Oy`E(@Nmm*dCI-OH;-{SoG1FL6^u3w%T{Noyz8XQ<VPg
zC$7Z3xBW0nq^Et60&pI|pGpAr&FZgbm*zg=mTisnPN3$M=R;(26!_n{1-GICATBc=
z>RRdtmV0sE%PTJc&GVWPt`%HkzJ|=8=Z4-0TA1mE3p51?3a#Joz$IH{`?j(RImzP9
z9Fp_XZEXdZzfGl&LnN?XvBEDuIJlFm_^T4)!Q*)qHu72UPv{MRUteAh&YLzB<HE!R
zvVg&5TwB~D(z?@7`s4EJ;KuC~@mU*h?@LaB8Sc^dagwMM{1S`64ox2F^A8x>c%Q*)
zAM*yA^ADN2c2nd(E%=-Qa2~;*ngR^W&&J9Ef4tiaoX$!}Ay}1gT?ZQ08e|4(jdU~U
znSh(Gzh2HqC7|{DM1s;^cSG)nZ?ml)SMa6V*zi&IM{MJW1hhu5AT+d-s(mW<D&pfH
z;4d2?<;>|P;8#?D%U}OmVmy7i%tyr#{K<RHTn!6I$Ymq{W<)CNJbC2;T|dt1tu(qB
z$|G;zEhYyHZ2fp>^03RoKiYfp!bxjixQqqg34DL|+rwcf`{R15N%|g<0*vMnJk9!m
zQP%_fW@VT+9*~7y?ZAzZzW4U&&5x(+Plrjm=qw(=DP<b#n72lY29s&i)NgFsRK{y;
z>|6JSgImE%3pmrPt@-vNv~NR|z*b%TRzX-;7ZHFf_&C|8yzjDUQ;E^^>4VnfjdV@8
z&VLg2`MYopUzN3AG#of@c?%bFDA2w*d#H5m%8kMsckZ*^KH0nf+I^gr`uD#-qVUN9
zgIhoT?g(3tn^YnAyKp?!vyGerjOG!H<Qt6Tvk{*f()m#5aAjllFe&GC2-v0ERSh*z
zT3rqWWkvWXQa(P4ln3{5iZ&r531U+2vG3WqjH|r166#wT;h2rC1Ro`P0zMHyi`gto
z4hfhWufAH+T30s!K9K;y=iy=we7;lut6vEMkObWv0VwA;R8<l9r9?FOM|rXbnmkLl
z9=Uk(>%)dCxKD9Df8w6A*OF|462SuH{<{+<N$BklJgkCIzXDsmlL-7DejrtzNAQ%-
z6OPb^;#0r>-u;m)<?dDy532F8ECM^_K^nLQxb<4zv@SGrx_0ZL)g|-8hDQ&6y!(?+
zR9{tndD4nW%TU_qPf(kns<cK)d&7qt{;~Do*1bnB95embt`Ebf|9yHLTFVmVYxV(B
zxsi8~VU{@m<uAoGSfmjV?i@bcI<#k(2OyCEi^RYTXXj1=zpktdTwZ&v^zyW68uGq7
z*6lQ(zwf-2aL-u_;g%h`f9T=Rv7YnK-w#*p&fhry^BuZ7-M&A%!{xng|Ikxhqxg3$
z-ex`Z$!Qu`jZwidXd$Gm<Nd}kFJL}5MQb?HY{ra@PjhY}f#u@G`<*sy$RvyTS%UvG
e*Ykh%JO2xYxK96pOn*xN0000<MNUMnLSTYOb`^dA

literal 6150
zcmV+h82RUkP)<h;3K|Lk000e1NJLTq003YB001Be1^@s6?ZACh0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU}s7XXYRCwCVT6cI9<<>v5vn^XwHpwQN
z4rzoM0t5nL0YpI{C<#sA67XW7qZF?cQ9wcX2we0r#EJ^iM4BRe3MvQ!8iA0Iklr?%
zwk6wl<~#2sSrSqR-uuV*KF|APGv%F`-#O=Ze&@_kEXx8J6h%R|MmW%lXvO2o-pWx{
zp0$_BWO7*YEqmb%oPviKE!XX6>{h8_6k%a|@TLT&^70RSD=YU;VObYE<k+QD4wi?9
zZ*<x1B@MT4zqOoYi{by<AV72lM(ZJdOgvt(NRcbwC}(+Vcr2`fruj11(J-37bKU#r
z4w)==|KpDr+D#_bX|u7}Uw&!Hh>AMB9)RE3IUUW6$jF^PtyxoJtgU6M^YYkz!-f@Z
zlgWBL%o<(Il*MmmuHN~%;f-Bi7-qh<IrHzXLv=d>dO=@!6s~~+`0e(YaGr#IPzZl@
zxkeb!Pz0{dBH%rRB1V&taQfL3C&Kt19&STbT)JfcZtmQ($~$)^bSDzfVCf03y*4X$
z=1gVFbsQ!W98XRzs>;e5x7=vV?yjSZ|L2-8nxay9JbK^JJ#UtiZK+E)@-zVfzm7;6
zmMGx!;o{}XziF$qNtv5gFl7IN_30X#N6iEtb>QFsdZnnV^?BWPSq=2>5PUMUZ~^1s
zRtIz?<VEv_iw23-PWor^mDMk=F${Zl*d8=QyX)>$D58S~4m|bj@#9V4TN;6_uHg0s
z4jn2SlacX6LuBN!gA_$~b(?#mqtg>suAJQhKI?P<xLm-ON@4ubqhaa+15Umtm-l+m
z<BprRijUyW3kwZB->+Z)Ei#$p-6@MVh{!&g;z^ZCrI$=10jbmjyzn=Vrln-xi|f-x
z3c2*%5yKL<#6?A&U-b3|^OkJ>fd8Kxpb$<#8Qg8R-2$ah0Fyb-4#j(mpyItIdMyuG
z8gjB{TF;t3Yx?{=e$4pwZ!X<9XxcN=B^#H&{bF!n$gI{&Y*#3v)B^{eo_yj&I3FJh
z4D~?G90}~$7+|mc!bO25DM>Wu!w*O4BO|}rKv5mucSdydu7p*qX2;H$p&<V^o;nHz
z(JCl^VJff=JCL=<9Xb>i&<!I{G!H}q!L*(|dxpfsM8Uv>gy}+oU?pb&ny2>nRr!lV
zA`lCOp!W0iM+Q-oeL|sd<zvH>rpNb<gZ{l^LqsCMG=}NoIuDhEBfwXfD4fd==C3nT
z<|d9PfvaeOeUebgNU5Ln5mA81NA52NiB!Vvw$<5Ssd5=RsPAC+1-56tm-+F#AI;-_
zQ&e!^$dTs>_yY7&FzSJtI~rU!t^$L%=JJpMopBPV_+i|+Wfv}3e^{{KOhsN^@;a7v
zKib~d*xiGWcA}?ElXI+i@(5HdoDEKglUqkJY8(W8@HtQdAvhWv;Z#aWQQgg(PrXu8
zlhfJbCcm^cb?DH<FM32o(1iJP+G<m!w(6upu853{ij4PFd4qsYgTY{gyn@2(X0ti3
zM|kMC9$}#}50Mb=+%0q+|Nh*J^w(cJ@SjIO7<f}aMGCdTdfGsjxwnTv0wlrzn1js8
zI-$;|thNm7=xr^-rn9k8;n5uUVzC(f{QN-euQs;q_lk{OJ8s{;Ch$p8N_!HRX7IV$
zXaZZ>IB;G2wJ8!tj1WJuXU~|xsHnp&k&qb|w`=gKRqeocIT3vPpG^G^C!uulJZ=pV
z31j!~50eH2yxRfiyB&qcqt4aT)MPO(2gvdM!ox#lLkA_K#`o(Juk!H%p@0u02dK~x
zg9h}Ce>7=GYE(poOo|k0vpb-$xHJn%@LbD!FRtI&&dWRGCVm`$fFerq4Bv|%?w}n#
z9F!x<DRBC+a+b34t>DB5>(H7!9w-!Y@Mun;ToOeTr4lKq)oS;4yWQ@lGFl`G5qWtv
z9ZP0yHMp9=cmG8rIOmQB(ca_0Pe_8GM;;MBo}NDTe-|!1^il8Lm4jBUoE4RlBICe6
zh2Sr00{{MXY&xAgu@i&yJUle_fuAPi^Hb6DKO*2C-n~J$;=PZrqT|K$X&Pvr01Rde
z)Ys|3TwV=!yav({$R!@&t(1X}rxHAcd~O>)BUtSAtGix*spjQ3clo*)_6eFt&z=9q
zjsqDRmu7ZJLBavT6!Ej-1I9*Uw<M|%!_D8{AAHagXu7RU8%rBuNO|IZA1|M>zOjAd
zB0_t_Z{EEr<y7X$3oTkbe(~Z{!!~U2;jUGX1CHmP07h5U4nPL!NSgUAX9RL=+4=Jp
zTYbGNV&X(M_}W&q<7#!Tphpz+`1%y^Res!k<sUg>xx9Am;swRU8O`8_W5T@<*)uZ8
zZnuF>r@O{7u0O*=L&t`Pg=m}@Ml}rvs6)CzMTEwnaPojN3{FBtd<0&t@&YwR2ic!@
zx2Qb7u;4pP(EU+04HSz#;Kr@&vfTW;k9@NE)xu6Az}{g0Sx_rrSrOZ1Vjvd|2n+yU
ze_vEw9kZE0E`U!DeX<>s`0veBhQx7i*@b%jmCV@Kj}_tJ^WtXD_GH7Of&T0)IA@N!
zX9PTsXivs$f`+*hK!HXOBn*R~kt01?9Hb-gnNGkj`{^g!@0&J#zo4XKulrdjD#hE&
zD@f(*!zI?Rkl=ynlLIA4n-;qZDr@S%ieBw0mw}(R5>!e#(vpNTfEDSc(PDuHlNt0z
zGe#c+em+XFhQ`lVl?M2@e1QP0RvUPFDuWo8D+Mq4PUktG5GwgLetuWrOEH9F<6^;I
z?cXW*Ee7BTc>(SXMd-W*ZNn<<_U%`HfA`(Yo1cEFZ<4RkAo%<&u)gXh4sQh}p`*Hg
zOaS}Ui|`=uT^)h{<B!%~UVZh%3wQ2JZXMp})nD8#DA-r6)go;&AV;9Rky4y^1P8v&
z0YUyMhz`?$msAY3wKZ&ZPLA=`?Hr@7x|)@Xg%A<w2mUHgJcoe>Gz3|kh!FuM{zjy(
zf}#@0x|zL?Vc0La%mEy&Fv3gtC$fDBi-{9MEG#UH<9z6fp(rBfD3AtAHO5?Hmozr_
z_U#oP#m17*NbB|d^GaSsG>AX@0ZcPd5mi^U%L&!9CxGgcW8lDj1bkOB_)J%xf9{;+
z*Hx=d%+JkDy`NjL$SOmf|BuU;uiO$Q4O=Odgn3fP`Gj_e=LchyhpJUjg<$`6^VY#C
zUCk#vips+LK$3Moe?Q+jn4G6*0s|;QO;#J`0GuRIo2^y^zqsMY3qQZZxR`DGwykzP
z&;YESy-NGgvs^Bh8+bB&R6Y<I7TP`8+I)`KPpmP5@qve<5tbtzAw}`hVx~`55F<!F
zKLh$1#0c7UMyQ-M0bDj42mbx}f`32wXU`JwznypI&a}=F+rgdd2rygzwfoCn;h`bV
z8yhj<>P<*HQqcH&gI23`ojd>Y+Vt07+H~Kkq+&e1c+&@2qaS<ZO^qgi=88bv=)`EU
zp!XLQmmL3e%gQZXtDtZoGA<O)%+}x1XVE=q<X)E>NQF|-eehdHlTz62J`vK<vdowm
z!fA6*Rw`*Uf^y#vP&0irFwI7|Cs7;QaD8jfk7xyc=?_0xeqFu#*!(+prgsK@>XMDb
zbCnp?egpdT?JX1vKwpmu7bDou#}inW6aKuJeWU~M?^W|_7HnF#=d1oGS*J+lat<eQ
zIYOgSiKO@RWp78h7^a$G82!QYb!;00D8?%KhzE)<7+IsIrP^}Yao(|-YCxc+%^+f8
z3Xcc}5^}&k6#l@M@`E1c__UmyC3|CH@KV&A=&4gN5~9HSi!)F?Z476Gb~5!o&L`jt
zeEqqHFFA9@eDU?yk0R~N?Cg37ekM{!w5L+3^7B)vgEbl@NwCG0I!@{MpySom=v>t`
zx{L?idsUS-Lt9%rIZP^}g~Fz;3929n4hbDV2?SSas%xqYMq>?1-CU%-G`9idaq`qk
zw$hU!b+ZbFz>{!}mEJ=-BrF6oKL2lZTxl^K^swj5%gI@s5gpCLqG@)-GtbCrG=l2O
z@1gQJl&E#J?Yy3&ozRFj;Fq2|N5DTkKPP8aSJ#T{*<)tHz<8llECR7e1R|8x0_1KR
zQX4UVLh1o!B^EP^jR!XI7?#a$&>PGSr&BJ$^+*I^(gm4J24SIL$^dnM(rmFt(|=_R
zBEII9FSa_Hu1$2xz|AvCR0B$dvTLsIV)6vMAgq`linmCWi%Bj><moAFxi5R}EpQt2
z?Y+NQrrLE{uoV`#S%$IOSy~`?VDjN~JZgBp0JS{7X$o)~pGR{tljwUQCc4u&K#2)1
z7Xwbx0K{{76b%lfFH*cZ(4Y>d3xDHuv2Ale-LG|r#pA_WEkcXHEn=EEEFd7D(*)a{
zB#ab<WhZ#z&-(6yuZfO6^61W;V*`f|7d183jzD#b+G%btxMxcgm>MB>W->&6egtHL
z5+P*lSgF%$ot@dcH<Nbr=E6?<j73HJoDO@m7oi}3Uv+4ZMyc}l1{umti`9-Q$cc$q
zF2P_R4ZQNM?%l<*y~JX%gcNH$G#rt}Hk7b+4GmCPS*5S7t>q|4TcyoyQwK12m@+}7
z;3F)Tn=Jyrd6ap4E#X?O(uV_|ZF`K+Q%F)rP<O!(iitV;*sfh;H6us10pHo&+vzF?
zIME2VXG{jel}nuSgio9(9r)U7bN0r?rFVAC&)!*?R;AUBzzQ|-*Nc}2=ie>7?sPi9
zOCbZA&%+|i3Vyymw7;)v{)6t{$IE-ZTrQ`D0-9?{m{Fyf%_u_)3a?+gdUY_?8j00a
z)gw;r-ICT$1sQ%bED_p;JeSBd9`fO3ag;bg;_Z>rZSXtUCy)w2pb!K*z;UCS;6K^o
z`R3C{n>^pyR_7D2`61!pFdBiWscCBrG{UXv&qC}Mhe0_w5yB=+km31rGJEx6(z3Ic
zbad^^w^xw6Zy<B`f$zvmlz5dVCSR1Hq{8)9_(6RCK9d)3et*r*)h~9agyyc<x@KtN
z(8&sg0#%Qg%O83?*N(<CH8vI<`{3<6UCYoyjJ87i3oZXTJ)Iga48`tJO{e>iKIP%^
zpt`KOu4yMG=9|ZM?|w2cDM{D@zV?+_9X8gugnQr=IQ0#Xn=&38XoNNfLL>Y&?OEvk
z#Ubz<k_ZvW$#Uf9xfy7L`PtdaI=Y7i8+OX19+LH=A06=&>1cYP6g8Mgi=h!}4JHT*
z45Y_A`siC5_I%Z^qDuP-CfqEJ^I5i^%Ex=ou*9KL0s_<&QB5*DzX8wD)$2*`1$=$|
zo=Sds?KZ2`w*GYHJEm^E58%b{2KQUn?=p|i>m2NEMnvVg%C{;qD&FYmrF^sJfAjdB
zJx>M<9r{4<>1OZ+0UB-{bIvWeJ>?m&HXEV!@svag{l7fO8G($v0|yLQJ9g|vS-QOS
zt-iQnXAJWGwvoezjtdS71kwW{6jE<!gmSG8T)3c@QU)R+9}IdUXlrU%z20C#U60Di
zLnc?qD7jpLl2wj0q~Lh}ZdoN7z`!MBtHlD^Y8_<Xym``K(62c2$+ny>D`74#*q9oZ
z*#$fW@1dpV{f6PoJFW#d&yS5g_Qd<|k5La9;s(FE8T^i<W_T;`$?%Bo1u+M{g&R{Q
zfb+gcAawNm)G3g#AB`}02=q)zQLqe?mJt)fpgeum?Q9gC+OK!qxUgUir-B;IW>hRr
z5DElXh<QPSu@Ni?Dp`|AN)L&Ia=M&yhm+x2GNk1|yk6=d;=nJitcLO`9VT%ro<m_S
zp@Fc8CM0-V!;N~<nB4F{1CaY-oJ=!`{AYvj(Xj#iLqlI0wr<_1fW$;jZnl8$bhdA-
z-4A}zi4z8aQb}XJkV<0XAnxmL;m_wLaCForYOrGdEp-YE-v2dt5hJ9gD)o2o&Q166
zIl8E}_F^*wd|IumnO9k@3o@Ea&Vu67i*~#HuZZx_Nf9BTL0$?e*Y#|2EDA`aEa8cp
z+tE~Wi<*aqGC_r|mIJ?}w6v_OwDcRGczsnW)i9x0%&)JlFT*uH?evY<hhOjA@YB@`
zfBtL78yf`z!8D$bN8R6Gd!QD!F+l5RwvVk3Ypbwvx6BjqIy8WXkI(!b6DNvWyji#W
zg>HF%-ob;0-`21H?EEXQoG!m`!A!PEV|zirgU5jHqiQEp9V90#zsEX#7A^AjP^;f^
ze~a|S%SAbP1se_@KXv%Ka~CG$=I4)J_WUyobMx{KHkunba7F0lq|eWFdDx~GP-r=@
zJ6uRrMkpw&fSjT-j&>|aIi;l~2S0v$>B5SN^6^=J{xRY5rHh9v%1bw#{cL+the>$x
zTT7NCKRIbFd2ukX&%l0jrp$q#uKWZybT`;sLk?AJF2<^i>+O*0mNN#SD0{sfd}&`c
z#yb}JsQSQw*m&sOvp2Qnz-CqyAmX|gw2;<t#aKyOa&p=2r8a}1uMm|30ny{>$<Xli
zXYDw@4fqER=&x_v_9^oCVnSg*FJAohBRh9KtsXwygBW4Jp<{4m@<gz-q9g9>ib<2)
z`Nvj=g23Tuqe{|WUqIduxZe@H{N^rsL}=(B^k9yTELIy*6QLBA)A%GWkVv&*onW@0
z+Cj}vaR%Z6OOZ|rZ_tzfcvb%W$6HA;c)EFZtb%$z)^m8;)OlM8_-=aeRYU5ysgMd&
zIlm{J(ekP?sHm<4lgY>>ZXYinhzN-Qg<RPtHcHA%;G6QJAdQr^6k{^HFJ-gTa}RT6
z<%*LjDRJa$1@f9uwdLR7#0P9R@VVRb!&-rVXa9b~_4nTU1o@kjljOxb8X@KUk|l@G
z2u}qhC5fdmv5;{18@QA_iA&66M6X^0kxQ3xYY^#r;gwhN8uRitbXim}>~KwB;9&CJ
zm-O?CO3EyS#U&?2B2h$0NN~JVCPxD>P~T7wcTwk?Or`>?<i`2<_;~PWKKS_h4K6P$
z8{QG{?I`H^$+O-L4-V%)sALb(ghJwgL>M(<G(0hU6!ec9K)`Qz?4b(>SxHX`r?R**
zT;L#)(5|E=UnNvuzdrVOa&n;^fx);2^*eh&IqL<GBt6;|{I9+uo}bwQe#;<6sJeUi
zxnGtpJzaI_l9lVEpb>@~ISO8b21D%Hb@#wGnc(b<8Tq>F*GDg5*~-qIb;0^{KKj=p
ziPS?#-u)JrmBaa8F7ABeh3BUHnf2GyvWm(Eo88X6E2yZbYRJBIYwE7mFHHI4+SQ#}
zZ8aA$SP`SBpcajqwX9QI-8=YvzUuFO+u4zX{ju;zHk-+&91aJ#-zg}7^oMWXf9zs|
zA$NyZJO+*M{rDqCA_S;1)El?EuR;Fie)*+7Yy0-h`{iS6BVZ&v_w%AfM@C>3?KgO^
zNRCEGI(f>y2KgL?fUo`Ik1;DOmM*^&Wf&wHmOXOoc5W|kZ?BM>**V9oR?AyWk-=2e
z=xViUb$}<4n6-7aT0FXn>#5mnZ{50iGd3tBcw$3+LkYvUj&vo~-3B;(>d?nCl4ouu
zl+t=|9EasJnFP!hK*`q*D8s;PC34LH0=@v`7?LunjQjj#NZ=6ar>q~{?d+y*TIb!Y
zrB-YHHV=<cCnilg^Yr1vJxNYz83=yEp9ucE+}ssif!1t<$!LV5Bhu5y`VJZ-Yysbi
zvhwWo>33_cU3+SU)mr!<2mA2NCB$no=B(a&hH){^Gc5DfzOAbpn~l?`H|p!nm}p63
z&1f{%yIc&n?{wz7jbrA#x;*>ljjIUz=a_K2H1xefEP|pZjGp+}=2cs!tC9N~(Obwg
z7!8nLoafRT4f$w{9J8gdw5GncFuy3T@b|y2lve4gYFv!Viu^*$Br>n4h$v03$X*cv
zzJbx%1=+D@3xDWs^|J;b{W#$wL}RsG*wxq3?@&}oz>pzlAAkS-NQu8c{IO$4UBU6=
zAGOx(-E8K46TfE7=#ZzM7TXO5I5%t7UES5IPcO4t@BBADYEFJ>ZDyb*a0+SP7Z;Zv
zJhgXo+TU5HZ6zEAl-f@{W!&TAC!vQs%c{z9E?)cfimB1`I~0NbZ`~<TJ~WW95+n3w
z-T6Fy6Gi#^Mn<ltXgbbPT>Sb%v-!%yUX~caFF5!`iJxB@QcszouyDnH3;h4)_&)&#
Y0Gfh&-Sn*XW&i*H07*qoM6N<$f&z^R?f?J)


From d2e381db0893023005e43ca7e4d2d11da26c194a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 16:14:52 +0200
Subject: [PATCH 356/829] de: use "loggen" to differentiate better from network
 protocols

---
 extension/locale/de/scriptish.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 4cfc4428..8e81ff9e 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -107,8 +107,8 @@ options.excludes.empty=Keine globalen Ausnahmen spezifiziert
 options.excludes.desc=Globale Ausnahmen heben Benutzerskript oder Benutzer Regeln auf
 options.excludes.remark=(Sie können eine Ausnahme pro Zeile spezifizieren)
 options.enableCopyDownloadURL=Kopieren der Download-URL aktivieren
-options.logging=Protokoll
-options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole protokollieren
+options.logging=Loggen
+options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole loggen
 options.logToErrorConsole=GM_log benutzt die Fehlerkonsole
 options.notifications=Benachrichtigungen
 options.notifications.disable=Benachrichtungen bei Benutzerskript-Änderungen deaktivieren

From df80f7347af1a545618850f339e79c03308ae4fb Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 16:23:49 +0200
Subject: [PATCH 357/829] Rename disableNotifications pref to
 enableNotifications

Closes #407
---
 extension/content/options.xul                          | 4 ++--
 extension/defaults/preferences/scriptish.js            | 2 +-
 extension/locale/de/scriptish.properties               | 2 +-
 extension/locale/en-US/scriptish.properties            | 2 +-
 extension/locale/ja-JP/scriptish.properties            | 2 +-
 extension/locale/sv-SE/scriptish.properties            | 2 +-
 extension/modules/utils/Scriptish_notification.js      | 2 +-
 extension/modules/utils/Scriptish_popupNotification.js | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index e1b39c0b..3848148f 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -48,13 +48,13 @@
 
   <prefpane id="pane-ui" label="options.pane.ui" localize="label">
     <preferences>
-      <preference id="pref-disableNotifications" name="extensions.scriptish.disableNotifications" type="bool"/>
+      <preference id="pref-enableNotifications" name="extensions.scriptish.enableNotifications" type="bool"/>
       <preference id="pref-enableCopyDownloadURL" name="extensions.scriptish.enableCopyDownloadURL" type="bool"/>
       <preference id="pref-useDefaultLocale" name="extensions.scriptish.useDefaultLocale" type="bool"/>
     </preferences>
     <groupbox>
       <caption label="options.notifications" localize="label"/>
-      <checkbox preference="pref-disableNotifications" label="options.notifications.disable" localize="label"/>
+      <checkbox preference="pref-enableNotifications" label="options.notifications.enable" localize="label"/>
     </groupbox>
     <groupbox>
       <caption label="options.translation" localize="label"/>
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 63e8127c..2d856faa 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -3,7 +3,7 @@ pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
 pref("extensions.scriptish.blocklist.url", "https://github.com/erikvold/scriptish/raw/master/blocklist.json");
 pref("extensions.scriptish.cache.enabled", true);
-pref("extensions.scriptish.disableNotifications", false);
+pref("extensions.scriptish.enableNotifications", true);
 pref("extensions.scriptish.enabled", true);
 pref("extensions.scriptish.enabledSchemes.about", false);
 pref("extensions.scriptish.enabledSchemes.chrome", false);
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 8e81ff9e..be4e96cb 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -111,7 +111,7 @@ options.logging=Loggen
 options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole loggen
 options.logToErrorConsole=GM_log benutzt die Fehlerkonsole
 options.notifications=Benachrichtigungen
-options.notifications.disable=Benachrichtungen bei Benutzerskript-Änderungen deaktivieren
+options.notifications.enable=Benachrichtungen bei Benutzerskript-Änderungen aktivieren
 options.requireBuiltInCerts=Sichere Aktualisierungen müssen eingebaute Zertifikate nutzen
 options.requireSecured=Benutzerskripte müssen über eine sichere Verbindung (https) aktualisiert werden
 options.translation=Übersetzung
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 8988ddb2..667c7071 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -111,7 +111,7 @@ options.logging=Logging
 options.logChrome=Log non-critical extension messages to the Error Console
 options.logToErrorConsole=GM_log uses the Error Console
 options.notifications=Notifications
-options.notifications.disable=Disable sliding notifications on script changes
+options.notifications.enable=Enable sliding notifications on script changes
 options.requireBuiltInCerts=Secure update requires using built-in certificates
 options.requireSecured=Require user scripts to update using HTTPS
 options.translation=Translation
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 6ce7037d..bd5b3e76 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -111,7 +111,7 @@ options.logging=ログ
 options.logChrome=重大ではないエクステンションのメッセージもエラーコンソールに出力する
 options.logToErrorConsole=
 options.notifications=通知
-options.notifications.disable=スクリプト変更時の通知を無効にする
+options.notifications.enable=
 options.requireBuiltInCerts=安全なアップデートには built-in 証明書の利用が必要です
 options.requireSecured=ユーザースクリプトが HTTPS で更新されるようにする
 options.translation=翻訳
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 7d62a747..55740832 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -111,7 +111,7 @@ options.logging=Loggning
 options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felonsolen
 options.logToErrorConsole=
 options.notifications=Aviseringar
-options.notifications.disable=Inaktivera glidande aviseringar om skriptändringar
+options.notifications.enable=
 options.requireBuiltInCerts=Säker uppdatering kräver användning av inbyggda certifikat
 options.requireSecured=Kräv att användarskript uppdateras via HTTPS
 options.translation=Översättning
diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index b24d60d1..4af1ddca 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -4,7 +4,7 @@ lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
 function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
-  if (Scriptish_prefRoot.getValue("disableNotifications"))
+  if (!Scriptish_prefRoot.getValue("enableNotifications"))
     return Scriptish_log(aMsg);
 
   timeout(function() {
diff --git a/extension/modules/utils/Scriptish_popupNotification.js b/extension/modules/utils/Scriptish_popupNotification.js
index e502b977..793dc1c6 100644
--- a/extension/modules/utils/Scriptish_popupNotification.js
+++ b/extension/modules/utils/Scriptish_popupNotification.js
@@ -7,7 +7,7 @@ lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
 function Scriptish_popupNotification(options) {
-  if (Scriptish_prefRoot.getValue("disableNotifications"))
+  if (!Scriptish_prefRoot.getValue("enableNotifications"))
     return Scriptish_log(aMsg);
 
   timeout(function() {

From c39709cbd4ff7082d083f04177f1b6b3259b07b5 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 16:58:15 +0200
Subject: [PATCH 358/829] Improve popup notification display behavior

Closes #391
---
 extension/content/browser.xul                  |  4 ++++
 extension/modules/addonprovider.js             |  8 ++++++++
 .../utils/Scriptish_popupNotification.js       | 17 +++++++++--------
 extension/skin/browser.css                     | 18 +++++++++++++-----
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index a981e412..02f3480a 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -58,6 +58,10 @@
     </toolbarbutton>
   </toolbarpalette>
 
+  <box id="notification-popup-box">
+    <image id="scriptish-notification-icon" class="notification-anchor-icon" role="button" />
+  </box>
+
   <popup id="contentAreaContextMenu">
     <menuitem id="scriptish-context-menu-install"
         class="menuitem-iconic"
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index b82f43d0..1618351d 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -27,6 +27,10 @@ const Scriptish_ScriptProvider = {
           label: Scriptish_stringBundle("openUserScriptsManager"),
           accessKey: Scriptish_stringBundle("openUserScriptsManager.ak"),
           callback: callback
+        },
+        options: {
+          removeOnDismissal: true,
+          persistWhileVisible: true
         }
       });
       break;
@@ -61,6 +65,10 @@ const Scriptish_ScriptProvider = {
           label: Scriptish_stringBundle("openUserScriptsManager"),
           accessKey: Scriptish_stringBundle("openUserScriptsManager.ak"),
           callback: callback
+        },
+        options: {
+          removeOnDismissal: true,
+          persistWhileVisible: true
         }
       });
       break;
diff --git a/extension/modules/utils/Scriptish_popupNotification.js b/extension/modules/utils/Scriptish_popupNotification.js
index 793dc1c6..09d0b044 100644
--- a/extension/modules/utils/Scriptish_popupNotification.js
+++ b/extension/modules/utils/Scriptish_popupNotification.js
@@ -6,7 +6,7 @@ lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
-function Scriptish_popupNotification(options) {
+function Scriptish_popupNotification(details) {
   if (!Scriptish_prefRoot.getValue("enableNotifications"))
     return Scriptish_log(aMsg);
 
@@ -14,17 +14,18 @@ function Scriptish_popupNotification(options) {
       var win = Scriptish.getMostRecentWindow();
       win.PopupNotifications.show(
         win.gBrowser.selectedBrowser,
-        options.id,
-        options.message,
-        null, /* anchor ID */
+        details.id,
+        details.message,
+        "scriptish-notification-icon",
         {
-          label: options.mainAction.label,
-          accessKey: options.mainAction.accessKey,
+          label: details.mainAction.label,
+          accessKey: details.mainAction.accessKey,
           callback: function() {
-            options.mainAction.callback();
+            details.mainAction.callback();
           }
         },
-        null  /* secondary action */
+        null  /* secondary action */,
+        details.options
       );
   });
 };
diff --git a/extension/skin/browser.css b/extension/skin/browser.css
index 5b3648c1..4ac1913e 100644
--- a/extension/skin/browser.css
+++ b/extension/skin/browser.css
@@ -1,20 +1,28 @@
 #scriptish-button {
-	-moz-box-orient: horizontal;
-	list-style-image: url("chrome://scriptish/skin/scriptish24.png");
+  -moz-box-orient: horizontal;
+  list-style-image: url("chrome://scriptish/skin/scriptish24.png");
 }
 
 toolbar[iconsize="small"] #scriptish-button {
-	list-style-image: url("chrome://scriptish/skin/scriptish16.png");
+  list-style-image: url("chrome://scriptish/skin/scriptish16.png");
 }
 
 #scriptish-button[scriptish-disabled] {
-	list-style-image: url("chrome://scriptish/skin/scriptish24_disabled.png");
+  list-style-image: url("chrome://scriptish/skin/scriptish24_disabled.png");
 }
 
 toolbar[iconsize="small"] #scriptish-button[scriptish-disabled] {
-	list-style-image: url("chrome://scriptish/skin/scriptish16_disabled.png");
+  list-style-image: url("chrome://scriptish/skin/scriptish16_disabled.png");
+}
+
+#scriptish-notification-icon {
+  list-style-image: url("chrome://scriptish/skin/scriptish16.png");
 }
 
 .popup-notification-icon[popupid="scriptish-install-popup-notification"] {
   list-style-image: url("chrome://scriptish/skin/scriptish64.png");
 }
+
+#notification-popup-box[anchorid="scriptish-notification-icon"] > #scriptish-notification-icon {
+  display: -moz-box;
+}

From b0b9d5d82adb118f4c33248a4a5d57a841dec730 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 17:29:47 +0200
Subject: [PATCH 359/829] Tweak the install dialog a bit more

---
 extension/content/install.xul                 | 13 ++++++---
 extension/content/js/install.js               | 28 ++++++++-----------
 extension/locale/de/scriptish.properties      |  1 +
 extension/locale/en-US/scriptish.properties   |  1 +
 extension/locale/es-ES/scriptish.properties   |  1 +
 extension/locale/ja-JP/scriptish.properties   |  1 +
 extension/locale/pt-BR/scriptish.properties   |  1 +
 extension/locale/ru-RU/scriptish.properties   |  1 +
 extension/locale/sv-SE/scriptish.properties   |  1 +
 .../modules/utils/Scriptish_localizeDOM.js    | 10 +++++--
 extension/skin/install.css                    | 11 +++++---
 11 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/extension/content/install.xul b/extension/content/install.xul
index bd350b72..d1233e15 100644
--- a/extension/content/install.xul
+++ b/extension/content/install.xul
@@ -7,13 +7,15 @@
     style="width: 42em; height:32em;"
     persist="width,height"
     buttons="accept,cancel"
+    title="install.title"
+    localize="title"
     defaultButton="cancel">
   <script type="text/javascript" src="chrome://scriptish/content/js/install.js"/>
   <hbox align="start" id="xpinstallheader">
     <image class="alert-icon"/>
     <vbox flex="1">
-      <description id="warning1" class="warning"/>
-      <description id="warning2"/>
+      <description id="warning1" class="warning" localize="#text">install.warning1</description>
+      <description id="warning2" localize="#text">install.warning2</description>
     </vbox>
   </hbox>
   <vbox id="installBox" flex="1">
@@ -21,7 +23,10 @@
       <vbox pack="start">
         <image id="scriptIcon"/>
       </vbox>
-      <description id="scriptDescription" flex="1"/>
+      <vbox flex="1">
+        <description id="scriptTitle"/>
+        <description id="scriptDescription"/>
+      </vbox>
     </hbox>
     <vbox id="itemBox" flex="1">
       <vbox id="domains">
@@ -50,7 +55,7 @@
       </vbox>
     </vbox>
     <hbox id="showSource-box" flex="1" pack="end" align="end">
-      <label id="showSource" class="text-link"/>
+      <label id="showSource" class="text-link" value="install.showScriptSource" localize="value"/>
     </hbox>
   </vbox>
 </dialog>
diff --git a/extension/content/js/install.js b/extension/content/js/install.js
index 7f908cb0..b37cd73f 100644
--- a/extension/content/js/install.js
+++ b/extension/content/js/install.js
@@ -4,8 +4,12 @@ const valueSplitter = /(\S+)\s+([^\r\f\n]+)/;
 
 Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/logging.js");
-Components.utils.import("resource://scriptish/scriptish.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Scriptish_localizeOnLoad"]);
+lazyUtil(this, "stringBundle");
+
+Scriptish_localizeOnLoad(this);
 
 function $(id) document.getElementById(id);
 function $t(text) document.createTextNode(text);
@@ -40,10 +44,6 @@ function cleanup() scriptDownloader.cleanupTempFiles();
 function delayedClose() timeout(close);
 
 
-/* Main */
-document.title = Scriptish_stringBundle("install.title");
-
-
 on("load", function() {
   let script = scriptDownloader.script;
   let headers = script.getScriptHeader();
@@ -64,10 +64,6 @@ on("load", function() {
   });
   dialog.getButton("cancel").focus();
 
-  // setup other l10n
-  $("warning1").appendChild($t(Scriptish_stringBundle("install.warning1")));
-  $("warning2").appendChild($t(Scriptish_stringBundle("install.warning2")));
-
   // setup script info
   let icon = $("scriptIcon");
   if (script.icon.tempFile) {
@@ -79,10 +75,12 @@ on("load", function() {
   }
   if (!icon.src) icon.src = script.iconURL;
 
-  let desc = $("scriptDescription");
-  desc.appendChild($nHTML("strong", script.name + " " + script.version));
-  desc.appendChild($nHTML("br"));
-  desc.appendChild($t(script.description));
+  let title = (script.name || Scriptish_stringBundle("untitledScript"));
+  if (script.version) {
+    title += " " + script.version;
+  }
+  $("scriptTitle").textContent = title;
+  $("scriptDescription").textContent = script.description;
 
   // setup action event listeners
   on("dialogaccept", function() {
@@ -93,8 +91,6 @@ on("load", function() {
   on("dialogcancel", delayedClose, false);
 
   let showSource = $("showSource");
-  showSource.setAttribute("value",
-      Scriptish_stringBundle("install.showScriptSource"));
   showSource.addEventListener("click", function() {
     removeEventListener("unload", cleanup, false);
     scriptDownloader.showScriptView();
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index be4e96cb..793564fc 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -136,6 +136,7 @@ statusbar.updated=erfolgreich aktualisiert
 tooltip.loading=Lade...
 Uninstall=Entfernen
 Update=Aktualisieren
+untitledScript=Unbenanntes Script
 userscripts=Benutzerskripte
 userscripts.get=Benutzerskripte finden
 userscripts.noneInstalled=Sie haben keine Benutzerskripte installiert
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 667c7071..e9307b2b 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -135,6 +135,7 @@ statusbar.noScripts.scheme=Scheme is disabled!
 statusbar.updated=updated successfully
 tooltip.loading=Loading...
 Uninstall=Uninstall
+untitledScript=Untitled Script
 Update=Update
 userscripts=User Scripts
 userscripts.get=Get user scripts
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index f4cc2c43..cbb187a3 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -135,6 +135,7 @@ statusbar.noScripts.scheme=
 statusbar.updated=actualizado con éxito
 tooltip.loading=Cargando...
 Uninstall=Desinstalar
+untitledScript=
 Update=Actualizar
 userscripts=Scripts de usuario
 userscripts.get=
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index bd5b3e76..9ba3fbd3 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -135,6 +135,7 @@ statusbar.noScripts.scheme=
 statusbar.updated=は正常に更新されました
 tooltip.loading=読み込み中…
 Uninstall=アンインストール
+untitledScript=
 Update=更新
 userscripts=ユーザースクリプト
 userscripts.get=ユーザースクリプトを取得
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 914ed58b..6dce2406 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -135,6 +135,7 @@ statusbar.noScripts.scheme=
 statusbar.updated=atualizado com sucesso
 tooltip.loading=Carregando...
 Uninstall=Desinstalação
+untitledScript=
 Update=Atualização
 userscripts=Scripts de usuário
 userscripts.get=
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 6bfa8e7a..7950741d 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -135,6 +135,7 @@ statusbar.noScripts.scheme=
 statusbar.updated=успешно обновлен(ы)
 tooltip.loading=Грузим ...
 Uninstall=Удалить
+untitledScript=
 Update=Обновить
 userscripts=Пользовательские скрипты
 userscripts.get=
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 55740832..3b0f184b 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -135,6 +135,7 @@ statusbar.noScripts.scheme=
 statusbar.updated=har uppdaterats
 tooltip.loading=Läser in…
 Uninstall=Avinstallera
+untitledScript=
 Update=Uppdatera
 userscripts=Användarskript
 userscripts.get=Hämta användarskript
diff --git a/extension/modules/utils/Scriptish_localizeDOM.js b/extension/modules/utils/Scriptish_localizeDOM.js
index 53a65cf3..2d6533ba 100644
--- a/extension/modules/utils/Scriptish_localizeDOM.js
+++ b/extension/modules/utils/Scriptish_localizeDOM.js
@@ -24,8 +24,14 @@ function Scriptish_localizeSubtree(aNode) {
     let localized = n.getAttribute("localize").split(",");
     for each (let l in localized) {
       try {
-        let s = Scriptish_stringBundle(n.getAttribute(l));
-        n.setAttribute(l, s);
+        if (l == "#text") {
+          let s = Scriptish_stringBundle(n.textContent);
+          n.textContent = s;
+        }
+        else {
+          let s = Scriptish_stringBundle(n.getAttribute(l));
+          n.setAttribute(l, s);
+        }
 
         // also localize pref-panes
         if (/^pane-/.test(n.id)) {
diff --git a/extension/skin/install.css b/extension/skin/install.css
index 0b3842e1..42183c07 100644
--- a/extension/skin/install.css
+++ b/extension/skin/install.css
@@ -21,7 +21,8 @@
   background:InfoBackground;
   color: InfoText;
   border-bottom:1px black dotted;
-  padding:0.5em;
+  padding: 0.5em;
+  padding-right: 1.5em;
 }
 
 #scriptIcon {
@@ -30,9 +31,11 @@
   margin-right: 1ex;
 }
 
-#scriptDescription{margin:0;}
-
-#scriptDescription strong{font-size: 1.25em;}
+#scriptTitle {
+  font-weight: bold;
+  font-size: 1.1em;
+  margin-bottom: 1ex;
+}
 
 #showSource-box{margin: 1ex;}
 

From 97c1ea4f88b79f6a7d854bcc1082b5c1670572dd Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 17:34:13 +0200
Subject: [PATCH 360/829] Use `untitledScript` as a name for scripts lacking
 one otherwise

---
 extension/modules/script/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index b8235b56..274d0b52 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -339,7 +339,7 @@ Script.prototype = {
   set id(aId) {
     this._id = aId.replace(nonIdChars, ''); // remove unacceptable chars
   },
-  get name() this._name,
+  get name() this._name || Scriptish_stringBundle("untitledScript"),
   get namespace() this._namespace,
   get prefroot() {
     if (!this._prefroot) this._prefroot = ["scriptvals.", this.id, "."].join("");

From 5a7ab370d406fd7a4b63b6662a7ab1eb8c8d7ff7 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 17:53:55 +0200
Subject: [PATCH 361/829] Pimp script-options dialog a bit

---
 extension/content/js/script-options.js | 16 +++++++++---
 extension/content/script-options.xul   | 34 ++++++++++++++------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/extension/content/js/script-options.js b/extension/content/js/script-options.js
index 5077aad3..72a5deea 100644
--- a/extension/content/js/script-options.js
+++ b/extension/content/js/script-options.js
@@ -1,6 +1,6 @@
-Components.utils.import("resource://scriptish/scriptish.js");
-Components.utils.import("resource://scriptish/logging.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+Components.utils.import("resource://scriptish/constants.js");
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyUtil(this, "stringBundle");
 
 var $ = function(aID) document.getElementById(aID);
 var script;
@@ -20,7 +20,15 @@ window.addEventListener("load", function() {
     let dialog = $("scriptish-script-options-dialog");
     dialog.setAttribute("title", script.name + " - " + options);
     dialog.setAttribute("ondialogaccept", "return doSave();");
-    $("header").setAttribute("description", options);
+
+    // setup script info
+    $("scriptIcon").src = script.iconURL;
+
+    let title = (script.name || Scriptish_stringBundle("untitledScript"));
+    if (script.version) {
+      title += " " + script.version;
+    }
+    $("scriptTitle").textContent = title;
 
     $("includes-label").setAttribute("value", Scriptish_stringBundle("scriptOptions.includes"));
     $("excludes-label").setAttribute("value", Scriptish_stringBundle("scriptOptions.excludes"));
diff --git a/extension/content/script-options.xul b/extension/content/script-options.xul
index 3fbae797..385433c8 100644
--- a/extension/content/script-options.xul
+++ b/extension/content/script-options.xul
@@ -1,27 +1,31 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://scriptish/skin/install.css" type="text/css"?>
 <?xul-overlay href="chrome://scriptish/content/closewindow.xul"?>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     buttons="accept"
     id="scriptish-script-options-dialog"
-    width="500"
-    height="400"
-    persist="screenX screenY">
+    style="width: 45em; height: 32em;"
+    persist="screenX screenY"
+    >
   <script type="application/x-javascript" src="chrome://scriptish/content/js/script-options.js"/>
 
-  <dialogheader id="header"/>
+  <hbox>
+    <vbox pack="start">
+      <image id="scriptIcon"/>
+    </vbox>
+    <vbox flex="1">
+      <description id="scriptTitle"/>
+      <label id="includes-label" control="includes"/>
+      <textbox id="includes" multiline="true" rows="4" cols="50"/>
 
-  <vbox>
-    <label id="includes-label" control="includes"/>
-    <textbox id="includes" multiline="true" rows="4" cols="60"/>
+      <separator class="thin"/>
 
-    <separator class="thin"/>
+      <label id="excludes-label" control="excludes"/>
+      <textbox id="excludes" multiline="true" rows="4" cols="50"/>
 
-    <label id="excludes-label" control="excludes"/>
-    <textbox id="excludes" multiline="true" rows="4" cols="60"/>
+      <separator class="thin"/>
 
-    <separator class="thin"/>
-
-    <checkbox id="disableScriptIncludes"/>
-  </vbox>
+      <checkbox id="disableScriptIncludes"/>
+    </vbox>
+  </hbox>
 </dialog>

From f1d5dbc1679e7907f36e7d7f470c230c093f6f82 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 18:24:45 +0200
Subject: [PATCH 362/829] Fix prefpane localization

---
 extension/modules/utils/Scriptish_localizeDOM.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/extension/modules/utils/Scriptish_localizeDOM.js b/extension/modules/utils/Scriptish_localizeDOM.js
index 2d6533ba..ccad7f61 100644
--- a/extension/modules/utils/Scriptish_localizeDOM.js
+++ b/extension/modules/utils/Scriptish_localizeDOM.js
@@ -27,11 +27,10 @@ function Scriptish_localizeSubtree(aNode) {
         if (l == "#text") {
           let s = Scriptish_stringBundle(n.textContent);
           n.textContent = s;
+          continue;
         }
-        else {
-          let s = Scriptish_stringBundle(n.getAttribute(l));
-          n.setAttribute(l, s);
-        }
+        let s = Scriptish_stringBundle(n.getAttribute(l));
+        n.setAttribute(l, s);
 
         // also localize pref-panes
         if (/^pane-/.test(n.id)) {

From 0d6f32eb468ae85d58360fd4e779108cc208338e Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 18:29:34 +0200
Subject: [PATCH 363/829] Too many tabpanels in pane-advanced

---
 extension/content/options.xul | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index 3848148f..ca10491e 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -89,14 +89,21 @@
 
     <tabbox>
       <tabs>
-        <tab label="options.cache" localize="label"/>
+        <tab label="options.pane.main" localize="label"/>
         <tab label="options.enabledSchemes.advanced" localize="label" />
-        <tab label="options.logging" localize="label" />
         <tab label="options.update.security" localize="label"/>
       </tabs>
       <tabpanels>
         <tabpanel>
-          <checkbox preference="pref-cache-enabled" label="options.cache.enabled" localize="label"/>
+          <groupbox>
+          <caption label="options.cache" localize="label" />
+            <checkbox preference="pref-cache-enabled" label="options.cache.enabled" localize="label"/>
+          </groupbox>
+          <groupbox>
+            <caption label="options.logging" localize="label" />
+            <checkbox preference="pref-logChrome" label="options.logChrome" localize="label"/>
+            <checkbox preference="pref-logToErrorConsole" label="options.logToErrorConsole" localize="label"/>
+          </groupbox>
         </tabpanel>
         <tabpanel>
           <checkbox preference="pref-enabledSchemes-file" label="options.enabledSchemes.file" localize="label"/>
@@ -107,10 +114,6 @@
           <label class="remark" control="enabledschemes-advanced" value="options.enabledSchemes.securityRemark" localize="value"/>
           <label class="remark" control="enabledschemes-advanced" value="options.enabledSchemes.securityRemark2" localize="value"/>
         </tabpanel>
-        <tabpanel>
-          <checkbox preference="pref-logChrome" label="options.logChrome" localize="label"/>
-          <checkbox preference="pref-logToErrorConsole" label="options.logToErrorConsole" localize="label"/>
-        </tabpanel>
         <tabpanel>
           <checkbox preference="pref-update-requireSecured" label="options.requireSecured" localize="label"/>
           <checkbox preference="pref-update-requireBuiltInCerts" label="options.requireBuiltInCerts" localize="label"/>

From 28c8707de3ee7e1359b250dba63878406686f133 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 19:09:12 +0200
Subject: [PATCH 364/829] convert2RegExp: add forceString argument

If `forceString` convert2RegExp will always consider aPattern to be a
plain string instead of checking if it is an expression already
---
 extension/modules/utils/Scriptish_convert2RegExp.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/extension/modules/utils/Scriptish_convert2RegExp.js b/extension/modules/utils/Scriptish_convert2RegExp.js
index 8b97c605..7c484361 100644
--- a/extension/modules/utils/Scriptish_convert2RegExp.js
+++ b/extension/modules/utils/Scriptish_convert2RegExp.js
@@ -5,11 +5,13 @@ const RE_ESCAPE = /[{}()\[\]\\^$.?]/g;
 const RE_WILD = /\*/g;
 const RE_TLD = /^\^[^\/]*(?:\/\/)?[^\/]*\\\.tld(?:\/.*)?\$$/;
 
-function Scriptish_convert2RegExp(aPattern, aNoTLD) {
-  var s = aPattern.toString().trim();
+function Scriptish_convert2RegExp(aPattern, aNoTLD, forceString) {
+  var s = aPattern.toString().trim(), m;
 
   // Already a regexp?
-  if (RE_REGEXP.test(s)) return new RegExp(RegExp.$1, RegExp.$2);
+  if (!forceString && (m = s.match(RE_REGEXP))) {
+    return new RegExp(m[1], m[2]);
+  }
 
   var res = "^" + s
     .replace(RE_ESCAPE, "\\$&")

From fc42ca8b640f28b1ffaae574256c9bce98401633 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 20:11:50 +0200
Subject: [PATCH 365/829] Rewrite MatchPattern implementation

Should now conform to:
http://code.google.com/chrome/extensions/match_patterns.html

Closes #405
---
 extension/content/tests/runTests.js           |  1 +
 extension/content/tests/testMatchPattern.js   | 98 +++++++++++++++++++
 extension/modules/third-party/MatchPattern.js | 78 ++++++++-------
 3 files changed, 143 insertions(+), 34 deletions(-)
 create mode 100644 extension/content/tests/testMatchPattern.js
 mode change 100755 => 100644 extension/modules/third-party/MatchPattern.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index e5a50a8e..7caa03bc 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -69,6 +69,7 @@ function runTests() {
     function() include("tests/testToolsMenuItem.js"),
     function() include("tests/testGetConfig.js"),
     function() include("tests/testIsGMable.js"),
+    function() include("tests/testMatchPattern.js"),
     function() include("tests/testPatternCollection.js"),
     function() include("tests/testScriptishConvert2RegExp.js"),
     function() include("tests/testScriptishCreateUserScriptSource.js"),
diff --git a/extension/content/tests/testMatchPattern.js b/extension/content/tests/testMatchPattern.js
new file mode 100644
index 00000000..18d472cc
--- /dev/null
+++ b/extension/content/tests/testMatchPattern.js
@@ -0,0 +1,98 @@
+module("Match Pattern");
+
+test("exports", function() {
+  checkExports("resource://scriptish/third-party/MatchPattern.js", ["MatchPattern"]);
+});
+
+test("&lt;all_urls&gt;", function() {
+  var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
+  var m = new MatchPattern("<all_urls>");
+  ok(m.doMatch("http://google.com/"));
+  ok(!m.doMatch("extern://google.com/"));
+});
+
+test("* scheme", function() {
+  var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
+  var m = new MatchPattern("*://google.com/");
+  ok(m.doMatch("http://google.com/"));
+  ok(m.doMatch("https://google.com/"));
+  ok(!m.doMatch("file://google.com/"));
+  ok(!m.doMatch("extern://google.com/"));
+});
+
+test("fully defined", function() {
+  var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
+  var m = new MatchPattern("http://google.com/");
+  ok(m.doMatch("http://google.com/"));
+  ok(!m.doMatch("https://google.com/"));
+  ok(!m.doMatch("file://google.com/"));
+  ok(!m.doMatch("extern://google.com/"));
+  ok(!m.doMatch("http://google.com/a"));
+});
+
+test("fully wild host", function() {
+  var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
+  var m = new MatchPattern("http://*/");
+  ok(m.doMatch("http://google.com/"));
+  ok(m.doMatch("http://www.google.com/"));
+  ok(m.doMatch("http://www.mail.google.com/"));
+  ok(!m.doMatch("https://google.com/"));
+  ok(!m.doMatch("extern://google.com/"));
+  ok(!m.doMatch("http://google.com/a"));
+});
+
+test("wild host", function() {
+  var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
+  var m = new MatchPattern("http://*.google.com/");
+  ok(m.doMatch("http://google.com/"));
+  ok(m.doMatch("http://www.google.com/"));
+  ok(m.doMatch("http://www.mail.google.com/"));
+  ok(!m.doMatch("https://google.com/"));
+  ok(!m.doMatch("extern://google.com/"));
+  ok(!m.doMatch("http://google.com/a"));
+});
+
+test("wild host invalid", function() {
+  var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
+  raises(function() new MatchPattern("http://docs.*.google.com/"));
+});
+
+test("wild path", function() {
+  var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
+  var m = new MatchPattern("http://google.com/*");
+  ok(m.doMatch("http://google.com/"));
+  ok(!m.doMatch("https://google.com/"));
+  ok(!m.doMatch("file://google.com/"));
+  ok(!m.doMatch("extern://google.com/"));
+  ok(m.doMatch("http://google.com/a"));
+});
+
+test("wild path2", function() {
+  var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
+  var m = new MatchPattern("http://*.google.com/a/*");
+  ok(m.doMatch("http://google.com/a/"));
+  ok(m.doMatch("http://www.google.com/a/"));
+  ok(!m.doMatch("https://google.com/a/"));
+  ok(!m.doMatch("file://google.com/a/"));
+  ok(!m.doMatch("extern://google.com/a/"));
+  ok(m.doMatch("http://google.com/a/bc"));
+  ok(!m.doMatch("http://docs.google.com/a"));
+});
+
+test("file", function() {
+  var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
+  var m = new MatchPattern("file:///dude*");
+  ok(m.doMatch("file:///dude"));
+  ok(m.doMatch("file:///dudette"));
+  ok(!m.doMatch("file://dude"));
+  // moz currently ignores the "host" portion of a file: URI, here "dude"
+  // Hence the following test is valid
+  ok(m.doMatch("file://dude/dudette"));
+});
+
+test("issue 405", function() {
+  var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
+  var m = new MatchPattern("*://*.somesite.com/somepage.php?*");
+  ok(m.doMatch("http://somesite.com/somepage.php?id=1"));
+  ok(m.doMatch("https://www.somesite.com/somepage.php?id=1"));
+});
diff --git a/extension/modules/third-party/MatchPattern.js b/extension/modules/third-party/MatchPattern.js
old mode 100755
new mode 100644
index d79ba1bc..c0969ffc
--- a/extension/modules/third-party/MatchPattern.js
+++ b/extension/modules/third-party/MatchPattern.js
@@ -21,6 +21,7 @@
  *   David Dahl <ddahl@mozilla.com>
  *   Drew Willcoxon <adw@mozilla.com>
  *   Erik Vold <erikvvold@gmail.com>
+ *   Nils Maier <maierman@web.de>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -42,16 +43,26 @@ Cu.import("resource://scriptish/constants.js");
 Cu.import("resource://scriptish/utils/Scriptish_convert2RegExp.js");
 Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 
-const validScheme = ['http', 'https', 'ftp', 'file'];
+const validSchemes = ['http', 'https', 'ftp', 'file'];
+const REG_HOST = /^(?:\*\.)?[^*\/]+$|^\*$|^$/;
 
-// matches *. or * or text of host
-const validateHost = /^(\*|\*\.[^/*]+|[^/*]+)$/;
+function MatchPattern(pattern) {
+  this.pattern = pattern;
 
-const validatePath = /^(\*|\/.*)$/;
+  // special case "<all_urls>
+  if (pattern == "<all_urls>") {
+    this.all = true;
+    this.scheme = "all_urls";
+    return;
+  }
 
-// create and return a match pattern obj validate match pattern!
-function MatchPattern(pattern){
-  this.pattern = pattern;
+  // special case wild scheme
+  var wildScheme = false;
+  if (pattern[0] == "*") {
+    this.wildScheme = true;
+    // use http, because we need to ensure we get a host
+    pattern = "http" + pattern.slice(1);
+  }
 
   try {
     var uri = NetUtil.newURI(pattern);
@@ -59,44 +70,43 @@ function MatchPattern(pattern){
     throw new Error(Scriptish_stringBundle("error.pattern.parsing") + ": " + e);
   }
 
-  var scheme = uri.scheme;
+  var scheme = this.wildScheme ? "all" : uri.scheme;
   var host = uri.host;
   var path = uri.path;
 
-  if (scheme === 'file') {
-    if (!validatePath.test(path)) {
-      throw new Error(Scriptish_stringBundle("error.matchPattern.rules.file"));
-    }
+  if (scheme != "all" && validSchemes.indexOf(scheme) == -1) {
+    throw new Error(Scriptish_stringBundle("error.matchPattern.rules"));
   }
-  else {
-    if (validScheme.indexOf(scheme) < 0 || !validateHost.test(host) ||
-        !validatePath.test(path)) {
-      throw new Error(Scriptish_stringBundle("error.matchPattern.rules"));
-    }
-
-    if (host == "*" && uri.path == "/") path = host;
+  if (!REG_HOST.test(host)) {
+    throw new Error(Scriptish_stringBundle("error.matchPattern.rules"));
+  }
+  if (path[0] !== "/") {
+    throw new Error(Scriptish_stringBundle("error.matchPattern.rules"));
   }
 
-  var regexs = {};
-  regexs.scheme = scheme;
-  regexs.host = (scheme !== 'file') ? Scriptish_convert2RegExp(host) : null;
-  regexs.path = Scriptish_convert2RegExp(path, true);
-
-  this.regexs = regexs;
-  return this;
+  this.scheme = scheme;
+  if (host) {
+    this.hostExpr = Scriptish_convert2RegExp(host.replace(/^\*\./, "*"));
+  }
+  else {
+    // if omitted, then it means "", an alias for localhost
+    this.hostExpr = /^$/;
+  }
+  this.pathExpr = Scriptish_convert2RegExp(path, false, true);
 }
 
 MatchPattern.prototype.doMatch = function (uriSpec) {
   var matchURI = NetUtil.newURI(uriSpec);
-  var regexs = this.regexs;
 
-  if (regexs.host === null){
-    return (regexs.scheme === matchURI.scheme &&
-        regexs.path.test(matchURI.path));
-  } else {
-    return (regexs.scheme === matchURI.scheme &&
-        regexs.path.test(matchURI.path) &&
-        regexs.host.test(matchURI.host));
+  if (validSchemes.indexOf(matchURI.scheme) == -1) {
+    return false;
+  }
 
+  if (this.all) {
+    return true;
+  }
+  if (!this.wildScheme && this.scheme != matchURI.scheme) {
+    return false;
   }
+  return this.hostExpr.test(matchURI.host) && this.pathExpr.test(matchURI.path);
 };

From 82df567158d4d3abec921d0fb46ce387591001e7 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 20:16:30 +0200
Subject: [PATCH 366/829] Add test for convert2RegExp forceString

---
 extension/content/tests/testScriptishConvert2RegExp.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extension/content/tests/testScriptishConvert2RegExp.js b/extension/content/tests/testScriptishConvert2RegExp.js
index 8044a6a4..41bfee14 100644
--- a/extension/content/tests/testScriptishConvert2RegExp.js
+++ b/extension/content/tests/testScriptishConvert2RegExp.js
@@ -48,3 +48,9 @@ test("Regular Exp @includes", 5, function() {
   ok(regExp.test(url));
   ok(!regExp.test("http://googleTcom/"));
 });
+
+test("forceString", function() {
+  var c2r = importModule("resource://scriptish/utils/Scriptish_convert2RegExp.js").Scriptish_convert2RegExp;
+  var regExp = c2r("/notaregexp/i", false, true);
+  equal(regExp.source, "^\\/notaregexp\\/i$", "not a regexp");
+});

From 55f82e1dd484fb93fd06e3f3e2bef82c981ee64e Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 20:19:59 +0200
Subject: [PATCH 367/829] Minor: remove unused variable

---
 extension/modules/third-party/MatchPattern.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension/modules/third-party/MatchPattern.js b/extension/modules/third-party/MatchPattern.js
index c0969ffc..d9f77123 100644
--- a/extension/modules/third-party/MatchPattern.js
+++ b/extension/modules/third-party/MatchPattern.js
@@ -57,7 +57,6 @@ function MatchPattern(pattern) {
   }
 
   // special case wild scheme
-  var wildScheme = false;
   if (pattern[0] == "*") {
     this.wildScheme = true;
     // use http, because we need to ensure we get a host

From 68fd5b4825141565c2ae2584cf50981981bbd24a Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 4 Jul 2011 13:57:20 -0500
Subject: [PATCH 368/829] Replace undefined getStorage() and getResources() in
 api.js.

Introduced in 4addf2f5a9d74b9919b086ef7dea7c6b851c7140
---
 extension/modules/api.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index e2d1be17..9573e4f7 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -100,28 +100,28 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
 
   this.GM_setValue = function GM_setValue() {
     if (!GM_apiLeakCheck("GM_setValue")) return;
-    return lazyLoaders.storage.setValue.apply(getStorage(), arguments);
+    return lazyLoaders.storage.setValue.apply(lazyLoaders.storage, arguments);
   }
   this.GM_getValue = function GM_getValue() {
     if (!GM_apiLeakCheck("GM_getValue")) return;
-    return lazyLoaders.storage.getValue.apply(getStorage(), arguments);
+    return lazyLoaders.storage.getValue.apply(lazyLoaders.storage, arguments);
   }
   this.GM_deleteValue = function GM_deleteValue() {
     if (!GM_apiLeakCheck("GM_deleteValue")) return;
-    return lazyLoaders.storage.deleteValue.apply(getStorage(), arguments);
+    return lazyLoaders.storage.deleteValue.apply(lazyLoaders.storage, arguments);
   }
   this.GM_listValues = function GM_listValues() {
     if (!GM_apiLeakCheck("GM_listValues")) return;
-    return lazyLoaders.storage.listValues.apply(getStorage(), arguments);
+    return lazyLoaders.storage.listValues.apply(lazyLoaders.storage, arguments);
   }
 
   this.GM_getResourceURL = function GM_getResourceURL() {
     if (!GM_apiLeakCheck("GM_getResourceURL")) return;
-    return lazyLoaders.resources.getResourceURL.apply(getResources(), arguments)
+    return lazyLoaders.resources.getResourceURL.apply(lazyLoaders.resources, arguments)
   }
   this.GM_getResourceText = function GM_getResourceText() {
     if (!GM_apiLeakCheck("GM_getResourceText")) return;
-    return lazyLoaders.resources.getResourceText.apply(getResources(), arguments)
+    return lazyLoaders.resources.getResourceText.apply(lazyLoaders.resources, arguments)
   }
 
   this.GM_getMetadata = function(aKey, aLocalVal) {

From 66dcbe6caef5c2b62514097b06106b95d497c72a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 22:27:40 +0200
Subject: [PATCH 369/829] Service: `script` needs to be block local

Closes #410
---
 extension/components/scriptish.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 4bf6b015..6af6b34c 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -339,7 +339,12 @@ ScriptishService.prototype = {
       for (let [, id] in Iterator(delays)) self.timer.clearTimeout(id);
     });
 
-    for (var i = 0, script; script = scripts[i++];) {
+    for (var i = 0, e = scripts.length; i < e; ++i) {
+      // Do not "optimize" |script| out of the loop block and into the loop
+      // declaration!
+      // Need to keep a valid reference to |script| around so that GM_log
+      // and the delay code (and probably other consumer work).
+      let script = scripts[i];
       let sandbox = new Cu.Sandbox(wrappedContentWin);
 
       let GM_api = new GM_API(
@@ -357,6 +362,7 @@ ScriptishService.prototype = {
       });
       XPCOMUtils.defineLazyGetter(sandbox, "GM_log", function() {
         if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
+          sandbox.console.log("binding");
           var logger = new GM_ScriptLogger(script);
           return function() {
             logger.log(Array.slice(arguments).join(" "));

From 3083fd83b7eb27e2d8a5b04702a8133879b21232 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 4 Jul 2011 22:33:32 +0200
Subject: [PATCH 370/829] Minor: Remove debug cruft

---
 extension/components/scriptish.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 6af6b34c..010cb2df 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -362,7 +362,6 @@ ScriptishService.prototype = {
       });
       XPCOMUtils.defineLazyGetter(sandbox, "GM_log", function() {
         if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
-          sandbox.console.log("binding");
           var logger = new GM_ScriptLogger(script);
           return function() {
             logger.log(Array.slice(arguments).join(" "));

From 4771732ad64cf632fe19b8f6226301ae14bf62ad Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 4 Jul 2011 13:59:42 -0700
Subject: [PATCH 371/829] removing redundant let statement

---
 extension/components/scriptish.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 010cb2df..cda54c1a 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -376,12 +376,10 @@ ScriptishService.prototype = {
 
       let delay = script.delay;
       if (delay || delay === 0) {
-        let (script = script, sb = sandbox) {
-          // don't use window's setTimeout, b/c then window could clearTimeout
-          delays.push(self.timer.setTimeout(function() {
-            self.evalInSandbox(script, sandbox, wrappedContentWin);
-          }, script.delay));
-        }
+        // don't use window's setTimeout, b/c then window could clearTimeout
+        delays.push(self.timer.setTimeout(function() {
+          self.evalInSandbox(script, sandbox, wrappedContentWin);
+        }, delay));
       } else {
         this.evalInSandbox(script, sandbox, wrappedContentWin);
       }

From 53706abd5a916d8c8ba2c61aa4771282dd829406 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 4 Jul 2011 14:13:27 -0700
Subject: [PATCH 372/829] <em:maxVersion>8.*</em:maxVersion> for FF

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index e55d5221..5b61ca52 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -79,7 +79,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>7.*</em:maxVersion>
+        <em:maxVersion>8.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- SeaMonkey -->

From 2b45d4ec25097c5881f253a6c6ebebc36adf80b5 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 4 Jul 2011 17:25:03 -0500
Subject: [PATCH 373/829] 'ScriptInstaller' -> 'ScriptInstall' in a script.js
 lazyImport

---
 extension/modules/script/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 274d0b52..3e344cb0 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -10,7 +10,7 @@ lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/script/cachedresource.js", ["CachedResource"]);
 lazyImport(this, "resource://scriptish/utils/PatternCollection.js", ["PatternCollection"]);
-lazyImport(this, "resource://scriptish/script/scriptinstaller.js", ["ScriptInstaller"]);
+lazyImport(this, "resource://scriptish/script/scriptinstaller.js", ["ScriptInstall"]);
 lazyImport(this, "resource://scriptish/script/scripticon.js", ["ScriptIcon"]);
 lazyImport(this, "resource://scriptish/script/scriptrequire.js", ["ScriptRequire"]);
 lazyImport(this, "resource://scriptish/script/scriptresource.js", ["ScriptResource"]);

From 6bfe8f60ccbeb3a6d1efa5483460300a07534ae0 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 4 Jul 2011 19:23:05 -0500
Subject: [PATCH 374/829] minor fix: _applyBackgroundUpdates was being reset
 when updating a script

---
 extension/modules/script/script.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 3e344cb0..e13138b9 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -651,7 +651,6 @@ Script.prototype = {
     this._screenshots = newScript._screenshots;
     this._homepageURL = newScript.homepageURL;
     this._updateURL = newScript._updateURL;
-    this._applyBackgroundUpdates = newScript._applyBackgroundUpdates;
     this.supportURL = newScript.supportURL;
     this._name = newScript._name;
     this._namespace = newScript._namespace;

From 13ffd7c6a7ce99855b1398ac2e52265b21aa94f0 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 5 Jul 2011 06:45:26 +0200
Subject: [PATCH 375/829] Work around selection restore issues due to changing
 category ids

Closes #411
---
 extension/content/js/addonstab.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 4bb21e4c..6f9be49d 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -17,6 +17,15 @@ gStrings.ext = Scriptish_bundle;
 let NetUtil = tools.NetUtil;
 let Services = tools.Services;
 
+// Work-around for Firefox4/5 selection restore failures
+if (!AddonManagerPrivate.AddonType) {
+  window.addEventListener("DOMContentLoaded", function() {
+    if ($("categories").node.selectedIndex == -1) {
+      $("categories").node.selectedIndex = 0;
+    }
+  }, false);
+}
+
 window.addEventListener("load", function() {
   function addonIsInstalledScript(aAddon) {
     if (!aAddon || "userscript" != aAddon.type || aAddon.needsUninstall)

From 0b051a8e3afa1e837c4c60eda752adcb81a59ac7 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 5 Jul 2011 06:49:17 +0200
Subject: [PATCH 376/829] Fixed workaround for selection restore issues

Closes #411 again
---
 extension/content/js/addonstab.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 6f9be49d..82e982e3 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -20,8 +20,8 @@ let Services = tools.Services;
 // Work-around for Firefox4/5 selection restore failures
 if (!AddonManagerPrivate.AddonType) {
   window.addEventListener("DOMContentLoaded", function() {
-    if ($("categories").node.selectedIndex == -1) {
-      $("categories").node.selectedIndex = 0;
+    if ($("categories").selectedIndex == -1) {
+      $("categories").selectedIndex = 0;
     }
   }, false);
 }

From a3bc247dfc56e227a0d66e86581719c3d10ee90f Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 5 Jul 2011 06:53:22 +0200
Subject: [PATCH 377/829] Workaround adjustment: Select category-scriptish

If the selection failed to restore, it can be safely assumed that
scriptish was the culprit and hence we can restore to our category.

Closes #411
---
 extension/content/js/addonstab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 82e982e3..036f245e 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -21,7 +21,7 @@ let Services = tools.Services;
 if (!AddonManagerPrivate.AddonType) {
   window.addEventListener("DOMContentLoaded", function() {
     if ($("categories").selectedIndex == -1) {
-      $("categories").selectedIndex = 0;
+      $("categories").selectedItem = $("category-scriptish");
     }
   }, false);
 }

From 21b5a8578850edf9c4561c3da4a6973d55cab004 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 4 Jul 2011 23:05:47 -0700
Subject: [PATCH 378/829] The AddonManagerPrivate.registerProvider types
 argument seems to be ignored when a I insert the category node with a overlay
 which has to be done for FF < 6 in order for the #categories persist
 attribute to behave.

So the AddonManagerPrivate.registerProvider types argument is not used atm..
---
 extension/content/addonstab.xul   |  2 +-
 extension/content/js/addonstab.js | 19 ++-----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/extension/content/addonstab.xul b/extension/content/addonstab.xul
index 456421cf..9769cdea 100644
--- a/extension/content/addonstab.xul
+++ b/extension/content/addonstab.xul
@@ -31,7 +31,7 @@
   </menupopup>
 
   <richlistbox id="categories">
-    <richlistitem id="category-scriptish"
+    <richlistitem id="category-userscript"
         class="category"
         insertafter="category-plugins"
         value="addons://list/userscript">
diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 036f245e..b7812d56 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -17,16 +17,9 @@ gStrings.ext = Scriptish_bundle;
 let NetUtil = tools.NetUtil;
 let Services = tools.Services;
 
-// Work-around for Firefox4/5 selection restore failures
-if (!AddonManagerPrivate.AddonType) {
-  window.addEventListener("DOMContentLoaded", function() {
-    if ($("categories").selectedIndex == -1) {
-      $("categories").selectedItem = $("category-scriptish");
-    }
-  }, false);
-}
-
 window.addEventListener("load", function() {
+  $("category-userscript").setAttribute("name", Scriptish_stringBundle("userscripts"));
+
   function addonIsInstalledScript(aAddon) {
     if (!aAddon || "userscript" != aAddon.type || aAddon.needsUninstall)
       return false;
@@ -71,14 +64,6 @@ window.addEventListener("load", function() {
     }
   })();
 
-  var category = $("category-scriptish");
-  if (AddonManagerPrivate.AddonType) {
-    category.parentNode.removeChild(category);
-  } else {
-    category.setAttribute("id", "category-userscript");
-    category.setAttribute("name", Scriptish_stringBundle("userscripts"));
-  }
-
   $("scriptish-get-scripts-btn").addEventListener("command", function() {
     var gBrowser = Services.wm.getMostRecentWindow("navigator:browser").gBrowser;
     gBrowser.selectedTab = gBrowser.addTab("http://userscripts.org");

From 74733d89b50735121bdb6eb5f9088f6cef052147 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 5 Jul 2011 10:03:20 -0700
Subject: [PATCH 379/829] Rewrote Script.header_parse so that a whole script's
 contents are no longer parsed, just the top section (assuming there is a
 UserScript header).

This is a old tip from @satyr which I hadn't gotten around to, thanks!
---
 extension/content/tests/runTests.js           |  1 +
 .../content/tests/testScriptHeaderParse.js    | 97 +++++++++++++++++++
 extension/modules/script/script.js            | 45 ++++-----
 3 files changed, 119 insertions(+), 24 deletions(-)
 create mode 100644 extension/content/tests/testScriptHeaderParse.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 7caa03bc..14244840 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -66,6 +66,7 @@ function runTests() {
     function() include("tests/testLazyImport.js"),
     function() include("tests/testCachedResource.js"),
     function() include("tests/testCryptoHash.js"),
+    function() include("tests/testScriptHeaderParse.js"),
     function() include("tests/testToolsMenuItem.js"),
     function() include("tests/testGetConfig.js"),
     function() include("tests/testIsGMable.js"),
diff --git a/extension/content/tests/testScriptHeaderParse.js b/extension/content/tests/testScriptHeaderParse.js
new file mode 100644
index 00000000..553ebba9
--- /dev/null
+++ b/extension/content/tests/testScriptHeaderParse.js
@@ -0,0 +1,97 @@
+module("Script.header_parse");
+
+test("normal @keys (with space b4 @)", function() {
+  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var header = (<><![CDATA[
+  // ==UserScript==
+  // @id test-id
+  // @name test-name
+  // @version test-version
+  // @version test-version-II
+  // ==/UserScript==
+  ]]></>).toString();
+  var parsed = parser(header);
+
+  deepEqual(parsed.id, ["test-id"], "@id found");
+  deepEqual(parsed.name, ["test-name"], "@name found");
+  deepEqual(parsed.version, ["test-version", "test-version-II"], "@versions found");
+  equal(parsed.fail, undefined, "@fail not found");
+});
+
+test("normal @keys and following @fail", function() {
+  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var header = (<><![CDATA[
+  // ==UserScript==
+  // @id test-id
+  // @name test-name
+  // @version test-version
+  // @version test-version-II
+  // ==/UserScript==
+  // @fail test-fail
+  ]]></>).toString();
+  var parsed = parser(header);
+
+  deepEqual(parsed.id, ["test-id"], "@id found");
+  deepEqual(parsed.name, ["test-name"], "@name found");
+  deepEqual(parsed.version, ["test-version", "test-version-II"], "@versions found");
+  equal(parsed.fail, undefined, "@fail not found");
+});
+
+test("normal @keys and leading @fail", function() {
+  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var header = (<><![CDATA[
+  // @fail test-fail
+  // ==UserScript==
+  // @id test-id
+  // @name test-name
+  // @version test-version
+  // @version test-version-II
+  // ==/UserScript==
+  ]]></>).toString();
+  var parsed = parser(header);
+
+  deepEqual(parsed.id, ["test-id"], "@id found");
+  deepEqual(parsed.name, ["test-name"], "@name found");
+  deepEqual(parsed.version, ["test-version", "test-version-II"], "@versions found");
+  equal(parsed.fail, undefined, "@fail not found");
+});
+
+test("two sets of normal @keys", function() {
+  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var header = (<><![CDATA[
+  // ==UserScript==
+  // @id test-id
+  // @name test-name
+  // @version test-version
+  // @version test-version-II
+  // ==/UserScript==
+  // ==UserScript==
+  // @fail test-fail
+  // ==/UserScript==
+  ]]></>).toString();
+  var parsed = parser(header);
+
+  deepEqual(parsed.id, ["test-id"], "@id found");
+  deepEqual(parsed.name, ["test-name"], "@name found");
+  deepEqual(parsed.version, ["test-version", "test-version-II"], "@versions found");
+  equal(parsed.fail, undefined, "@fail not found");
+});
+
+test("@keys without space b4 @", function() {
+  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var header = (<><![CDATA[
+  //==UserScript==
+  //@id test-id
+  //@name test-name
+  //@version test-version
+  //@version test-version-II
+  //==/UserScript==
+  //@fail test-fail
+  ]]></>).toString();
+  var parsed = parser(header);
+
+  deepEqual(parsed.id, ["test-id"], "@id found");
+  deepEqual(parsed.name, ["test-name"], "@name found");
+  deepEqual(parsed.version, ["test-version", "test-version-II"], "@versions found");
+  equal(parsed.fail, undefined, "@fail not found");
+});
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index e13138b9..e91ad4f0 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -29,6 +29,8 @@ const runAtValues = ["document-start", "document-end", "document-idle", "window-
 const defaultRunAt = runAtValues[1];
 const defaultAutoUpdateState = AddonManager.AUTOUPDATE_DISABLE;
 const usoURLChk = /^https?:\/\/userscripts\.org\/scripts\/[^\d]+(\d+)/i;
+const RE_USERSCRIPT_HEADER_START = /\/\/[ \t]*==UserScript==/i;
+const RE_USERSCRIPT_HEADER_END = /\/\/[ \t]*==\/UserScript==/i;
 
 function noUpdateFound(aListener, aReason) {
   aListener.onNoUpdateAvailable(this);
@@ -807,36 +809,31 @@ Script.parseVersion = function Script_parseVersion(aSrc) {
 // TODO: DRY this by combining it with Script.parse some way..
 Script.header_parse = function(aSource) {
   var headers = {};
-
-  // read one line at a time looking for start meta delimiter or EOF
-  var lines = aSource.match(metaRegExp);
-  var i = 0;
-  var result;
   var foundMeta = false;
+  var line;
 
-  // used for duplicate resource name detection
-  var previousResourceNames = {};
+  // do not 'optimize' by reusing this reg exp! it should not be reused!
+  var metaRegExp = /\/\/[ \t]*(?:==(\/?UserScript)==|\@(\S+)(?:[ \t]+([^\r\f\n]+))?)/g;
 
-  if (!lines) lines = [""];
-  while (result = lines[i++]) {
-    if (!foundMeta) {
-      if (result.indexOf("// ==UserScript==") == 0) foundMeta = true;
-      continue;
-    }
-
-    if (result.indexOf("// ==/UserScript==") == 0) {
-      // done gathering up meta lines
-      break;
+  // read one line at a time looking for start meta delimiter or EOF
+  while (line = metaRegExp.exec(aSource)) {
+    if (line[1]) {
+      if ("userscript" == line[1].toLowerCase()) {
+        foundMeta = true; // start
+        continue;
+      } else {
+        break; // done
+      }
     }
+    if (!foundMeta) continue;
 
-    var match = result.match(/\/\/ \@(\S+)(?:\s+([^\r\f\n]+))?/);
-    if (match === null) continue;
-    var header = match[1];
-    var value = match[2];
+    var header = line[2];
+    var value = line[3];
 
     if (!headers[header]) headers[header] = [value];
-    else headers[header].push(value)
+    else headers[header].push(value);
   }
+
   return headers;
 }
 
@@ -859,11 +856,11 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript) {
   if (!lines) lines = [""];
   while (result = lines[i++]) {
     if (!foundMeta) {
-      if (result.match(/\/\/[ \t]*==UserScript==/i)) foundMeta = true;
+      if (result.match(RE_USERSCRIPT_HEADER_START)) foundMeta = true;
       continue;
     }
 
-    if (result.match(/\/\/[ \t]*==\/UserScript==/i))
+    if (result.match(RE_USERSCRIPT_HEADER_END))
       break; // done gathering up meta lines
 
     var match = result.match(/\/\/[ \t]*\@(\S+)(?:\s+([^\r\f\n]+))?/);

From a598ab64ed6ec6209bcc0fe3a058274cf087f57f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 5 Jul 2011 11:33:50 -0700
Subject: [PATCH 380/829] test: test that @keys with multiple values are parsed
 correctly

---
 extension/content/tests/testScriptHeaderParse.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extension/content/tests/testScriptHeaderParse.js b/extension/content/tests/testScriptHeaderParse.js
index 553ebba9..6ac23349 100644
--- a/extension/content/tests/testScriptHeaderParse.js
+++ b/extension/content/tests/testScriptHeaderParse.js
@@ -8,6 +8,8 @@ test("normal @keys (with space b4 @)", function() {
   // @name test-name
   // @version test-version
   // @version test-version-II
+  // @key v1 v2 v3
+  // @key v1 v2
   // ==/UserScript==
   ]]></>).toString();
   var parsed = parser(header);
@@ -15,6 +17,7 @@ test("normal @keys (with space b4 @)", function() {
   deepEqual(parsed.id, ["test-id"], "@id found");
   deepEqual(parsed.name, ["test-name"], "@name found");
   deepEqual(parsed.version, ["test-version", "test-version-II"], "@versions found");
+  deepEqual(parsed.key, ["v1 v2 v3", "v1 v2"], "@key w/ multiple values found");
   equal(parsed.fail, undefined, "@fail not found");
 });
 
@@ -85,6 +88,8 @@ test("@keys without space b4 @", function() {
   //@name test-name
   //@version test-version
   //@version test-version-II
+  //@key v1 v2 v3
+  //@key v1 v2
   //==/UserScript==
   //@fail test-fail
   ]]></>).toString();
@@ -93,5 +98,6 @@ test("@keys without space b4 @", function() {
   deepEqual(parsed.id, ["test-id"], "@id found");
   deepEqual(parsed.name, ["test-name"], "@name found");
   deepEqual(parsed.version, ["test-version", "test-version-II"], "@versions found");
+  deepEqual(parsed.key, ["v1 v2 v3", "v1 v2"], "@key w/ multiple values found");
   equal(parsed.fail, undefined, "@fail not found");
 });

From 472016707331127f0ed14ded6c16ee0c7b0b9252 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 5 Jul 2011 11:58:35 -0700
Subject: [PATCH 381/829] Script.parseVersion is now a simple wrapper for
 Script.header_parse, some changes were made however:

- if there were missing spaces b4 a = or @ char then the line was skipped in parseVersion, which was a bug.
- Script.header_parse did not lower case @keys before, but it's going to be reused then it must, so this is a permenant change (which effects GM_getMetaData)
- parseVersion used to return the first @version found, which is not how parse works, so that was a bug that is now fixed.
- parseVersion used to be case sensitive which was a bug, now this is fixed.
---
 extension/content/tests/runTests.js           |  1 +
 .../content/tests/testScriptHeaderParse.js    | 13 +++++
 .../content/tests/testScriptParseVersion.js   | 57 +++++++++++++++++++
 extension/modules/script/script.js            | 24 +-------
 4 files changed, 74 insertions(+), 21 deletions(-)
 create mode 100644 extension/content/tests/testScriptParseVersion.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 14244840..68946ae2 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -67,6 +67,7 @@ function runTests() {
     function() include("tests/testCachedResource.js"),
     function() include("tests/testCryptoHash.js"),
     function() include("tests/testScriptHeaderParse.js"),
+    function() include("tests/testScriptParseVersion.js"),
     function() include("tests/testToolsMenuItem.js"),
     function() include("tests/testGetConfig.js"),
     function() include("tests/testIsGMable.js"),
diff --git a/extension/content/tests/testScriptHeaderParse.js b/extension/content/tests/testScriptHeaderParse.js
index 6ac23349..5b874e7d 100644
--- a/extension/content/tests/testScriptHeaderParse.js
+++ b/extension/content/tests/testScriptHeaderParse.js
@@ -101,3 +101,16 @@ test("@keys without space b4 @", function() {
   deepEqual(parsed.key, ["v1 v2 v3", "v1 v2"], "@key w/ multiple values found");
   equal(parsed.fail, undefined, "@fail not found");
 });
+
+test("normal @keys case check", function() {
+  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var header = (<><![CDATA[
+  // ==UserScript==
+  // @Key v1
+  // @kEy v1 v2 v3
+  // @keY v1 v2
+  // ==/UserScript==
+  ]]></>).toString();
+  var parsed = parser(header);
+  deepEqual(parsed.key, ["v1", "v1 v2 v3", "v1 v2"], "@key w/ multiple values found");
+});
diff --git a/extension/content/tests/testScriptParseVersion.js b/extension/content/tests/testScriptParseVersion.js
new file mode 100644
index 00000000..745329e0
--- /dev/null
+++ b/extension/content/tests/testScriptParseVersion.js
@@ -0,0 +1,57 @@
+module("Script.parseVersion");
+
+test("1 @version", function() {
+  var parser = importModule("resource://scriptish/script/script.js").Script.parseVersion;
+  var header = (<><![CDATA[
+  // ==UserScript==
+  // @id test-id
+  // @version 1
+  // ==/UserScript==
+  ]]></>).toString();
+  var parsed = parser(header);
+
+  equal(parsed, "1", "@version");
+});
+
+test("2 @version", function() {
+  var parser = importModule("resource://scriptish/script/script.js").Script.parseVersion;
+  var header = (<><![CDATA[
+  // ==UserScript==
+  // @id test-id
+  // @version 1
+  // @version 2
+  // ==/UserScript==
+  ]]></>).toString();
+  var parsed = parser(header);
+
+  equal(parsed, "2", "@version");
+});
+
+test("2 @version no leading space", function() {
+  var parser = importModule("resource://scriptish/script/script.js").Script.parseVersion;
+  var header = (<><![CDATA[
+  //==UserScript==
+  //@id test-id
+  //@version 1
+  //@version 2
+  //==/UserScript==
+  ]]></>).toString();
+  var parsed = parser(header);
+
+  equal(parsed, "2", "@version");
+});
+
+test("2 @version mixed", function() {
+  var parser = importModule("resource://scriptish/script/script.js").Script.parseVersion;
+  var header = (<><![CDATA[
+  // ==UserScript==
+  // @id test-id
+  // @version 1
+  // @key value
+  // @Version 2
+  // ==/UserScript==
+  ]]></>).toString();
+  var parsed = parser(header);
+
+  equal(parsed, "2", "@version");
+});
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index e91ad4f0..fbc5c7b9 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -783,26 +783,8 @@ Script.prototype = {
 };
 
 Script.parseVersion = function Script_parseVersion(aSrc) {
-  var lines = aSrc.match(/\s*\/\/ [=@].*/g);
-  if (!lines) return null;
-  var lnIdx = 0;
-  var result = {};
-  var foundMeta = false;
-  var start = "// ==UserScript==";
-  var end = "// ==/UserScript==";
-  var version = /\/\/ \@version\s+([^\s]+)/;
-
-  while ((result = lines[lnIdx++])) {
-    if (result.indexOf(start) != 0) continue;
-    foundMeta = true;
-    break;
-  }
-  if (!foundMeta) return;
-  while ((result = lines[lnIdx++])) {
-    if (result.indexOf(end) == 0) break;
-    var match = result.match(version);
-    if (match !== null) return match[1];
-  }
+  var parsed = Script.header_parse(aSrc);
+  if (parsed.version) return parsed.version.pop();
   return null;
 }
 
@@ -827,7 +809,7 @@ Script.header_parse = function(aSource) {
     }
     if (!foundMeta) continue;
 
-    var header = line[2];
+    var header = line[2].toLowerCase();
     var value = line[3];
 
     if (!headers[header]) headers[header] = [value];

From ac78d5e6f128126990f2d572969ca7e892c62ee0 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 04:42:23 +0200
Subject: [PATCH 382/829] Fix the AddonManagerPrivate.registerProvider/overlay
 issues

Use another overlay to add the category for appversions that need it.
Tested against Fx5 release and Fx6/7 nightlies.

Closes #413
---
 extension/chrome.manifest            |  2 ++
 extension/content/addonstab-moz5.xul | 20 ++++++++++++++++++++
 extension/content/addonstab.xul      |  8 +-------
 extension/content/js/addonstab.js    |  2 --
 4 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 extension/content/addonstab-moz5.xul

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 5b7d1d2f..ba0f3c1a 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -15,6 +15,8 @@ overlay    chrome://browser/content/scratchpad.xul chrome://scriptish/content/sc
 overlay    chrome://navigator/content/navigator.xul chrome://scriptish/content/browser.xul
 overlay    about:addons chrome://scriptish/content/addonstab.xul
 overlay    chrome://mozapps/content/extensions/extensions.xul chrome://scriptish/content/addonstab.xul
+overlay    chrome://scriptish/content/addonstab.xul chrome://scriptish/content/addonstab-moz5.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} appversion<5.0+
+overlay    chrome://scriptish/content/addonstab.xul chrome://scriptish/content/addonstab-moz5.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} appversion<2.1+
 
 overlay    chrome://scriptish/content/install.xul chrome://scriptish/content/closewindow.xul
 overlay    chrome://scriptish/content/options.xul chrome://scriptish/content/closewindow.xul
diff --git a/extension/content/addonstab-moz5.xul b/extension/content/addonstab-moz5.xul
new file mode 100644
index 00000000..cdc0f010
--- /dev/null
+++ b/extension/content/addonstab-moz5.xul
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <richlistbox id="categories">
+    <richlistitem id="category-userscript"
+        class="category"
+        insertafter="category-plugins"
+        value="addons://list/userscript">
+    </richlistitem>
+  </richlistbox>
+  <script type="text/javascript"><![CDATA[
+    addEventListener("DOMContentLoaded", function scriptish_dcl() {
+      removeEventListener("DOMContentLoaded", scriptish_dcl, false);
+
+      var sb = {};
+      Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js", sb);
+      document.getElementById("category-userscript")
+        .setAttribute("name", sb.Scriptish_stringBundle("userscripts"));
+    }, false);
+  ]]></script>
+</overlay>
diff --git a/extension/content/addonstab.xul b/extension/content/addonstab.xul
index 9769cdea..1c2e463a 100644
--- a/extension/content/addonstab.xul
+++ b/extension/content/addonstab.xul
@@ -30,13 +30,7 @@
         command="cmd_scriptish_userscript_dl_link" type="userscript"/>
   </menupopup>
 
-  <richlistbox id="categories">
-    <richlistitem id="category-userscript"
-        class="category"
-        insertafter="category-plugins"
-        value="addons://list/userscript">
-    </richlistitem>
-  </richlistbox>
+  <richlistbox id="categories"/>
 
   <hbox id="detail-controls">
       <button class="addon-control button_scriptish_userscript_edit"
diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index b7812d56..e7ca9da1 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -18,8 +18,6 @@ let NetUtil = tools.NetUtil;
 let Services = tools.Services;
 
 window.addEventListener("load", function() {
-  $("category-userscript").setAttribute("name", Scriptish_stringBundle("userscripts"));
-
   function addonIsInstalledScript(aAddon) {
     if (!aAddon || "userscript" != aAddon.type || aAddon.needsUninstall)
       return false;

From 81934018b3ff93d025e55c08dce20f8b966f4487 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 04:59:56 +0200
Subject: [PATCH 383/829] Add more MatchPattern tests

Also add expected number of tests run
---
 extension/content/tests/testMatchPattern.js | 25 ++++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/extension/content/tests/testMatchPattern.js b/extension/content/tests/testMatchPattern.js
index 18d472cc..44502a97 100644
--- a/extension/content/tests/testMatchPattern.js
+++ b/extension/content/tests/testMatchPattern.js
@@ -1,17 +1,17 @@
 module("Match Pattern");
 
-test("exports", function() {
+test("exports", 1, function() {
   checkExports("resource://scriptish/third-party/MatchPattern.js", ["MatchPattern"]);
 });
 
-test("&lt;all_urls&gt;", function() {
+test("&lt;all_urls&gt;", 2, function() {
   var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
   var m = new MatchPattern("<all_urls>");
   ok(m.doMatch("http://google.com/"));
   ok(!m.doMatch("extern://google.com/"));
 });
 
-test("* scheme", function() {
+test("* scheme", 4, function() {
   var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
   var m = new MatchPattern("*://google.com/");
   ok(m.doMatch("http://google.com/"));
@@ -20,7 +20,7 @@ test("* scheme", function() {
   ok(!m.doMatch("extern://google.com/"));
 });
 
-test("fully defined", function() {
+test("fully defined", 5, function() {
   var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
   var m = new MatchPattern("http://google.com/");
   ok(m.doMatch("http://google.com/"));
@@ -30,7 +30,7 @@ test("fully defined", function() {
   ok(!m.doMatch("http://google.com/a"));
 });
 
-test("fully wild host", function() {
+test("fully wild host", 6, function() {
   var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
   var m = new MatchPattern("http://*/");
   ok(m.doMatch("http://google.com/"));
@@ -41,7 +41,7 @@ test("fully wild host", function() {
   ok(!m.doMatch("http://google.com/a"));
 });
 
-test("wild host", function() {
+test("wild host", 8, function() {
   var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
   var m = new MatchPattern("http://*.google.com/");
   ok(m.doMatch("http://google.com/"));
@@ -50,14 +50,16 @@ test("wild host", function() {
   ok(!m.doMatch("https://google.com/"));
   ok(!m.doMatch("extern://google.com/"));
   ok(!m.doMatch("http://google.com/a"));
+  ok(!m.doMatch("http://example.org/www.google.com/"));
+  ok(!m.doMatch("http://example.org/?www.google.com/"));
 });
 
-test("wild host invalid", function() {
+test("wild host invalid", 1, function() {
   var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
   raises(function() new MatchPattern("http://docs.*.google.com/"));
 });
 
-test("wild path", function() {
+test("wild path", 5, function() {
   var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
   var m = new MatchPattern("http://google.com/*");
   ok(m.doMatch("http://google.com/"));
@@ -67,7 +69,7 @@ test("wild path", function() {
   ok(m.doMatch("http://google.com/a"));
 });
 
-test("wild path2", function() {
+test("wild path2", 8, function() {
   var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
   var m = new MatchPattern("http://*.google.com/a/*");
   ok(m.doMatch("http://google.com/a/"));
@@ -77,9 +79,10 @@ test("wild path2", function() {
   ok(!m.doMatch("extern://google.com/a/"));
   ok(m.doMatch("http://google.com/a/bc"));
   ok(!m.doMatch("http://docs.google.com/a"));
+  ok(!m.doMatch("http://example.org/docs.google.com/a/"));
 });
 
-test("file", function() {
+test("file", 4, function() {
   var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
   var m = new MatchPattern("file:///dude*");
   ok(m.doMatch("file:///dude"));
@@ -90,7 +93,7 @@ test("file", function() {
   ok(m.doMatch("file://dude/dudette"));
 });
 
-test("issue 405", function() {
+test("issue 405", 2, function() {
   var {MatchPattern} = importModule("resource://scriptish/third-party/MatchPattern.js");
   var m = new MatchPattern("*://*.somesite.com/somepage.php?*");
   ok(m.doMatch("http://somesite.com/somepage.php?id=1"));

From 7b0a448c12aa18be4ec1c7de277349dff08d2edd Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 05:53:56 +0200
Subject: [PATCH 384/829] Optimize getTLDURL

---
 extension/modules/utils/Scriptish_getTLDURL.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/extension/modules/utils/Scriptish_getTLDURL.js b/extension/modules/utils/Scriptish_getTLDURL.js
index eafccbce..a4dc6465 100644
--- a/extension/modules/utils/Scriptish_getTLDURL.js
+++ b/extension/modules/utils/Scriptish_getTLDURL.js
@@ -3,14 +3,11 @@ Components.utils.import("resource://scriptish/constants.js");
 lazyUtil(this, "memoize");
 
 const Scriptish_getTLDURL = Scriptish_memoize(function(aURL) {
-  let tldURL = aURL;
   try {
     let uri = NetUtil.newURI(aURL);
-    let host = uri.host;
-    let tld = Services.tld.getPublicSuffixFromHost(host);
-    uri.host = uri.host.replace(new RegExp(tld + "$"), "tld");
-    tldURL = uri.spec;
+    uri.host = uri.host.slice(0, -Services.tld.getPublicSuffix(uri).length) + "tld";
+    return uri.spec;
   } catch (e) {}
 
-  return tldURL;
-});
+  return aURL	;
+}, 200);

From 4771415c02d0d1e6dce53781ed84fd4a40bc0105 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 5 Jul 2011 22:18:14 -0700
Subject: [PATCH 385/829] reducing multiple *s in normal @include patterns to a
 single *

---
 extension/content/tests/testScriptishConvert2RegExp.js | 4 +++-
 extension/modules/utils/Scriptish_convert2RegExp.js    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extension/content/tests/testScriptishConvert2RegExp.js b/extension/content/tests/testScriptishConvert2RegExp.js
index 41bfee14..4f6db865 100644
--- a/extension/content/tests/testScriptishConvert2RegExp.js
+++ b/extension/content/tests/testScriptishConvert2RegExp.js
@@ -7,7 +7,7 @@ test("exports", function() {
     );
 });
 
-test("Regular @includes", 5, function() {
+test("Regular @includes", 6, function() {
   var c2r = importModule("resource://scriptish/utils/Scriptish_convert2RegExp.js").Scriptish_convert2RegExp;
   var url = "https://google.com/";
   var regExp = c2r("https://google.com/*");
@@ -26,6 +26,8 @@ test("Regular @includes", 5, function() {
     "@include with ?"
   );
   equal(regExp.isTLD, true, "should be a tld");
+
+  equal(c2r("***").toString(), "/^.*$/i", "@include ***");
 });
 
 test("Regular Exp @includes", 5, function() {
diff --git a/extension/modules/utils/Scriptish_convert2RegExp.js b/extension/modules/utils/Scriptish_convert2RegExp.js
index 7c484361..8ec43f21 100644
--- a/extension/modules/utils/Scriptish_convert2RegExp.js
+++ b/extension/modules/utils/Scriptish_convert2RegExp.js
@@ -2,7 +2,7 @@ var EXPORTED_SYMBOLS = ["Scriptish_convert2RegExp"];
 
 const RE_REGEXP = /^\/(.*)\/(i)?$/;
 const RE_ESCAPE = /[{}()\[\]\\^$.?]/g;
-const RE_WILD = /\*/g;
+const RE_WILD = /\*+/g;
 const RE_TLD = /^\^[^\/]*(?:\/\/)?[^\/]*\\\.tld(?:\/.*)?\$$/;
 
 function Scriptish_convert2RegExp(aPattern, aNoTLD, forceString) {

From a00eea9dcec5867d1c803757916585e57d2f558b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 5 Jul 2011 22:35:27 -0700
Subject: [PATCH 386/829] test: merging reg expressions with {} fails

---
 extension/content/tests/testPatternCollection.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index 4cb0bbf5..b1ab4632 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -77,6 +77,20 @@ test("merged", function() {
   equal(pc.test("foobax"), true, "foobax");
 });
 
+test("merged {}", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  var patterns = ["/ab{2}c/i", "/ba{4}c/i", "/ab{5}c/i"];
+  pc.addPatterns(patterns);
+  deepEqual(pc.patterns, patterns, "patterns");
+  deepEqual(
+      pc._regs.map(function(e) e.source),
+      ["ab{2}c", "ab{4}c", "ab{5}c"],
+      "regs");
+  equal(pc.merged.source, "a(?:b{2}c|b{4}c|b{5}c)", "merged"); // maybe (?:ab{2}c|ab{4}c|ab{5}c) ?
+});
+
 test("merged2 with reg exp", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 

From ee6aacdf049c1d71bbad093252b2ba7b62ee4b93 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 5 Jul 2011 22:36:29 -0700
Subject: [PATCH 387/829] typo

---
 extension/content/tests/testPatternCollection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index b1ab4632..ecc62c90 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -81,7 +81,7 @@ test("merged {}", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 
   var pc = new PatternCollection();
-  var patterns = ["/ab{2}c/i", "/ba{4}c/i", "/ab{5}c/i"];
+  var patterns = ["/ab{2}c/i", "/ab{4}c/i", "/ab{5}c/i"];
   pc.addPatterns(patterns);
   deepEqual(pc.patterns, patterns, "patterns");
   deepEqual(

From 806a968ff12d462d87498239e431c4d9bed03dfb Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 08:14:14 +0200
Subject: [PATCH 388/829] Fix es-ES registration

Closes #413
---
 extension/chrome.manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index ba0f3c1a..5ecb5a9c 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -24,7 +24,7 @@ overlay    chrome://scriptish/content/newscript.xul chrome://scriptish/content/c
 
 locale     scriptish  en-US  locale/en-US/
 locale     scriptish  de  locale/de/
-locale     scriptish  es-ES  locale/es_ES/
+locale     scriptish  es-ES  locale/es-ES/
 locale     scriptish  ja-JP  locale/ja-JP/
 locale     scriptish  ru-RU  locale/ru-RU/
 locale     scriptish  sv-SE  locale/sv-SE/

From 12c609bc1691d8251daac69858f4f667ec1f817a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 08:25:15 +0200
Subject: [PATCH 389/829] Use old school description.properties instead of
 em:localized

This avoids having to replicate all localizable items (such as creator,
developer, translator, contributor), which scriptish does have many of,
within em:localized nodes.
---
 extension/defaults/preferences/scriptish.js   |  1 +
 extension/install.rdf                         | 21 -------------------
 extension/locale/de/description.properties    |  1 +
 extension/locale/es-ES/description.properties |  1 +
 extension/locale/ja-JP/description.properties |  1 +
 extension/locale/ru-RU/description.properties |  1 +
 6 files changed, 5 insertions(+), 21 deletions(-)
 create mode 100644 extension/locale/de/description.properties
 create mode 100644 extension/locale/es-ES/description.properties
 create mode 100644 extension/locale/ja-JP/description.properties
 create mode 100644 extension/locale/ru-RU/description.properties

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 2d856faa..a04254c9 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -1,3 +1,4 @@
+pref("extensions.scriptish@erikvold.com.description", "chrome://scriptish/locale/description.properties");
 pref("extensions.scriptish.blocklist.enabled", true);
 pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
diff --git a/extension/install.rdf b/extension/install.rdf
index 5b61ca52..cec77969 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -3,27 +3,6 @@
     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>scriptish@erikvold.com</em:id>
-    <em:localized>
-      <Description>
-        <em:locale>ja-JP</em:locale>
-        <em:name>Scriptish</em:name>
-        <em:description>Firefox用のスクリプトマネージャ</em:description>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>ru-RU</em:locale>
-        <em:name>Scriptish</em:name>
-        <em:description>Управление пользовательских скриптов для Firefox</em:description>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>es-ES</em:locale>
-        <em:name>Scriptish</em:name>
-        <em:description>Un gestor de scripts de usuario para aplicaciones Mozilla</em:description>
-      </Description>
-    </em:localized>
 
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
diff --git a/extension/locale/de/description.properties b/extension/locale/de/description.properties
new file mode 100644
index 00000000..c3f9d4cb
--- /dev/null
+++ b/extension/locale/de/description.properties
@@ -0,0 +1 @@
+extensions.scriptish@erikvold.com.description=Ein Benutzerskript-Erweiterungen-Manager für Firefox
diff --git a/extension/locale/es-ES/description.properties b/extension/locale/es-ES/description.properties
new file mode 100644
index 00000000..2852f501
--- /dev/null
+++ b/extension/locale/es-ES/description.properties
@@ -0,0 +1 @@
+extensions.scriptish@erikvold.com.description=Un gestor de scripts de usuario para aplicaciones Mozilla
diff --git a/extension/locale/ja-JP/description.properties b/extension/locale/ja-JP/description.properties
new file mode 100644
index 00000000..0eecbb1b
--- /dev/null
+++ b/extension/locale/ja-JP/description.properties
@@ -0,0 +1 @@
+extensions.scriptish@erikvold.com.description=Firefox用のスクリプトマネージャ
diff --git a/extension/locale/ru-RU/description.properties b/extension/locale/ru-RU/description.properties
new file mode 100644
index 00000000..8e492232
--- /dev/null
+++ b/extension/locale/ru-RU/description.properties
@@ -0,0 +1 @@
+extensions.scriptish@erikvold.com.description=Управление пользовательских скриптов для Firefox

From 35bb367ec06c96a91e7ef342442eadafa875c64a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 09:14:34 +0200
Subject: [PATCH 390/829] New regexpmerger upstream and additional tests for
 the {} case

---
 .../content/tests/testPatternCollection.js    |  28 +
 extension/modules/third-party/regexpmerger.js | 708 +++++++++---------
 2 files changed, 395 insertions(+), 341 deletions(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index ecc62c90..bc53eba7 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -91,6 +91,34 @@ test("merged {}", function() {
   equal(pc.merged.source, "a(?:b{2}c|b{4}c|b{5}c)", "merged"); // maybe (?:ab{2}c|ab{4}c|ab{5}c) ?
 });
 
+test("merged {} 2", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  var patterns = ["/ab(cd){2}c/i", "/ab(cd){4}c/i", "/ab(cd){5}c/i"];
+  pc.addPatterns(patterns);
+  deepEqual(pc.patterns, patterns, "patterns");
+  deepEqual(
+      pc._regs.map(function(e) e.source),
+      ["ab(cd){2}c", "ab(cd){4}c", "ab(cd){5}c"],
+  "regs");
+  equal(pc.merged.source, "ab(?:(cd){2}c|(cd){4}c|(cd){5}c)", "merged"); // maybe (?:ab{2}c|ab{4}c|ab{5}c) ?
+});
+
+test("merged {} 3", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  var patterns = ["/ab(cd)e{2}c/i", "/ab(cd)e{4}c/i", "/ab(cd)e{5}c/i"];
+  pc.addPatterns(patterns);
+  deepEqual(pc.patterns, patterns, "patterns");
+  deepEqual(
+      pc._regs.map(function(e) e.source),
+      ["ab(cd)e{2}c", "ab(cd)e{4}c", "ab(cd)e{5}c"],
+  "regs");
+  equal(pc.merged.source, "ab(cd)(?:e{2}c|e{4}c|e{5}c)", "merged"); // maybe (?:ab{2}c|ab{4}c|ab{5}c) ?
+});
+
 test("merged2 with reg exp", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 
diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index 0bcedf75..1913aebb 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -1,341 +1,367 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is DownThemAll! RegExp optimizing merger
- *
- * The Initial Developer of the Original Code is Nils Maier
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Nils Maier <MaierMan@web.de>
- *   Erik Vold <erikvvold@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-"use strict";
-
-const EXPORTED_SYMBOLS = ['merge'];
-
-/**
- * Array filter function to create an unique array
- * @usage arr.filter(unique_filter, Object.create(null));
- */
-function unique_filter(e) !((e in this) || (this[e] = null));
-
-/**
- * Return a good prefix, with no bracket mismatches
- *
- * @param {String} Calculate the prefix from
- * @return {String} Calculated safe prefix without bracket mismatches
- */
-function killInvalidBrackets(string) {
-  let c = 0; // num of unclosed (
-  let C = 0; // num of unclosed [
-  let good = -1; // last good position
-
-  for (let i = 0, e = string.length; i < e; ++i) {
-    let ch = string[i];
-
-    if (ch == "\\") {
-      // step over escaping
-      ++i;
-      continue;
-    }
-
-    // ()
-    if (ch == '(') {
-      if (!C) {
-        // not in a character class []
-        if (!c) {
-          // not open yet
-          good = i - 1;
-        }
-        ++c;
-      }
-      continue;
-    }
-    if (ch == ')') {
-      if (!C) {
-        // not in a character class
-        --c;
-        if (c < 0) {
-          // cannot be valid and negative at the same time
-          // At this point the regex would be bad
-          break;
-        }
-        if (!c && !C) {
-          // all closed
-          good = i;
-        }
-      }
-      continue;
-    }
-
-    // []
-    if (ch == '[') {
-      if (!C && !c) {
-        // last good (nothing open)
-        good = i - 1;
-      }
-      ++C;
-    }
-    if (ch == ']') {
-      --C;
-      if (C < 0) {
-        // cannot be valid and negative at the same time
-        break;
-      }
-      if (!C && !c) {
-        // all closed now
-        good = i;
-      }
-    }
-  }
-
-  if (c == 0 && C == 0) {
-    // all closed, use whole string
-    return string;
-  }
-
-  if (good >= 0) {
-    // something is bad, but we got a good position
-    return string.substring(0, good + 1);
-  }
-
-  // whole string is invalid
-  return "";
-}
-
-/**
- * Splits a pattern into individual alternates, if any
- * @param {String} pattern Pattern to process
- * @param {Array} rv Result array patterns will be pushed to
- */
-function splitAlternates(pattern, rv) {
-  if (!pattern) {
-    rv.push(pattern);
-    return;
-  }
-
-  let c = 0; // num of unclosed (
-  let C = 0; // num of unclosed [
-  let cur = ""; // current alternate
-  for (let i = 0, e = pattern.length; i < e; ++i) {
-    let char = pattern[i];
-
-    if (char == "\\") {
-      cur += char + pattern[++i];
-    }
-    else if (char == "(") {
-      if (!C) ++c;
-      cur += char;
-    }
-    else if (char == ")") {
-      if (!C) --c;
-      cur += char;
-    }
-    else if (char == "[") {
-      ++C;
-      cur += char;
-    }
-    else if (char == "]") {
-      --C;
-      cur += char;
-    }
-    else {
-      if (char == "|" && !c && !C) {
-        rv.push(cur);
-        cur = "";
-      }
-      else {
-        cur += char;
-      }
-    }
-  }
-  rv.push(cur);
-}
-
-/**
- * Recursively determine the the largest group with a common prefix
- * The group is guaranteed to contain at least 3 items
- *
- * @param {Array} patterns Patterns to process. Must be sorted.
- * @param {int} low Optional. Low bound. Default = 0
- * @param {int} high Optional. High bound. Default = patterns.length
- * @param {int} level Optional. Recursion level. Default = length
- */
-function largestPrefixGroup(patterns, low, high, level) {
-  level = level || 0;
-  low = low || 0;
-  high = high || patterns.length;
-
-  // split patterns in heading char and tails
-  let heads = patterns.map(function(p) p.charAt(0));
-  let tails = patterns.map(function(p) p.substring(1));
-
-  let besti = -1; // best starting match
-  let beste = 0; // best ending match
-  let bestc = 0; // num of matches
-
-  for (let i = low; i < high - 1; ++i) {
-    let allgood = true;
-
-    for (let e = i + 1; e < high; ++e) {
-      if (heads[i] == heads[e]) {
-        continue;
-      }
-
-      // mismatched!
-      let c = e - i;
-      if (bestc < c) {
-        bestc = c;
-        beste = e;
-        besti = i;
-      }
-      allgood = false;
-      break;
-    }
-
-    if (allgood) {
-      let c = high - i;
-      if (bestc < c) {
-        bestc = c;
-        besti = i;
-        beste = high;
-      }
-    }
-  }
-
-  if (bestc < Math.min(4, Math.max(2, patterns.length))) {
-    // at least 3 items in the group are required
-    return [0,0,0];
-  }
-
-  let prefix = heads[besti];
-
-  if (tails.some(function(p) p.length == 0)) {
-    return [besti, beste, prefix];
-  }
-
-  let [nlow, nhigh, np] = largestPrefixGroup(tails, besti, beste, level + 1);
-  if (nhigh) {
-    prefix += np;
-    if (!level) {
-      // root level needs to check for bracket mismatches
-      // this might cause the group to get smaller than it has to be
-      // Consumers should/will account for this
-      prefix = killInvalidBrackets(prefix);
-    }
-    return [nlow, nhigh, prefix];
-  }
-
-  return [besti, beste, prefix];
-}
-
-/**
- * Merge prefix group with set of patterns according to bounds and prefix
- *
- * @param {Array} patterns Set of patterns
- * @param {int} low Lower bound
- * @param {int} high Higher bound
- * @param {String} prefix Prefix of the group
- * @return {Array} mutated & reduced patterns array where the patterns
- *                  specified by the low & high params are merged.
- */
-function mergePatterns(patterns, low, high, prefix) {
-  let pl = prefix.length;
-
-  // splice the patterns to be merged, chop off their common prefix and join
-  let tails = patterns.splice(low, high - low).map(function(p) p.substring(pl));
-
-  // if there is an empty tail, then we can omit the whole group
-  let newpattern = "";
-  if (tails.indexOf("") == -1) {
-    newpattern = tails.join("|");
-  }
-
-  if (prefix && newpattern) {
-    newpattern = prefix + "(?:" + newpattern + ")";
-  }
-  else if (prefix) {
-    newpattern = prefix;
-  }
-
-  // Add the merged pattern
-  patterns.push(newpattern);
-
-  // need to return sorted as largestPrefixGroup relies on sorting
-  return patterns.sort();
-}
-
-/**
- * Merge patterns with optimizations (prefixes)
- * @param {Array} patterns Patterns to merge
- * @returns {String} Resulting merged and optimized pattern
- */
-function merge(patterns) {
-  if (patterns.length < 2) {
-    return patterns[0];
-  }
-
-  // Copy patterns and make unique
-  patterns = patterns.filter(unique_filter, Object.create(null));
-  if (patterns.length < 2) {
-    return patterns[0];
-  }
-
-  // split patterns into pieces by top-level alternates
-  let newpatterns = [];
-  for (let [,p] in Iterator(patterns)) {
-    splitAlternates(p, newpatterns);
-  }
-  patterns = newpatterns.filter(unique_filter, Object.create(null));
-  if (patterns.length < 2) {
-    return patterns[0];
-  }
-
-  // Good to go
-  patterns.sort();
-
-  for (;;) {
-    let [i, e, prefix] = largestPrefixGroup(patterns);
-    if (!e) {
-      // no common prefix found in (remaining) patterns
-      break;
-    }
-    patterns = mergePatterns(patterns, i, e, prefix);
-  }
-
-  let len = patterns.length;
-  if (len == 1) {
-    // already merged into a single pattern
-    return patterns[0];
-  }
-
-  // not yet a single pattern (i.e. not all patterns shared a common prefix)
-  // merge without a prefix to get single pattern
-  return mergePatterns(patterns, 0, len, "")[0];
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is DownThemAll! RegExp optimizing merger
+ *
+ * The Initial Developer of the Original Code is Nils Maier
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Nils Maier <MaierMan@web.de>
+ *   Erik Vold <erikvvold@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+"use strict";
+
+const EXPORTED_SYMBOLS = ['merge'];
+
+/**
+ * Array filter function to create an unique array
+ * @usage arr.filter(unique_filter, Object.create(null));
+ */
+function unique_filter(e) !((e in this) || (this[e] = null));
+
+/**
+ * Return a good prefix, with no bracket mismatches
+ *
+ * @param {String} Calculate the prefix from
+ * @return {String} Calculated safe prefix without bracket mismatches
+ */
+function killInvalidBrackets(string) {
+  let c = 0; // num of unclosed (
+  let C = 0; // num of unclosed [
+  let good = -1; // last good position
+
+  for (let i = 0, e = string.length; i < e; ++i) {
+    let ch = string[i];
+
+    if (ch == "\\") {
+      // step over escaping
+      ++i;
+      continue;
+    }
+
+    // ()
+    if (ch == '(') {
+      if (!C) {
+        // not in a character class []
+        if (!c) {
+          // not open yet
+          good = i - 1;
+        }
+        ++c;
+      }
+      continue;
+    }
+    if (ch == ')') {
+      if (!C) {
+        // not in a character class
+        --c;
+        if (c < 0) {
+          // cannot be valid and negative at the same time
+          // At this point the regex would be bad
+          break;
+        }
+        if (!c && !C) {
+          // all closed
+          good = i;
+        }
+      }
+      continue;
+    }
+
+    // []
+    if (ch == '[') {
+      if (!C && !c) {
+        // last good (nothing open)
+        good = i - 1;
+      }
+      ++C;
+    }
+    if (ch == ']') {
+      --C;
+      if (C < 0) {
+        // cannot be valid and negative at the same time
+        break;
+      }
+      if (!C && !c) {
+        // all closed now
+        good = i;
+      }
+    }
+    if (ch == "{") {
+      if (good == -1 || good != i - 1) {
+        good = i - 2;
+      }
+      else if (good != -1 && string[good] == ")" || string[good] == "]") {
+        // we don't really have a good position now :p
+        good = -1;
+        for (i = 0; i < e; ++i) {
+          ch = string[i];
+          if (ch == "\\") {
+            ++i;
+          }
+          else if (ch == "(" || ch == "[") {
+            break;
+          }
+          ++good;
+        }
+      }
+      else {
+        good -= 1;
+      }
+      // force not ok
+      c = 1;
+      Components.utils.reportError(good);
+      break;
+    }
+  }
+
+  if (c == 0 && C == 0) {
+    // all closed, use whole string
+    return string;
+  }
+
+  if (good >= 0) {
+    // something is bad, but we got a good position
+    return string.substring(0, good + 1);
+  }
+
+  // whole string is invalid
+  return "";
+}
+
+/**
+ * Splits a pattern into individual alternates, if any
+ * @param {String} pattern Pattern to process
+ * @param {Array} rv Result array patterns will be pushed to
+ */
+function splitAlternates(pattern, rv) {
+  if (!pattern) {
+    rv.push(pattern);
+    return;
+  }
+
+  let c = 0; // num of unclosed (
+  let C = 0; // num of unclosed [
+  let cur = ""; // current alternate
+  for (let i = 0, e = pattern.length; i < e; ++i) {
+    let char = pattern[i];
+
+    if (char == "\\") {
+      cur += char + pattern[++i];
+    }
+    else if (char == "(") {
+      if (!C) ++c;
+      cur += char;
+    }
+    else if (char == ")") {
+      if (!C) --c;
+      cur += char;
+    }
+    else if (char == "[") {
+      ++C;
+      cur += char;
+    }
+    else if (char == "]") {
+      --C;
+      cur += char;
+    }
+    else {
+      if (char == "|" && !c && !C) {
+        rv.push(cur);
+        cur = "";
+      }
+      else {
+        cur += char;
+      }
+    }
+  }
+  rv.push(cur);
+}
+
+/**
+ * Recursively determine the the largest group with a common prefix
+ * The group is guaranteed to contain at least 3 items
+ *
+ * @param {Array} patterns Patterns to process. Must be sorted.
+ * @param {int} low Optional. Low bound. Default = 0
+ * @param {int} high Optional. High bound. Default = patterns.length
+ * @param {int} level Optional. Recursion level. Default = length
+ */
+function largestPrefixGroup(patterns, low, high, level) {
+  level = level || 0;
+  low = low || 0;
+  high = high || patterns.length;
+
+  // split patterns in heading char and tails
+  let heads = patterns.map(function(p) p.charAt(0));
+  let tails = patterns.map(function(p) p.substring(1));
+
+  let besti = -1; // best starting match
+  let beste = 0; // best ending match
+  let bestc = 0; // num of matches
+
+  for (let i = low; i < high - 1; ++i) {
+    let allgood = true;
+
+    for (let e = i + 1; e < high; ++e) {
+      if (heads[i] == heads[e]) {
+        continue;
+      }
+
+      // mismatched!
+      let c = e - i;
+      if (bestc < c) {
+        bestc = c;
+        beste = e;
+        besti = i;
+      }
+      allgood = false;
+      break;
+    }
+
+    if (allgood) {
+      let c = high - i;
+      if (bestc < c) {
+        bestc = c;
+        besti = i;
+        beste = high;
+      }
+    }
+  }
+
+  if (bestc < Math.min(4, Math.max(2, patterns.length))) {
+    // at least 3 items in the group are required
+    return [0,0,0];
+  }
+
+  let prefix = heads[besti];
+
+  if (tails.some(function(p) p.length == 0)) {
+    return [besti, beste, prefix];
+  }
+
+  let [nlow, nhigh, np] = largestPrefixGroup(tails, besti, beste, level + 1);
+  if (nhigh) {
+    prefix += np;
+    if (!level) {
+      // root level needs to check for bracket mismatches
+      // this might cause the group to get smaller than it has to be
+      // Consumers should/will account for this
+      prefix = killInvalidBrackets(prefix);
+    }
+    return [nlow, nhigh, prefix];
+  }
+
+  return [besti, beste, prefix];
+}
+
+/**
+ * Merge prefix group with set of patterns according to bounds and prefix
+ *
+ * @param {Array} patterns Set of patterns
+ * @param {int} low Lower bound
+ * @param {int} high Higher bound
+ * @param {String} prefix Prefix of the group
+ * @return {Array} mutated & reduced patterns array where the patterns
+ *                  specified by the low & high params are merged.
+ */
+function mergePatterns(patterns, low, high, prefix) {
+  let pl = prefix.length;
+
+  // splice the patterns to be merged, chop off their common prefix and join
+  let tails = patterns.splice(low, high - low).map(function(p) p.substring(pl));
+
+  // if there is an empty tail, then we can omit the whole group
+  let newpattern = "";
+  if (tails.indexOf("") == -1) {
+    newpattern = tails.join("|");
+  }
+
+  if (prefix && newpattern) {
+    newpattern = prefix + "(?:" + newpattern + ")";
+  }
+  else if (prefix) {
+    newpattern = prefix;
+  }
+
+  // Add the merged pattern
+  patterns.push(newpattern);
+
+  // need to return sorted as largestPrefixGroup relies on sorting
+  return patterns.sort();
+}
+
+/**
+ * Merge patterns with optimizations (prefixes)
+ * @param {Array} patterns Patterns to merge
+ * @returns {String} Resulting merged and optimized pattern
+ */
+function merge(patterns) {
+  if (patterns.length < 2) {
+    return patterns[0];
+  }
+
+  // Copy patterns and make unique
+  patterns = patterns.filter(unique_filter, Object.create(null));
+  if (patterns.length < 2) {
+    return patterns[0];
+  }
+
+  // split patterns into pieces by top-level alternates
+  let newpatterns = [];
+  for (let [,p] in Iterator(patterns)) {
+    splitAlternates(p, newpatterns);
+  }
+  patterns = newpatterns.filter(unique_filter, Object.create(null));
+  if (patterns.length < 2) {
+    return patterns[0];
+  }
+
+  // Good to go
+  patterns.sort();
+
+  for (;;) {
+    let [i, e, prefix] = largestPrefixGroup(patterns);
+    if (!e) {
+      // no common prefix found in (remaining) patterns
+      break;
+    }
+    patterns = mergePatterns(patterns, i, e, prefix);
+  }
+
+  let len = patterns.length;
+  if (len == 1) {
+    // already merged into a single pattern
+    return patterns[0];
+  }
+
+  // not yet a single pattern (i.e. not all patterns shared a common prefix)
+  // merge without a prefix to get single pattern
+  return mergePatterns(patterns, 0, len, "")[0];
+}

From 105ab9bcbc29ad7aebfa407333a5b0079037663a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 09:19:33 +0200
Subject: [PATCH 391/829] Minor: remove a reportError()

---
 extension/modules/third-party/regexpmerger.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index 1913aebb..0150663b 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -136,7 +136,6 @@ function killInvalidBrackets(string) {
       }
       // force not ok
       c = 1;
-      Components.utils.reportError(good);
       break;
     }
   }

From b68e7b3a8b403fa947f1e5867eef438c03c10eb8 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 10:15:14 +0200
Subject: [PATCH 392/829] newscript: add version and run-at

---
 extension/content/js/newscript.js           |  4 +++-
 extension/content/newscript.xul             | 21 ++++++++++++++++++---
 extension/locale/de/scriptish.properties    |  6 ++++++
 extension/locale/en-US/scriptish.properties |  6 ++++++
 extension/locale/es-ES/scriptish.properties |  5 +++++
 extension/locale/ja-JP/scriptish.properties |  5 +++++
 extension/locale/ru-RU/scriptish.properties |  5 +++++
 extension/skin/newscript.css                |  7 +++++--
 8 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 2dd43cb5..e6a704e7 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -122,11 +122,13 @@ function createScriptSource() {
   var header = {
     id: $("id").value,
     name: $("name").value,
+    version: $("version").value,
     namespace: $("namespace").value,
     author: $("author").value,
     description: $("description").value,
     include: $("includes").value ? $("includes").value.match(/.+/g) : [],
-    exclude: $("excludes").value ? $("excludes").value.match(/.+/g) : []
+    exclude: $("excludes").value ? $("excludes").value.match(/.+/g) : [],
+    "run-at": $("run-at").value
   }
   try {
     return Scriptish_createUserScriptSource(header, scriptContent);
diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index ddbcadf2..1abca9c1 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -9,7 +9,7 @@
     >
   <script type="application/x-javascript" src="chrome://scriptish/content/js/newscript.js" />
 
-  <grid>
+  <grid flex="1">
     <columns>
       <column />
       <column flex="1"/>
@@ -26,6 +26,10 @@
         <label control="name" value="newscript.name" localize="value"/>
         <textbox id="name" placeholder="newscript.missing.name" localize="placeholder" required="true"/>
       </row>
+      <row>
+        <label control="version" value="newscript.version" localize="value"/>
+        <textbox id="version" value="1.0"/>
+      </row>
       <row>
         <label control="namespace" value="newscript.namespace" localize="value"/>
         <textbox id="namespace"/>
@@ -40,11 +44,22 @@
       </row>
       <row>
         <label control="includes" value="newscript.includes" localize="value"/>
-        <textbox id="includes" multiline="true" wrap="off" rows="4" cols="60"/>
+        <textbox id="includes" multiline="true" wrap="off" rows="4" cols="50"/>
       </row>
       <row>
         <label control="excludes" value="newscript.excludes" localize="value"/>
-        <textbox id="excludes" multiline="true" wrap="off" rows="4" cols="60"/>
+        <textbox id="excludes" multiline="true" wrap="off" rows="4" cols="50"/>
+      </row>
+      <row>
+        <label control="run-at" value="newscript.runat" localize="value"/>
+        <menulist id="run-at">
+          <menupopup>
+            <menuitem label="newscript.runat.documentend" value="document-end" localize="label"/>
+            <menuitem label="newscript.runat.documentstart" value="document-start" localize="label"/>
+            <menuitem label="newscript.runat.documentidle" value="document-idle" localize="label"/>
+            <menuitem label="newscript.runat.windowload" value="window-load" localize="label"/>
+          </menupopup>
+        </menulist>
       </row>
     </rows>
   </grid>
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 793564fc..16fa5aec 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -74,6 +74,12 @@ newscript.name=Name
 newscript.namespace=Namensraum
 newscript.noID=Bitte gültige ID für Ihr Benutzerskript angeben.
 newscript.noName=Bitte Namen für Ihr Benutzerskript angeben.
+newscript.runat=Ausführen wenn
+newscript.runat.documentstart=Dokument anfängt zu laden
+newscript.runat.documentend=Document laden abschließt
+newscript.runat.documentidle=Document das erste mal unbeschäftigt ist
+newscript.runat.windowload=Das Fenster incl. aller Medien fertig geladen ist
+newscript.version=Version
 nothing.timedOut=Nichts (Zeitüberschreitung)
 openFolder=Ordner öffnen
 openFolder.ak=O
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index e9307b2b..c5e2c38e 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -74,6 +74,12 @@ newscript.missing.name=Please provide a name. The name will be shown within the
 newscript.namespace=Namespace
 newscript.noID=Please provide a valid ID for your script.
 newscript.noName=Please provide a name for your script.
+newscript.runat=Run when
+newscript.runat.documentstart=Document starts loading
+newscript.runat.documentend=Document finishes loading
+newscript.runat.documentidle=Document is first idle
+newscript.runat.windowload=Window incl. all media is fully loaded
+newscript.version=Version
 nothing.timedOut=nothing (timed out)
 openFolder=Open Folder
 openFolder.ak=O
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index cbb187a3..f7516ce5 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -74,6 +74,11 @@ newscript.name=Nombre
 newscript.namespace=Espacio de nombres
 newscript.noID=Por favor, introduzca un ID válido para su script.
 newscript.noName=Por favor, introduzca un nombre para su script.
+newscript.runat.documentstart=
+newscript.runat.documentend=
+newscript.runat.documentidle=
+newscript.runat.windowload=
+newscript.version=
 nothing.timedOut=
 openFolder=Abrir carpeta
 openFolder.ak=A
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 9ba3fbd3..38662ffb 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -74,6 +74,11 @@ newscript.missing.name=スクリプト名を指定してください。アドオ
 newscript.namespace=名前空間（グルーピングする為に使用。スクリプト名と組み合わせて Scriptish の「ID」のように使用するものもある）
 newscript.noID=スクリプトに正しい ID を指定してください
 newscript.noName=スクリプトに名前をつけてください
+newscript.runat.documentstart=
+newscript.runat.documentend=
+newscript.runat.documentidle=
+newscript.runat.windowload=
+newscript.version=
 nothing.timedOut=なし（タイムアウト）
 openFolder=フォルダを開く
 openFolder.ak=O
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 7950741d..6e810100 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -74,6 +74,11 @@ newscript.name=Имя
 newscript.namespace=
 newscript.noID=Пожалуйста, введите идентификатор скрипта
 newscript.noName=Пожалуйста, задайте имя скрипта.
+newscript.runat.documentstart=
+newscript.runat.documentend=
+newscript.runat.documentidle=
+newscript.runat.windowload=
+newscript.version=
 nothing.timedOut=
 openFolder=Открыть папку скрипта.
 openFolder.ak=
diff --git a/extension/skin/newscript.css b/extension/skin/newscript.css
index 4b645679..a929467a 100644
--- a/extension/skin/newscript.css
+++ b/extension/skin/newscript.css
@@ -8,9 +8,12 @@ row {
   margin-bottom: 4px;
 }
 
+row > label {
+  margin-right: 1em;
+}
+
 textbox {
-  margin-left: 1em;
-  min-width: 44em;
+  min-width: 35em;
 }
 
 *[required][invalid="true"] {

From a9913bf9634f9ee6d60b8a6fdf1474623ec62259 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 10:56:48 +0200
Subject: [PATCH 393/829] Move unprivileged API functions to sandbox.js
 (injected via Cu.evalInSandbox)

This lays the foundation to add more unprivileged helper functions later
without the need for the engine to create back and forth wrappers
---
 extension/components/scriptish.js          |  4 +++-
 extension/modules/api.js                   | 13 -------------
 extension/modules/api/GM_sandboxScripts.js | 14 ++++++++++++++
 extension/modules/api/sandbox.js           | 14 ++++++++++++++
 4 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 extension/modules/api/GM_sandboxScripts.js
 create mode 100644 extension/modules/api/sandbox.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index cda54c1a..7c98848f 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -8,10 +8,11 @@ const fileURLPrefix = "chrome://scriptish/content/scriptish.js -> ";
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 
-lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
+lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_sandboxScripts"]);
 lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
 lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
 lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
@@ -346,6 +347,7 @@ ScriptishService.prototype = {
       // and the delay code (and probably other consumer work).
       let script = scripts[i];
       let sandbox = new Cu.Sandbox(wrappedContentWin);
+      Cu.evalInSandbox(GM_sandboxScripts, sandbox);
 
       let GM_api = new GM_API(
           script, url, winID, wrappedContentWin, unsafeContentWin, chromeWin);
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 9573e4f7..a74e6a04 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -67,17 +67,6 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
     return new GM_Resources(aScript);
   });
 
-  this.GM_addStyle = function GM_addStyle(css) {
-    var head = document.getElementsByTagName("head")[0];
-    if (head) {
-      var style = document.createElement("style");
-      style.textContent = css;
-      style.type = "text/css";
-      head.appendChild(style);
-    }
-    return style;
-  }
-
   this.GM_safeHTMLParser = function GM_safeHTMLParser(aHTMLStr) {
     if (!GM_apiLeakCheck("GM_safeHTMLParser")) return;
     let doc = document.implementation.createDocument(NS_XHTML, "html", null);
@@ -215,8 +204,6 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
 GM_API.prototype.GM_generateUUID = function GM_generateUUID() (
     Services.uuid.generateUUID().toString());
 
-GM_API.prototype.GM_updatingEnabled = true;
-
 GM_API.prototype.GM_setClipboard = function GM_setClipboard() {
   if (!GM_apiLeakCheck("GM_setClipboard")) return;
   GM_setClipboard.apply(null, arguments);
diff --git a/extension/modules/api/GM_sandboxScripts.js b/extension/modules/api/GM_sandboxScripts.js
new file mode 100644
index 00000000..4aae7dd3
--- /dev/null
+++ b/extension/modules/api/GM_sandboxScripts.js
@@ -0,0 +1,14 @@
+"use strict";
+const EXPORTED_SYMBOLS = ["GM_sandboxScripts"];
+
+if (!('XMLHttpRequest' in this)) {
+  this.XMLHttpRequest = Components.Constructor("@mozilla.org/xmlextras/xmlhttprequest;1", "nsIXMLHttpRequest");
+}
+
+let r = new XMLHttpRequest();
+// don't try to parse as XML
+r.overrideMimeType('text/javascript');
+r.open('GET', 'resource://scriptish/api/sandbox.js', false);
+r.send(null);
+
+const GM_sandboxScripts = r.responseText;
diff --git a/extension/modules/api/sandbox.js b/extension/modules/api/sandbox.js
new file mode 100644
index 00000000..4ac8b7f0
--- /dev/null
+++ b/extension/modules/api/sandbox.js
@@ -0,0 +1,14 @@
+// These script bits will only run unprivileged in a sandbox
+
+const GM_updatingEnabled = true;
+
+function GM_addStyle(css) {
+  var head = document.getElementsByTagName("head")[0];
+  if (head) {
+    var style = document.createElement("style");
+    style.textContent = css;
+    style.type = "text/css";
+    head.appendChild(style);
+  }
+  return style;
+}

From 641b219ecec512d91a2548b6ee47202e5d7cfc4c Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 17:04:07 +0200
Subject: [PATCH 394/829] Merge de from Babelzilla

---
 extension/locale/de/scriptish.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 16fa5aec..ff08a2f5 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -10,7 +10,7 @@ error.api.noResourceWithName=Keine Resource mit dem Namen
 error.api.noSecondArgValue=Zweites Argument nicht spezifiziert: Value
 error.api.reqURL.scheme=Verbotenes Schema (Protokoll) in URL
 error.api.reqURL=Ungültige URL
-error.api.unsafeAccess=Scriptish Zugriffsverletzung: unsafeWindow darf nicht aufrufen
+error.api.unsafeAccess=Scriptish Zugriffsverletzung: unsafeWindow darf nicht aufrufen werden
 error.charset=Ungültige Zeichenkodierung angegeben.
 error.dependency.loading=Fehler beim Laden von Anhängigkeit
 error.dependency.local=SecurityException: Anfragen nach lokalen oder Chrome-URLs sind verboten
@@ -92,7 +92,7 @@ options.pane.ui=Benutzeroberfläche
 options.pane.excludes=Globale Ausnahmen
 options.pane.advanced=Erweitert
 options.addonsManager=Add-ons-Manager
-options.alsoUninstallPrefs=Wenn ein Benutzerskript entfernt wird, dann auch seine Einstellungen entfernen
+options.alsoUninstallPrefs=Bei der Deinstallation eines Skripts auch seine Einstellungen entfernen
 options.cache=Cache
 options.cache.enabled=Benutzerskripte zwischenspeichern
 options.changeEditor=Editor ändern
@@ -108,7 +108,7 @@ options.enabledSchemes.ftp=ftp Protokoll
 options.enabledSchemes.http=http/https Protokoll
 options.enabledSchemes.unmht=unmht Protokoll (Mozilla Archive Format)
 options.enabledSchemes.securityRemark=Die zusätzlichen Protokolle können vollen Systemzugriff haben.
-options.enabledSchemes.securityRemark2=Daher stellen sie ein beträchliches Sicherheitsrisko mit nicht vertrauten Benutzerskripten dar!
+options.enabledSchemes.securityRemark2=Daher stellen sie ein beträchtliches Sicherheitsrisko mit nicht vertrautenswürdigen Benutzerskripten dar!
 options.excludes.empty=Keine globalen Ausnahmen spezifiziert
 options.excludes.desc=Globale Ausnahmen heben Benutzerskript oder Benutzer Regeln auf
 options.excludes.remark=(Sie können eine Ausnahme pro Zeile spezifizieren)

From 645005774b9c8b540275a6cbd7ff7d07b67f27c3 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 6 Jul 2011 09:48:57 -0500
Subject: [PATCH 395/829] Updating ja-JP with modifications by k2jp
 (BabelZilla).

---
 extension/locale/ja-JP/scriptish.properties | 38 ++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 38662ffb..8506951e 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -35,9 +35,9 @@ greeting.btn.ak=I
 greeting.msg=これはユーザースクリプトです。使用するには インストール をクリックして下さい
 install=インストール
 install.domains=
-install.excludes=スクリプト無効:
-install.includes=スクリプト有効:
-install.matches=一致:
+install.excludes=
+install.includes=
+install.matches=
 install.requires=
 install.resources=
 install.showScriptSource=スクリプトのソースを表示
@@ -64,14 +64,14 @@ moving.dependency=依存関係ファイルを次から移動：
 moving.script=スクリプトを次から移動：
 newscript.author=スクリプトの作者
 newscript.description=スクリプトの詳細
-newscript.excludes=exclude（スクリプトを実行したくない URL を１行１つずつ列挙：ワイルドカード「＊」又は正規表現も可能）
+newscript.excludes=Excludes（１行１つずつ列挙）
 newscript.exists=同じ名前のスクリプトが既にインストールされています。\n上書きしますか？
-newscript.id=ID（Scriptish がこのスクリプトを一意に識別する為の文字列）
-newscript.includes=include（スクリプトを実行したい URL を１行１つずつ列挙：ワイルドカード「＊」又は正規表現も可能）
+newscript.id=ID（一意に識別する為の文字列）
+newscript.includes=Includes（１行１つずつ列挙）
 newscript.name=スクリプト名
 newscript.missing.id=ID を指定してください
 newscript.missing.name=スクリプト名を指定してください。アドオン・マネージャー内での表示で使用します
-newscript.namespace=名前空間（グルーピングする為に使用。スクリプト名と組み合わせて Scriptish の「ID」のように使用するものもある）
+newscript.namespace=名前空間
 newscript.noID=スクリプトに正しい ID を指定してください
 newscript.noName=スクリプトに名前をつけてください
 newscript.runat.documentstart=
@@ -91,10 +91,10 @@ options.pane.ui=
 options.pane.excludes=
 options.pane.advanced=詳細
 options.addonsManager=アドオン・マネージャー
-options.alsoUninstallPrefs=スクリプトをアンインストールする時、その設定も削除する
+options.alsoUninstallPrefs=スクリプトのアンインストール時に設定も削除
 options.cache=キャッシュ
-options.cache.enabled=ユーザースクリプトをキャッシュする
-options.changeEditor=エディタを変更する
+options.cache.enabled=ユーザースクリプトをキャッシュ
+options.changeEditor=エディタを変更
 options.editor=エディタ
 options.editor.notset=エディタは指定されていません
 options.enabledSchemes.main=利用プロトコル
@@ -106,30 +106,30 @@ options.enabledSchemes.file=ファイル・プロトコル（ローカルファ
 options.enabledSchemes.ftp=ftp プロトコル
 options.enabledSchemes.http=http/https プロトコル
 options.enabledSchemes.unmht=unmht プロトコル（Mozilla Archive フォーマット）
-options.enabledSchemes.securityRemark=追加したプロトコルによりシステムへのフルアクセスが可能になることがあります
-options.enabledSchemes.securityRemark2=つまり、信用できないスクリプトと併用すると相当なセキュリティ・リスク！
+options.enabledSchemes.securityRemark=追加したプロトコルでシステムにフルアクセス可能になることがあります
+options.enabledSchemes.securityRemark2=つまり、信用できないスクリプトと併用すると相当なセキュリティ・リスクになるので注意！
 options.excludes.empty=global excludes が指定されていません
-options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先されます
+options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先
 options.excludes.remark=（１行１つずつ指定）
-options.enableCopyDownloadURL=ダウンロード URL のコピーを有効にする
+options.enableCopyDownloadURL=ダウンロード URL のコピーを有効
 options.logging=ログ
-options.logChrome=重大ではないエクステンションのメッセージもエラーコンソールに出力する
+options.logChrome=重大でないエクステンションのメッセージもエラーコンソールに出力
 options.logToErrorConsole=
 options.notifications=通知
 options.notifications.enable=
-options.requireBuiltInCerts=安全なアップデートには built-in 証明書の利用が必要です
-options.requireSecured=ユーザースクリプトが HTTPS で更新されるようにする
+options.requireBuiltInCerts=安全なアップデートに built-in 証明書を利用
+options.requireSecured=ユーザースクリプトを HTTPS で更新
 options.translation=翻訳
 options.translation.useEnglish=常に英語を使用
 options.update.security=更新に関するセキュリティ
-options.useDownloadURL=更新用 URL が指定されていない場合はダウンロード URL を更新に利用する
+options.useDownloadURL=更新用 URL が指定されていない場合はダウンロード URL を利用
 reinstall=再インストール
 saving=保存
 scratchpad.saveAsUserScript=ユーザースクリプトとして保存
 scratchpad.saveAsUserScript.ak=U
 scriptOptions.includes=
 scriptOptions.excludes=
-scriptOptions.disableScriptIncludes=スクリプト内 include を無効にし、ユーザー指定のみを利用
+scriptOptions.disableScriptIncludes=スクリプト内 include を無効。ユーザー指定のみを利用
 statusbar.enabled=有効
 statusbar.enabled.ak=E
 statusbar.installed=のインストールに成功しました

From 457fb68cb7ce295ac783e13b826bbfe4d3c604ac Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 6 Jul 2011 09:55:45 -0500
Subject: [PATCH 396/829] Updating pt-BR with modifications by Mauro Jos da
 Silva (BabelZilla).

---
 extension/locale/pt-BR/scriptish.properties | 82 ++++++++++-----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 6dce2406..c67e0b86 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -48,7 +48,7 @@ menu.commands=Comandos de script de usuário
 menu.commands.ak=C
 menu.install=Instalar script de usuário
 menu.install.ak=I
-menu.manage=Gerenciar script de usuário
+menu.manage=Gerenciar scripts de usuário
 menu.manage.ak=G
 menu.new=Novo script de usuário...
 menu.new.ak=N
@@ -62,14 +62,14 @@ menuitem.manage=Gerenciar scripts de usuário
 menuitem.new=Novo script de usuário
 moving.dependency=Movendo arquivo de dependência:
 moving.script=Movendo arquivo de script:
-newscript.author=
+newscript.author=Autor
 newscript.description=Descrição
 newscript.excludes=Exclusões (uma por linha)
 newscript.exists=Um script com esse nome já está instalado.\nDeseja substituir?
 newscript.id=Identificador
 newscript.includes=Inclusões (uma por linha)
-newscript.missing.id=
-newscript.missing.name=
+newscript.missing.id=Informe um identificador.
+newscript.missing.name=Informe um nome para ser exibido no gerenciador de complementos.
 newscript.name=Nome
 newscript.namespace=Espaço de nomes
 newscript.noID=Por favor, informe um identificador válido para o seu script.
@@ -80,51 +80,51 @@ openFolder.ak=A
 openUserScriptsManager=
 openUserScriptsManager.ak=
 options=Opções
-options.title=
-options.pane.main=
+options.title=Opções do Scriptish
+options.pane.main=Principal
 options.pane.ui=
-options.pane.excludes=Exclusões globais
-options.pane.advanced=
+options.pane.excludes=Exclusões Globais
+options.pane.advanced=Avançado
 options.addonsManager=Gerenciador de complementos
-options.alsoUninstallPrefs=Ao desinstalar um script, remover também as suas preferências
-options.cache=
-options.cache.enabled=
+options.alsoUninstallPrefs=Ao desinstalar um script, remover também as configurações dele
+options.cache=Cache
+options.cache.enabled=Usar cache para scripts de usuário
 options.changeEditor=Alterar editor
 options.editor=Editor
-options.editor.notset=
-options.enabledSchemes.main=
-options.enabledSchemes.advanced=
-options.enabledSchemes.about=
-options.enabledSchemes.chrome=
-options.enabledSchemes.data=
-options.enabledSchemes.file=
-options.enabledSchemes.ftp=
-options.enabledSchemes.http=
-options.enabledSchemes.unmht=
-options.enabledSchemes.securityRemark=
-options.enabledSchemes.securityRemark2=
-options.excludes.empty=
-options.excludes.desc=
-options.excludes.remark=
+options.editor.notset=Nenhum editor selecionado
+options.enabledSchemes.main=Protocolos
+options.enabledSchemes.advanced=Protocolos adicionais
+options.enabledSchemes.about=Protocolo about (interno)
+options.enabledSchemes.chrome=Protocolo chrome (interno)
+options.enabledSchemes.data=Protocolo data
+options.enabledSchemes.file=Protocolo file (arquivos locais)
+options.enabledSchemes.ftp=Protocolo ftp
+options.enabledSchemes.http=Protocolo http/https
+options.enabledSchemes.unmht=Protocolo unmht (formato de arquivamento da Mozilla)
+options.enabledSchemes.securityRemark=Os protocolos adicionais podem ter acesso total ao seu computador.
+options.enabledSchemes.securityRemark2=Portanto, eles representam um risco de segurança considerável com scripts não confiáveis!
+options.excludes.empty=Nenhuma exclusão global
+options.excludes.desc=Exclusões globais substituem qualquer regra especificada por scripts ou pelo usuário.
+options.excludes.remark=(Informe uma exclusão por linha)
 options.enableCopyDownloadURL=Habilitar cópia do endereço de download
-options.logging=
-options.logChrome=
+options.logging=Log
+options.logChrome=Registrar mensagens da extensão não-críticas no console de erros
 options.logToErrorConsole=
-options.notifications=
-options.notifications.disable=
-options.requireBuiltInCerts=
+options.notifications=Notificações
+options.notifications.disable=Desativar notificações sobre alterações de scripts
+options.requireBuiltInCerts=Exigir que atualizações seguras usem os certificados internos
 options.requireSecured=Exigir que scripts de usuário atualizem usando HTTPS
-options.translation=
-options.translation.useEnglish=
-options.update.security=
+options.translation=Tradução
+options.translation.useEnglish=Sempre usar Inglês
+options.update.security=Segurança na atualização
 options.useDownloadURL=Usar endereço de download para atualizações se não houver endereço de atualização
-reinstall=
+reinstall=Reinstalar
 saving=Salvando
-scratchpad.saveAsUserScript=
-scratchpad.saveAsUserScript.ak=
+scratchpad.saveAsUserScript=Salvar como script de usuário
+scratchpad.saveAsUserScript.ak=u
 scriptOptions.includes=Inclusões personalizadas:
 scriptOptions.excludes=Exclusões personalizadas:
-scriptOptions.disableScriptIncludes=Desativar as inclusões originais deste sript e usar somente as inclusões personalizadas.
+scriptOptions.disableScriptIncludes=Desativar as inclusões originais deste script e usar somente as inclusões personalizadas.
 statusbar.enabled=Ativado
 statusbar.enabled.ak=A
 statusbar.installed=instalado com sucesso
@@ -138,6 +138,6 @@ Uninstall=Desinstalação
 untitledScript=
 Update=Atualização
 userscripts=Scripts de usuário
-userscripts.get=
-userscripts.noneInstalled=
-warning.returnfrommain=
+userscripts.get=Obter scripts de usuário
+userscripts.noneInstalled=Você não possui nenhum script de usuário instalado.
+warning.returnfrommain=Não é geralmente suportado usar "return" no escopo principal. Você precisa corrigir isso no seu script.

From e196cd68bfebae9dfee07d18b8f886a6ebd1dbfa Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 6 Jul 2011 10:51:01 -0500
Subject: [PATCH 397/829] various fixes in l10ns

---
 extension/locale/de/scriptish.properties    | 2 +-
 extension/locale/en-US/scriptish.properties | 2 +-
 extension/locale/es-ES/scriptish.properties | 3 ++-
 extension/locale/ja-JP/scriptish.properties | 3 ++-
 extension/locale/pt-BR/scriptish.properties | 8 +++++++-
 extension/locale/ru-RU/scriptish.properties | 3 ++-
 extension/locale/sv-SE/scriptish.properties | 6 ++++++
 7 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index ff08a2f5..b6b1d819 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -141,8 +141,8 @@ statusbar.noScripts.scheme=
 statusbar.updated=erfolgreich aktualisiert
 tooltip.loading=Lade...
 Uninstall=Entfernen
-Update=Aktualisieren
 untitledScript=Unbenanntes Script
+Update=Aktualisieren
 userscripts=Benutzerskripte
 userscripts.get=Benutzerskripte finden
 userscripts.noneInstalled=Sie haben keine Benutzerskripte installiert
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index c5e2c38e..222552af 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -68,9 +68,9 @@ newscript.excludes=Excludes (One per line)
 newscript.exists=A script with that name is already installed.\nOK to overwrite?
 newscript.id=ID
 newscript.includes=Includes (One per line)
-newscript.name=Name
 newscript.missing.id=Please provide an ID.
 newscript.missing.name=Please provide a name. The name will be shown within the Add-ons Manager.
+newscript.name=Name
 newscript.namespace=Namespace
 newscript.noID=Please provide a valid ID for your script.
 newscript.noName=Please provide a name for your script.
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index f7516ce5..dd6278ea 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -74,6 +74,7 @@ newscript.name=Nombre
 newscript.namespace=Espacio de nombres
 newscript.noID=Por favor, introduzca un ID válido para su script.
 newscript.noName=Por favor, introduzca un nombre para su script.
+newscript.runat=
 newscript.runat.documentstart=
 newscript.runat.documentend=
 newscript.runat.documentidle=
@@ -116,7 +117,7 @@ options.logging=
 options.logChrome=
 options.logToErrorConsole=
 options.notifications=
-options.notifications.disable=
+options.notifications.enable=
 options.requireBuiltInCerts=
 options.requireSecured=
 options.translation=
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 8506951e..fdae2031 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -68,12 +68,13 @@ newscript.excludes=Excludes（１行１つずつ列挙）
 newscript.exists=同じ名前のスクリプトが既にインストールされています。\n上書きしますか？
 newscript.id=ID（一意に識別する為の文字列）
 newscript.includes=Includes（１行１つずつ列挙）
-newscript.name=スクリプト名
 newscript.missing.id=ID を指定してください
 newscript.missing.name=スクリプト名を指定してください。アドオン・マネージャー内での表示で使用します
+newscript.name=スクリプト名
 newscript.namespace=名前空間
 newscript.noID=スクリプトに正しい ID を指定してください
 newscript.noName=スクリプトに名前をつけてください
+newscript.runat=
 newscript.runat.documentstart=
 newscript.runat.documentend=
 newscript.runat.documentidle=
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index c67e0b86..f14c9192 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -74,6 +74,12 @@ newscript.name=Nome
 newscript.namespace=Espaço de nomes
 newscript.noID=Por favor, informe um identificador válido para o seu script.
 newscript.noName=Por favor, informe um nome para o seu script.
+newscript.runat=
+newscript.runat.documentstart=
+newscript.runat.documentend=
+newscript.runat.documentidle=
+newscript.runat.windowload=
+newscript.version=
 nothing.timedOut=nada (excedido o tempo limite)
 openFolder=Abrir pasta
 openFolder.ak=A
@@ -111,7 +117,7 @@ options.logging=Log
 options.logChrome=Registrar mensagens da extensão não-críticas no console de erros
 options.logToErrorConsole=
 options.notifications=Notificações
-options.notifications.disable=Desativar notificações sobre alterações de scripts
+options.notifications.enable=Desativar notificações sobre alterações de scripts
 options.requireBuiltInCerts=Exigir que atualizações seguras usem os certificados internos
 options.requireSecured=Exigir que scripts de usuário atualizem usando HTTPS
 options.translation=Tradução
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 6e810100..05d430ed 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -74,6 +74,7 @@ newscript.name=Имя
 newscript.namespace=
 newscript.noID=Пожалуйста, введите идентификатор скрипта
 newscript.noName=Пожалуйста, задайте имя скрипта.
+newscript.runat=
 newscript.runat.documentstart=
 newscript.runat.documentend=
 newscript.runat.documentidle=
@@ -116,7 +117,7 @@ options.logging=
 options.logChrome=
 options.logToErrorConsole=
 options.notifications=
-options.notifications.disable=
+options.notifications.enable=
 options.requireBuiltInCerts=
 options.requireSecured=Разрешить обновления скриптов только по протоколу HTTPS
 options.translation=
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 3b0f184b..a7d95629 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -74,6 +74,12 @@ newscript.name=Namn
 newscript.namespace=Namnområde
 newscript.noID=Var vänlig ange ett giltigt ID för ditt skript.
 newscript.noName=Var vänlig ange ett namn på ditt skript.
+newscript.runat=
+newscript.runat.documentstart=
+newscript.runat.documentend=
+newscript.runat.documentidle=
+newscript.runat.windowload=
+newscript.version=
 nothing.timedOut=ingenting (tidsgränsen uppnåddes)
 openFolder=Öppna mapp
 openFolder.ak=Ö

From 124d5ccc2473a9439cc8190f63987c3fa62eec23 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 6 Jul 2011 10:56:42 -0500
Subject: [PATCH 398/829] minor fix in pt-BR... forgot to remove the 'disable'
 value

---
 extension/locale/pt-BR/scriptish.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index f14c9192..76b77275 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -117,7 +117,7 @@ options.logging=Log
 options.logChrome=Registrar mensagens da extensão não-críticas no console de erros
 options.logToErrorConsole=
 options.notifications=Notificações
-options.notifications.enable=Desativar notificações sobre alterações de scripts
+options.notifications.enable=
 options.requireBuiltInCerts=Exigir que atualizações seguras usem os certificados internos
 options.requireSecured=Exigir que scripts de usuário atualizem usando HTTPS
 options.translation=Tradução

From 5d3c45109038fc850ceca146e1eae3b1d124e9f0 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 6 Jul 2011 11:03:11 -0500
Subject: [PATCH 399/829] pt-BR wasn't included in chrome.manifest

---
 extension/chrome.manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 5ecb5a9c..c9574f4e 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -26,5 +26,6 @@ locale     scriptish  en-US  locale/en-US/
 locale     scriptish  de  locale/de/
 locale     scriptish  es-ES  locale/es-ES/
 locale     scriptish  ja-JP  locale/ja-JP/
+locale     scriptish  pt-BR  locale/pt-BR/
 locale     scriptish  ru-RU  locale/ru-RU/
 locale     scriptish  sv-SE  locale/sv-SE/

From cec1faa10307b9b7e69d03a56a134f60b847a17f Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 18:14:37 +0200
Subject: [PATCH 400/829] Use nsISafeOutputStream to write config instead of
 home-brew implementation

---
 extension/modules/config/config.js            | 41 ++++++++-----------
 extension/modules/constants.js                |  3 ++
 .../modules/utils/Scriptish_getWriteStream.js |  9 ++--
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 05d317e9..85860991 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -69,7 +69,7 @@ Config.prototype = {
     switch(aTopic) {
     case "scriptish-script-user-prefs-change":
       Scriptish.notify(
-          aSubject, "scriptish-script-modified", {saved:false, reloadUI:false});
+          aSubject, "scriptish-script-modified", {saved:true, reloadUI:false});
     case "scriptish-script-prefs-change":
     case "scriptish-script-installed":
     case "scriptish-script-modified":
@@ -132,9 +132,12 @@ Config.prototype = {
       // write blocklist
       let converter = Instances.suc;
       converter.charset = "UTF-8";
+      let writeStream = Scriptish_getWriteStream(file, {defer:true, safe:true});
       NetUtil.asyncCopy(
-          converter.convertToInputStream(json),
-          Scriptish_getWriteStream(file, true));
+          converter.convertToInputStream(json), // source must be buffered!
+          writeStream,
+          function() writeStream.finish()
+          );
 
       Scriptish_log("Updated Scriptish blocklist " + SCRIPTISH_BLOCKLIST, true);
 
@@ -266,7 +269,7 @@ Config.prototype = {
 
     // Load the config (trying from various sources)
     var configFile;
-    // source: Scriptish JSON tmp
+    // source: Scriptish JSON tmp; for pre-nsISafeOutputStream compatiblity
     self._loadJSON(self._tempFile, function(aSuccess) {
       if (aSuccess) return callback(true);
 
@@ -325,15 +328,11 @@ Config.prototype = {
     }
     delete this["_saveTimer"];
 
-    var self = this;
-
     if (this._isSaving)
       return (this._pendingSave = true);
 
     this._isSaving = true;
 
-    let tempFile = self._tempFile;
-
     // make sure that the configFile is SCRIPTISH_CONFIG_JSON
     (this._configFile = this._scriptDir).append(SCRIPTISH_CONFIG_JSON);
 
@@ -343,22 +342,18 @@ Config.prototype = {
     let converter = Instances.suc;
     converter.charset = "UTF-8";
     let json = JSON.stringify(this.toJSON());
+    let writeStream = Scriptish_getWriteStream(this._configFile, {defer:true, safe:true});
     NetUtil.asyncCopy(
-        converter.convertToInputStream(json),
-        Scriptish_getWriteStream(tempFile, true),
-        function() {
-          NetUtil.asyncCopy(
-                converter.convertToInputStream(json),
-                Scriptish_getWriteStream(self._configFile, true),
-                function() {
-                  tempFile.remove(true);
-                  delete self["_isSaving"];
-                  if (self._pendingSave) {
-                    delete self["_pendingSave"];
-                    self._save();
-                  }
-                });
-        });
+      converter.convertToInputStream(json), // source must be buffered!
+      writeStream,
+      function() {
+        writeStream.finish();
+        delete this._isSaving;
+        if (this._pendingSave) {
+          delete this._pendingSave;
+          this._save();
+        }
+      }.bind(this));
   },
 
   parse: function(source, uri, aUpdateScript) (
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 76fc055f..641998f6 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -25,6 +25,9 @@ var Instances = {
       .createInstance(Ci.nsIDOMSerializer),
   get fos() Cc["@mozilla.org/network/file-output-stream;1"]
       .createInstance(Ci.nsIFileOutputStream),
+  get sfos() Cc["@mozilla.org/network/safe-file-output-stream;1"]
+      .createInstance(Ci.nsIFileOutputStream)
+      .QueryInterface(Ci.nsISafeOutputStream),
   get fp() Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker),
   get json() Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON),
   get lf() Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile),
diff --git a/extension/modules/utils/Scriptish_getWriteStream.js b/extension/modules/utils/Scriptish_getWriteStream.js
index 006b2711..0fae0121 100644
--- a/extension/modules/utils/Scriptish_getWriteStream.js
+++ b/extension/modules/utils/Scriptish_getWriteStream.js
@@ -1,8 +1,11 @@
 var EXPORTED_SYMBOLS = ["Scriptish_getWriteStream"];
 Components.utils.import("resource://scriptish/constants.js");
 
-const Scriptish_getWriteStream = function(aFile, aAsync) {
-  var fos = Instances.fos;
-  fos.init(aFile, 0x02 | 0x08 | 0x20, 420, (aAsync) ? fos.DEFER_OPEN : -1);
+const Scriptish_getWriteStream = function(aFile, details) {
+  var fos;
+  details = details || {};
+  if (details.safe) fos = Instances.sfos;
+  else fos = Instances.fos;
+  fos.init(aFile, 0x02 | 0x08 | 0x20, 420, (details.defer) ? fos.DEFER_OPEN : -1);
   return fos;
 }

From 81422dcdb4b191d23691090dac71e3e49b9bee3a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 18:55:38 +0200
Subject: [PATCH 401/829] Add sync-locales.py tool

The tool will take all en-US property files, sort them by lowercase key,
then find all corresponding files from other locales and sort them as
well, but adding missing keys and removing obsolete keys in the process.
---
 sync-locales.py | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 sync-locales.py

diff --git a/sync-locales.py b/sync-locales.py
new file mode 100644
index 00000000..4573f42e
--- /dev/null
+++ b/sync-locales.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+# Nils Maier has dedicated this work to the public domain by waiving all of his
+# rights to the work worldwide under copyright law, including all related
+# and neighboring rights, to the extent allowed by law.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+import os, sys, re
+from glob import glob
+from codecs import open as copen
+
+class Properties(object):
+    def __init__(self, file):
+        self.file = file
+        self._items = {}
+        with copen(self.file, "rb", encoding="utf-8") as fp:
+            for line in fp:
+                line = line.strip()
+                if line.startswith("#"):
+                    continue
+                key, value = line.split("=", 2)
+                self._items[key] = value
+
+    def merge(self, rhs):
+        # remove obsolete
+        for k in self._items.keys():
+            if not k in rhs._items:
+                del self._items[key]
+
+        # add new keys
+        for k in rhs._items.keys():
+            if not k in self._items:
+                self._items[key] = ""
+
+    def save(self):
+        with copen(self.file, "wb", encoding="utf-8") as op:
+            for k in sorted(self._items.keys(), key=unicode.lower):
+                op.write("%s=%s\n" % (k, self._items[k]))
+
+def process_properties(base, files):
+    base = Properties(base)
+    base.save()
+    for file in files:
+        if file == base.file:
+            continue
+        print file
+        file = Properties(file)
+        file.merge(base)
+        file.save()
+
+
+if __name__ == "__main__":
+    for f in glob("extension/locale/en-US/*.properties"):
+        fn = os.path.basename(f)
+        process_properties(f, glob("extension/locale/*/" + fn))

From 12e6ac0f3c33a8ae06013a599f7982506ec22db5 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 19:24:05 +0200
Subject: [PATCH 402/829] Replace Instances.json with (native) JSON

---
 extension/components/scriptish.js            | 2 +-
 extension/modules/api/GM_xmlhttpRequester.js | 2 +-
 extension/modules/config/config.js           | 4 ++--
 extension/modules/constants.js               | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 7c98848f..b8e50d6c 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -83,7 +83,7 @@ ScriptishService.prototype = {
         if (win) win.Scriptish_BrowserUI.installCurrentScript();
         break;
       case "scriptish-enabled":
-        aData = Instances.json.decode(aData);
+        aData = JSON.parse(aData);
         let bWins = Scriptish.getWindows();
         let on = aData.enabling;
         while (bWins.hasMoreElements()) {
diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 854ea4d3..6b23fe4a 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -212,7 +212,7 @@ GM_xmlhttpRequester.prototype.setupRequestEvent =
             || MIME_JSON.test(details.overrideMimeType)
             || MIME_JSON.test(req.channel.contentType)) {
           try {
-            responseState.responseJSON = Instances.json.decode(req.responseText);
+            responseState.responseJSON = JSON.parse(req.responseText);
           } catch (e) {
             responseState.responseJSON = {};
           }
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 85860991..c6f388b1 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -118,7 +118,7 @@ Config.prototype = {
     req.onload = function() {
       var json = req.responseText;
       try {
-        var blocklist = Instances.json.decode(json);
+        var blocklist = JSON.parse(json);
       } catch (e) {
         return;
       }
@@ -155,7 +155,7 @@ Config.prototype = {
       var file = self._blocklistFile;
       if (file.exists()) {
         Scriptish_getContents(file, 0, function(str) {
-          self._blocklist = Instances.json.decode(str);
+          self._blocklist = JSON.parse(str);
           self._blocklistHash = Scriptish_cryptoHash(str);
 
           // block scripts
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 641998f6..854e67d9 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -29,7 +29,6 @@ var Instances = {
       .createInstance(Ci.nsIFileOutputStream)
       .QueryInterface(Ci.nsISafeOutputStream),
   get fp() Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker),
-  get json() Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON),
   get lf() Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile),
   get process() Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess),
   get se() Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError)

From 51284f59da98fdeb145ab3d8e46c8f257ab7ce28 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 20:35:42 +0200
Subject: [PATCH 403/829] Disable the optimizing regexp merger by default and
 instead use the naive merger

Closes #419
---
 .../content/tests/testPatternCollection.js    | 60 +++++++++++++++----
 extension/defaults/preferences/scriptish.js   |  1 +
 .../modules/utils/Scriptish_mergeRegExps.js   | 16 ++++-
 3 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index bc53eba7..09583307 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -1,5 +1,9 @@
 module("Pattern Collection");
 
+(function() {
+
+const optimized = importModule("resource://scriptish/prefmanager.js").Scriptish_prefRoot.getValue("optimizingRegexpMerge");
+
 test("exports", function() checkExports(
     "resource://scriptish/utils/PatternCollection.js",
     ["PatternCollection"]
@@ -68,7 +72,12 @@ test("merged", function() {
       pc._regs.map(function(e) e.source),
       ["^foobar.*$", "^foobaz.*$", "^foobax$"],
       "regs");
-  equal(pc.merged.source, "^fooba(?:r.*$|x$|z.*$)", "merged");
+  if (optimized) {
+    equal(pc.merged.source, "^fooba(?:r.*$|x$|z.*$)", "merged");
+  }
+  else {
+    equal(pc.merged.source, "(?:^foobar.*$)|(?:^foobaz.*$)|(?:^foobax$)", "merged");
+  }
   equal(pc.test("foo"), false, "foo");
   equal(pc.test("fooba"), false, "fooba");
   equal(pc.test("foobar"), true, "foobar");
@@ -88,7 +97,12 @@ test("merged {}", function() {
       pc._regs.map(function(e) e.source),
       ["ab{2}c", "ab{4}c", "ab{5}c"],
       "regs");
-  equal(pc.merged.source, "a(?:b{2}c|b{4}c|b{5}c)", "merged"); // maybe (?:ab{2}c|ab{4}c|ab{5}c) ?
+  if (optimized) {
+    equal(pc.merged.source, "a(?:b{2}c|b{4}c|b{5}c)", "merged");
+  }
+  else {
+    equal(pc.merged.source, "(?:ab{2}c)|(?:ab{4}c)|(?:ab{5}c)", "merged");
+  }
 });
 
 test("merged {} 2", function() {
@@ -102,7 +116,12 @@ test("merged {} 2", function() {
       pc._regs.map(function(e) e.source),
       ["ab(cd){2}c", "ab(cd){4}c", "ab(cd){5}c"],
   "regs");
-  equal(pc.merged.source, "ab(?:(cd){2}c|(cd){4}c|(cd){5}c)", "merged"); // maybe (?:ab{2}c|ab{4}c|ab{5}c) ?
+  if (optimized) {
+    equal(pc.merged.source, "ab(?:(cd){2}c|(cd){4}c|(cd){5}c)", "merged");
+  }
+  else {
+    equal(pc.merged.source, "(?:ab(cd){2}c)|(?:ab(cd){4}c)|(?:ab(cd){5}c)", "merged");
+  }
 });
 
 test("merged {} 3", function() {
@@ -116,7 +135,12 @@ test("merged {} 3", function() {
       pc._regs.map(function(e) e.source),
       ["ab(cd)e{2}c", "ab(cd)e{4}c", "ab(cd)e{5}c"],
   "regs");
-  equal(pc.merged.source, "ab(cd)(?:e{2}c|e{4}c|e{5}c)", "merged"); // maybe (?:ab{2}c|ab{4}c|ab{5}c) ?
+  if (optimized) {
+    equal(pc.merged.source, "ab(cd)(?:e{2}c|e{4}c|e{5}c)", "merged");
+  }
+  else {
+    equal(pc.merged.source, "(?:ab(cd)e{2}c)|(?:ab(cd)e{4}c)|(?:ab(cd)e{5}c)", "merged");
+  }
 });
 
 test("merged2 with reg exp", function() {
@@ -132,7 +156,12 @@ test("merged2 with reg exp", function() {
       pc._regs.map(function(e) e.source),
       ["^foobar.*$", "^foobaz.*$", "foobax$"],
       "regs");
-  equal(pc.merged.source, "^foobar.*$|^foobaz.*$|foobax$", "merged");
+  if (optimized) {
+    equal(pc.merged.source, "^foobar.*$|^foobaz.*$|foobax$", "merged");
+  }
+  else {
+    equal(pc.merged.source, "(?:^foobar.*$)|(?:^foobaz.*$)|(?:foobax$)", "merged");
+  }
   equal(pc.test("foo"), false, "foo");
   equal(pc.test("fooba"), false, "fooba");
   equal(pc.test("foobar"), true, "foobar");
@@ -179,7 +208,12 @@ test("merged3", function() {
   pc.addPattern("foobaz*");
   deepEqual(pc.patterns, ["foo", "foobar*", "foobaz*"], "patterns");
   deepEqual(pc._regs.map(function(e) e.source), ["^foo$", "^foobar.*$", "^foobaz.*$"], "regs");
-  equal(pc.merged.source, "^foo(?:$|bar.*$|baz.*$)", "merged");
+  if (optimized) {
+    equal(pc.merged.source, "^foo(?:$|bar.*$|baz.*$)", "merged");
+  }
+  else {
+    equal(pc.merged.source, "(?:^foo$)|(?:^foobar.*$)|(?:^foobaz.*$)", "merged");
+  }
   equal(pc.test("foo"), true, "foo");
   equal(pc.test("fooba"), false, "fooba");
   equal(pc.test("foobar"), true, "foobar");
@@ -312,8 +346,14 @@ test("tld", function() {
   pc.addPattern("http://mozilla.com/*");
   deepEqual(pc._regs.map(function(e) e.source), ["^http:\\/\\/bing\\.com\\/.*$", "^http:\\/\\/mozilla\\.com\\/.*$"], "regs");
   deepEqual(pc._regsTLD.map(function(e) e.source), ["^http:\\/\\/google\\.tld\\/.*$", "^http:\\/\\/yahoo\\.tld\\/.*$"], "regsTLD");
-  equal(pc.merged.source, "^http:\\/\\/(?:bing\\.com\\/.*$|mozilla\\.com\\/.*$)", "merged");
-  equal(pc.mergedTLD.source, "^http:\\/\\/(?:google\\.tld\\/.*$|yahoo\\.tld\\/.*$)", "mergedTLD");
+  if (optimized) {
+    equal(pc.merged.source, "^http:\\/\\/(?:bing\\.com\\/.*$|mozilla\\.com\\/.*$)", "merged");
+    equal(pc.mergedTLD.source, "^http:\\/\\/(?:google\\.tld\\/.*$|yahoo\\.tld\\/.*$)", "mergedTLD");
+  }
+  else {
+    equal(pc.merged.source, "(?:^http:\\/\\/bing\\.com\\/.*$)|(?:^http:\\/\\/mozilla\\.com\\/.*$)", "merged");
+    equal(pc.mergedTLD.source, "(?:^http:\\/\\/google\\.tld\\/.*$)|(?:^http:\\/\\/yahoo\\.tld\\/.*$)", "mergedTLD");
+  }
   equal(pc.test("http://mozilla.com/"), true, "moco");
   equal(pc.test("http://mozilla.org/"), false, "mofo");
   equal(pc.test("http://google.de/"), true, "g.de");
@@ -329,8 +369,6 @@ test("clear", function() {
   pc.addPattern("http://yahoo.tld/*");
   pc.addPattern("http://bing.com/*");
   pc.addPattern("http://mozilla.com/*");
-  equal(pc.merged.source, "^http:\\/\\/(?:bing\\.com\\/.*$|mozilla\\.com\\/.*$)", "merged");
-  equal(pc.mergedTLD.source, "^http:\\/\\/(?:google\\.tld\\/.*$|yahoo\\.tld\\/.*$)", "mergedTLD");
   pc.clear();
   deepEqual(pc.patterns, [], "cleared patterns");
   deepEqual(pc._regs, [], "cleared regs");
@@ -339,3 +377,5 @@ test("clear", function() {
   strictEqual(pc._mergedTLD, null, "cleared _mergeTLD");
   equal(pc.test("http://mozilla.com/"), false, "no matches");
 });
+
+})();
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index a04254c9..33453fbb 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -15,6 +15,7 @@ pref("extensions.scriptish.enabledSchemes.http", true);
 pref("extensions.scriptish.enabledSchemes.unmht", false);
 pref("extensions.scriptish.enableCopyDownloadURL", false);
 pref("extensions.scriptish.enableScriptRefreshing", true);
+pref("extensions.scriptish.optimizingRegexpMerge", false);
 pref("extensions.scriptish.uninstallPreferences", true);
 pref("extensions.scriptish.update.requireBuiltInCerts", true);
 pref("extensions.scriptish.update.requireSecured", true);
diff --git a/extension/modules/utils/Scriptish_mergeRegExps.js b/extension/modules/utils/Scriptish_mergeRegExps.js
index 48cf2206..655ee0e2 100644
--- a/extension/modules/utils/Scriptish_mergeRegExps.js
+++ b/extension/modules/utils/Scriptish_mergeRegExps.js
@@ -1,7 +1,21 @@
 "use strict";
 const EXPORTED_SYMBOLS = ["Scriptish_mergeRegExpStrings", "Scriptish_mergeRegExps"];
+Components.utils.import("resource://scriptish/prefmanager.js");
+
+function merge_map(e) "(?:" + e + ")";
+
+if (Scriptish_prefRoot.getValue("optimizingRegexpMerge")) {
+  Components.utils.import("resource://scriptish/third-party/regexpmerger.js");
+}
+else {
+  this.merge = function merge_naive(strs) {
+    if (strs.length < 2) {
+      return strs[0];
+    }
+    return strs.map(merge_map).join("|");
+  }
+}
 
-Components.utils.import("resource://scriptish/third-party/regexpmerger.js");
 
 function Scriptish_mergeRegExpStrings(strs, flags) (
     new RegExp(merge(strs), flags || ""))

From 469301ee76d1aaf85b39cb3a21f968b0594cf634 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 6 Jul 2011 21:46:50 -0500
Subject: [PATCH 404/829] Closes #317 Show user scripts with updates in
 'Available Updates'. (cherry picked from commit
 ba4b3587c6313f11a39da1939cf5ed24ffe82f82)

---
 extension/modules/addonprovider.js          | 27 ++++++++++++++++++---
 extension/modules/script/script.js          |  3 +--
 extension/modules/script/scriptinstaller.js |  2 +-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index 1618351d..833c6051 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -100,10 +100,29 @@ AddonManagerPrivate.registerProvider({
     });
   },
   getAddonsByTypes: function(aTypes, aCallback) {
-    if (aTypes && aTypes.indexOf("userscript") < 0) aCallback([]);
-    else Scriptish.getConfig(function(config) {
-      aCallback(config.scripts);
-    });
+    if (aTypes && aTypes.indexOf("userscript") < 0) {
+      aCallback([]);
+    } else {
+      Scriptish.getConfig(function(config) {
+        aCallback(config.scripts);
+      });
+    }
+  },
+
+  getInstallsByTypes: function(aTypes, aCallback) {
+    if (aTypes && aTypes.indexOf("userscript") < 0) {
+      aCallback([]);
+    } else {
+      Scriptish.getConfig(function(config) {
+        let updates = [];
+        config.scripts.forEach(function(script) {
+          if (script.updateAvailable
+              && script.updateAvailable.state == AddonManager.STATE_AVAILABLE)
+            updates.push(script.updateAvailable);
+        });
+        aCallback(updates);
+      });
+    }
   }
 }, types);
 [
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index fbc5c7b9..5eedcb76 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -39,7 +39,7 @@ function noUpdateFound(aListener, aReason) {
 }
 function updateFound(aListener, aReason) {
   var AddonInstall = new ScriptInstall(this);
-  this.updateAvailable = true;
+  this.updateAvailable = AddonInstall;
   AddonManagerPrivate.callAddonListeners("onNewInstall", AddonInstall);
   aListener.onUpdateAvailable(this, AddonInstall);
   if (aListener.onUpdateFinished)
@@ -641,7 +641,6 @@ Script.prototype = {
 
     // Copy new values.
     this.blocked = newScript.blocked;
-    this.updateAvailable = false;
     this.domains = newScript.domains;
     this._includes = newScript._includes;
     this._excludes = newScript._excludes;
diff --git a/extension/modules/script/scriptinstaller.js b/extension/modules/script/scriptinstaller.js
index c8473486..a4300d82 100644
--- a/extension/modules/script/scriptinstaller.js
+++ b/extension/modules/script/scriptinstaller.js
@@ -51,7 +51,7 @@ ScriptInstall.prototype = {
   get icon64URL() this._script.icon64URL,
   releaseNotesURI: null,
   type: "userscript",
-  state: AddonManager.STATE_DOWNLOADING,
+  state: AddonManager.STATE_AVAILABLE,
   error: null,
   sourceURI: null,
   file: null,

From f109b1164c0f13ed19699af776905ed7c83e3066 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 7 Jul 2011 10:27:59 -0500
Subject: [PATCH 405/829] Adding @contributionURL and @contributionAmount.

---
 extension/modules/script/script.js | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 5eedcb76..eade57b8 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -52,6 +52,8 @@ function Script(config) {
   this._observers = [];
 
   this._homepageURL = null;
+  this._contributionURL = null;
+  this._contributionAmount = null;
   this._downloadURL = null;
   this._updateURL = null;
   this._tempFile = null; // Only for scripts not installed
@@ -479,7 +481,12 @@ Script.prototype = {
     }
     return this._homepageURL = url;
   },
+
+  get contributionURL() this._contributionURL,
+  get contributionAmount() this._contributionAmount,
+
   supportURL: "",
+
   get updateURL() {
     if (!this.version) return null;
     if (Scriptish_prefRoot.getValue("useDownloadURLForUpdateURL"))
@@ -651,8 +658,10 @@ Script.prototype = {
     this.priority = newPriority;
     this._screenshots = newScript._screenshots;
     this._homepageURL = newScript.homepageURL;
-    this._updateURL = newScript._updateURL;
+    this._contributionURL = newScript.contributionURL;
+    this._contributionAmount = newScript.contributionAmount;
     this.supportURL = newScript.supportURL;
+    this._updateURL = newScript._updateURL;
     this._name = newScript._name;
     this._namespace = newScript._namespace;
     this.author = newScript._author;
@@ -745,6 +754,8 @@ Script.prototype = {
     "run-at": this["_run-at"],
     includesDisabled: this.includesDisabled,
     homepageURL: this.homepageURL,
+    contributionURL: this._contributionURL,
+    contributionAmount: this._contributionAmount,
     downloadURL: this._downloadURL,
     updateURL: this._updateURL,
     supportURL: this.supportURL,
@@ -906,6 +917,17 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript) {
           }
           script._homepageURL = uri.spec;
           break;
+        case "contributionurl":
+          try {
+            var uri = NetUtil.newURI(value);
+          } catch (e) {
+            break;
+          }
+          script._contributionURL = uri.spec;
+          break;
+        case "contributionamount":
+          script._contributionAmount = value;
+          break;
         case "supporturl":
           try {
             var uri = NetUtil.newURI(value);
@@ -1068,6 +1090,8 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
   script._downloadURL = aSkeleton.downloadURL;
   script._updateURL = aSkeleton.updateURL;
   script._homepageURL = aSkeleton.homepageURL;
+  script._contributionURL = aSkeleton.contributionURL;
+  script._contributionAmount = aSkeleton.contributionAmount;
   script.supportURL = aSkeleton.supportURL;
   script._jsversion = aSkeleton.jsversion;
   script["_run-at"] = aSkeleton["run-at"];

From 731c4631a39ec904807ef01d2aa6ed2be2ad22a3 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 7 Jul 2011 13:10:23 -0500
Subject: [PATCH 406/829] Replace the contribution message with one for user
 scripts.

Also tweaking how addonstab.js handles view changes.
---
 extension/content/addonstab.xul             |  5 +++
 extension/content/js/addonstab.js           | 35 ++++++++++++++++-----
 extension/locale/de/scriptish.properties    |  1 +
 extension/locale/en-US/scriptish.properties |  1 +
 extension/locale/es-ES/scriptish.properties |  1 +
 extension/locale/ja-JP/scriptish.properties |  1 +
 extension/locale/pt-BR/scriptish.properties |  1 +
 extension/locale/ru-RU/scriptish.properties |  1 +
 extension/locale/sv-SE/scriptish.properties |  1 +
 extension/skin/addonstab.css                |  7 +++++
 10 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/extension/content/addonstab.xul b/extension/content/addonstab.xul
index 1c2e463a..a1fa7820 100644
--- a/extension/content/addonstab.xul
+++ b/extension/content/addonstab.xul
@@ -41,6 +41,11 @@
               insertbefore="detail-prefs-btn" />
   </hbox>
 
+  <vbox id="detail-contributions">
+    <description id="scriptish-detail-contrib-description"
+                 insertbefore="detail-contrib-description"></description>
+  </vbox>
+
   <vbox id="list-view">
   <vbox id="scriptish-list-empty" insertbefore="addon-list-empty"
       class="alert-container" flex="1">
diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index e7ca9da1..f67026dd 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -71,19 +71,40 @@ window.addEventListener("load", function() {
       "value", Scriptish_stringBundle("userscripts.noneInstalled"));
   $("scriptish-get-scripts-btn").setAttribute(
       "label", Scriptish_stringBundle("userscripts.get"));
+  $("scriptish-detail-contrib-description").textContent =
+      Scriptish_stringBundle("contributions.description");
 
   function onViewChanged() {
     let de = document.documentElement;
-    if ("addons://list/userscript" == gViewController.currentViewId) {
-      de.classList.add("scriptish");
-      Scriptish.getConfig(function(config) {
-        if (!config.scripts.length)
-          $("scriptish-list-empty").style.display = "-moz-box";
-      });
-    } else {
+    let view = /^addons:\/\/([^/]+)(?:\/([^/]+)?)?$/.exec(gViewController.currentViewId);
+
+    function reset() {
       de.classList.remove("scriptish");
       $("scriptish-list-empty").style.display = "none";
     }
+
+    // something strange happened if `null`
+    if (view == null) return reset();
+
+    switch (view[1]) {
+      case "list":
+        if (view[2] != "userscript") return reset();
+        de.classList.add("scriptish");
+        Scriptish.getConfig(function(config) {
+          if (!config.scripts.length)
+            $("scriptish-list-empty").style.display = "-moz-box";
+        });
+        break;
+      case "detail":
+        Scriptish.getConfig(function(config) {
+          let script = config.getScriptById(decodeURIComponent(view[2]));
+          if (script == null || !script.contributionURL) return reset();
+          de.classList.add("scriptish");
+        });
+        break;
+      default:
+        reset();
+    }
   }
   window.addEventListener('ViewChanged', onViewChanged, false);
   onViewChanged(); // initialize on load as well as when it changes later
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index b6b1d819..f09395b0 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -1,3 +1,4 @@
+contributions.description=
 copyDownloadURL=Download URL kopieren
 copyDownloadURL.ak=k
 edit=Bearbeiten
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 222552af..286fab4f 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -1,3 +1,4 @@
+contributions.description=The developer of this user script asks that you help support its continued development by making a small contribution.
 copyDownloadURL=Copy Download URL
 copyDownloadURL.ak=C
 edit=Edit
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index dd6278ea..9ee13cce 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -1,3 +1,4 @@
+contributions.description=
 copyDownloadURL=Copiar URL de descarga
 copyDownloadURL.ak=C
 edit=Editar
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index fdae2031..0bc9ec84 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -1,3 +1,4 @@
+contributions.description=
 copyDownloadURL=ダウンロード URL をコピー
 copyDownloadURL.ak=C
 edit=編集
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 76b77275..bdce8ab1 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -1,3 +1,4 @@
+contributions.description=
 copyDownloadURL=Copiar endereço de download
 copyDownloadURL.ak=C
 edit=Editar
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 05d430ed..fbcb43e7 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -1,3 +1,4 @@
+contributions.description=
 copyDownloadURL=
 copyDownloadURL.ak=
 edit=Редактировать
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index a7d95629..2e617a3f 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -1,3 +1,4 @@
+contributions.description=
 copyDownloadURL=Kopiera hämtningsadress
 copyDownloadURL.ak=K
 edit=Redigera
diff --git a/extension/skin/addonstab.css b/extension/skin/addonstab.css
index 7a4c856c..52e8c5d6 100644
--- a/extension/skin/addonstab.css
+++ b/extension/skin/addonstab.css
@@ -9,6 +9,13 @@ page.scriptish #addon-list-empty, #scriptish-list-empty {
   display: none;
 }
 
+page.scriptish #scriptish-detail-contrib-description, #detail-contrib-description {
+  display: inline;
+}
+page.scriptish #detail-contrib-description, #scriptish-detail-contrib-description {
+  display: none;
+}
+
 /* Hide the 'restart now' link for user scripts. */
 page.scriptish #addon-list button[command=cmd_restartApp] {
   display: none;

From 2242b9a8368c61bdc7bb317fa8d84c755c98ac62 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 7 Jul 2011 13:40:45 -0500
Subject: [PATCH 407/829] Styling the 'user script' contribution description
 based on 'extensions.css'.

---
 extension/skin/addonstab.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extension/skin/addonstab.css b/extension/skin/addonstab.css
index 52e8c5d6..0f1acf8c 100644
--- a/extension/skin/addonstab.css
+++ b/extension/skin/addonstab.css
@@ -9,6 +9,11 @@ page.scriptish #addon-list-empty, #scriptish-list-empty {
   display: none;
 }
 
+page.scriptish #scriptish-detail-contrib-description {
+  font-style: italic;
+  margin-bottom: 1em;
+  color: #373D48; /* color not set in gnomestripe... */
+}
 page.scriptish #scriptish-detail-contrib-description, #detail-contrib-description {
   display: inline;
 }

From 4590a26ddc6e486b3d71e1b61d7d83b83301a59f Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 8 Jul 2011 03:34:19 +0200
Subject: [PATCH 408/829] Update de locale

---
 extension/locale/de/scriptish.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index f09395b0..ae9e5c00 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -1,4 +1,4 @@
-contributions.description=
+contributions.description=Der Entwickler dieses Benutzerskripts bittet um einen kleinen Beitrag zur Unterstützung der weiteren Entwicklung
 copyDownloadURL=Download URL kopieren
 copyDownloadURL.ak=k
 edit=Bearbeiten

From b5f8b4b7012b9c2d050f19f5ef1f288c6a0fa4d0 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 7 Jul 2011 20:44:44 -0500
Subject: [PATCH 409/829] Updating ja-JP with modifications by k2jp
 (BabelZilla).

---
 extension/locale/ja-JP/scriptish.properties | 54 ++++++++++-----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 0bc9ec84..57055932 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -1,5 +1,5 @@
 contributions.description=
-copyDownloadURL=ダウンロード URL をコピー
+copyDownloadURL=ダウンロードした URL をコピー
 copyDownloadURL.ak=C
 edit=編集
 edit.ak=E
@@ -21,8 +21,8 @@ error.icon.dataURL=不正なデータ： @icon 用 URL　
 error.icon.notImage=エラー！ @icon が画像の MIME タイプではありません
 error.icon.URL=@icon の URL が不正です
 error.isInvalidValue=は不正な値です
-error.matchPattern.rules=@match のパターンが不適合です
-error.matchPattern.rules.file=ファイル・スキームの @match パターンが不適合です
+error.matchPattern.rules=@match のパターンが適合していません
+error.matchPattern.rules.file=ファイル・スキームの @match パターンが適合していません
 error.notSupported.Firefox=はこのバージョンの Firefox でサポートされていません
 error.openingFile=ファイルを開くことが出来ませんでした
 error.pattern.parsing=パターンをパースできませんでした
@@ -63,40 +63,40 @@ menuitem.manage=ユーザースクリプトを管理
 menuitem.new=新規ユーザースクリプト
 moving.dependency=依存関係ファイルを次から移動：
 moving.script=スクリプトを次から移動：
-newscript.author=スクリプトの作者
-newscript.description=スクリプトの詳細
-newscript.excludes=Excludes（１行１つずつ列挙）
+newscript.author=作者
+newscript.description=スクリプトの説明
+newscript.excludes=Excludes（１行１つずつ）
 newscript.exists=同じ名前のスクリプトが既にインストールされています。\n上書きしますか？
-newscript.id=ID（一意に識別する為の文字列）
-newscript.includes=Includes（１行１つずつ列挙）
+newscript.id=ID（一意に識別する文字列）
+newscript.includes=Includes（１行１つずつ）
 newscript.missing.id=ID を指定してください
 newscript.missing.name=スクリプト名を指定してください。アドオン・マネージャー内での表示で使用します
 newscript.name=スクリプト名
 newscript.namespace=名前空間
 newscript.noID=スクリプトに正しい ID を指定してください
 newscript.noName=スクリプトに名前をつけてください
-newscript.runat=
-newscript.runat.documentstart=
-newscript.runat.documentend=
-newscript.runat.documentidle=
-newscript.runat.windowload=
-newscript.version=
+newscript.runat=スクリプト実行タイミング
+newscript.runat.documentstart=Document 読み込み開始時
+newscript.runat.documentend=Document 読み込み完了時
+newscript.runat.documentidle=Document 初回アイドル時
+newscript.runat.windowload=全メディアを含む Window が完全に読み込まれた時
+newscript.version=バージョン
 nothing.timedOut=なし（タイムアウト）
 openFolder=フォルダを開く
 openFolder.ak=O
-openUserScriptsManager=
-openUserScriptsManager.ak=
+openUserScriptsManager=ユーザースクリプトマネージャを開く
+openUserScriptsManager.ak=O
 options=オプション
 options.title=Scriptish オプション
 options.pane.main=メイン
-options.pane.ui=
-options.pane.excludes=
+options.pane.ui=ユーザーインタフェース
+options.pane.excludes=Global Excludes
 options.pane.advanced=詳細
 options.addonsManager=アドオン・マネージャー
 options.alsoUninstallPrefs=スクリプトのアンインストール時に設定も削除
 options.cache=キャッシュ
 options.cache.enabled=ユーザースクリプトをキャッシュ
-options.changeEditor=エディタを変更
+options.changeEditor=エディタ変更
 options.editor=エディタ
 options.editor.notset=エディタは指定されていません
 options.enabledSchemes.main=利用プロトコル
@@ -110,15 +110,15 @@ options.enabledSchemes.http=http/https プロトコル
 options.enabledSchemes.unmht=unmht プロトコル（Mozilla Archive フォーマット）
 options.enabledSchemes.securityRemark=追加したプロトコルでシステムにフルアクセス可能になることがあります
 options.enabledSchemes.securityRemark2=つまり、信用できないスクリプトと併用すると相当なセキュリティ・リスクになるので注意！
-options.excludes.empty=global excludes が指定されていません
+options.excludes.empty=global excludes は指定されていません
 options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先
 options.excludes.remark=（１行１つずつ指定）
 options.enableCopyDownloadURL=ダウンロード URL のコピーを有効
 options.logging=ログ
 options.logChrome=重大でないエクステンションのメッセージもエラーコンソールに出力
-options.logToErrorConsole=
+options.logToErrorConsole=GM_log でエラーコンソールを使用
 options.notifications=通知
-options.notifications.enable=
+options.notifications.enable=スクリプトの変更を通知
 options.requireBuiltInCerts=安全なアップデートに built-in 証明書を利用
 options.requireSecured=ユーザースクリプトを HTTPS で更新
 options.translation=翻訳
@@ -129,20 +129,20 @@ reinstall=再インストール
 saving=保存
 scratchpad.saveAsUserScript=ユーザースクリプトとして保存
 scratchpad.saveAsUserScript.ak=U
-scriptOptions.includes=
-scriptOptions.excludes=
+scriptOptions.includes=ユーザー指定 Include：
+scriptOptions.excludes=ユーザー指定 Exclude：
 scriptOptions.disableScriptIncludes=スクリプト内 include を無効。ユーザー指定のみを利用
 statusbar.enabled=有効
 statusbar.enabled.ak=E
 statusbar.installed=のインストールに成功しました
 statusbar.modified=は変更されました
-statusbar.noScripts.excluded=
+statusbar.noScripts.excluded=ページが除外（exclude）されました！
 statusbar.noScripts.notfound=このページ用のスクリプトはありません！
-statusbar.noScripts.scheme=
+statusbar.noScripts.scheme=スキームが無効になっています！
 statusbar.updated=は正常に更新されました
 tooltip.loading=読み込み中…
 Uninstall=アンインストール
-untitledScript=
+untitledScript=名称未定スクリプト
 Update=更新
 userscripts=ユーザースクリプト
 userscripts.get=ユーザースクリプトを取得

From 0c7f0980246f1e123639d35a99cbaa34bd8d0543 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 7 Jul 2011 20:46:30 -0500
Subject: [PATCH 410/829] Updating sv-SE with modifications by Lakrits
 (BabelZilla).

---
 extension/locale/sv-SE/scriptish.properties | 30 ++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 2e617a3f..c466f7a1 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -75,21 +75,21 @@ newscript.name=Namn
 newscript.namespace=Namnområde
 newscript.noID=Var vänlig ange ett giltigt ID för ditt skript.
 newscript.noName=Var vänlig ange ett namn på ditt skript.
-newscript.runat=
-newscript.runat.documentstart=
-newscript.runat.documentend=
-newscript.runat.documentidle=
-newscript.runat.windowload=
-newscript.version=
+newscript.runat=Kör när
+newscript.runat.documentstart=Dokumentet börjar läsas in
+newscript.runat.documentend=Dokumentet har lästs in
+newscript.runat.documentidle=Dokumentet är först i väntelistan
+newscript.runat.windowload=Fönster inkl. alla medier har lästs in helt och hållet
+newscript.version=Version
 nothing.timedOut=ingenting (tidsgränsen uppnåddes)
 openFolder=Öppna mapp
 openFolder.ak=Ö
-openUserScriptsManager=
-openUserScriptsManager.ak=
+openUserScriptsManager=Öppna användarskripthanteraren
+openUserScriptsManager.ak=Ö
 options=Inställningar
 options.title=Inställningar för Scriptish
 options.pane.main=Allmänt
-options.pane.ui=
+options.pane.ui=Användargränssnitt
 options.pane.excludes=Globala undantag
 options.pane.advanced=Avancerat
 options.addonsManager=Tilläggshanteraren
@@ -115,10 +115,10 @@ options.excludes.desc=Globala undantag kommer att åsidosätta alla skript och a
 options.excludes.remark=(Du kan ange ett undantag per rad)
 options.enableCopyDownloadURL=Aktivera kopiering av hämtningsadress
 options.logging=Loggning
-options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felonsolen
-options.logToErrorConsole=
+options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felkonsolen
+options.logToErrorConsole=GM_log använder Felkonsolen
 options.notifications=Aviseringar
-options.notifications.enable=
+options.notifications.enable=Aktivera glidande aviseringar vid skriptändringar
 options.requireBuiltInCerts=Säker uppdatering kräver användning av inbyggda certifikat
 options.requireSecured=Kräv att användarskript uppdateras via HTTPS
 options.translation=Översättning
@@ -136,13 +136,13 @@ statusbar.enabled=Aktiverat
 statusbar.enabled.ak=A
 statusbar.installed=har installerats
 statusbar.modified=har ändrats
-statusbar.noScripts.excluded=
+statusbar.noScripts.excluded=Sidan är undantagen!
 statusbar.noScripts.notfound=Inga skript för sidan!
-statusbar.noScripts.scheme=
+statusbar.noScripts.scheme=Schemat är inaktiverat!
 statusbar.updated=har uppdaterats
 tooltip.loading=Läser in…
 Uninstall=Avinstallera
-untitledScript=
+untitledScript=(Namnlöst skript)
 Update=Uppdatera
 userscripts=Användarskript
 userscripts.get=Hämta användarskript

From 8a406127a1ed469a68a1bbda3bda79aac825ed4b Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 7 Jul 2011 21:08:06 -0500
Subject: [PATCH 411/829] syncing locales (cherry picked from commit
 f8eeb0126a63ff789916b5d07ab8e74e2324e70f)

---
 extension/locale/de/scriptish.properties    | 30 +++++++++----------
 extension/locale/en-US/scriptish.properties | 30 +++++++++----------
 extension/locale/es-ES/scriptish.properties | 30 +++++++++----------
 extension/locale/ja-JP/scriptish.properties | 32 ++++++++++-----------
 extension/locale/pt-BR/scriptish.properties | 30 +++++++++----------
 extension/locale/ru-RU/scriptish.properties | 30 +++++++++----------
 extension/locale/sv-SE/scriptish.properties | 30 +++++++++----------
 7 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index ae9e5c00..6109d004 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -9,8 +9,8 @@ editor.prompt=Bitte erst den bevorzugten Texteditor wählen
 error.api.clipboard.type=ist kein von GM_setClipboard unterstützter Typ.
 error.api.noResourceWithName=Keine Resource mit dem Namen
 error.api.noSecondArgValue=Zweites Argument nicht spezifiziert: Value
-error.api.reqURL.scheme=Verbotenes Schema (Protokoll) in URL
 error.api.reqURL=Ungültige URL
+error.api.reqURL.scheme=Verbotenes Schema (Protokoll) in URL
 error.api.unsafeAccess=Scriptish Zugriffsverletzung: unsafeWindow darf nicht aufrufen werden
 error.charset=Ungültige Zeichenkodierung angegeben.
 error.dependency.loading=Fehler beim Laden von Anhängigkeit
@@ -76,9 +76,9 @@ newscript.namespace=Namensraum
 newscript.noID=Bitte gültige ID für Ihr Benutzerskript angeben.
 newscript.noName=Bitte Namen für Ihr Benutzerskript angeben.
 newscript.runat=Ausführen wenn
-newscript.runat.documentstart=Dokument anfängt zu laden
 newscript.runat.documentend=Document laden abschließt
 newscript.runat.documentidle=Document das erste mal unbeschäftigt ist
+newscript.runat.documentstart=Dokument anfängt zu laden
 newscript.runat.windowload=Das Fenster incl. aller Medien fertig geladen ist
 newscript.version=Version
 nothing.timedOut=Nichts (Zeitüberschreitung)
@@ -87,11 +87,6 @@ openFolder.ak=O
 openUserScriptsManager=Benutzerskript-Manager öffnen
 openUserScriptsManager.ak=B
 options=Optionen
-options.title=Scriptish Einstellungen
-options.pane.main=Allgemein
-options.pane.ui=Benutzeroberfläche
-options.pane.excludes=Globale Ausnahmen
-options.pane.advanced=Erweitert
 options.addonsManager=Add-ons-Manager
 options.alsoUninstallPrefs=Bei der Deinstallation eines Skripts auch seine Einstellungen entfernen
 options.cache=Cache
@@ -99,28 +94,33 @@ options.cache.enabled=Benutzerskripte zwischenspeichern
 options.changeEditor=Editor ändern
 options.editor=Editor
 options.editor.notset=Kein Editor ausgewählt
-options.enabledSchemes.main=Protokolle
-options.enabledSchemes.advanced=Zusätzliche Protokolle
+options.enableCopyDownloadURL=Kopieren der Download-URL aktivieren
 options.enabledSchemes.about=about Protokoll (intern)
+options.enabledSchemes.advanced=Zusätzliche Protokolle
 options.enabledSchemes.chrome=chrome Protokoll (intern)
 options.enabledSchemes.data=data Protokoll
 options.enabledSchemes.file=file Protokoll (Lokale Dateien)
 options.enabledSchemes.ftp=ftp Protokoll
 options.enabledSchemes.http=http/https Protokoll
-options.enabledSchemes.unmht=unmht Protokoll (Mozilla Archive Format)
+options.enabledSchemes.main=Protokolle
 options.enabledSchemes.securityRemark=Die zusätzlichen Protokolle können vollen Systemzugriff haben.
 options.enabledSchemes.securityRemark2=Daher stellen sie ein beträchtliches Sicherheitsrisko mit nicht vertrautenswürdigen Benutzerskripten dar!
-options.excludes.empty=Keine globalen Ausnahmen spezifiziert
+options.enabledSchemes.unmht=unmht Protokoll (Mozilla Archive Format)
 options.excludes.desc=Globale Ausnahmen heben Benutzerskript oder Benutzer Regeln auf
+options.excludes.empty=Keine globalen Ausnahmen spezifiziert
 options.excludes.remark=(Sie können eine Ausnahme pro Zeile spezifizieren)
-options.enableCopyDownloadURL=Kopieren der Download-URL aktivieren
-options.logging=Loggen
 options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole loggen
+options.logging=Loggen
 options.logToErrorConsole=GM_log benutzt die Fehlerkonsole
 options.notifications=Benachrichtigungen
 options.notifications.enable=Benachrichtungen bei Benutzerskript-Änderungen aktivieren
+options.pane.advanced=Erweitert
+options.pane.excludes=Globale Ausnahmen
+options.pane.main=Allgemein
+options.pane.ui=Benutzeroberfläche
 options.requireBuiltInCerts=Sichere Aktualisierungen müssen eingebaute Zertifikate nutzen
 options.requireSecured=Benutzerskripte müssen über eine sichere Verbindung (https) aktualisiert werden
+options.title=Scriptish Einstellungen
 options.translation=Übersetzung
 options.translation.useEnglish=Immer Englisch benutzen
 options.update.security=Aktualisierungsicherheit
@@ -129,9 +129,9 @@ reinstall=Neu installieren
 saving=Speichern
 scratchpad.saveAsUserScript=Als Benutzerskript speichern
 scratchpad.saveAsUserScript.ak=B
-scriptOptions.includes=Benutzer-Einschlüsse:
-scriptOptions.excludes=Benutzer-Ausnahmen:
 scriptOptions.disableScriptIncludes=Die Einschlüsse dieses Benutzerskripts deaktivieren und nur Benutzereinschlüsse verwenden.
+scriptOptions.excludes=Benutzer-Ausnahmen:
+scriptOptions.includes=Benutzer-Einschlüsse:
 statusbar.enabled=Aktiviert
 statusbar.enabled.ak=K
 statusbar.installed=erfolgreich installiert
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 286fab4f..d36efd80 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -9,8 +9,8 @@ editor.prompt=Please choose your preferred text editor first
 error.api.clipboard.type=is not a type that is supported by GM_setClipboard.
 error.api.noResourceWithName=No resource with name
 error.api.noSecondArgValue=Second argument not specified: Value
-error.api.reqURL.scheme=Disallowed scheme in URL
 error.api.reqURL=Invalid URL
+error.api.reqURL.scheme=Disallowed scheme in URL
 error.api.unsafeAccess=Scriptish access violation: unsafeWindow cannot call
 error.charset=Invalid charset specified.
 error.dependency.loading=Error loading dependency
@@ -76,9 +76,9 @@ newscript.namespace=Namespace
 newscript.noID=Please provide a valid ID for your script.
 newscript.noName=Please provide a name for your script.
 newscript.runat=Run when
-newscript.runat.documentstart=Document starts loading
 newscript.runat.documentend=Document finishes loading
 newscript.runat.documentidle=Document is first idle
+newscript.runat.documentstart=Document starts loading
 newscript.runat.windowload=Window incl. all media is fully loaded
 newscript.version=Version
 nothing.timedOut=nothing (timed out)
@@ -87,11 +87,6 @@ openFolder.ak=O
 openUserScriptsManager=Open User Scripts Manager
 openUserScriptsManager.ak=O
 options=Options
-options.title=Scriptish Options
-options.pane.main=Main
-options.pane.ui=User Interface
-options.pane.excludes=Global Excludes
-options.pane.advanced=Advanced
 options.addonsManager=Add-ons Manager
 options.alsoUninstallPrefs=When uninstalling a script, also remove its preferences
 options.cache=Cache
@@ -99,28 +94,33 @@ options.cache.enabled=Cache user scripts
 options.changeEditor=Change Editor
 options.editor=Editor
 options.editor.notset=No editor selected
-options.enabledSchemes.main=Protocols
-options.enabledSchemes.advanced=Additional protocols
+options.enableCopyDownloadURL=Enable copying of download URL
 options.enabledSchemes.about=about protocol (internal)
+options.enabledSchemes.advanced=Additional protocols
 options.enabledSchemes.chrome=chrome protocol (internal)
 options.enabledSchemes.data=data protocol
 options.enabledSchemes.file=file protocol (Local files)
 options.enabledSchemes.ftp=ftp protocol
 options.enabledSchemes.http=http/https protocol
-options.enabledSchemes.unmht=unmht protocol (Mozilla Archive format)
+options.enabledSchemes.main=Protocols
 options.enabledSchemes.securityRemark=The additional protocols might have full system access.
 options.enabledSchemes.securityRemark2=Hence they pose a sizable security risk with untrusted scripts!
-options.excludes.empty=No global excludes specified
+options.enabledSchemes.unmht=unmht protocol (Mozilla Archive format)
 options.excludes.desc=Global excludes will override any script or user specified rules
+options.excludes.empty=No global excludes specified
 options.excludes.remark=(You may specify one exclude per line)
-options.enableCopyDownloadURL=Enable copying of download URL
-options.logging=Logging
 options.logChrome=Log non-critical extension messages to the Error Console
+options.logging=Logging
 options.logToErrorConsole=GM_log uses the Error Console
 options.notifications=Notifications
 options.notifications.enable=Enable sliding notifications on script changes
+options.pane.advanced=Advanced
+options.pane.excludes=Global Excludes
+options.pane.main=Main
+options.pane.ui=User Interface
 options.requireBuiltInCerts=Secure update requires using built-in certificates
 options.requireSecured=Require user scripts to update using HTTPS
+options.title=Scriptish Options
 options.translation=Translation
 options.translation.useEnglish=Always use English
 options.update.security=Update Security
@@ -129,9 +129,9 @@ reinstall=Reinstall
 saving=Saving
 scratchpad.saveAsUserScript=Save As User Script
 scratchpad.saveAsUserScript.ak=u
-scriptOptions.includes=User Includes:
-scriptOptions.excludes=User Excludes:
 scriptOptions.disableScriptIncludes=Disable this script's include patterns and only use the user defined ones.
+scriptOptions.excludes=User Excludes:
+scriptOptions.includes=User Includes:
 statusbar.enabled=Enabled
 statusbar.enabled.ak=E
 statusbar.installed=installed successfully
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 9ee13cce..c2c73080 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -9,8 +9,8 @@ editor.prompt=Por favor, elija antes su editor de texto favorito
 error.api.clipboard.type=no es un tipo soportado por GM_setClipboard.
 error.api.noResourceWithName=No hay recursos con el nombre
 error.api.noSecondArgValue=Segundo argumento no especificado: Valor
-error.api.reqURL.scheme=Esquema no permitido en URL
 error.api.reqURL=URL no válido
+error.api.reqURL.scheme=Esquema no permitido en URL
 error.api.unsafeAccess=Violación de acceso de Scriptish: unsafeWindow no puede invocar
 error.charset=El conjunto de caracteres especificado no es válido.
 error.dependency.loading=Error al cargar dependencia
@@ -76,9 +76,9 @@ newscript.namespace=Espacio de nombres
 newscript.noID=Por favor, introduzca un ID válido para su script.
 newscript.noName=Por favor, introduzca un nombre para su script.
 newscript.runat=
-newscript.runat.documentstart=
 newscript.runat.documentend=
 newscript.runat.documentidle=
+newscript.runat.documentstart=
 newscript.runat.windowload=
 newscript.version=
 nothing.timedOut=
@@ -87,11 +87,6 @@ openFolder.ak=A
 openUserScriptsManager=
 openUserScriptsManager.ak=
 options=Opciones
-options.title=
-options.pane.main=
-options.pane.ui=
-options.pane.excludes=Exclusiones globales
-options.pane.advanced=
 options.addonsManager=Gestor de extensiones
 options.alsoUninstallPrefs=Al desinstalar un script, borrar también sus preferencias
 options.cache=
@@ -99,28 +94,33 @@ options.cache.enabled=
 options.changeEditor=Cambiar editor
 options.editor=Editor
 options.editor.notset=
-options.enabledSchemes.main=
-options.enabledSchemes.advanced=
+options.enableCopyDownloadURL=Activar copia del URL de descarga
 options.enabledSchemes.about=
+options.enabledSchemes.advanced=
 options.enabledSchemes.chrome=
 options.enabledSchemes.data=
 options.enabledSchemes.file=
 options.enabledSchemes.ftp=
 options.enabledSchemes.http=
-options.enabledSchemes.unmht=
+options.enabledSchemes.main=
 options.enabledSchemes.securityRemark=
 options.enabledSchemes.securityRemark2=
-options.excludes.empty=
+options.enabledSchemes.unmht=
 options.excludes.desc=
+options.excludes.empty=
 options.excludes.remark=
-options.enableCopyDownloadURL=Activar copia del URL de descarga
-options.logging=
 options.logChrome=
+options.logging=
 options.logToErrorConsole=
 options.notifications=
 options.notifications.enable=
+options.pane.advanced=
+options.pane.excludes=Exclusiones globales
+options.pane.main=
+options.pane.ui=
 options.requireBuiltInCerts=
 options.requireSecured=
+options.title=
 options.translation=
 options.translation.useEnglish=
 options.update.security=
@@ -129,9 +129,9 @@ reinstall=
 saving=
 scratchpad.saveAsUserScript=
 scratchpad.saveAsUserScript.ak=
-scriptOptions.includes=Inclusiones de usuario:
-scriptOptions.excludes=Exclusiones de usuario:
 scriptOptions.disableScriptIncludes=Desactivar los filtros de inclusión de este script y utilizar sólo los definidos por el usuario.
+scriptOptions.excludes=Exclusiones de usuario:
+scriptOptions.includes=Inclusiones de usuario:
 statusbar.enabled=Activado
 statusbar.enabled.ak=A
 statusbar.installed=instalado con éxito
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 57055932..31c00e8c 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -9,15 +9,15 @@ editor.prompt=まず、使いたいエディタを選択してください
 error.api.clipboard.type=は GM_setClipboard がサポートしてない型です
 error.api.noResourceWithName=名前付きリソースがありません
 error.api.noSecondArgValue=２番目の引数が指定されていません： 値
-error.api.reqURL.scheme=URL 内で許されないスキームです
 error.api.reqURL=不正な URL です
+error.api.reqURL.scheme=URL 内で許されないスキームです
 error.api.unsafeAccess=Scriptish アクセス違反： unsafeWindow は以下を呼び出すことが出来ません
 error.charset=不正な文字セットが指定されました
 error.dependency.loading=依存関係の読み込みでエラーが発生しました
 error.dependency.local=セキュリティ例外： ローカル及び chrome URL へのリクエストは禁止されています
 error.dependency.serverReturned=エラー！ サーバーからの返答：
 error.hash.algorithm=不正なハッシュ・アルゴリズムが指定されました
-error.icon.dataURL=不正なデータ： @icon 用 URL　
+error.icon.dataURL=不正なデータ： @icon 用 URL
 error.icon.notImage=エラー！ @icon が画像の MIME タイプではありません
 error.icon.URL=@icon の URL が不正です
 error.isInvalidValue=は不正な値です
@@ -76,9 +76,9 @@ newscript.namespace=名前空間
 newscript.noID=スクリプトに正しい ID を指定してください
 newscript.noName=スクリプトに名前をつけてください
 newscript.runat=スクリプト実行タイミング
-newscript.runat.documentstart=Document 読み込み開始時
 newscript.runat.documentend=Document 読み込み完了時
 newscript.runat.documentidle=Document 初回アイドル時
+newscript.runat.documentstart=Document 読み込み開始時
 newscript.runat.windowload=全メディアを含む Window が完全に読み込まれた時
 newscript.version=バージョン
 nothing.timedOut=なし（タイムアウト）
@@ -87,11 +87,6 @@ openFolder.ak=O
 openUserScriptsManager=ユーザースクリプトマネージャを開く
 openUserScriptsManager.ak=O
 options=オプション
-options.title=Scriptish オプション
-options.pane.main=メイン
-options.pane.ui=ユーザーインタフェース
-options.pane.excludes=Global Excludes
-options.pane.advanced=詳細
 options.addonsManager=アドオン・マネージャー
 options.alsoUninstallPrefs=スクリプトのアンインストール時に設定も削除
 options.cache=キャッシュ
@@ -99,28 +94,33 @@ options.cache.enabled=ユーザースクリプトをキャッシュ
 options.changeEditor=エディタ変更
 options.editor=エディタ
 options.editor.notset=エディタは指定されていません
-options.enabledSchemes.main=利用プロトコル
-options.enabledSchemes.advanced=利用プロトコルの追加
+options.enableCopyDownloadURL=ダウンロード URL のコピーを有効
 options.enabledSchemes.about=about プロトコル（内部）
+options.enabledSchemes.advanced=利用プロトコルの追加
 options.enabledSchemes.chrome=chrome プロトコル（内部）
 options.enabledSchemes.data=データ・プロトコル
 options.enabledSchemes.file=ファイル・プロトコル（ローカルファイル）
 options.enabledSchemes.ftp=ftp プロトコル
 options.enabledSchemes.http=http/https プロトコル
-options.enabledSchemes.unmht=unmht プロトコル（Mozilla Archive フォーマット）
+options.enabledSchemes.main=利用プロトコル
 options.enabledSchemes.securityRemark=追加したプロトコルでシステムにフルアクセス可能になることがあります
 options.enabledSchemes.securityRemark2=つまり、信用できないスクリプトと併用すると相当なセキュリティ・リスクになるので注意！
-options.excludes.empty=global excludes は指定されていません
+options.enabledSchemes.unmht=unmht プロトコル（Mozilla Archive フォーマット）
 options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先
+options.excludes.empty=global excludes は指定されていません
 options.excludes.remark=（１行１つずつ指定）
-options.enableCopyDownloadURL=ダウンロード URL のコピーを有効
-options.logging=ログ
 options.logChrome=重大でないエクステンションのメッセージもエラーコンソールに出力
+options.logging=ログ
 options.logToErrorConsole=GM_log でエラーコンソールを使用
 options.notifications=通知
 options.notifications.enable=スクリプトの変更を通知
+options.pane.advanced=詳細
+options.pane.excludes=Global Excludes
+options.pane.main=メイン
+options.pane.ui=ユーザーインタフェース
 options.requireBuiltInCerts=安全なアップデートに built-in 証明書を利用
 options.requireSecured=ユーザースクリプトを HTTPS で更新
+options.title=Scriptish オプション
 options.translation=翻訳
 options.translation.useEnglish=常に英語を使用
 options.update.security=更新に関するセキュリティ
@@ -129,9 +129,9 @@ reinstall=再インストール
 saving=保存
 scratchpad.saveAsUserScript=ユーザースクリプトとして保存
 scratchpad.saveAsUserScript.ak=U
-scriptOptions.includes=ユーザー指定 Include：
-scriptOptions.excludes=ユーザー指定 Exclude：
 scriptOptions.disableScriptIncludes=スクリプト内 include を無効。ユーザー指定のみを利用
+scriptOptions.excludes=ユーザー指定 Exclude：
+scriptOptions.includes=ユーザー指定 Include：
 statusbar.enabled=有効
 statusbar.enabled.ak=E
 statusbar.installed=のインストールに成功しました
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index bdce8ab1..05c6c7d5 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -9,8 +9,8 @@ editor.prompt=Escolha seu editor de texto preferido
 error.api.clipboard.type=não é um tipo suportado por GM_setClipboard.
 error.api.noResourceWithName=Nenhum recurso com o nome
 error.api.noSecondArgValue=Segundo argumento não especificado: Valor
-error.api.reqURL.scheme=Esquema não permitido em URL
 error.api.reqURL=Endereço inválido
+error.api.reqURL.scheme=Esquema não permitido em URL
 error.api.unsafeAccess=Violação de acesso do Scriptish: unsafeWindow não pode chamar
 error.charset=O conjunto de caracteres especificado é inválido.
 error.dependency.loading=Erro carregando dependência
@@ -76,9 +76,9 @@ newscript.namespace=Espaço de nomes
 newscript.noID=Por favor, informe um identificador válido para o seu script.
 newscript.noName=Por favor, informe um nome para o seu script.
 newscript.runat=
-newscript.runat.documentstart=
 newscript.runat.documentend=
 newscript.runat.documentidle=
+newscript.runat.documentstart=
 newscript.runat.windowload=
 newscript.version=
 nothing.timedOut=nada (excedido o tempo limite)
@@ -87,11 +87,6 @@ openFolder.ak=A
 openUserScriptsManager=
 openUserScriptsManager.ak=
 options=Opções
-options.title=Opções do Scriptish
-options.pane.main=Principal
-options.pane.ui=
-options.pane.excludes=Exclusões Globais
-options.pane.advanced=Avançado
 options.addonsManager=Gerenciador de complementos
 options.alsoUninstallPrefs=Ao desinstalar um script, remover também as configurações dele
 options.cache=Cache
@@ -99,28 +94,33 @@ options.cache.enabled=Usar cache para scripts de usuário
 options.changeEditor=Alterar editor
 options.editor=Editor
 options.editor.notset=Nenhum editor selecionado
-options.enabledSchemes.main=Protocolos
-options.enabledSchemes.advanced=Protocolos adicionais
+options.enableCopyDownloadURL=Habilitar cópia do endereço de download
 options.enabledSchemes.about=Protocolo about (interno)
+options.enabledSchemes.advanced=Protocolos adicionais
 options.enabledSchemes.chrome=Protocolo chrome (interno)
 options.enabledSchemes.data=Protocolo data
 options.enabledSchemes.file=Protocolo file (arquivos locais)
 options.enabledSchemes.ftp=Protocolo ftp
 options.enabledSchemes.http=Protocolo http/https
-options.enabledSchemes.unmht=Protocolo unmht (formato de arquivamento da Mozilla)
+options.enabledSchemes.main=Protocolos
 options.enabledSchemes.securityRemark=Os protocolos adicionais podem ter acesso total ao seu computador.
 options.enabledSchemes.securityRemark2=Portanto, eles representam um risco de segurança considerável com scripts não confiáveis!
-options.excludes.empty=Nenhuma exclusão global
+options.enabledSchemes.unmht=Protocolo unmht (formato de arquivamento da Mozilla)
 options.excludes.desc=Exclusões globais substituem qualquer regra especificada por scripts ou pelo usuário.
+options.excludes.empty=Nenhuma exclusão global
 options.excludes.remark=(Informe uma exclusão por linha)
-options.enableCopyDownloadURL=Habilitar cópia do endereço de download
-options.logging=Log
 options.logChrome=Registrar mensagens da extensão não-críticas no console de erros
+options.logging=Log
 options.logToErrorConsole=
 options.notifications=Notificações
 options.notifications.enable=
+options.pane.advanced=Avançado
+options.pane.excludes=Exclusões Globais
+options.pane.main=Principal
+options.pane.ui=
 options.requireBuiltInCerts=Exigir que atualizações seguras usem os certificados internos
 options.requireSecured=Exigir que scripts de usuário atualizem usando HTTPS
+options.title=Opções do Scriptish
 options.translation=Tradução
 options.translation.useEnglish=Sempre usar Inglês
 options.update.security=Segurança na atualização
@@ -129,9 +129,9 @@ reinstall=Reinstalar
 saving=Salvando
 scratchpad.saveAsUserScript=Salvar como script de usuário
 scratchpad.saveAsUserScript.ak=u
-scriptOptions.includes=Inclusões personalizadas:
-scriptOptions.excludes=Exclusões personalizadas:
 scriptOptions.disableScriptIncludes=Desativar as inclusões originais deste script e usar somente as inclusões personalizadas.
+scriptOptions.excludes=Exclusões personalizadas:
+scriptOptions.includes=Inclusões personalizadas:
 statusbar.enabled=Ativado
 statusbar.enabled.ak=A
 statusbar.installed=instalado com sucesso
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index fbcb43e7..af2de337 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -9,8 +9,8 @@ editor.prompt=Пожалуйста сначала выберите ваш ред
 error.api.clipboard.type=Тип данных не подходит для GM_setClipboard.
 error.api.noResourceWithName=Нет ресурса с таким именем
 error.api.noSecondArgValue=Второй аргумент - значение - не задан
-error.api.reqURL.scheme=Схема  URL запрещена
 error.api.reqURL=Неверный URL
+error.api.reqURL.scheme=Схема  URL запрещена
 error.api.unsafeAccess=Нарушение доступа Scriptish: из unsafeWindow не позволено работать с
 error.charset=Неверная кодировка.
 error.dependency.loading=Не могу загрузить зависимость
@@ -76,9 +76,9 @@ newscript.namespace=
 newscript.noID=Пожалуйста, введите идентификатор скрипта
 newscript.noName=Пожалуйста, задайте имя скрипта.
 newscript.runat=
-newscript.runat.documentstart=
 newscript.runat.documentend=
 newscript.runat.documentidle=
+newscript.runat.documentstart=
 newscript.runat.windowload=
 newscript.version=
 nothing.timedOut=
@@ -87,11 +87,6 @@ openFolder.ak=
 openUserScriptsManager=
 openUserScriptsManager.ak=
 options=Настройки
-options.title=
-options.pane.main=
-options.pane.ui=
-options.pane.excludes=Глобальные исключения
-options.pane.advanced=
 options.addonsManager=Менеджер Дополнений
 options.alsoUninstallPrefs=Удалять также ассоциированные настройки
 options.cache=
@@ -99,28 +94,33 @@ options.cache.enabled=
 options.changeEditor=Изменить редактор
 options.editor=Редактор
 options.editor.notset=
-options.enabledSchemes.main=
-options.enabledSchemes.advanced=
+options.enableCopyDownloadURL=Включить копирование URL для загрузки
 options.enabledSchemes.about=
+options.enabledSchemes.advanced=
 options.enabledSchemes.chrome=
 options.enabledSchemes.data=
 options.enabledSchemes.file=
 options.enabledSchemes.ftp=
 options.enabledSchemes.http=
-options.enabledSchemes.unmht=
+options.enabledSchemes.main=
 options.enabledSchemes.securityRemark=
 options.enabledSchemes.securityRemark2=
-options.excludes.empty=
+options.enabledSchemes.unmht=
 options.excludes.desc=
+options.excludes.empty=
 options.excludes.remark=
-options.enableCopyDownloadURL=Включить копирование URL для загрузки
-options.logging=
 options.logChrome=
+options.logging=
 options.logToErrorConsole=
 options.notifications=
 options.notifications.enable=
+options.pane.advanced=
+options.pane.excludes=Глобальные исключения
+options.pane.main=
+options.pane.ui=
 options.requireBuiltInCerts=
 options.requireSecured=Разрешить обновления скриптов только по протоколу HTTPS
+options.title=
 options.translation=
 options.translation.useEnglish=
 options.update.security=
@@ -129,9 +129,9 @@ reinstall=
 saving=
 scratchpad.saveAsUserScript=
 scratchpad.saveAsUserScript.ak=
-scriptOptions.includes=Пользовательские включения:
-scriptOptions.excludes=Пользовательские исключения:
 scriptOptions.disableScriptIncludes=Отключить прописанные в скрипте включения, использовать только эти.
+scriptOptions.excludes=Пользовательские исключения:
+scriptOptions.includes=Пользовательские включения:
 statusbar.enabled=Включено
 statusbar.enabled.ak=
 statusbar.installed=успешно установлен
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index c466f7a1..42682cea 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -9,8 +9,8 @@ editor.prompt=Var vänlig välj först det textredigeringsprogram du föredrar
 error.api.clipboard.type=är inte en typ som stöds av GM_setClipboard.
 error.api.noResourceWithName=Det finns ingen resurs med namnet
 error.api.noSecondArgValue=Det andra argumentet har inte angivits: Värde
-error.api.reqURL.scheme=Otillåtet schema i URL
 error.api.reqURL=Ogiltig URL
+error.api.reqURL.scheme=Otillåtet schema i URL
 error.api.unsafeAccess=Åtkomstfel i Scriptish: unsafeWindow kan inte anropa
 error.charset=Ogiltig teckenuppsättning angavs.
 error.dependency.loading=Fel vid inläsning av beroende
@@ -76,9 +76,9 @@ newscript.namespace=Namnområde
 newscript.noID=Var vänlig ange ett giltigt ID för ditt skript.
 newscript.noName=Var vänlig ange ett namn på ditt skript.
 newscript.runat=Kör när
-newscript.runat.documentstart=Dokumentet börjar läsas in
 newscript.runat.documentend=Dokumentet har lästs in
 newscript.runat.documentidle=Dokumentet är först i väntelistan
+newscript.runat.documentstart=Dokumentet börjar läsas in
 newscript.runat.windowload=Fönster inkl. alla medier har lästs in helt och hållet
 newscript.version=Version
 nothing.timedOut=ingenting (tidsgränsen uppnåddes)
@@ -87,11 +87,6 @@ openFolder.ak=Ö
 openUserScriptsManager=Öppna användarskripthanteraren
 openUserScriptsManager.ak=Ö
 options=Inställningar
-options.title=Inställningar för Scriptish
-options.pane.main=Allmänt
-options.pane.ui=Användargränssnitt
-options.pane.excludes=Globala undantag
-options.pane.advanced=Avancerat
 options.addonsManager=Tilläggshanteraren
 options.alsoUninstallPrefs=Vid avinstallation av ett skript, ta även bort dess inställningar
 options.cache=Cache
@@ -99,28 +94,33 @@ options.cache.enabled=Cachelagra användarskript
 options.changeEditor=Byt redigeringsprogram
 options.editor=Redigeringsprogram
 options.editor.notset=Inget redigeringsprogram har valts
-options.enabledSchemes.main=Protokoll
-options.enabledSchemes.advanced=Ytterligare protokoll
+options.enableCopyDownloadURL=Aktivera kopiering av hämtningsadress
 options.enabledSchemes.about=about-protokoll (internt)
+options.enabledSchemes.advanced=Ytterligare protokoll
 options.enabledSchemes.chrome=chrome-protokoll (internt)
 options.enabledSchemes.data=dataprotokoll
 options.enabledSchemes.file=filprotokoll (lokala filer)
 options.enabledSchemes.ftp=FTP-protokoll
 options.enabledSchemes.http=HTTP/HTTPS-protokoll
-options.enabledSchemes.unmht=UNMHT-protokoll (format för Mozilla Archive)
+options.enabledSchemes.main=Protokoll
 options.enabledSchemes.securityRemark=Alla ytterligare protokoll kan ha full åtkomst till systemet.
 options.enabledSchemes.securityRemark2=Därmed utgör de en säkerhetsrisk tillsammans med ej betrodda skript!
-options.excludes.empty=Inga globala undantag har angivits
+options.enabledSchemes.unmht=UNMHT-protokoll (format för Mozilla Archive)
 options.excludes.desc=Globala undantag kommer att åsidosätta alla skript och användardefinierade regler
+options.excludes.empty=Inga globala undantag har angivits
 options.excludes.remark=(Du kan ange ett undantag per rad)
-options.enableCopyDownloadURL=Aktivera kopiering av hämtningsadress
-options.logging=Loggning
 options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felkonsolen
+options.logging=Loggning
 options.logToErrorConsole=GM_log använder Felkonsolen
 options.notifications=Aviseringar
 options.notifications.enable=Aktivera glidande aviseringar vid skriptändringar
+options.pane.advanced=Avancerat
+options.pane.excludes=Globala undantag
+options.pane.main=Allmänt
+options.pane.ui=Användargränssnitt
 options.requireBuiltInCerts=Säker uppdatering kräver användning av inbyggda certifikat
 options.requireSecured=Kräv att användarskript uppdateras via HTTPS
+options.title=Inställningar för Scriptish
 options.translation=Översättning
 options.translation.useEnglish=Använd alltid engelska
 options.update.security=Uppdateringssäkerhet
@@ -129,9 +129,9 @@ reinstall=Ominstallera
 saving=Sparar
 scratchpad.saveAsUserScript=Spara som användarskript
 scratchpad.saveAsUserScript.ak=p
-scriptOptions.includes=Inkluderade av användaren:
-scriptOptions.excludes=Undantagna av användaren:
 scriptOptions.disableScriptIncludes=Inaktivera detta skripts inkluderade mönster och använd endast de användardefinierade mönstren.
+scriptOptions.excludes=Undantagna av användaren:
+scriptOptions.includes=Inkluderade av användaren:
 statusbar.enabled=Aktiverat
 statusbar.enabled.ak=A
 statusbar.installed=har installerats

From 827f3933c8833500518f02ed76de121f278be5b6 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 17:03:35 +0200
Subject: [PATCH 412/829] Implement GM_xpath

---
 extension/modules/api/sandbox.js | 38 ++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/extension/modules/api/sandbox.js b/extension/modules/api/sandbox.js
index 4ac8b7f0..c70abdda 100644
--- a/extension/modules/api/sandbox.js
+++ b/extension/modules/api/sandbox.js
@@ -12,3 +12,41 @@ function GM_addStyle(css) {
   }
   return style;
 }
+
+function GM_xpath(details) {
+  var contextNode = details.node || document;
+  var paths = details.paths || [details.path];
+  var result;
+
+  if (details.all) {
+    var rv = [], i, e;
+    for (var [,path] in Iterator(paths)) {
+      result = document.evaluate(
+        path,
+        contextNode,
+        null,
+        XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
+        null
+      );
+      for (i = 0, e = result.snapshotLength; i < e; ++i) {
+        rv.push(result.snapshotItem(i));
+      }
+    }
+    return rv;
+  }
+
+
+  for (var [,path] in Iterator(paths)) {
+     result = document.evaluate(
+        path,
+        contextNode,
+        null,
+        XPathResult.FIRST_ORDERED_NODE_TYPE,
+        null
+    ).singleNodeValue;
+    if (result) {
+      return result;
+    }
+  }
+  return null;
+}

From befda34f3812c212f7fa0eee4eb7f0c5f3cf5d0b Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 8 Jul 2011 06:21:33 +0200
Subject: [PATCH 413/829] PatternCollection: Check for regs we cannot merge

Some types of expressions are "tainted" for merging. Right now those
containing \backrefs or \x,\u escapes are considered tainted.
Tainted regexps are not merged

Closes #417
---
 .../content/tests/testPatternCollection.js    | 45 ++++++++++++++++
 extension/modules/utils/PatternCollection.js  | 54 ++++++++++++++-----
 2 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index 09583307..978332e0 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -378,4 +378,49 @@ test("clear", function() {
   equal(pc.test("http://mozilla.com/"), false, "no matches");
 });
 
+test("untainted", 1, function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("foo");
+  pc.addPattern("bar");
+  pc.addPattern("/(foo)baz\\\\1/i");
+  pc.addPattern("/(foo)baz\\\\x25/i");
+  pc.addPattern("/(foo)baz\\\\u0025/i");
+  notEqual(pc.merged.source, undefined, "untainted");
+});
+
+test("tainted backref", 2, function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("foo");
+  pc.addPattern("bar");
+  pc.addPattern("/(foo)baz\\1/i");
+  equal(pc.merged.source, undefined, "tainted");
+  equal(pc.test("foobazfoo"), true, "test");
+});
+
+test("tainted \\x escape", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("foo");
+  pc.addPattern("bar");
+  pc.addPattern("/(foo)baz\\x25/i");
+  equal(pc.merged.source, undefined, "tainted");
+  equal(pc.test("foobaz\x25"), true, "test");
+});
+
+test("tainted \\u escape", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("foo");
+  pc.addPattern("bar");
+  pc.addPattern("/(foo)baz\\u0025/i");
+  equal(pc.merged.source, undefined, "tainted");
+  equal(pc.test("foobaz\u0025"), true, "test");
+});
+
 })();
diff --git a/extension/modules/utils/PatternCollection.js b/extension/modules/utils/PatternCollection.js
index a96e45a4..503ec75c 100644
--- a/extension/modules/utils/PatternCollection.js
+++ b/extension/modules/utils/PatternCollection.js
@@ -6,6 +6,45 @@ Components.utils.import("resource://scriptish/utils/Scriptish_getTLDURL.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_mergeRegExps.js");
 
 const FAKE_REGEXP = {test: function() false};
+const REG_TAINTED = /\\[ux]?\d/;
+const REG_TAINTED_ESCAPES = /\\\\/g;
+
+function tainted_filter(r) {
+  // No negative lookbehind in js :p
+  if (REG_TAINTED.test(r.source.replace(REG_TAINTED_ESCAPES, ""))) {
+    this.push(r);
+    return false;
+  }
+  return true;
+}
+
+function merge(regs, flags) {
+  if (!regs.length) {
+    // No patterns -> always test |false|
+    // Do not merge, or we'll create an empty expression
+    // that will always test |true|
+    return FAKE_REGEXP;
+  }
+
+  // Split the regs into "tainted" ones and those we can merge
+  // Tainted:
+  // - contains back refs /(["']).+?\1/
+  // - contains string escapes /\x00\u0000/
+  let tainted = [];
+  regs = regs.filter(tainted_filter, tainted);
+
+  // merge what we can
+  regs = Scriptish_mergeRegExps(regs, flags);
+
+  if (tainted.length) {
+    // we need to test regs individually
+    tainted.unshift(regs);
+    return {test: function(s) tainted.some(function(r) r.test(s))};
+  }
+
+  // no tainted regs
+  return regs;
+}
 
 function PatternCollection() {
   this._patterns = [];
@@ -46,28 +85,19 @@ PatternCollection.prototype = {
     this._merged = this._mergedTLD = null;
   },
   get patterns() this._patterns.concat(),
-  _merge: function(regs, flags) {
-    if (!regs.length) {
-      // No patterns -> always test |false|
-      // Do not merge, or we'll create an empty expression
-      // that will always test |true|
-      return FAKE_REGEXP;
-    }
-    return Scriptish_mergeRegExps(regs, flags);
-  },
   get merged() {
     if (!this._merged)
-      this._merged = this._merge(this._regs, "i");
+      this._merged = merge(this._regs, "i");
     return this._merged;
   },
   get mergedSensitives() {
     if (!this._mergedSensitives)
-      this._mergedSensitives = this._merge(this._regsSensitives);
+      this._mergedSensitives = merge(this._regsSensitives);
     return this._mergedSensitives;
   },
   get mergedTLD() {
     if (!this._mergedTLD)
-      this._mergedTLD = this._merge(this._regsTLD, "i");
+      this._mergedTLD = merge(this._regsTLD, "i");
     return this._mergedTLD;
   },
   test: function(url) this.merged.test(url) || this.mergedSensitives.test(url)

From 8cc028c8ea36140188bc4b86a3380db66125dd2b Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 06:16:08 +0200
Subject: [PATCH 414/829] Rewrite Scriptish_memoize to use less gc objects.

Special-case for Function.length < 5.
A memoized function is not re-entrant-safe any longer, so no recursive
functions ;)

Closes #414
---
 .../content/tests/testScriptishMemoize.js     |  91 +++++++++++++-
 extension/modules/utils/Scriptish_memoize.js  | 113 +++++++++++++++---
 2 files changed, 182 insertions(+), 22 deletions(-)

diff --git a/extension/content/tests/testScriptishMemoize.js b/extension/content/tests/testScriptishMemoize.js
index 015588a9..a219af5d 100644
--- a/extension/content/tests/testScriptishMemoize.js
+++ b/extension/content/tests/testScriptishMemoize.js
@@ -1,9 +1,34 @@
+module("Scriptish_memoize");
 
-Components.utils.import("resource://scriptish/utils/Scriptish_memoize.js");
+test("exports", 1, function() checkExports("resource://scriptish/utils/Scriptish_memoize.js", ["Scriptish_memoize"]));
 
-module("Scriptish_memoize");
+test("memoize0", function() {
+  const {Scriptish_memoize} = importModule("resource://scriptish/utils/Scriptish_memoize.js");
+  raises(function() Scriptish_memoize(function() true));
+});
+
+test("memoize1", function() {
+  const {Scriptish_memoize} = importModule("resource://scriptish/utils/Scriptish_memoize.js");
+  var counter = 0;
+  var memoizedFunc = Scriptish_memoize(function(aIn1) {
+    counter++;
+    return -aIn1;
+  });
+
+  equal(memoizedFunc(2), -2, "-2");
+  ok(counter, 1);
+  equal(memoizedFunc(3), -3, "-3");
+  ok(counter, 2);
+  equal(memoizedFunc(2), -2, "-2");
+  ok(counter, 2);
+  equal(memoizedFunc(3), -3, "-3");
+  ok(counter, 2);
+  equal(memoizedFunc(4), -4, "-4");
+  ok(counter, 3);
+});
 
-test("Memoization", function() {
+test("memoize2", function() {
+  const {Scriptish_memoize} = importModule("resource://scriptish/utils/Scriptish_memoize.js");
   var counter = 0;
   var memoizedFunc = Scriptish_memoize(function(aIn1, aIn2) {
     counter++;
@@ -23,3 +48,63 @@ test("Memoization", function() {
   equal(memoizedFunc(1,234), 235, "1 + 234 = 235");
   ok(counter, 4);
 });
+
+test("memoize3", function() {
+  const {Scriptish_memoize} = importModule("resource://scriptish/utils/Scriptish_memoize.js");
+  var counter = 0;
+  var memoizedFunc = Scriptish_memoize(function(aIn1, aIn2, aIn3) {
+    counter++;
+    return aIn1 + aIn2 + aIn3;
+  });
+
+  equal(memoizedFunc(1,2,3), 6, "1 + 2 + 3 = 6");
+  ok(counter, 1);
+  equal(memoizedFunc(3,2,1), 6, "3 + 2 + 1 = 6");
+  ok(counter, 2);
+  equal(memoizedFunc(1,2,3), 6, "1 + 2 + 3 = 6");
+  ok(counter, 2);
+  equal(memoizedFunc(3,2,1), 6, "3 + 2 + 1 = 6");
+  ok(counter, 2);
+  equal(memoizedFunc(2,3,1), 6, "2 + 3 + 1 = 6");
+  ok(counter, 3);
+});
+
+test("memoize4", function() {
+  const {Scriptish_memoize} = importModule("resource://scriptish/utils/Scriptish_memoize.js");
+  var counter = 0;
+  var memoizedFunc = Scriptish_memoize(function(aIn1, aIn2, aIn3, aIn4) {
+    counter++;
+    return aIn1 + aIn2 + aIn3 - aIn4;
+  });
+
+  equal(memoizedFunc(1,2,3,7), -1, "1 + 2 + 3 - 7 = -1");
+  ok(counter, 1);
+  equal(memoizedFunc(3,2,1,7), -1, "3 + 2 + 1 - 7 = -1");
+  ok(counter, 2);
+  equal(memoizedFunc(1,2,3,7), -1, "1 + 2 + 3 - 7 = -1");
+  ok(counter, 2);
+  equal(memoizedFunc(3,2,1,7), -1, "3 + 2 + 1 - 7 = -1");
+  ok(counter, 2);
+  equal(memoizedFunc(2,3,1,7), -1, "2 + 3 + 1 - 7 = -1");
+  ok(counter, 3);
+});
+
+test("memoize5", function() {
+  const {Scriptish_memoize} = importModule("resource://scriptish/utils/Scriptish_memoize.js");
+  var counter = 0;
+  var memoizedFunc = Scriptish_memoize(function(aIn1, aIn2, aIn3, aIn4, aIn5) {
+    counter++;
+    return aIn1 + aIn2 + aIn3 - aIn4 - aIn5;
+  });
+
+  equal(memoizedFunc(1,2,3,7,-2), 1, "1 + 2 + 3 - 7 - (-2) = 1");
+  ok(counter, 1);
+  equal(memoizedFunc(3,2,1,7,-2), 1, "3 + 2 + 1 - 7 - (-2) = 1");
+  ok(counter, 2);
+  equal(memoizedFunc(1,2,3,7,-2), 1, "1 + 2 + 3 - 7 - (-2) = 1");
+  ok(counter, 2);
+  equal(memoizedFunc(3,2,1,7,-2), 1, "3 + 2 + 1 - 7 - (-2) = 1");
+  ok(counter, 2);
+  equal(memoizedFunc(2,3,1,7,-2), 1, "2 + 3 + 1 - 7 - (-2) = 1");
+  ok(counter, 3);
+});
diff --git a/extension/modules/utils/Scriptish_memoize.js b/extension/modules/utils/Scriptish_memoize.js
index 2a965a59..3b2bfb1f 100644
--- a/extension/modules/utils/Scriptish_memoize.js
+++ b/extension/modules/utils/Scriptish_memoize.js
@@ -1,30 +1,105 @@
+"use strict";
 var EXPORTED_SYMBOLS = ["Scriptish_memoize"];
 
-// Decorate a function with a memoization wrapper, with a limited-size cache
-// to reduce peak memory utilization.  Simple usage:
-//
-// function foo(arg1, arg2) { /* complex operation */ }
-// foo = Scriptish_memoize(foo);
-//
-// The memoized function may have any number of arguments, but they must be
-// be serializable, and uniquely.  It's safest to use this only on functions
-// that accept primitives.
-const Scriptish_memoize = function(func, limit) {
+/**
+ * Decorate a function with a memoization wrapper, with a limited-size cache
+ * to reduce peak memory utilization.
+ *
+ * The memoized function may have any number of arguments, but they must be
+ * be serializable.  It's safest to use this only on functions that accept
+ * primitives.
+ *
+ * A memoized function is not thread-safe, but so is JS,  nor re-entrant-safe!
+ *
+ * @usage var foo = Scriptish_memoize(function foo(arg1, arg2) { ... complex operation ... });
+ * @param {Function} func The function to be memoized
+ * @param {Number} limit Optional. Cache size (default: 3000)
+ * @param {Number} num_args Options. Number of arguments the function expects (default: func.length)
+ * @return {Function} Memoized function
+ */
+function Scriptish_memoize(func, limit, num_args) {
   limit = limit || 3000;
-  var cache = {__proto__: null};
+  num_args = num_args || func.length;
+
+  var cache = Object.create(null);
   var keylist = [];
+  var args = [];
+  var key, result;
+
+  switch (num_args) {
+  case 0:
+    throw new Error("memoize does not support functions without arguments");
+  case 1:
+    return function memoize_one_arg(a) {
+      key = a.toString();
+
+      if (key in cache)
+        return cache[key];
+
+      result = func.call(null, a);
+      cache[key] = result;
+      if (keylist.push(key) > limit)
+        delete cache[keylist.shift()];
+      return result;
+    };
+  case 2:
+    return function memoize_two_args(a, b) {
+      args[0] = a; args[1] = b;
+      key = JSON.stringify(args);
+      args.length = 0;
+
+      if (key in cache)
+        return cache[key];
+
+      var result = func.call(null, a, b);
+      cache[key] = result;
+      if (keylist.push(key) > limit)
+        delete cache[keylist.shift()];
+      return result;
+    };
+  case 3:
+    return function memoize_three_args(a, b, c) {
+      args[0] = a; args[1] = b; args[2] = c;
+      key = JSON.stringify(args);
+      args.length = 0;
+
+      if (key in cache)
+        return cache[key];
+
+      var result = func.call(null, a, b, c);
+      cache[key] = result;
+      if (keylist.push(key) > limit)
+        delete cache[keylist.shift()];
+      return result;
+    };
 
-  return function(a) {
-    var args = Array.prototype.slice.call(arguments);
-    var key = uneval(args);
-    if (key in cache) return cache[key];
+  case 4:
+    return function memoize_four_args(a, b, c, d) {
+      args[0] = a; args[1] = b; args[2] = c; args[3] = d;
+      key = JSON.stringify(args);
+      args.length = 0;
 
-    var result = func.apply(null, args);
+      if (key in cache)
+        return cache[key];
 
-    cache[key] = result;
+      var result = func.call(null, a, b, c, d);
+      cache[key] = result;
+      if (keylist.push(key) > limit)
+        delete cache[keylist.shift()];
+      return result;
+    };
 
-    if (keylist.push(key) > limit) delete cache[keylist.shift()];
+  default:
+    return function() {
+      var key = JSON.stringify(arguments);
+      if (key in cache)
+        return cache[key];
 
-    return result;
+      var result = func.apply(null, arguments);
+      cache[key] = result;
+      if (keylist.push(key) > limit)
+        delete cache[keylist.shift()];
+      return result;
+    };
   }
 }

From e18709677b7a794aa1fd3c1428e1ff7df5cd9e79 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 6 Jul 2011 06:52:29 +0200
Subject: [PATCH 415/829] Memoize matchesURL

This now requires a call to script.update() whenever the script changes

Closes #404
---
 extension/content/js/script-options.js |  1 +
 extension/modules/script/script.js     | 37 +++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/extension/content/js/script-options.js b/extension/content/js/script-options.js
index 72a5deea..cf75f11d 100644
--- a/extension/content/js/script-options.js
+++ b/extension/content/js/script-options.js
@@ -54,6 +54,7 @@ function doSave() {
   }
 
   script.includesDisabled = $("disableScriptIncludes").checked;
+  script.update();
 
   return true;
 }
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index eade57b8..c33717f9 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -19,6 +19,7 @@ lazyImport(this, "resource://scriptish/config/configdownloader.js", ["Scriptish_
 
 lazyUtil(this, "getUriFromFile");
 lazyUtil(this, "getContents");
+lazyUtil(this, "memoize");
 lazyUtil(this, "stringBundle");
 
 const metaRegExp = /\/\/[ \t]*(?:==\/?UserScript==|\@\S+(?:[ \t]+(?:[^\r\f\n]+))?)/g;
@@ -322,20 +323,32 @@ Script.prototype = {
     return false;
   },
 
-  matchesURL: function(aURL) {
+  matchesURL: null,
+  _matchesURL_noincludes: function(aURL) {
     // check if the domain is ok
     if (!this.matchesDomain(aURL)) return false;
 
-    // check if script @includes/@excludes are disabled
-    if (this.includesDisabled)
-      return this._user_includes.test(aURL)
-          && !this._user_excludes.test(aURL);
+    return this._user_includes.test(aURL)
+        && !this._user_excludes.test(aURL);
+  },
+  _matchesURL_includes: function(aURL) {
+    // check if the domain is ok
+    if (!this.matchesDomain(aURL)) return false;
 
     return (this._all_includes.test(aURL)
       || this._matches.some(function(m) m.doMatch(aURL)))
       && !this._all_excludes.test(aURL);
   },
 
+  _make_matchesURL: function() {
+    if (this.includesDisabled) {
+      this.matchesURL = this._matchesURL_noincludes.bind(this);
+    }
+    else {
+      this.matchesURL = this._matchesURL_includes.bind(this);
+    }
+    this.matchesURL = Scriptish_memoize(this.matchesURL, 100);
+  },
   get id() {
     if (!this._id) this.id = this.name + "@" + this.namespace;
     return this._id;
@@ -631,6 +644,11 @@ Script.prototype = {
     }
   },
 
+  update: function() {
+    this.clearResourceCaches();
+    this._make_matchesURL();
+  },
+
   replaceScriptWith: function(aNewScript) {
     this.removeFiles();
     this.updateFromNewScript(aNewScript.installProcess());
@@ -644,8 +662,6 @@ Script.prototype = {
     var oldPriority = this.priority;
     var newPriority = newScript.priority;
 
-    this.clearResourceCaches();
-
     // Copy new values.
     this.blocked = newScript.blocked;
     this.domains = newScript.domains;
@@ -711,6 +727,9 @@ Script.prototype = {
         Scriptish.notify(this, "scriptish-script-modified", {saved: true, reloadUI: true});
       }
     }
+
+    this.update();
+
     if (oldPriority != newPriority) this._config.sortScripts();
   },
 
@@ -1148,6 +1167,8 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
   script.totalDownloads = aSkeleton.totalDownloads;
   script._applyBackgroundUpdates = aSkeleton.applyBackgroundUpdates
 
+  script.update();
+
   aConfig.addScript(script);
   return false;
 }
@@ -1269,6 +1290,8 @@ Script.loadFromXML = function(aConfig, aNode) {
   if (aNode.getAttribute("totalDownloads"))
     script.totalDownloads = aNode.getAttribute("totalDownloads") * 1;
 
+  script.update();
+
   aConfig.addScript(script);
   return fileModified;
 };

From 2b04815f84855ad3c3630e2a7ccfd9c38d29ab93 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 8 Jul 2011 13:08:05 -0700
Subject: [PATCH 416/829] bug fix: needed to call script.update() when
 installing a script

---
 extension/modules/script/script.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index c33717f9..2141732b 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -806,6 +806,8 @@ Script.prototype = {
     // set up _modified and stat thrashing stuff
     this.isModified();
 
+    this.update();
+
     this._dependhash = tools.Scriptish_cryptoHash(this._rawMeta);
     return this;
   }

From 4854b7659a97a0b30129a585c0ac2d8ac26a868f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 8 Jul 2011 13:18:31 -0700
Subject: [PATCH 417/829] Closes #422 for now, providing a alert() function
 which actually works to user scripts

---
 extension/modules/api.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index a74e6a04..c535c159 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -4,6 +4,7 @@ const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_alert.js", ["Scriptish_alert"]);
 
 lazyUtil(this, "cryptoHash");
 lazyUtil(this, "notification");
@@ -208,3 +209,8 @@ GM_API.prototype.GM_setClipboard = function GM_setClipboard() {
   if (!GM_apiLeakCheck("GM_setClipboard")) return;
   GM_setClipboard.apply(null, arguments);
 }
+
+// temp solution for #422
+GM_API.prototype.alert = function alert(aMsg) {
+  Scriptish_alert(aMsg);
+}

From 92dc2ff0aa08398a76c35ab1599bddb6a7de2690 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 8 Jul 2011 16:03:26 -0500
Subject: [PATCH 418/829] minor change in ja-JP by k2jp (BabelZilla).

---
 extension/locale/ja-JP/scriptish.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 31c00e8c..6083de6b 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -115,7 +115,7 @@ options.logToErrorConsole=GM_log でエラーコンソールを使用
 options.notifications=通知
 options.notifications.enable=スクリプトの変更を通知
 options.pane.advanced=詳細
-options.pane.excludes=Global Excludes
+options.pane.excludes=
 options.pane.main=メイン
 options.pane.ui=ユーザーインタフェース
 options.requireBuiltInCerts=安全なアップデートに built-in 証明書を利用
@@ -124,7 +124,7 @@ options.title=Scriptish オプション
 options.translation=翻訳
 options.translation.useEnglish=常に英語を使用
 options.update.security=更新に関するセキュリティ
-options.useDownloadURL=更新用 URL が指定されていない場合はダウンロード URL を利用
+options.useDownloadURL=updateURL の指定が無い場合は代わりにダウンロード時の URL を利用
 reinstall=再インストール
 saving=保存
 scratchpad.saveAsUserScript=ユーザースクリプトとして保存

From 06904746c21114a286d3a274672186b628b07e82 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 8 Jul 2011 16:21:39 -0500
Subject: [PATCH 419/829] Adding zh-CN (simplified Chinese), courtesy of
 yfdyh000 (BabelZilla).

---
 extension/chrome.manifest                     |   1 +
 extension/install.rdf                         |   1 +
 extension/locale/zh-CN/description.properties |   1 +
 extension/locale/zh-CN/scriptish.properties   | 150 ++++++++++++++++++
 4 files changed, 153 insertions(+)
 create mode 100644 extension/locale/zh-CN/description.properties
 create mode 100644 extension/locale/zh-CN/scriptish.properties

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index c9574f4e..96e57567 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -29,3 +29,4 @@ locale     scriptish  ja-JP  locale/ja-JP/
 locale     scriptish  pt-BR  locale/pt-BR/
 locale     scriptish  ru-RU  locale/ru-RU/
 locale     scriptish  sv-SE  locale/sv-SE/
+locale     scriptish  zh-CN  locale/zh-CN/
diff --git a/extension/install.rdf b/extension/install.rdf
index cec77969..5e5a60fc 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -49,6 +49,7 @@
     <em:translator>Mikael Hiort af Ornäs (sv-SE)</em:translator>
     <em:translator>Nils Maier (de)</em:translator>
     <em:translator>nishikawasasaki (kohsei yamamoto) (ja-JP)</em:translator>
+    <em:translator>yfdyh000 (zh-CN); mailto:yfdyh000@gmail.com</em:translator>
 
     <em:updateURL>http://github.com/downloads/erikvold/scriptish/update.rdf</em:updateURL>
     <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjEA/hqcsMgPctoWvqJFfjtNcQbfBi1uP3zoWR3PPMRSXnpBJv/5Kb5lJD9HJ+963CFQ3oFvkgO9+oEWisiKBjxhx94Bynl0Ym2sZ1DdEzTsH9kV4HGFLjeYTix5WkQqdoswyM32ebtDSYrFbSqxpBrgHwVLELfFYM1qZsnWpJKwIDAQAB</em:updateKey>
diff --git a/extension/locale/zh-CN/description.properties b/extension/locale/zh-CN/description.properties
new file mode 100644
index 00000000..4ce40ad3
--- /dev/null
+++ b/extension/locale/zh-CN/description.properties
@@ -0,0 +1 @@
+extensions.scriptish@erikvold.com.description=
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
new file mode 100644
index 00000000..b3bbdef3
--- /dev/null
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -0,0 +1,150 @@
+contributions.description=
+copyDownloadURL=复制下载 URL
+copyDownloadURL.ak=C
+edit=编辑
+edit.ak=E
+editor.couldNotLaunch=无法启动编辑器。
+editor.pleasePickExecutable=请选择一个可执行程序用来编辑用户脚本。
+editor.prompt=请选择您喜欢的文本编辑器
+error.api.clipboard.type=不是 GM_setClipboard 所支持的类型。
+error.api.noResourceWithName=没有该名称的资源
+error.api.noSecondArgValue=第二个参数未指定：值
+error.api.reqURL.scheme=不允许在 URL 中出现 scheme
+error.api.reqURL=无效的 URL
+error.api.unsafeAccess=Scriptish 访问冲突：unsafeWindow 无法调用
+error.charset=指定的字符集无效。
+error.dependency.loading=加载依赖文件时发生错误
+error.dependency.local=安全异常：禁止本地及 chrome 的 URL 请求
+error.dependency.serverReturned=错误！服务器已返回
+error.hash.algorithm=指定的散列算法无效
+error.icon.dataURL=无效的数据：@icon 的 URL
+error.icon.notImage=错误！@icon 没有图像 MIME 类型
+error.icon.URL=无效的 @icon URL
+error.isInvalidValue=是个无效的值
+error.matchPattern.rules=@match 模式不符合模式规则
+error.matchPattern.rules.file=文件 scheme @match 模式不符合模式规则
+error.notSupported.Firefox=不支持这一版本的 Firefox
+error.openingFile=无法打开文件
+error.pattern.parsing=模式不能被解析
+error.pref.type=不支持的首选项类型。有效的类型有：字符串、布尔和32位整数。
+error.resource.dupName=是一个重复的资源名称。每一个 @resource 都必须有唯一的名称。
+error.resource.syntax=无效的 @resource 声明语法
+error.retrieving=检索失败
+error.script.installing=安装用户脚本时发生错误
+error.script.loading=加载用户脚本时发生错误
+greeting.btn.ak=I
+greeting.msg=这是一个用户脚本。要使用该脚本请点击“安装”。
+install=安装
+install.domains=域名：
+install.excludes=不在下列网页运行：
+install.includes=脚本运行于下列网页：
+install.matches=匹配：
+install.requires=要求：
+install.resources=资源：
+install.showScriptSource=显示脚本源代码
+install.title=安装用户脚本
+install.warning1=恶意脚本可能会侵犯您的隐私并在您不知情的情况下以您的身份运行。
+install.warning2=您应该只安装从可信任来源获得的脚本。
+menu.commands=用户脚本命令...
+menu.commands.ak=C
+menu.install=安装用户脚本...
+menu.install.ak=I
+menu.manage=管理用户脚本...
+menu.manage.ak=M
+menu.new=新建用户脚本...
+menu.new.ak=N
+menu.options.ak=O
+menu.show=查看用户脚本源代码
+menu.show.ak=V
+menu.title=Scriptish
+menu.title.ak=S
+menuitem.install=安装这个用户脚本...
+menuitem.manage=管理用户脚本
+menuitem.new=新建用户脚本
+moving.dependency=从这里移除依赖文件
+moving.script=从这里移除脚本文件
+newscript.author=作者
+newscript.description=描述
+newscript.excludes=排除网址（每行一条）
+newscript.exists=已安装了同名的脚本。\n覆盖同名脚本吗？
+newscript.id=ID
+newscript.includes=包括网址（每行一条）
+newscript.missing.id=请提供 ID。
+newscript.missing.name=请提供一个名称。这个名称将显示在附加组件管理器中。
+newscript.name=名称
+newscript.namespace=命名空间
+newscript.noID=请为您的脚本提供一个有效的 ID。
+newscript.noName=请为您的脚本命名。
+newscript.runat=运行当
+newscript.runat.documentend=文档加载完成时
+newscript.runat.documentidle=文档首次闲置时
+newscript.runat.documentstart=文档加载开始时
+newscript.runat.windowload=窗口包含的所有媒体都加载完成时
+newscript.version=版本
+nothing.timedOut=无（超时）
+openFolder=打开文件夹
+openFolder.ak=O
+openUserScriptsManager=打开用户脚本管理器
+openUserScriptsManager.ak=O
+options=选项
+options.addonsManager=附加组件管理器
+options.alsoUninstallPrefs=当卸载脚本时，同时清除相关的首选项。
+options.cache=缓存
+options.cache.enabled=缓存用户脚本
+options.changeEditor=更换编辑器
+options.editor=编辑器
+options.editor.notset=未选择编辑器
+options.enableCopyDownloadURL=启用复制下载 URL
+options.enabledSchemes.about=about 协议（内部）
+options.enabledSchemes.advanced=额外的协议
+options.enabledSchemes.chrome=chrome 协议（内部）
+options.enabledSchemes.data=data 协议
+options.enabledSchemes.file=file 协议（本地文件）
+options.enabledSchemes.ftp=ftp 协议
+options.enabledSchemes.http=http/https 协议
+options.enabledSchemes.main=协议
+options.enabledSchemes.securityRemark=额外的协议可能会拥有完全的系统访问权限。
+options.enabledSchemes.securityRemark2=因此这些不受信任的脚本可能造成巨大的安全风险！
+options.enabledSchemes.unmht=unmht 协议（Mozilla 存档格式）
+options.excludes.desc=全局排除将覆盖任何脚本和用户指定的规则
+options.excludes.empty=当前没有指定全局排除
+options.excludes.remark=（您可以每行指定一条排除网址）
+options.logChrome=记录非关键的扩展信息到错误控制台
+options.logging=日志
+options.logToErrorConsole=GM_log 使用错误控制台
+options.notifications=通知
+options.notifications.enable=启用脚本变化时滑动通知
+options.pane.advanced=高级
+options.pane.excludes=全局排除
+options.pane.main=常规
+options.pane.ui=用户界面
+options.requireBuiltInCerts=安全更新需要使用内置的证书
+options.requireSecured=要求用户脚本使用 HTTPS 更新
+options.title=Scriptish 选项
+options.translation=翻译
+options.translation.useEnglish=始终使用英语界面
+options.update.security=更新安全
+options.useDownloadURL=如果没有更新 URL 则使用下载 URL 进行更新
+reinstall=重装
+saving=正在保存
+scratchpad.saveAsUserScript=保存为用户脚本
+scratchpad.saveAsUserScript.ak=u
+scriptOptions.disableScriptIncludes=禁用该脚本的包括模式，仅使用用户定义的。
+scriptOptions.excludes=用户指定的排除网页：
+scriptOptions.includes=用户指定的包括网页：
+statusbar.enabled=启用
+statusbar.enabled.ak=E
+statusbar.installed=安装成功
+statusbar.modified=已修改
+statusbar.noScripts.excluded=页面已排除！
+statusbar.noScripts.notfound=页面上没有脚本在运行！
+statusbar.noScripts.scheme=Scheme 已禁用！
+statusbar.updated=更新成功
+tooltip.loading=正在加载...
+Uninstall=卸载
+untitledScript=无标题的脚本
+Update=更新
+userscripts=用户脚本
+userscripts.get=获取用户脚本
+userscripts.noneInstalled=您尚未安装任何用户脚本
+warning.returnfrommain=一般不支持从主体范围“返回”。您需要在您的用户脚本中修复这个问题。

From 7bc25cf824fbd603afc86270c4128422c95a3074 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 8 Jul 2011 23:57:12 +0200
Subject: [PATCH 420/829] Avoid dialog layout changes when loading @iconURL

Closes #424
---
 extension/content/install.xul        |  2 +-
 extension/content/script-options.xul |  2 +-
 extension/skin/install.css           | 16 +++++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/extension/content/install.xul b/extension/content/install.xul
index d1233e15..cb1956cf 100644
--- a/extension/content/install.xul
+++ b/extension/content/install.xul
@@ -20,7 +20,7 @@
   </hbox>
   <vbox id="installBox" flex="1">
     <hbox id="script-desc-vbox">
-      <vbox pack="start">
+      <vbox pack="start" align="center" id="scriptIconBox">
         <image id="scriptIcon"/>
       </vbox>
       <vbox flex="1">
diff --git a/extension/content/script-options.xul b/extension/content/script-options.xul
index 385433c8..26247ccd 100644
--- a/extension/content/script-options.xul
+++ b/extension/content/script-options.xul
@@ -10,7 +10,7 @@
   <script type="application/x-javascript" src="chrome://scriptish/content/js/script-options.js"/>
 
   <hbox>
-    <vbox pack="start">
+    <vbox pack="start" align="center" id="scriptIconBox">
       <image id="scriptIcon"/>
     </vbox>
     <vbox flex="1">
diff --git a/extension/skin/install.css b/extension/skin/install.css
index 42183c07..e8979bfb 100644
--- a/extension/skin/install.css
+++ b/extension/skin/install.css
@@ -25,12 +25,22 @@
   padding-right: 1.5em;
 }
 
-#scriptIcon {
-  max-width: 48px;
-  max-height: 48px;
+#scriptIconBox {
+  width: 64px;
+  height: 64px;
+  margin-top: 1ex;
   margin-right: 1ex;
 }
 
+#scriptIcon {
+  min-width: 24px;
+  min-height: 24px;
+  max-width: 64px;
+  max-height: 64px;
+  image-rendering: optimizeQuality;
+  image-rendering: -moz-crisp-edges;
+}
+
 #scriptTitle {
   font-weight: bold;
   font-size: 1.1em;

From fa1187fa4cc5259483f11c190899bf561b57b021 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sat, 9 Jul 2011 00:00:02 +0200
Subject: [PATCH 421/829] Init script-options already in DOMContentLoaded

---
 extension/content/js/script-options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/script-options.js b/extension/content/js/script-options.js
index cf75f11d..9108b38f 100644
--- a/extension/content/js/script-options.js
+++ b/extension/content/js/script-options.js
@@ -5,7 +5,7 @@ lazyUtil(this, "stringBundle");
 var $ = function(aID) document.getElementById(aID);
 var script;
 
-window.addEventListener("load", function() {
+window.addEventListener("DOMContentLoaded", function() {
   var scriptID = window.location.search.match(/[\?&]id=([^&,]+)/i);
   if (!scriptID) {
     //window.close();

From affa233b7035bf11a79322611ab1209bdb98d541 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sat, 9 Jul 2011 00:04:28 +0200
Subject: [PATCH 422/829] newscript: l10n code

---
 extension/content/js/script-options.js | 9 ++++-----
 extension/content/script-options.xul   | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/extension/content/js/script-options.js b/extension/content/js/script-options.js
index 9108b38f..f67f45b4 100644
--- a/extension/content/js/script-options.js
+++ b/extension/content/js/script-options.js
@@ -1,10 +1,13 @@
 Components.utils.import("resource://scriptish/constants.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_localizeDOM.js");
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyUtil(this, "stringBundle");
 
 var $ = function(aID) document.getElementById(aID);
 var script;
 
+Scriptish_localizeOnLoad(this);
+
 window.addEventListener("DOMContentLoaded", function() {
   var scriptID = window.location.search.match(/[\?&]id=([^&,]+)/i);
   if (!scriptID) {
@@ -30,14 +33,10 @@ window.addEventListener("DOMContentLoaded", function() {
     }
     $("scriptTitle").textContent = title;
 
-    $("includes-label").setAttribute("value", Scriptish_stringBundle("scriptOptions.includes"));
-    $("excludes-label").setAttribute("value", Scriptish_stringBundle("scriptOptions.excludes"));
     $("includes").value = script.getUserIncStr();
     $("excludes").value = script.getUserIncStr("exclude");
 
-    let tmp = $("disableScriptIncludes");
-    tmp.setAttribute("label", Scriptish_stringBundle("scriptOptions.disableScriptIncludes"));
-    tmp.checked = script.includesDisabled;
+    $("disableScriptIncludes").checked = script.includesDisabled;
   });
 
   return true;
diff --git a/extension/content/script-options.xul b/extension/content/script-options.xul
index 26247ccd..858ac20c 100644
--- a/extension/content/script-options.xul
+++ b/extension/content/script-options.xul
@@ -15,17 +15,17 @@
     </vbox>
     <vbox flex="1">
       <description id="scriptTitle"/>
-      <label id="includes-label" control="includes"/>
+      <label control="includes" value="scriptOptions.includes" localize="value"/>
       <textbox id="includes" multiline="true" rows="4" cols="50"/>
 
       <separator class="thin"/>
 
-      <label id="excludes-label" control="excludes"/>
+      <label control="excludes" value="scriptOptions.excludes" localize="value"/>
       <textbox id="excludes" multiline="true" rows="4" cols="50"/>
 
       <separator class="thin"/>
 
-      <checkbox id="disableScriptIncludes"/>
+      <checkbox id="disableScriptIncludes" label="scriptOptions.disableScriptIncludes" localize="label"/>
     </vbox>
   </hbox>
 </dialog>

From 8de05dc6a369a97bc8a8a66b0008cfc1f8989829 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 9 Jul 2011 14:44:16 -0500
Subject: [PATCH 423/829] Closes #431 Updating es-ES with modifications by
 strel.

---
 extension/install.rdf                       |   1 +
 extension/locale/es-ES/scriptish.properties | 146 ++++++++++----------
 2 files changed, 74 insertions(+), 73 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 5e5a60fc..90fd76b1 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -49,6 +49,7 @@
     <em:translator>Mikael Hiort af Ornäs (sv-SE)</em:translator>
     <em:translator>Nils Maier (de)</em:translator>
     <em:translator>nishikawasasaki (kohsei yamamoto) (ja-JP)</em:translator>
+    <em:translator>strel (es-ES)</em:translator>
     <em:translator>yfdyh000 (zh-CN); mailto:yfdyh000@gmail.com</em:translator>
 
     <em:updateURL>http://github.com/downloads/erikvold/scriptish/update.rdf</em:updateURL>
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index c2c73080..0a202882 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -1,13 +1,13 @@
-contributions.description=
+contributions.description=El desarrollador de este script de usuario te pide que ayudes a mantener su desarrollo continuo haciendo un pequeño donativo.
 copyDownloadURL=Copiar URL de descarga
 copyDownloadURL.ak=C
 edit=Editar
 edit.ak=E
 editor.couldNotLaunch=Error al abrir el editor.
-editor.pleasePickExecutable=Por favor elija un programa para editar sus scripts de usuario.
+editor.pleasePickExecutable=Por favor, elija un programa para editar sus scripts de usuario.
 editor.prompt=Por favor, elija antes su editor de texto favorito
 error.api.clipboard.type=no es un tipo soportado por GM_setClipboard.
-error.api.noResourceWithName=No hay recursos con el nombre
+error.api.noResourceWithName=No hay recursos con ese nombre
 error.api.noSecondArgValue=Segundo argumento no especificado: Valor
 error.api.reqURL=URL no válido
 error.api.reqURL.scheme=Esquema no permitido en URL
@@ -15,11 +15,11 @@ error.api.unsafeAccess=Violación de acceso de Scriptish: unsafeWindow no puede
 error.charset=El conjunto de caracteres especificado no es válido.
 error.dependency.loading=Error al cargar dependencia
 error.dependency.local=Excepción de seguridad: prohibidas las peticiones a URLs locales y chrome
-error.dependency.serverReturned=¡Error! El servidor ha devuelto
+error.dependency.serverReturned=El servidor ha devuelto ¡Error!
 error.hash.algorithm=Especificado algoritmo de hash no válido.
-error.icon.dataURL=URL de tipo datos para @icon no válido
-error.icon.notImage=¡Error!: @icon no tiene un tipo MIME de imagen
-error.icon.URL=URL para @icon no válido
+error.icon.dataURL=URL de tipo datos para @ICON no válido
+error.icon.notImage=¡Error!: @ICON no tiene un tipo MIME de imagen
+error.icon.URL=URL para @ICON no válido
 error.isInvalidValue=es un valor no permitido
 error.matchPattern.rules=el filtro @match no se ajusta a las reglas para filtros
 error.matchPattern.rules.file=El filtro @match del esquema File no se ajusta a las reglas para filtros
@@ -27,8 +27,8 @@ error.notSupported.Firefox=no soportado por esta versión de Firefox
 error.openingFile=Error abriendo el archivo
 error.pattern.parsing=Error interpretando el filtro
 error.pref.type=Tipo de preferencia no soportado. Tipos válidos: cadena, booleano y entero de 32 bits.
-error.resource.dupName=es un nombre de recurso duplicado. Cada declaración @resource debe tener un nombre único.
-error.resource.syntax=Sintaxis no válida para la declaración @resource
+error.resource.dupName=es un nombre de recurso duplicado. Cada declaración @Resource debe tener un nombre único.
+error.resource.syntax=Sintaxis no válida para la declaración @Resource
 error.retrieving=Error al descargar
 error.script.installing=Error al instalar script de usuario
 error.script.loading=Error al cargar script de usuario
@@ -39,13 +39,13 @@ install.domains=dominios:
 install.excludes=no se ejecuta sobre:
 install.includes=se ejecuta sobre:
 install.matches=filtros:
-install.requires=requiere:
+install.requires=requerimientos:
 install.resources=recursos:
 install.showScriptSource=Mostrar código fuente del script
-install.title=Instalar script de usuario
+install.title=Instalación de script de usuario
 install.warning1=Los scripts maliciosos pueden violar su privacidad y actuar en su nombre sin su conocimiento.
 install.warning2=Sólo debería instalar scripts de fuentes en las que confíe.
-menu.commands=Mandatos del script de usuario...
+menu.commands=Comandos del script de usuario...
 menu.commands.ak=M
 menu.install=Instalar script de usuario...
 menu.install.ak=I
@@ -61,90 +61,90 @@ menu.title.ak=S
 menuitem.install=Instalar este script de usuario...
 menuitem.manage=Gestionar scripts de usuario
 menuitem.new=Nuevo script de usuario
-moving.dependency=
-moving.script=
-newscript.author=
+moving.dependency=Moviendo el archivo de dependencias desde
+moving.script=Moviendo el archivo de script desde
+newscript.author=Autor
 newscript.description=Descripción
 newscript.excludes=Exclusiones (una por línea)
 newscript.exists=Ya hay instalado un script con ese nombre.\n¿Sobreescribir?
 newscript.id=ID
-newscript.includes=Inclusiones (Una por línea)
-newscript.missing.id=
-newscript.missing.name=
+newscript.includes=Inclusiones (una por línea)
+newscript.missing.id=Por favor, introduzca un identificador.
+newscript.missing.name=Por favor, introduzca un nombre. El nombre se mostrará en el administrador de complementos.
 newscript.name=Nombre
 newscript.namespace=Espacio de nombres
-newscript.noID=Por favor, introduzca un ID válido para su script.
+newscript.noID=Por favor, introduzca un identificador válido para su script.
 newscript.noName=Por favor, introduzca un nombre para su script.
-newscript.runat=
-newscript.runat.documentend=
-newscript.runat.documentidle=
-newscript.runat.documentstart=
-newscript.runat.windowload=
-newscript.version=
-nothing.timedOut=
+newscript.runat=Ejecutar cuando
+newscript.runat.documentend=el documento termine de cargarse
+newscript.runat.documentidle=el documento esté inactivo por primera vez
+newscript.runat.documentstart=el documento comience a cargarse
+newscript.runat.windowload=la ventana con todo su contenido esté completamente cargada
+newscript.version=Versión
+nothing.timedOut=nada (en espera)
 openFolder=Abrir carpeta
 openFolder.ak=A
-openUserScriptsManager=
-openUserScriptsManager.ak=
+openUserScriptsManager=Abrir administrador de scripts de usuario
+openUserScriptsManager.ak=A
 options=Opciones
-options.addonsManager=Gestor de extensiones
+options.addonsManager=Administrador de complementos
 options.alsoUninstallPrefs=Al desinstalar un script, borrar también sus preferencias
-options.cache=
-options.cache.enabled=
+options.cache=Cache
+options.cache.enabled=Cargar los scripts de usuario en cache
 options.changeEditor=Cambiar editor
 options.editor=Editor
-options.editor.notset=
-options.enableCopyDownloadURL=Activar copia del URL de descarga
-options.enabledSchemes.about=
-options.enabledSchemes.advanced=
-options.enabledSchemes.chrome=
-options.enabledSchemes.data=
-options.enabledSchemes.file=
-options.enabledSchemes.ftp=
-options.enabledSchemes.http=
-options.enabledSchemes.main=
-options.enabledSchemes.securityRemark=
-options.enabledSchemes.securityRemark2=
-options.enabledSchemes.unmht=
-options.excludes.desc=
-options.excludes.empty=
-options.excludes.remark=
-options.logChrome=
-options.logging=
-options.logToErrorConsole=
-options.notifications=
-options.notifications.enable=
-options.pane.advanced=
+options.editor.notset=No se ha seleccionado editor
+options.enableCopyDownloadURL=Activar copiado de URL de descarga
+options.enabledSchemes.about=Protocolo about (interno)
+options.enabledSchemes.advanced=Protocolos adicionales
+options.enabledSchemes.chrome=Protocolo chrome (interno)
+options.enabledSchemes.data=Protocolo data
+options.enabledSchemes.file=Protocolo file (archivos locales)
+options.enabledSchemes.ftp=Protocolo ftp
+options.enabledSchemes.http=Protocolo http/https
+options.enabledSchemes.main=Protocolos
+options.enabledSchemes.securityRemark=Los protocolos adicionales podrían tener acceso completo al sistema.
+options.enabledSchemes.securityRemark2=¡Por lo tanto representan un riesgo de seguridad considerable con scripts no confiables!
+options.enabledSchemes.unmht=Protocolo unmht (Formato de Archivo Mozilla, .maf)
+options.excludes.desc=Las exclusiones globales se imponen a cualquier regla de script, o definida por el usuario
+options.excludes.empty=No hay definidas exclusiones globales
+options.excludes.remark=(Puede definir una exclusión por linea)
+options.logChrome=Registrar en log mensajes de extensión no críticos a la consola de errores
+options.logging=Registro de eventos (logging)
+options.logToErrorConsole=GM_log usa la consola de errores
+options.notifications=Notificaciones
+options.notifications.enable=Activar notificaciones deslizantes para cambios en el script
+options.pane.advanced=Avanzado
 options.pane.excludes=Exclusiones globales
-options.pane.main=
-options.pane.ui=
-options.requireBuiltInCerts=
-options.requireSecured=
-options.title=
-options.translation=
-options.translation.useEnglish=
-options.update.security=
+options.pane.main=Principal
+options.pane.ui=Interfaz de usuario
+options.requireBuiltInCerts=Las actualizaciones seguras requieren que el certificado esté incluído
+options.requireSecured=Requerir que los scripts de usuario se actualicen usando HTTPS
+options.title=Opciones de scriptish
+options.translation=Traducción
+options.translation.useEnglish=Usar Inglés siempre
+options.update.security=Seguridad de las actualizaciones
 options.useDownloadURL=Utilizar URL de descarga para actualizar si no hay URL de actualización
-reinstall=
-saving=
-scratchpad.saveAsUserScript=
-scratchpad.saveAsUserScript.ak=
+reinstall=Reinstalar
+saving=Guardando
+scratchpad.saveAsUserScript=Guardar como script de usuario
+scratchpad.saveAsUserScript.ak=U
 scriptOptions.disableScriptIncludes=Desactivar los filtros de inclusión de este script y utilizar sólo los definidos por el usuario.
-scriptOptions.excludes=Exclusiones de usuario:
-scriptOptions.includes=Inclusiones de usuario:
+scriptOptions.excludes=Exclusiones definidas por el usuario:
+scriptOptions.includes=Inclusiones defenidas por el usuario:
 statusbar.enabled=Activado
 statusbar.enabled.ak=A
 statusbar.installed=instalado con éxito
 statusbar.modified=modificado
-statusbar.noScripts.excluded=
+statusbar.noScripts.excluded=¡Esta página está excluída!
 statusbar.noScripts.notfound=¡No hay scripts para esta página!
-statusbar.noScripts.scheme=
+statusbar.noScripts.scheme=¡Este esquema está deshabilitado!
 statusbar.updated=actualizado con éxito
 tooltip.loading=Cargando...
 Uninstall=Desinstalar
-untitledScript=
+untitledScript=Script sin título
 Update=Actualizar
 userscripts=Scripts de usuario
-userscripts.get=
-userscripts.noneInstalled=
-warning.returnfrommain=
+userscripts.get=Obtener scripts de usuario
+userscripts.noneInstalled=No tiene instalado ningún script de usuario
+warning.returnfrommain="return" desde el ámbito principal no está soportado generalmente. Debería arreglar eso en su script

From e806688e8c7be415ca5d9b4e6089cb2fcec4e627 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 9 Jul 2011 20:51:06 -0500
Subject: [PATCH 424/829] Adding 'logChrome' pref default, since we have it
 under Scriptish Options -> Advanced -> Main.

---
 extension/defaults/preferences/scriptish.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 33453fbb..7da695ce 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -4,7 +4,6 @@ pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
 pref("extensions.scriptish.blocklist.url", "https://github.com/erikvold/scriptish/raw/master/blocklist.json");
 pref("extensions.scriptish.cache.enabled", true);
-pref("extensions.scriptish.enableNotifications", true);
 pref("extensions.scriptish.enabled", true);
 pref("extensions.scriptish.enabledSchemes.about", false);
 pref("extensions.scriptish.enabledSchemes.chrome", false);
@@ -14,7 +13,10 @@ pref("extensions.scriptish.enabledSchemes.ftp", true);
 pref("extensions.scriptish.enabledSchemes.http", true);
 pref("extensions.scriptish.enabledSchemes.unmht", false);
 pref("extensions.scriptish.enableCopyDownloadURL", false);
+pref("extensions.scriptish.enableNotifications", true);
 pref("extensions.scriptish.enableScriptRefreshing", true);
+pref("extensions.scriptish.logChrome", false);
+pref("extensions.scriptish.logToErrorConsole", true);
 pref("extensions.scriptish.optimizingRegexpMerge", false);
 pref("extensions.scriptish.uninstallPreferences", true);
 pref("extensions.scriptish.update.requireBuiltInCerts", true);
@@ -23,4 +25,3 @@ pref("extensions.scriptish.update.uso.interval", 86400);
 pref("extensions.scriptish.update.uso.lastFetch", 0);
 pref("extensions.scriptish.useDefaultLocale", false);
 pref("extensions.scriptish.useDownloadURLForUpdateURL", false);
-pref("extensions.scriptish.logToErrorConsole", true);

From 79cc754625ad2903c21e4f7d64c10d8f67235ac4 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 10 Jul 2011 22:30:54 -0500
Subject: [PATCH 425/829] Update USO data immediately after installing a new
 script.

---
 extension/modules/config/config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index c6f388b1..da73507d 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -366,6 +366,7 @@ Config.prototype = {
       this._scripts[existingIndex].replaceScriptWith(aNewScript);
     } else {
       aNewScript.installProcess();
+      timeout(aNewScript.updateUSOData.bind(aNewScript));
       this.addScript(aNewScript);
 
       Scriptish.notify(aNewScript, "scriptish-script-installed", true);

From d02431c4f964aa43783e5a11d715ba134943196a Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 11 Jul 2011 12:42:26 -0500
Subject: [PATCH 426/829] Closes #434 Only show a user script's options button
 (in the Add-ons Manager) if it is enabled.

This is how extensions (and others add-on types?) behave.
(cherry picked from commit c55eb94cf9e3e5e9728b5ade9bafb5faa4078918)
---
 extension/modules/script/script.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 2141732b..7a118c05 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -402,7 +402,11 @@ Script.prototype = {
   },
   get description() this._description,
   get version() this._version,
-  get optionsURL() "chrome://scriptish/content/script-options.xul?id=" + this.id,
+  get optionsURL() {
+    if (this.enabled)
+      return "chrome://scriptish/content/script-options.xul?id=" + this.id;
+    return null;
+  },
   get icon() this._icon,
   set icon(aIcon) this._icon = aIcon,
   get icon64() this._icon64,

From 3387c2b63d404675198dad435985f99c0c83b05a Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 11 Jul 2011 15:19:01 -0500
Subject: [PATCH 427/829] Updating ja-JP with modifications by nishikawasasaki
 (BabelZilla).

---
 extension/locale/ja-JP/scriptish.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 6083de6b..a22b4b2c 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -5,7 +5,7 @@ edit=編集
 edit.ak=E
 editor.couldNotLaunch=エディタの起動に失敗しました
 editor.pleasePickExecutable=ユーザースクリプト編集用アプリケーションを指定してください
-editor.prompt=まず、使いたいエディタを選択してください
+editor.prompt=はじめにお好みのエディタを選択してください
 error.api.clipboard.type=は GM_setClipboard がサポートしてない型です
 error.api.noResourceWithName=名前付きリソースがありません
 error.api.noSecondArgValue=２番目の引数が指定されていません： 値
@@ -108,7 +108,7 @@ options.enabledSchemes.securityRemark2=つまり、信用できないスクリ
 options.enabledSchemes.unmht=unmht プロトコル（Mozilla Archive フォーマット）
 options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先
 options.excludes.empty=global excludes は指定されていません
-options.excludes.remark=（１行１つずつ指定）
+options.excludes.remark=（１行１つずつ除外するものを指定）
 options.logChrome=重大でないエクステンションのメッセージもエラーコンソールに出力
 options.logging=ログ
 options.logToErrorConsole=GM_log でエラーコンソールを使用
@@ -124,7 +124,7 @@ options.title=Scriptish オプション
 options.translation=翻訳
 options.translation.useEnglish=常に英語を使用
 options.update.security=更新に関するセキュリティ
-options.useDownloadURL=updateURL の指定が無い場合は代わりにダウンロード時の URL を利用
+options.useDownloadURL=更新 URL の指定が無い場合は代わりにダウンロード時の URL を利用
 reinstall=再インストール
 saving=保存
 scratchpad.saveAsUserScript=ユーザースクリプトとして保存

From 3e88f8dfc4bc2f8527c874bcf7c70f98a6d01d3a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 11 Jul 2011 23:33:58 +0200
Subject: [PATCH 428/829] GM_xpath improvements

- Validate details.node a little
- Accept string in details.paths (.paths and .path are aliases now)
- Get the contextDocument from the contextNode
- Generate a default namespace resolver

Closes #430
---
 extension/modules/api/sandbox.js | 37 ++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/extension/modules/api/sandbox.js b/extension/modules/api/sandbox.js
index c70abdda..1f7f5bb8 100644
--- a/extension/modules/api/sandbox.js
+++ b/extension/modules/api/sandbox.js
@@ -14,17 +14,40 @@ function GM_addStyle(css) {
 }
 
 function GM_xpath(details) {
-  var contextNode = details.node || document;
-  var paths = details.paths || [details.path];
-  var result;
+  var contextNode, contextDocument, paths, resolver, namespace, result;
+  contextNode = "node" in details ? details.node : document;
+  if (!contextNode) {
+    throw new Error("The value specified for node is invalid");
+  }
+
+  if (contextNode.ownerDocument) {
+    contextDocument = contextNode.ownerDocument;
+  }
+  else if (contextNode.evaluate) {
+    // contextNode is a Document already
+    contextDocument = contextNode;
+  }
+  else {
+    throw new Error("No owning document for the specified node. Make sure you pass a valid node!");
+  }
+
+  paths = details.paths || details.path;
+  if (typeof paths == "string") {
+    paths = [paths];
+  }
+
+  if (contextNode.namepaceURI) {
+    namespace = contextNode.namespaceURI;
+    resolver = {lookupNamespaceURI: function(p) namespace};
+  }
 
   if (details.all) {
     var rv = [], i, e;
     for (var [,path] in Iterator(paths)) {
-      result = document.evaluate(
+      result = contextDocument.evaluate(
         path,
         contextNode,
-        null,
+        resolver,
         XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
         null
       );
@@ -37,10 +60,10 @@ function GM_xpath(details) {
 
 
   for (var [,path] in Iterator(paths)) {
-     result = document.evaluate(
+     result = contextDocument.evaluate(
         path,
         contextNode,
-        null,
+        resolver,
         XPathResult.FIRST_ORDERED_NODE_TYPE,
         null
     ).singleNodeValue;

From 0e891023d7a9cec90184a23909babdc2753b716a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 11 Jul 2011 23:37:20 +0200
Subject: [PATCH 429/829] GM_xpath: allow to specify an own namespace resolver

---
 extension/modules/api/sandbox.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/extension/modules/api/sandbox.js b/extension/modules/api/sandbox.js
index 1f7f5bb8..dce1b2eb 100644
--- a/extension/modules/api/sandbox.js
+++ b/extension/modules/api/sandbox.js
@@ -15,6 +15,7 @@ function GM_addStyle(css) {
 
 function GM_xpath(details) {
   var contextNode, contextDocument, paths, resolver, namespace, result;
+
   contextNode = "node" in details ? details.node : document;
   if (!contextNode) {
     throw new Error("The value specified for node is invalid");
@@ -36,7 +37,21 @@ function GM_xpath(details) {
     paths = [paths];
   }
 
-  if (contextNode.namepaceURI) {
+  if (details.resolver) {
+    if (typeof details.resolver == "string") {
+      resolver = {lookupNamespaceURI: function(p) details.resolver};
+    }
+    else if (typeof details.resolver == "function") {
+      resolver = {lookupNamespaceURI: details.resolver};
+    }
+    else if (typeof resolver.lookupNamespaceURI == "function") {
+      resolver = details.resolver;
+    }
+    else {
+      throw new Error("resolver is invalid");
+    }
+  }
+  else if (contextNode.namepaceURI) {
     namespace = contextNode.namespaceURI;
     resolver = {lookupNamespaceURI: function(p) namespace};
   }

From 99c04d6f82971642194985709a67c2458b31f4ff Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 12 Jul 2011 02:06:39 +0200
Subject: [PATCH 430/829] Use script name as alert title

Closes #437
---
 extension/modules/api.js                     | 12 +++++++-----
 extension/modules/script/scriptdownloader.js |  2 +-
 extension/modules/utils/Scriptish_alert.js   |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index c535c159..05dacd53 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -200,6 +200,13 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
     if (!GM_apiLeakCheck("GM_cryptoHash")) return;
     return Scriptish_cryptoHash.apply(null, arguments);
   }
+
+  //temp solution for #422
+  let scriptName = aScript.name || aScript.id;
+  this.alert = function alert(aMsg) {
+    Scriptish_alert(aMsg, scriptName);
+  }
+
 }
 
 GM_API.prototype.GM_generateUUID = function GM_generateUUID() (
@@ -209,8 +216,3 @@ GM_API.prototype.GM_setClipboard = function GM_setClipboard() {
   if (!GM_apiLeakCheck("GM_setClipboard")) return;
   GM_setClipboard.apply(null, arguments);
 }
-
-// temp solution for #422
-GM_API.prototype.alert = function alert(aMsg) {
-  Scriptish_alert(aMsg);
-}
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 0d2404d6..76d1c10f 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -325,7 +325,7 @@ ScriptDownloader.prototype.errorInstallDependency = function(dep, msg) {
 }
 ScriptDownloader.prototype.installScript = function() {
   if (this.dependencyError) {
-    Scriptish_alert(this.dependencyError, 0);
+    Scriptish_alert(this.dependencyError, null, 0);
     return false;
   } else if (this.scriptInstaller && this.dependenciesLoaded_) {
     this.scriptInstaller._script.replaceScriptWith(this.script);
diff --git a/extension/modules/utils/Scriptish_alert.js b/extension/modules/utils/Scriptish_alert.js
index 99310909..ed91d2ae 100644
--- a/extension/modules/utils/Scriptish_alert.js
+++ b/extension/modules/utils/Scriptish_alert.js
@@ -1,8 +1,8 @@
 var EXPORTED_SYMBOLS = ["Scriptish_alert"];
 Components.utils.import("resource://scriptish/constants.js");
 
-function Scriptish_alert(aMsg, aWait) {
+function Scriptish_alert(aMsg, aTitle, aWait) {
   if (typeof aWait == "number")
-    return timeout(function() Scriptish_alert(aMsg), aWait);
-  Services.prompt.alert(null, "Scriptish", aMsg+"");
+    return timeout(function() Scriptish_alert(aMsg, aTitle), aWait);
+  Services.prompt.alert(null, aTitle || "Scriptish", aMsg+"");
 }

From 7bd2f9950f8ee16d7abf6f62aa5c07b0abdd2f8b Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 11 Jul 2011 19:38:31 -0500
Subject: [PATCH 431/829] Adding AMO translation keys to
 'description.properties'.

---
 extension/locale/de/description.properties    | 12 ++++++++++++
 extension/locale/en-US/description.properties | 13 +++++++++++++
 extension/locale/es-ES/description.properties | 12 ++++++++++++
 extension/locale/ja-JP/description.properties | 12 ++++++++++++
 extension/locale/pt-BR/description.properties | 13 +++++++++++++
 extension/locale/ru-RU/description.properties | 12 ++++++++++++
 extension/locale/sv-SE/description.properties | 13 +++++++++++++
 extension/locale/zh-CN/description.properties | 12 ++++++++++++
 8 files changed, 99 insertions(+)
 create mode 100644 extension/locale/en-US/description.properties
 create mode 100644 extension/locale/pt-BR/description.properties
 create mode 100644 extension/locale/sv-SE/description.properties

diff --git a/extension/locale/de/description.properties b/extension/locale/de/description.properties
index c3f9d4cb..d9c8d9cd 100644
--- a/extension/locale/de/description.properties
+++ b/extension/locale/de/description.properties
@@ -1 +1,13 @@
 extensions.scriptish@erikvold.com.description=Ein Benutzerskript-Erweiterungen-Manager für Firefox
+amo.description.line1=
+amo.description.line2=
+amo.description.line3=
+amo.description.line4=
+amo.description.line5=
+amo.description.line6=
+amo.description.line7=
+amo.description.line8=
+amo.developerComments.line1=
+amo.developerComments.line2=
+amo.developerComments.line3=
+amo.summary=
diff --git a/extension/locale/en-US/description.properties b/extension/locale/en-US/description.properties
new file mode 100644
index 00000000..31b62385
--- /dev/null
+++ b/extension/locale/en-US/description.properties
@@ -0,0 +1,13 @@
+extensions.scriptish@erikvold.com.description=A Script Extension Manager for Firefox
+amo.description.line1=Scriptish is a fork of Greasemonkey, offering:
+amo.description.line2=Everything Greasemonkey does (which is actually useful)
+amo.description.line3=Updating: User scripts can be updated in Scriptish using @updateURL
+amo.description.line4=Many new <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">metadata @keys</a>
+amo.description.line5=Many new <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">additions to the GM_ API</a>
+amo.description.line6=Superior Performance: A faster, cleaner code base which takes advantage of all that Firefox 4 has to offer
+amo.description.line7=Superior Security: Scriptish provides security features you won't find elsewhere
+amo.description.line8=Testing: Code is written to test Scriptish's functionality and features
+amo.developerComments.line1=Scriptish has everything Greasemonkey has, plus many features which you can read about at: <a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
+amo.developerComments.line2=Please submit any bugs or feature requests to: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line3=If you have any other questions, please send them to the mailing list: http://groups.google.com/group/scriptish
+amo.summary=The greatest user script engine on the Internet.
diff --git a/extension/locale/es-ES/description.properties b/extension/locale/es-ES/description.properties
index 2852f501..858b1bc3 100644
--- a/extension/locale/es-ES/description.properties
+++ b/extension/locale/es-ES/description.properties
@@ -1 +1,13 @@
 extensions.scriptish@erikvold.com.description=Un gestor de scripts de usuario para aplicaciones Mozilla
+amo.description.line1=
+amo.description.line2=
+amo.description.line3=
+amo.description.line4=
+amo.description.line5=
+amo.description.line6=
+amo.description.line7=
+amo.description.line8=
+amo.developerComments.line1=
+amo.developerComments.line2=
+amo.developerComments.line3=
+amo.summary=
diff --git a/extension/locale/ja-JP/description.properties b/extension/locale/ja-JP/description.properties
index 0eecbb1b..e2d2eece 100644
--- a/extension/locale/ja-JP/description.properties
+++ b/extension/locale/ja-JP/description.properties
@@ -1 +1,13 @@
 extensions.scriptish@erikvold.com.description=Firefox用のスクリプトマネージャ
+amo.description.line1=
+amo.description.line2=
+amo.description.line3=
+amo.description.line4=
+amo.description.line5=
+amo.description.line6=
+amo.description.line7=
+amo.description.line8=
+amo.developerComments.line1=
+amo.developerComments.line2=
+amo.developerComments.line3=
+amo.summary=
diff --git a/extension/locale/pt-BR/description.properties b/extension/locale/pt-BR/description.properties
new file mode 100644
index 00000000..1ecd72d0
--- /dev/null
+++ b/extension/locale/pt-BR/description.properties
@@ -0,0 +1,13 @@
+extensions.scriptish@erikvold.com.description=
+amo.description.line1=
+amo.description.line2=
+amo.description.line3=
+amo.description.line4=
+amo.description.line5=
+amo.description.line6=
+amo.description.line7=
+amo.description.line8=
+amo.developerComments.line1=
+amo.developerComments.line2=
+amo.developerComments.line3=
+amo.summary=
diff --git a/extension/locale/ru-RU/description.properties b/extension/locale/ru-RU/description.properties
index 8e492232..bc08fef9 100644
--- a/extension/locale/ru-RU/description.properties
+++ b/extension/locale/ru-RU/description.properties
@@ -1 +1,13 @@
 extensions.scriptish@erikvold.com.description=Управление пользовательских скриптов для Firefox
+amo.description.line1=
+amo.description.line2=
+amo.description.line3=
+amo.description.line4=
+amo.description.line5=
+amo.description.line6=
+amo.description.line7=
+amo.description.line8=
+amo.developerComments.line1=
+amo.developerComments.line2=
+amo.developerComments.line3=
+amo.summary=
diff --git a/extension/locale/sv-SE/description.properties b/extension/locale/sv-SE/description.properties
new file mode 100644
index 00000000..1ecd72d0
--- /dev/null
+++ b/extension/locale/sv-SE/description.properties
@@ -0,0 +1,13 @@
+extensions.scriptish@erikvold.com.description=
+amo.description.line1=
+amo.description.line2=
+amo.description.line3=
+amo.description.line4=
+amo.description.line5=
+amo.description.line6=
+amo.description.line7=
+amo.description.line8=
+amo.developerComments.line1=
+amo.developerComments.line2=
+amo.developerComments.line3=
+amo.summary=
diff --git a/extension/locale/zh-CN/description.properties b/extension/locale/zh-CN/description.properties
index 4ce40ad3..8ac4fb8e 100644
--- a/extension/locale/zh-CN/description.properties
+++ b/extension/locale/zh-CN/description.properties
@@ -1 +1,13 @@
 extensions.scriptish@erikvold.com.description=
+amo.description.line1=Scriptish 是 Greasemonkey 的分支，提供:
+amo.description.line2=Greasemonkey 提供的所有功能（都是非常有用的）
+amo.description.line3=更新：用户脚本在 Scriptish 上可以使用 @updateURL 更新
+amo.description.line4=更多的 <a href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">@keys 元数据支持</a>
+amo.description.line5=更多的 <a href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">用户脚本API支持</a>
+amo.description.line6=优越的性能：利用一切 Firefox 4所提供的更快、更清洁的代码基础
+amo.description.line7=出众的安全：Scriptish 提供独一无二的安全功能
+amo.description.line8=测试：编写代码测试Scriptish 的功能和特性
+amo.developerComments.line1=Scriptish 拥有 Greasemonkey 的所有功能，增加的很多其他特性您可以到这里查看：<a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
+amo.developerComments.line2=请到这里提交 bug 或功能需求：<a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line3=如果您还有其他问题，请发送邮件到这里：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=互联网上最伟大的用户脚本引擎。

From ebc3468d5d9626c6bf3ff92d6099e980089dad1f Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 11 Jul 2011 19:56:33 -0500
Subject: [PATCH 432/829] Updating ja-JP with modifications by k2jp
 (BabelZilla).

---
 extension/locale/ja-JP/scriptish.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index a22b4b2c..1260afe0 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -118,8 +118,8 @@ options.pane.advanced=詳細
 options.pane.excludes=
 options.pane.main=メイン
 options.pane.ui=ユーザーインタフェース
-options.requireBuiltInCerts=安全なアップデートに built-in 証明書を利用
-options.requireSecured=ユーザースクリプトを HTTPS で更新
+options.requireBuiltInCerts=更新に built-in 証明書を利用
+options.requireSecured=HTTPS でユーザースクリプトを更新
 options.title=Scriptish オプション
 options.translation=翻訳
 options.translation.useEnglish=常に英語を使用

From 90828026c500302436eb81158c3e1490dd2968b8 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 11 Jul 2011 20:08:33 -0500
Subject: [PATCH 433/829] Closes #432 Using a more accurate description of the
 'enableNotifications' preference/option.

---
 extension/locale/de/scriptish.properties    | 2 +-
 extension/locale/en-US/scriptish.properties | 2 +-
 extension/locale/es-ES/scriptish.properties | 2 +-
 extension/locale/ja-JP/scriptish.properties | 2 +-
 extension/locale/sv-SE/scriptish.properties | 2 +-
 extension/locale/zh-CN/scriptish.properties | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 6109d004..1d673b72 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole
 options.logging=Loggen
 options.logToErrorConsole=GM_log benutzt die Fehlerkonsole
 options.notifications=Benachrichtigungen
-options.notifications.enable=Benachrichtungen bei Benutzerskript-Änderungen aktivieren
+options.notifications.enable=
 options.pane.advanced=Erweitert
 options.pane.excludes=Globale Ausnahmen
 options.pane.main=Allgemein
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index d36efd80..7ae6355d 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=Log non-critical extension messages to the Error Console
 options.logging=Logging
 options.logToErrorConsole=GM_log uses the Error Console
 options.notifications=Notifications
-options.notifications.enable=Enable sliding notifications on script changes
+options.notifications.enable=Redirect all sliding and popup notification messages to the console
 options.pane.advanced=Advanced
 options.pane.excludes=Global Excludes
 options.pane.main=Main
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 0a202882..bb073ec1 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=Registrar en log mensajes de extensión no críticos a la cons
 options.logging=Registro de eventos (logging)
 options.logToErrorConsole=GM_log usa la consola de errores
 options.notifications=Notificaciones
-options.notifications.enable=Activar notificaciones deslizantes para cambios en el script
+options.notifications.enable=
 options.pane.advanced=Avanzado
 options.pane.excludes=Exclusiones globales
 options.pane.main=Principal
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 1260afe0..19e312ae 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=重大でないエクステンションのメッセージも
 options.logging=ログ
 options.logToErrorConsole=GM_log でエラーコンソールを使用
 options.notifications=通知
-options.notifications.enable=スクリプトの変更を通知
+options.notifications.enable=
 options.pane.advanced=詳細
 options.pane.excludes=
 options.pane.main=メイン
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 42682cea..290a64c2 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felkonsolen
 options.logging=Loggning
 options.logToErrorConsole=GM_log använder Felkonsolen
 options.notifications=Aviseringar
-options.notifications.enable=Aktivera glidande aviseringar vid skriptändringar
+options.notifications.enable=
 options.pane.advanced=Avancerat
 options.pane.excludes=Globala undantag
 options.pane.main=Allmänt
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index b3bbdef3..ba0b4933 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=记录非关键的扩展信息到错误控制台
 options.logging=日志
 options.logToErrorConsole=GM_log 使用错误控制台
 options.notifications=通知
-options.notifications.enable=启用脚本变化时滑动通知
+options.notifications.enable=
 options.pane.advanced=高级
 options.pane.excludes=全局排除
 options.pane.main=常规

From 5665ab2fcb558c12a3bb62307386afac2f12c297 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 12 Jul 2011 02:43:17 +0200
Subject: [PATCH 434/829] Hook up api callback error reporting (and others)
 correctly

---
 extension/components/scriptish.js            | 41 +++++++++++++-------
 extension/modules/api.js                     | 16 +++++---
 extension/modules/api/GM_xmlhttpRequester.js |  3 +-
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index b8e50d6c..893f0048 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -389,33 +389,41 @@ ScriptishService.prototype = {
   },
 
   evalInSandbox: function(aScript, aSandbox, aWindow) {
-    var jsVer = aScript.jsversion;
-    var fileURL;
+    const jsVer = aScript.jsversion;
 
     try {
       for (let [, req] in Iterator(aScript.requires)) {
+        var rfileURL = req.fileURL;
         try {
-          fileURL = req.fileURL;
           Cu.evalInSandbox(
-              req.textContent + "\n", aSandbox, jsVer, fileURLPrefix+fileURL, 1);
+            req.textContent + "\n",
+            aSandbox,
+            jsVer,
+            fileURLPrefix + rfileURL,
+            1
+            );
         } catch (ex) {
-          Scriptish_logScriptError(ex, aWindow, fileURL);
+          Scriptish_logScriptError(ex, aWindow, rfileURL, aScript.id);
         }
       }
     } catch (e) {
-      return Scriptish_logError(e, 0, fileURL, e.lineNumber);
+      return Scriptish_logError(e, 0, aScript.fileURL, e.lineNumber);
     }
 
-    var src = aScript.textContent + "\n";
-    fileURL = aScript.fileURL;
     try {
       try {
-        Cu.evalInSandbox(src, aSandbox, jsVer, fileURLPrefix+fileURL, 1);
-      // catch errors when return is not in a function or when a window global
-      // is being overwritten (which throws NS_ERROR_OUT_OF_MEMORY..)
+        Cu.evalInSandbox(
+          aScript.textContent + "\n",
+          aSandbox,
+          jsVer,
+          fileURLPrefix + aScript.fileURL,
+          1
+          );
       }
       catch (e if (e.message == "return not in function"
           || /\(NS_ERROR_OUT_OF_MEMORY\) \[nsIXPCComponents_Utils.evalInSandbox\]/.test(e.message))) {
+        // catch errors when return is not in a function or when a window global
+        // is being overwritten (which throws NS_ERROR_OUT_OF_MEMORY..)
         var sw = Instances.se;
         sw.init(
           Scriptish_stringBundle("warning.returnfrommain"),
@@ -426,12 +434,17 @@ ScriptishService.prototype = {
           sw.warningFlag,
           "scriptish userscript warnings"
           );
-        Scriptish_logScriptError(sw, aWindow, fileURL, aScript.id);
+        Scriptish_logScriptError(sw, aWindow, aScript.fileURL, aScript.id);
         Cu.evalInSandbox(
-            "(function(){"+src+"})()", aSandbox, jsVer, fileURLPrefix+fileURL, 1);
+          "(function(){" + aScript.textContent + "\n})()",
+          aSandbox,
+          jsVer,
+          fileURLPrefix + aScript.fileURL,
+          1
+          );
       }
     } catch (e) {
-      Scriptish_logScriptError(e, aWindow, fileURL, aScript.id);
+      Scriptish_logScriptError(e, aWindow, aScript.fileURL, aScript.id);
     }
   }
 }
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 05dacd53..c277d74e 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -3,7 +3,7 @@ var EXPORTED_SYMBOLS = ["GM_API", "GM_apiSafeCallback"];
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 
-lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_alert.js", ["Scriptish_alert"]);
 
 lazyUtil(this, "cryptoHash");
@@ -39,12 +39,18 @@ function GM_apiLeakCheck(apiName) {
   return true;
 }
 
-function GM_apiSafeCallback(aWin, aThis, aCb, aArgs) {
+function GM_apiSafeCallback(aWindow, aScript, aThis, aCb, aArgs) {
   // Pop back onto browser scope and call event handler.
   // Have to use nested function here otherwise aCallback.apply can point to
   // window.setTimeout, which can be abused to get increased privileges.
-  new XPCNativeWrapper(aWin, "setTimeout()")
-      .setTimeout(function() aCb.apply(aThis, aArgs), 0);
+  new XPCNativeWrapper(aWindow, "setTimeout()").setTimeout(function() {
+    try {
+      aCb.apply(aThis, aArgs);
+    }
+    catch (ex) {
+      Scriptish_logScriptError(ex, aWindow, aScript.fileURL, aScript.id);
+    }
+  }, 0);
 }
 
 function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin) {
@@ -84,7 +90,7 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
     if (typeof aIcon != "string") aIcon = aScript.iconURL;
     var callback = null;
     if (typeof aCallback == "function")
-      callback = function() GM_apiSafeCallback(aSafeWin, null, aCallback);
+      callback = function() GM_apiSafeCallback(aSafeWin, aScript, null, aCallback);
     Scriptish_notification(aMsg, aTitle, aIcon, callback);
   }
 
diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 6b23fe4a..1c064a2e 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -191,6 +191,7 @@ GM_xmlhttpRequester.prototype.chromeStartRequest =
 GM_xmlhttpRequester.prototype.setupRequestEvent =
     function(unsafeContentWin, req, event, details) {
   var origMimeType = details.overrideMimeType;
+  var script = this.script;
 
   if (details[event]) {
     req[event] = function() {
@@ -221,7 +222,7 @@ GM_xmlhttpRequester.prototype.setupRequestEvent =
       }
 
       GM_apiSafeCallback(
-          unsafeContentWin, details, details[event], [responseState]);
+          unsafeContentWin, script, details, details[event], [responseState]);
     }
   }
 }

From 39f1c5d326ab183710547a2995a9c7bc12fb6856 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 12 Jul 2011 03:08:48 +0200
Subject: [PATCH 435/829] description: Drop Firefox 4 reference and rephrase
 tests

---
 extension/locale/en-US/description.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/locale/en-US/description.properties b/extension/locale/en-US/description.properties
index 31b62385..4423e92f 100644
--- a/extension/locale/en-US/description.properties
+++ b/extension/locale/en-US/description.properties
@@ -4,10 +4,10 @@ amo.description.line2=Everything Greasemonkey does (which is actually useful)
 amo.description.line3=Updating: User scripts can be updated in Scriptish using @updateURL
 amo.description.line4=Many new <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">metadata @keys</a>
 amo.description.line5=Many new <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">additions to the GM_ API</a>
-amo.description.line6=Superior Performance: A faster, cleaner code base which takes advantage of all that Firefox 4 has to offer
+amo.description.line6=Superior Performance: A faster, cleaner code base which takes advantage of all that recent Firefox versions have to offer
 amo.description.line7=Superior Security: Scriptish provides security features you won't find elsewhere
-amo.description.line8=Testing: Code is written to test Scriptish's functionality and features
+amo.description.line8=Testing: The developers make use of a lot of tests to ensure the correct functioning of Scriptish and to find any bugs sooner
 amo.developerComments.line1=Scriptish has everything Greasemonkey has, plus many features which you can read about at: <a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
 amo.developerComments.line2=Please submit any bugs or feature requests to: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
-amo.developerComments.line3=If you have any other questions, please send them to the mailing list: http://groups.google.com/group/scriptish
+amo.developerComments.line3=If you have any other questions, please send them to the mailing list: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=The greatest user script engine on the Internet.

From 8d53b681e0337050c64249d1b917633be21cc9a6 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 12 Jul 2011 03:09:49 +0200
Subject: [PATCH 436/829] description: de locale

---
 extension/locale/de/description.properties | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/extension/locale/de/description.properties b/extension/locale/de/description.properties
index d9c8d9cd..34306522 100644
--- a/extension/locale/de/description.properties
+++ b/extension/locale/de/description.properties
@@ -1,13 +1,13 @@
 extensions.scriptish@erikvold.com.description=Ein Benutzerskript-Erweiterungen-Manager für Firefox
-amo.description.line1=
-amo.description.line2=
-amo.description.line3=
-amo.description.line4=
-amo.description.line5=
-amo.description.line6=
-amo.description.line7=
-amo.description.line8=
-amo.developerComments.line1=
-amo.developerComments.line2=
-amo.developerComments.line3=
-amo.summary=
+amo.description.line1=Scriptish ist eine unabhängige Weiterentwicklung von Greasemonkey und beinhaltet:
+amo.description.line2=Alles, was Greasemoneky kann (was tatsächlich nützlich ist)
+amo.description.line3=Updates: Benutzerskripte können von Scriptish mit @updateURL aktualisiert werden
+amo.description.line4=Viele neue <a title="Scriptish Metadaten-Block Dokumentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">Metadaten @Schlüssel</a>
+amo.description.line5=Viele neue <a title="Scriptish Benutzerskript API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">Funktionen der GM_ API</a>
+amo.description.line6=Überlegene Leistung: Schnellerer, saubererer Code, der von allem, was aktuelle Firefox Versionen zu bieten haben, Gebrauch macht
+amo.description.line7=Überlegene Sicherheit: Scriptish beinhaltet Sicherheitsfunktionen, die Sie nirgendwo anders finden
+amo.description.line8=Tests: Die Entwickler benutzen viele Tests um eine korrekte Arbeitsweise sicherzustellen und Fehler schnell zu entdecken
+amo.developerComments.line1=Scriptish beinhaltet alles, was auch Greasemonkey kann, plus viele neue und verbesserte Funktionen. Erfahren Sie mehr im <a href="http://github.com/erikvold/scriptish/wiki">Scriptish Wiki</a>
+amo.developerComments.line2=Bitte schicken Sie alle Bugs oder Funktionsvorschläge zu: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line3=Wenn sie weitere Fragen haben, dann senden Sie diese bitte auf Englisch an die Mailing-Liste: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=Der beste Benutzerskript Software im Internet

From c0d804be3cb349b90bd7418c57a92232b91d6cc8 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 12 Jul 2011 03:16:40 +0200
Subject: [PATCH 437/829] Revert "Closes #432 Using a more accurate description
 of the 'enableNotifications' preference/option."

Actually the description is wrong now.
This reverts commit 90828026c500302436eb81158c3e1490dd2968b8.
---
 extension/locale/de/scriptish.properties    | 2 +-
 extension/locale/en-US/scriptish.properties | 2 +-
 extension/locale/es-ES/scriptish.properties | 2 +-
 extension/locale/ja-JP/scriptish.properties | 2 +-
 extension/locale/sv-SE/scriptish.properties | 2 +-
 extension/locale/zh-CN/scriptish.properties | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 1d673b72..6109d004 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole
 options.logging=Loggen
 options.logToErrorConsole=GM_log benutzt die Fehlerkonsole
 options.notifications=Benachrichtigungen
-options.notifications.enable=
+options.notifications.enable=Benachrichtungen bei Benutzerskript-Änderungen aktivieren
 options.pane.advanced=Erweitert
 options.pane.excludes=Globale Ausnahmen
 options.pane.main=Allgemein
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 7ae6355d..d36efd80 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=Log non-critical extension messages to the Error Console
 options.logging=Logging
 options.logToErrorConsole=GM_log uses the Error Console
 options.notifications=Notifications
-options.notifications.enable=Redirect all sliding and popup notification messages to the console
+options.notifications.enable=Enable sliding notifications on script changes
 options.pane.advanced=Advanced
 options.pane.excludes=Global Excludes
 options.pane.main=Main
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index bb073ec1..0a202882 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=Registrar en log mensajes de extensión no críticos a la cons
 options.logging=Registro de eventos (logging)
 options.logToErrorConsole=GM_log usa la consola de errores
 options.notifications=Notificaciones
-options.notifications.enable=
+options.notifications.enable=Activar notificaciones deslizantes para cambios en el script
 options.pane.advanced=Avanzado
 options.pane.excludes=Exclusiones globales
 options.pane.main=Principal
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 19e312ae..1260afe0 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=重大でないエクステンションのメッセージも
 options.logging=ログ
 options.logToErrorConsole=GM_log でエラーコンソールを使用
 options.notifications=通知
-options.notifications.enable=
+options.notifications.enable=スクリプトの変更を通知
 options.pane.advanced=詳細
 options.pane.excludes=
 options.pane.main=メイン
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 290a64c2..42682cea 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felkonsolen
 options.logging=Loggning
 options.logToErrorConsole=GM_log använder Felkonsolen
 options.notifications=Aviseringar
-options.notifications.enable=
+options.notifications.enable=Aktivera glidande aviseringar vid skriptändringar
 options.pane.advanced=Avancerat
 options.pane.excludes=Globala undantag
 options.pane.main=Allmänt
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index ba0b4933..b3bbdef3 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -113,7 +113,7 @@ options.logChrome=记录非关键的扩展信息到错误控制台
 options.logging=日志
 options.logToErrorConsole=GM_log 使用错误控制台
 options.notifications=通知
-options.notifications.enable=
+options.notifications.enable=启用脚本变化时滑动通知
 options.pane.advanced=高级
 options.pane.excludes=全局排除
 options.pane.main=常规

From 63d303ae5afaf9e429a3d481156e772d7671b984 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 12 Jul 2011 03:21:25 +0200
Subject: [PATCH 438/829] de: translate noScripts additional messages

---
 extension/locale/de/scriptish.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 6109d004..bc964f87 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -136,9 +136,9 @@ statusbar.enabled=Aktiviert
 statusbar.enabled.ak=K
 statusbar.installed=erfolgreich installiert
 statusbar.modified=geändert
-statusbar.noScripts.excluded=
+statusbar.noScripts.excluded=Seite ist ausgenommen!
 statusbar.noScripts.notfound=Keine Benutzerskripte für diese Seite!
-statusbar.noScripts.scheme=
+statusbar.noScripts.scheme=Protokoll ist deaktiviert!
 statusbar.updated=erfolgreich aktualisiert
 tooltip.loading=Lade...
 Uninstall=Entfernen

From c96020791d10e21d761aaf08d4c0ec726a4b9b19 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 12 Jul 2011 03:32:56 +0200
Subject: [PATCH 439/829] TypeError: aListener.onNoUpdateAvailable is not a
 function

Must check existence of onNoUpdateAvailable, as a listener is not guaranteed
to provide that function.

Closes #435
---
 extension/modules/script/script.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 7a118c05..2c999d90 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -34,7 +34,8 @@ const RE_USERSCRIPT_HEADER_START = /\/\/[ \t]*==UserScript==/i;
 const RE_USERSCRIPT_HEADER_END = /\/\/[ \t]*==\/UserScript==/i;
 
 function noUpdateFound(aListener, aReason) {
-  aListener.onNoUpdateAvailable(this);
+  if (aListener.onNoUpdateAvailable)
+    aListener.onNoUpdateAvailable(this);
   if (aListener.onUpdateFinished)
     aListener.onUpdateFinished(this, aReason || AddonManager.UPDATE_STATUS_NO_ERROR);
 }

From 40129d4bfb02f6a155280b9a17c483548340dfc7 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 11 Jul 2011 20:49:22 -0500
Subject: [PATCH 440/829] minor fix: aMsg not defined in
 'Scriptish_popupNotification.js'.

---
 extension/modules/utils/Scriptish_popupNotification.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/utils/Scriptish_popupNotification.js b/extension/modules/utils/Scriptish_popupNotification.js
index 09d0b044..ebea1d94 100644
--- a/extension/modules/utils/Scriptish_popupNotification.js
+++ b/extension/modules/utils/Scriptish_popupNotification.js
@@ -8,7 +8,7 @@ lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
 function Scriptish_popupNotification(details) {
   if (!Scriptish_prefRoot.getValue("enableNotifications"))
-    return Scriptish_log(aMsg);
+    return Scriptish_log(details.message);
 
   timeout(function() {
       var win = Scriptish.getMostRecentWindow();

From 224af6b6c1113a5d88d31d124fc961b340249c28 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 12 Jul 2011 08:38:29 -0500
Subject: [PATCH 441/829] minor fix: 'fileURL' -> 'aScript.fileURL' in
 scriptish.js.

---
 extension/components/scriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 893f0048..d8ba72bf 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -427,7 +427,7 @@ ScriptishService.prototype = {
         var sw = Instances.se;
         sw.init(
           Scriptish_stringBundle("warning.returnfrommain"),
-          fileURL,
+          aScript.fileURL,
           "",
           e.lineNumber || 0,
           e.columnNumber || 0,

From 68c0c7c3f290596bab842ef38815a32e7493ff59 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 12 Jul 2011 09:42:56 -0500
Subject: [PATCH 442/829] Closes #432 and #439  Split 'enableNotifications'
 into 'enabledNotifications.popup' and 'enabledNotifications.sliding' for
 finer control.

Also adding a tooltip for these options indicating they will be redirected to the Error Console.
(cherry picked from commit a59556e7ee7dcee56dcb1bd4480724cd448c5c66)
---
 extension/content/options.xul                          | 6 ++++--
 extension/defaults/preferences/scriptish.js            | 3 ++-
 extension/locale/de/scriptish.properties               | 4 +++-
 extension/locale/en-US/scriptish.properties            | 4 +++-
 extension/locale/es-ES/scriptish.properties            | 4 +++-
 extension/locale/ja-JP/scriptish.properties            | 4 +++-
 extension/locale/pt-BR/scriptish.properties            | 4 +++-
 extension/locale/ru-RU/scriptish.properties            | 4 +++-
 extension/locale/sv-SE/scriptish.properties            | 4 +++-
 extension/locale/zh-CN/scriptish.properties            | 4 +++-
 extension/modules/utils/Scriptish_notification.js      | 2 +-
 extension/modules/utils/Scriptish_popupNotification.js | 2 +-
 12 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index ca10491e..4e48abc4 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -48,13 +48,15 @@
 
   <prefpane id="pane-ui" label="options.pane.ui" localize="label">
     <preferences>
-      <preference id="pref-enableNotifications" name="extensions.scriptish.enableNotifications" type="bool"/>
+      <preference id="pref-enablePopupNotifications" name="extensions.scriptish.enabledNotifications.popup" type="bool"/>
+      <preference id="pref-enableSlidingNotifications" name="extensions.scriptish.enabledNotifications.sliding" type="bool"/>
       <preference id="pref-enableCopyDownloadURL" name="extensions.scriptish.enableCopyDownloadURL" type="bool"/>
       <preference id="pref-useDefaultLocale" name="extensions.scriptish.useDefaultLocale" type="bool"/>
     </preferences>
     <groupbox>
       <caption label="options.notifications" localize="label"/>
-      <checkbox preference="pref-enableNotifications" label="options.notifications.enable" localize="label"/>
+      <checkbox preference="pref-enablePopupNotifications" label="options.notifications.popup.enable" tooltiptext="options.notifications.whenDisabled" localize="label,tooltiptext"/>
+      <checkbox preference="pref-enableSlidingNotifications" label="options.notifications.sliding.enable" tooltiptext="options.notifications.whenDisabled" localize="label,tooltiptext"/>
     </groupbox>
     <groupbox>
       <caption label="options.translation" localize="label"/>
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 7da695ce..7c27d1cf 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -13,7 +13,8 @@ pref("extensions.scriptish.enabledSchemes.ftp", true);
 pref("extensions.scriptish.enabledSchemes.http", true);
 pref("extensions.scriptish.enabledSchemes.unmht", false);
 pref("extensions.scriptish.enableCopyDownloadURL", false);
-pref("extensions.scriptish.enableNotifications", true);
+pref("extensions.scriptish.enabledNotifications.popup", true);
+pref("extensions.scriptish.enabledNotifications.sliding", true);
 pref("extensions.scriptish.enableScriptRefreshing", true);
 pref("extensions.scriptish.logChrome", false);
 pref("extensions.scriptish.logToErrorConsole", true);
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index bc964f87..700999f5 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -113,7 +113,9 @@ options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole
 options.logging=Loggen
 options.logToErrorConsole=GM_log benutzt die Fehlerkonsole
 options.notifications=Benachrichtigungen
-options.notifications.enable=Benachrichtungen bei Benutzerskript-Änderungen aktivieren
+options.notifications.popup.enable=
+options.notifications.sliding.enable=
+options.notifications.whenDisabled=
 options.pane.advanced=Erweitert
 options.pane.excludes=Globale Ausnahmen
 options.pane.main=Allgemein
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index d36efd80..061873c0 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -113,7 +113,9 @@ options.logChrome=Log non-critical extension messages to the Error Console
 options.logging=Logging
 options.logToErrorConsole=GM_log uses the Error Console
 options.notifications=Notifications
-options.notifications.enable=Enable sliding notifications on script changes
+options.notifications.popup.enable=Enable popup notifications
+options.notifications.sliding.enable=Enable sliding notifications
+options.notifications.whenDisabled=When disabled, any notification will appear in the Error Console.
 options.pane.advanced=Advanced
 options.pane.excludes=Global Excludes
 options.pane.main=Main
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 0a202882..6e671694 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -113,7 +113,9 @@ options.logChrome=Registrar en log mensajes de extensión no críticos a la cons
 options.logging=Registro de eventos (logging)
 options.logToErrorConsole=GM_log usa la consola de errores
 options.notifications=Notificaciones
-options.notifications.enable=Activar notificaciones deslizantes para cambios en el script
+options.notifications.popup.enable=
+options.notifications.sliding.enable=
+options.notifications.whenDisabled=
 options.pane.advanced=Avanzado
 options.pane.excludes=Exclusiones globales
 options.pane.main=Principal
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 1260afe0..95dc99ac 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -113,7 +113,9 @@ options.logChrome=重大でないエクステンションのメッセージも
 options.logging=ログ
 options.logToErrorConsole=GM_log でエラーコンソールを使用
 options.notifications=通知
-options.notifications.enable=スクリプトの変更を通知
+options.notifications.popup.enable=
+options.notifications.sliding.enable=
+options.notifications.whenDisabled=
 options.pane.advanced=詳細
 options.pane.excludes=
 options.pane.main=メイン
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 05c6c7d5..3b1bd50a 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -113,7 +113,9 @@ options.logChrome=Registrar mensagens da extensão não-críticas no console de
 options.logging=Log
 options.logToErrorConsole=
 options.notifications=Notificações
-options.notifications.enable=
+options.notifications.popup.enable=
+options.notifications.sliding.enable=
+options.notifications.whenDisabled=
 options.pane.advanced=Avançado
 options.pane.excludes=Exclusões Globais
 options.pane.main=Principal
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index af2de337..e5cf34f9 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -113,7 +113,9 @@ options.logChrome=
 options.logging=
 options.logToErrorConsole=
 options.notifications=
-options.notifications.enable=
+options.notifications.popup.enable=
+options.notifications.sliding.enable=
+options.notifications.whenDisabled=
 options.pane.advanced=
 options.pane.excludes=Глобальные исключения
 options.pane.main=
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 42682cea..80bb04b0 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -113,7 +113,9 @@ options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felkonsolen
 options.logging=Loggning
 options.logToErrorConsole=GM_log använder Felkonsolen
 options.notifications=Aviseringar
-options.notifications.enable=Aktivera glidande aviseringar vid skriptändringar
+options.notifications.popup.enable=
+options.notifications.sliding.enable=
+options.notifications.whenDisabled=
 options.pane.advanced=Avancerat
 options.pane.excludes=Globala undantag
 options.pane.main=Allmänt
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index b3bbdef3..6abea85a 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -113,7 +113,9 @@ options.logChrome=记录非关键的扩展信息到错误控制台
 options.logging=日志
 options.logToErrorConsole=GM_log 使用错误控制台
 options.notifications=通知
-options.notifications.enable=启用脚本变化时滑动通知
+options.notifications.popup.enable=
+options.notifications.sliding.enable=
+options.notifications.whenDisabled=
 options.pane.advanced=高级
 options.pane.excludes=全局排除
 options.pane.main=常规
diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index 4af1ddca..6e37650e 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -4,7 +4,7 @@ lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
 function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
-  if (!Scriptish_prefRoot.getValue("enableNotifications"))
+  if (!Scriptish_prefRoot.getValue("enabledNotifications.sliding"))
     return Scriptish_log(aMsg);
 
   timeout(function() {
diff --git a/extension/modules/utils/Scriptish_popupNotification.js b/extension/modules/utils/Scriptish_popupNotification.js
index ebea1d94..ac0e268d 100644
--- a/extension/modules/utils/Scriptish_popupNotification.js
+++ b/extension/modules/utils/Scriptish_popupNotification.js
@@ -7,7 +7,7 @@ lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
 function Scriptish_popupNotification(details) {
-  if (!Scriptish_prefRoot.getValue("enableNotifications"))
+  if (!Scriptish_prefRoot.getValue("enabledNotifications.popup"))
     return Scriptish_log(details.message);
 
   timeout(function() {

From b47dfb94a628a982d56abddd7b1ab43c289dc561 Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Tue, 12 Jul 2011 11:52:46 -0500
Subject: [PATCH 443/829] Closes #423 Respect insertRelatedAfterCurrent in
 GM_openInTab(). (cherry picked from commit
 ccd46f1d0c46e4c0c727c4850d4fd0c1beb3a5a3)

---
 extension/modules/utils/Scriptish_openInTab.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/extension/modules/utils/Scriptish_openInTab.js b/extension/modules/utils/Scriptish_openInTab.js
index 314eb4a2..044c9cdb 100644
--- a/extension/modules/utils/Scriptish_openInTab.js
+++ b/extension/modules/utils/Scriptish_openInTab.js
@@ -32,9 +32,16 @@ function Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin) {
 
   // Opening a new tab
   var browser = aChromeWin.gBrowser;
-  return getWindowForBrowser(browser.getBrowserForTab(browser.loadOneTab(aURL, {
-    "inBackground": !!aLoadInBackground
-  })));
+  var selectedTab = browser.selectedTab;
+  var newTab = browser.loadOneTab(aURL, {"inBackground": !!aLoadInBackground});
+  var afterCurrent = Services.prefs
+      .getBranch("browser.tabs.")
+      .getBoolPref("insertRelatedAfterCurrent");
+
+  if (afterCurrent)
+    browser.moveTabTo(newTab, selectedTab._tPos + 1);
+
+  return getWindowForBrowser(browser.getBrowserForTab(newTab));
 }
 
 function getWindowForBrowser(browser) browser.docShell

From 37317711a615a5680085e4353b796cb61cf3980f Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 12 Jul 2011 12:01:51 -0500
Subject: [PATCH 444/829] Updating sv-SE with modifications by Lakrits
 (BabelZilla).

---
 extension/locale/sv-SE/description.properties | 26 +++++++++----------
 extension/locale/sv-SE/scriptish.properties   |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/extension/locale/sv-SE/description.properties b/extension/locale/sv-SE/description.properties
index 1ecd72d0..9cfb8953 100644
--- a/extension/locale/sv-SE/description.properties
+++ b/extension/locale/sv-SE/description.properties
@@ -1,13 +1,13 @@
-extensions.scriptish@erikvold.com.description=
-amo.description.line1=
-amo.description.line2=
-amo.description.line3=
-amo.description.line4=
-amo.description.line5=
-amo.description.line6=
-amo.description.line7=
-amo.description.line8=
-amo.developerComments.line1=
-amo.developerComments.line2=
-amo.developerComments.line3=
-amo.summary=
+extensions.scriptish@erikvold.com.description=En skripttilläggshanterare för Firefox
+amo.description.line1=Scriptish är en fristående förgrening av Greasemonkey och erbjuder:
+amo.description.line2=Allting som Greasemonkey erbjuder (vilket faktiskt är riktigt användbart)
+amo.description.line3=Uppdatering: Användarskript kan uppdateras i Scriptish m.h.a. @updateURL
+amo.description.line4=Flera nya <a title="Scriptishs metadatablocksdokumentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">metadatanycklar (@keys)</a>
+amo.description.line5=Flera nya <a title="Scriptishs användarskripts-API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">tillägg till GM_-API:n</a>
+amo.description.line6=Överlägsen prestanda: En snabbare, renare kodbas, som drar fördel av allt det som tidigare Firefox-versioner har haft att erbjuda
+amo.description.line7=Överlägsen säkerhet: Scriptish tillhandahåller säkerhetsfunktioner som du inte hittar någon annanstans
+amo.description.line8=Testning: Utvecklarna använder sig av ett flertal tester för att säkerställa att Scriptish fungerar korrekt och för att hitta eventuella fel så tidigt som möjligt
+amo.developerComments.line1=Scriptish har allt som Greasemonkey har, plus flera funktioner som du kan läsa mer om på: <a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
+amo.developerComments.line2=Var vänlig skicka in alla buggrapporter och förslag på nya funktioner via: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line3=Om du har frågor, skicka dem till e-postlistan: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=Den bästa användarskriptmotorn på Internet.
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 80bb04b0..c2f19742 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -1,4 +1,4 @@
-contributions.description=
+contributions.description=Utvecklaren av detta användarskript ber om ditt stöd genom en liten donation för att kunna fortsätta utveckla det.
 copyDownloadURL=Kopiera hämtningsadress
 copyDownloadURL.ak=K
 edit=Redigera

From dd5a1b3fdda8b874a492395547a59a045e8b6fb3 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 12 Jul 2011 14:14:28 -0500
Subject: [PATCH 445/829] Updating pt-BR with modifications by maurojs10
 (BabelZilla).

---
 extension/locale/pt-BR/description.properties | 26 +++++++++----------
 extension/locale/pt-BR/scriptish.properties   |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/extension/locale/pt-BR/description.properties b/extension/locale/pt-BR/description.properties
index 1ecd72d0..ff519199 100644
--- a/extension/locale/pt-BR/description.properties
+++ b/extension/locale/pt-BR/description.properties
@@ -1,13 +1,13 @@
-extensions.scriptish@erikvold.com.description=
-amo.description.line1=
-amo.description.line2=
-amo.description.line3=
-amo.description.line4=
-amo.description.line5=
-amo.description.line6=
-amo.description.line7=
-amo.description.line8=
-amo.developerComments.line1=
-amo.developerComments.line2=
-amo.developerComments.line3=
-amo.summary=
+extensions.scriptish@erikvold.com.description=Um gerenciador de scripts para o Firefox.
+amo.description.line1=O Scriptish é um fork do Greasemonkey, oferecendo:
+amo.description.line2=Tudo que o Greasemonkey faz (o que é realmente útil)
+amo.description.line3=Atualização: os scripts podem ser atualizados usando @updateURL
+amo.description.line4=Muitos <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">metadados @keys</a> novos
+amo.description.line5=Muitos novos <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">acréscimos à API GM_</a>
+amo.description.line6=Desempenho superior: um código mais rápido e mais limpo, que tira proveito de tudo o que as versões recentes do Firefox tem a oferecer
+amo.description.line7=Segurança superior: o Scriptish fornece recursos de segurança que você não vai encontrar em outro lugar
+amo.description.line8=Testes: os desenvolvedores empregam uma série de testes para garantir o correto funcionamento do Scriptish e encontrar falhas o mais breve possível
+amo.developerComments.line1=O Scriptish tem todos os recursos que o Greasemonkey tem e muitos mais, que você pode descobrir em: <a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a> .
+amo.developerComments.line2=Por favor, envie informações sobre falhas ou solicite de novos recursos em: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a> .
+amo.developerComments.line3=Se você tiver qualquer dúvida, envie sua pergunta para a lista de discussão: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a> .
+amo.summary=O maior mecanismo de scripts de usuário da Internet.
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 3b1bd50a..57ed5091 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -1,4 +1,4 @@
-contributions.description=
+contributions.description=O desenvolvedor deste complemento pede sua ajuda para dar suporte ao desenvolvimento através de uma pequena doação.
 copyDownloadURL=Copiar endereço de download
 copyDownloadURL.ak=C
 edit=Editar

From 67b473ec4ad24dedc55110fa180a0c681e9b2cd5 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 13 Jul 2011 09:31:50 -0500
Subject: [PATCH 446/829] Use a different technique to get the browser window
 for a given content window.

---
 .../Scriptish_getBrowserForContentWindow.js   | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/extension/modules/utils/Scriptish_getBrowserForContentWindow.js b/extension/modules/utils/Scriptish_getBrowserForContentWindow.js
index b7059edb..19150a17 100644
--- a/extension/modules/utils/Scriptish_getBrowserForContentWindow.js
+++ b/extension/modules/utils/Scriptish_getBrowserForContentWindow.js
@@ -1,18 +1,13 @@
 var EXPORTED_SYMBOLS = ["Scriptish_getBrowserForContentWindow"];
 Components.utils.import("resource://scriptish/constants.js");
 
-function Scriptish_getBrowserForContentWindow(aWin) {
-  // enumerate through browser windows
-  let browserEnumerator = Services.wm.getEnumerator("navigator:browser");
-  while (browserEnumerator.hasMoreElements()) {
-    let browserWin = browserEnumerator.getNext();
-    let tabBrowser = browserWin.getBrowser();
-    if (!tabBrowser) continue;
-    for (let [, tab] in Iterator(tabBrowser.tabs)) {
-      if (!tab) continue;
-      let win = tab.linkedBrowser.contentWindow;
-      if (aWin === win || aWin.top === win) return browserWin;
-    }
-  }
-  return null;
+// See _getBrowserWindowForContentWindow in browser.js
+function Scriptish_getBrowserForContentWindow(aContentWindow) {
+  return aContentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+      .getInterface(Ci.nsIWebNavigation)
+      .QueryInterface(Ci.nsIDocShellTreeItem)
+      .rootTreeItem
+      .QueryInterface(Ci.nsIInterfaceRequestor)
+      .getInterface(Ci.nsIDOMWindow)
+      .wrappedJSObject;
 }

From 859d1b24c565dcd1893ceaa9c4380e89ffb60798 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 13 Jul 2011 09:56:10 -0500
Subject: [PATCH 447/829] Stop if we're unable to get either the
 Scriptish_BrowserUI or gBrowser from the chrome window.

---
 extension/components/scriptish.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index d8ba72bf..6dfdf9ab 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -108,10 +108,13 @@ ScriptishService.prototype = {
   docReady: function(safeWin, chromeWin) Scriptish.getConfig((function(config) {
     if (!Scriptish.enabled || !chromeWin) return;
 
-    let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
-    windows[currentInnerWindowID] = {unloaders: []};
     let gmBrowserUI = chromeWin.Scriptish_BrowserUI;
     let gBrowser = chromeWin.gBrowser;
+    if (!gmBrowserUI || !gBrowser) return;
+
+    let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
+    windows[currentInnerWindowID] = {unloaders: []};
+
     let href = (safeWin.location.href
         || (safeWin.frameElement && safeWin.frameElement.src))
         || "";

From f6f9dd08ab311129cc0e00552773223c31dff3fd Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 14 Jul 2011 16:44:00 -0700
Subject: [PATCH 448/829] Closes #215 Implemented @developer

---
 extension/modules/script/script.js | 39 +++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 2c999d90..eb9dbdce 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -70,6 +70,7 @@ function Script(config) {
   this._prefroot = null;
   this._author = null;
   this._applyBackgroundUpdates = defaultAutoUpdateState;
+  this._developers = [];
   this._contributors = [];
   this._description = null;
   this._version = null;
@@ -388,14 +389,25 @@ Script.prototype = {
       this._creator = this._author;
     }
   },
+  get developers() {
+    var devs = this._developers;
+    if (!AddonManagerPrivate.AddonAuthor) return devs;
+    var ary = [];
+    for (var i = devs.length-1; ~i; i--)
+      ary.unshift(new AddonManagerPrivate.AddonAuthor(devs[i]));
+    return ary;
+  },
   get contributors() {
-    if (!AddonManagerPrivate.AddonAuthor) return this._contributors;
-    var contributors = [];
-    for (var i = this._contributors.length-1; i >= 0; i--) {
-      contributors.unshift(
-          new AddonManagerPrivate.AddonAuthor(this._contributors[i]));
-    }
-    return contributors;
+    var contribs = this._contributors;
+    if (!AddonManagerPrivate.AddonAuthor) return contribs;
+    var ary = [];
+    for (var i = contribs.length-1; ~i; i--)
+      ary.unshift(new AddonManagerPrivate.AddonAuthor(contribs[i]));
+    return ary;
+  },
+  addDeveloper: function(aVal) {
+    if (!aVal) return;
+    this._developers.push(aVal);
   },
   addContributor: function(aContributor) {
     if (!aContributor) return;
@@ -686,6 +698,7 @@ Script.prototype = {
     this._name = newScript._name;
     this._namespace = newScript._namespace;
     this.author = newScript._author;
+    this._developers = newScript._developers;
     this._contributors = newScript._contributors;
     this._description = newScript._description;
     this._jsversion = newScript._jsversion;
@@ -739,7 +752,6 @@ Script.prototype = {
   },
 
   toJSON: function() ({
-    contributors: this._contributors,
     domains: this.domains,
     includes: this._includes.patterns,
     excludes: this._excludes.patterns,
@@ -763,6 +775,8 @@ Script.prototype = {
     name: this.name,
     namespace: this.namespace,
     author: this._author,
+    developers: this._developers,
+    contributors: this._contributors,
     blocklistState: this.blocklistState,
     description: this._description,
     version: this._version,
@@ -907,6 +921,10 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript) {
             script.author = value;
             continue;
           }
+          // nobreak
+        case "developer":
+          script.addDeveloper(value);
+          continue;
         case "contributor":
           script.addContributor(value);
           continue;
@@ -1134,7 +1152,10 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
   script._noframes = aSkeleton.noframes;
 
   script.domains = aSkeleton.domains;
-  aSkeleton.contributors.forEach(script.addContributor.bind(script));
+  if (aSkeleton.developers)
+    aSkeleton.developers.forEach(script.addDeveloper.bind(script));
+  if (aSkeleton.contributors)
+    aSkeleton.contributors.forEach(script.addContributor.bind(script));
   script.addInclude(aSkeleton.includes);
   script.addExclude(aSkeleton.excludes);
   script.addInclude(aSkeleton.user_includes, true);

From 573f36e61f46be9a91502de0f5607949c9c87d1c Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 14 Jul 2011 17:16:22 -0700
Subject: [PATCH 449/829] copying and pasting startButton.xml from Firebug

---
 .../content/third-party/firebug/license.txt   | 30 +++++++++++++++++++
 .../third-party/firebug/startButton.xml       | 27 +++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100755 extension/content/third-party/firebug/license.txt
 create mode 100755 extension/content/third-party/firebug/startButton.xml

diff --git a/extension/content/third-party/firebug/license.txt b/extension/content/third-party/firebug/license.txt
new file mode 100755
index 00000000..ce3c765f
--- /dev/null
+++ b/extension/content/third-party/firebug/license.txt
@@ -0,0 +1,30 @@
+Software License Agreement (BSD License)
+
+Copyright (c) 2007, Parakey Inc.
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of Parakey Inc. nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of Parakey Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/extension/content/third-party/firebug/startButton.xml b/extension/content/third-party/firebug/startButton.xml
new file mode 100755
index 00000000..741f24d0
--- /dev/null
+++ b/extension/content/third-party/firebug/startButton.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<bindings xmlns="http://www.mozilla.org/xbl"
+    xmlns:xbl="http://www.mozilla.org/xbl"
+    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<!-- Firebug start button is available in a 'Customize Toolbar' dialog with support
+     for error badge that displays number of errors on the current page (if any) -->
+<binding id="start-button" display="xul:menu"
+    extends="chrome://global/content/bindings/toolbarbutton.xml#menu-button">
+
+    <content>
+        <children includes="observes|template|menupopup|panel|tooltip"/>
+        <xul:stack class="badge">
+            <xul:label class="label" value="0" xbl:inherits="value=errorCount"/>
+        </xul:stack>
+
+        <xul:toolbarbutton class="fb-toolbarbutton box-inherit toolbarbutton-menubutton-button"
+            anonid="button" flex="1" allowevents="true"
+            xbl:inherits="disabled,crop,image,label,accesskey,command,align,dir,pack,orient"/>
+        <xul:dropmarker type="menu-button" class="toolbarbutton-menubutton-dropmarker"
+            xbl:inherits="align,dir,pack,orient,disabled,label"/>
+    </content>
+
+</binding>
+
+</bindings>

From d624ab1847d580bc48e8fc905a2448bd08b81104 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 14 Jul 2011 17:23:44 -0700
Subject: [PATCH 450/829] displaying the badge beside the scriptish button

---
 extension/content/browser.xul                 |  1 +
 .../third-party/firebug/startButton.xml       | 36 ++++++++-----------
 extension/skin/browser.css                    |  1 +
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index 02f3480a..e0c8de4c 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -41,6 +41,7 @@
         observes="scriptish-button-brd"
         type="menu-button"
         context=""
+        scriptCount="1"
         class="toolbarbutton-1 chromeclass-toolbar-additional"
         label="Scriptish">
       <menupopup id="scriptish-tb-popup" observes="scriptish-tb-popup-brd">
diff --git a/extension/content/third-party/firebug/startButton.xml b/extension/content/third-party/firebug/startButton.xml
index 741f24d0..d2d6f224 100755
--- a/extension/content/third-party/firebug/startButton.xml
+++ b/extension/content/third-party/firebug/startButton.xml
@@ -1,27 +1,21 @@
 <?xml version="1.0"?>
-
 <bindings xmlns="http://www.mozilla.org/xbl"
     xmlns:xbl="http://www.mozilla.org/xbl"
     xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<!-- Firebug start button is available in a 'Customize Toolbar' dialog with support
-     for error badge that displays number of errors on the current page (if any) -->
-<binding id="start-button" display="xul:menu"
-    extends="chrome://global/content/bindings/toolbarbutton.xml#menu-button">
-
-    <content>
-        <children includes="observes|template|menupopup|panel|tooltip"/>
-        <xul:stack class="badge">
-            <xul:label class="label" value="0" xbl:inherits="value=errorCount"/>
-        </xul:stack>
-
-        <xul:toolbarbutton class="fb-toolbarbutton box-inherit toolbarbutton-menubutton-button"
-            anonid="button" flex="1" allowevents="true"
-            xbl:inherits="disabled,crop,image,label,accesskey,command,align,dir,pack,orient"/>
-        <xul:dropmarker type="menu-button" class="toolbarbutton-menubutton-dropmarker"
-            xbl:inherits="align,dir,pack,orient,disabled,label"/>
-    </content>
-
-</binding>
-
+  <binding id="scriptish-button" display="xul:menu"
+      extends="chrome://global/content/bindings/toolbarbutton.xml#menu-button">
+      <content>
+          <children includes="observes|template|menupopup|panel|tooltip"/>
+          <xul:stack class="badge">
+              <xul:label class="label" value="0" xbl:inherits="value=scriptCount"/>
+          </xul:stack>
+  
+          <xul:toolbarbutton class="scriptish-button box-inherit toolbarbutton-menubutton-button"
+              anonid="button" flex="1" allowevents="true"
+              xbl:inherits="disabled,crop,image,label,accesskey,command,align,dir,pack,orient"/>
+          <xul:dropmarker type="menu-button" class="toolbarbutton-menubutton-dropmarker"
+              xbl:inherits="align,dir,pack,orient,disabled,label"/>
+      </content>
+  </binding>
 </bindings>
diff --git a/extension/skin/browser.css b/extension/skin/browser.css
index 4ac1913e..5ada41fb 100644
--- a/extension/skin/browser.css
+++ b/extension/skin/browser.css
@@ -1,5 +1,6 @@
 #scriptish-button {
   -moz-box-orient: horizontal;
+  -moz-binding: url("chrome://scriptish/content/third-party/firebug/startButton.xml#scriptish-button");'
   list-style-image: url("chrome://scriptish/skin/scriptish24.png");
 }
 

From 8809c379f5fe81c45cfe56fbc82e75164b6ceff2 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 15 Jul 2011 10:18:57 -0700
Subject: [PATCH 451/829] adding styling for the badge from Firebug

---
 extension/chrome.manifest                     |  1 +
 extension/content/browser.xul                 |  2 +
 .../third-party/firebug/startButton.css       | 62 +++++++++++++++++++
 extension/skin/browser.css                    |  2 +-
 4 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100755 extension/content/third-party/firebug/startButton.css

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 96e57567..12355516 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -9,6 +9,7 @@ content    scriptish    content/
 resource   scriptish    modules/
 skin       scriptish    classic/1.0 skin/
 style      chrome://global/content/customizeToolbar.xul chrome://scriptish/skin/browser.css
+style      chrome://global/content/customizeToolbar.xul chrome://scriptish/content/third-party/firebug/startButton.css
 
 overlay    chrome://browser/content/browser.xul chrome://scriptish/content/browser.xul
 overlay    chrome://browser/content/scratchpad.xul chrome://scriptish/content/scratchpad.xul
diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index e0c8de4c..25ed43b9 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://scriptish/skin/browser.css" type="text/css"?>
+<?xml-stylesheet href="chrome://scriptish/content/third-party/firebug/startButton.css" type="text/css"?>
 
 <overlay id="scriptish-browser-overlay"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -42,6 +43,7 @@
         type="menu-button"
         context=""
         scriptCount="1"
+        showScripts="true"
         class="toolbarbutton-1 chromeclass-toolbar-additional"
         label="Scriptish">
       <menupopup id="scriptish-tb-popup" observes="scriptish-tb-popup-brd">
diff --git a/extension/content/third-party/firebug/startButton.css b/extension/content/third-party/firebug/startButton.css
new file mode 100755
index 00000000..16d52ab4
--- /dev/null
+++ b/extension/content/third-party/firebug/startButton.css
@@ -0,0 +1,62 @@
+#scriptish-button .badge > .label {
+    -moz-box-sizing: border-box;
+    /*visibility: hidden;*/
+    font-size: 10px;
+    padding: 0 3px;
+    line-height: 13px;
+    font-family: Arial, Helvetica, sans-serif;
+    text-shadow: 0 0 1px #EEF1F7;
+    color: #900;
+    border-radius: 3px;
+    background-color: rgba(255, 0, 0, 0.9);
+    box-shadow: inset 0px 0px 1px white;
+    background-image: -moz-linear-gradient(
+        center bottom,
+        #DBE1EB 0%,
+        #DEE4EB 80%,
+        #E7EBF3 81%
+    );
+    border-width: 1px;
+    border-style: solid;
+    border-color: #B3BBC4 #9DA4AD #868D96 #9DA4AD;
+    box-shadow: 0 0 1px rgba(255, 255, 255, 0.3) inset,
+                0 1px 0 rgba(180, 189, 202, 0.7),
+                0 0 3px rgba(153, 0, 0, 0.9);
+}
+
+/* Slightly different positions of the badge for individual toolbars */
+#nav-bar #scriptish-button .badge {
+    margin: 3px -10px 0 -8px;
+}
+
+#addon-bar #scriptish-button .badge {
+    margin-top: 1px;
+}
+
+#addon-bar #scriptish-button .badge {
+    margin-top: 1px;
+}
+
+#TabsToolbar #scriptish-button .badge {
+    margin-top: 4px;
+}
+
+#toolbar-menubar #scriptish-button .badge {
+    margin-top: 4px;
+}
+
+/* Error badge (displays an error counter). The badge is only visible if error count
+   should be displayed */
+#scriptish-button .badge {
+    /*display: none;*/
+}
+
+#scriptish-button[showScripts="true"] .badge {
+    display: block;
+    -moz-box-sizing: border-box;
+    margin: 0;
+}
+
+#CustomizeToolbarWindow #wrapper-scriptish-button #scriptish-button .badge {
+  display: none;
+}
diff --git a/extension/skin/browser.css b/extension/skin/browser.css
index 5ada41fb..21178da1 100644
--- a/extension/skin/browser.css
+++ b/extension/skin/browser.css
@@ -1,6 +1,6 @@
 #scriptish-button {
   -moz-box-orient: horizontal;
-  -moz-binding: url("chrome://scriptish/content/third-party/firebug/startButton.xml#scriptish-button");'
+  -moz-binding: url("chrome://scriptish/content/third-party/firebug/startButton.xml#scriptish-button");
   list-style-image: url("chrome://scriptish/skin/scriptish24.png");
 }
 

From 08e246fc1bc9c58d6c8800c3b1d6e5cb4b682718 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 15 Jul 2011 10:29:54 -0700
Subject: [PATCH 452/829] hide badge if showScripts!=true and minor style
 changes

---
 .../third-party/firebug/startButton.css       | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/extension/content/third-party/firebug/startButton.css b/extension/content/third-party/firebug/startButton.css
index 16d52ab4..a8cbb651 100755
--- a/extension/content/third-party/firebug/startButton.css
+++ b/extension/content/third-party/firebug/startButton.css
@@ -1,60 +1,60 @@
 #scriptish-button .badge > .label {
-    -moz-box-sizing: border-box;
-    /*visibility: hidden;*/
-    font-size: 10px;
-    padding: 0 3px;
-    line-height: 13px;
-    font-family: Arial, Helvetica, sans-serif;
-    text-shadow: 0 0 1px #EEF1F7;
-    color: #900;
-    border-radius: 3px;
-    background-color: rgba(255, 0, 0, 0.9);
-    box-shadow: inset 0px 0px 1px white;
-    background-image: -moz-linear-gradient(
-        center bottom,
-        #DBE1EB 0%,
-        #DEE4EB 80%,
-        #E7EBF3 81%
-    );
-    border-width: 1px;
-    border-style: solid;
-    border-color: #B3BBC4 #9DA4AD #868D96 #9DA4AD;
-    box-shadow: 0 0 1px rgba(255, 255, 255, 0.3) inset,
-                0 1px 0 rgba(180, 189, 202, 0.7),
-                0 0 3px rgba(153, 0, 0, 0.9);
+  -moz-box-sizing: border-box;
+  /*visibility: hidden;*/
+  font-size: 10px;
+  padding: 0 3px;
+  line-height: 13px;
+  font-family: Arial, Helvetica, sans-serif;
+  text-shadow: 0 0 1px #EEF1F7;
+  color: #900;
+  border-radius: 3px;
+  background-color: rgba(255, 0, 0, 0.9);
+  box-shadow: inset 0px 0px 1px white;
+  background-image: -moz-linear-gradient(
+      center bottom,
+      #DBE1EB 0%,
+      #DEE4EB 80%,
+      #E7EBF3 81%
+  );
+  border-width: 1px;
+  border-style: solid;
+  border-color: #B3BBC4 #9DA4AD #868D96 #9DA4AD;
+  box-shadow: 0 0 1px rgba(255, 255, 255, 0.3) inset,
+              0 1px 0 rgba(180, 189, 202, 0.7),
+              0 0 3px rgba(153, 0, 0, 0.9);
 }
 
 /* Slightly different positions of the badge for individual toolbars */
 #nav-bar #scriptish-button .badge {
-    margin: 3px -10px 0 -8px;
+  margin: 3px -10px 0 -8px;
 }
 
 #addon-bar #scriptish-button .badge {
-    margin-top: 1px;
+  margin-top: 1px;
 }
 
 #addon-bar #scriptish-button .badge {
-    margin-top: 1px;
+  margin-top: 1px;
 }
 
 #TabsToolbar #scriptish-button .badge {
-    margin-top: 4px;
+  margin-top: 4px;
 }
 
 #toolbar-menubar #scriptish-button .badge {
-    margin-top: 4px;
+  margin-top: 4px;
 }
 
 /* Error badge (displays an error counter). The badge is only visible if error count
    should be displayed */
 #scriptish-button .badge {
-    /*display: none;*/
+  display: none;
 }
 
 #scriptish-button[showScripts="true"] .badge {
-    display: block;
-    -moz-box-sizing: border-box;
-    margin: 0;
+  display: block;
+  -moz-box-sizing: border-box;
+  margin: 0;
 }
 
 #CustomizeToolbarWindow #wrapper-scriptish-button #scriptish-button .badge {

From cfca58818c64a865f396f11cdf6e76e08fc441b5 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 15 Jul 2011 11:00:18 -0700
Subject: [PATCH 453/829] displaying the number of enabled scripts for the
 active tab in the badge

---
 extension/content/js/browser.js | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 63d54fcb..9b55619b 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -51,12 +51,14 @@ Scriptish_BrowserUI.tbBtnSetup = function() {
   var sbPopUp = $("scriptish-tb-popup-brd");
   sbPopUp.setAttribute("onclick",
       "Scriptish_popupClicked(event);event.stopPropagation();");
-  sbPopUp.setAttribute("onpopupshowing", "Scriptish_showPopup(event);");
+  sbPopUp.setAttribute("onpopupshowing", "Scriptish_setupPopup();");
 
   // update enabled icon
   Scriptish_BrowserUIM.refreshStatus();
 
   delete Scriptish_BrowserUI["tbBtnSetup"];
+
+  Scriptish_setupPopup();
 }
 
 /**
@@ -307,8 +309,10 @@ function Scriptish_popupClicked(aEvt) {
 /**
  * Handles a Scriptish menu popup event
  */
-function Scriptish_showPopup(aEvent) Scriptish.getConfig(function(config) {
+function Scriptish_setupPopup() Scriptish.getConfig(function(config) {
   var $ = function(aID) document.getElementById(aID);
+  var popup = $("scriptish-tb-popup");
+  if (!popup) return;
   Scriptish_BrowserUI.reattachMenuCmds();
 
   function okURL(url) (
@@ -334,11 +338,10 @@ function Scriptish_showPopup(aEvent) Scriptish.getConfig(function(config) {
     popup.insertBefore(mi, tail);
   }
 
-  var popup = aEvent.target;
   var tail = $("scriptish-tb-no-scripts-sep");
 
   // remove all the scripts from the list
-  for (var i = popup.childNodes.length - 1; i >= 0; i--) {
+  for (var i = popup.childNodes.length - 1; ~i; i--) {
     var node = popup.childNodes[i];
     if (node.script || node.getAttribute("value") == "hack")
       popup.removeChild(node);
@@ -374,8 +377,13 @@ function Scriptish_showPopup(aEvent) Scriptish.getConfig(function(config) {
   }
   runsOnTop.forEach(appendScriptToPopup);
 
+  var totalScriptCount = frameScriptLen + runsOnTop.length;
+  function isEnabled(aScript) aScript.enabled;
+  var enabledScriptCount = runsOnTop.filter(isEnabled).length + runsFramed.filter(isEnabled).length;
+  $("scriptish-button").setAttribute("scriptCount", enabledScriptCount);
+
   let (menuitem = $("scriptish-tb-no-scripts")) {
-    let collapsed = menuitem.collapsed = !!(frameScriptLen + runsOnTop.length);
+    let collapsed = menuitem.collapsed = !!totalScriptCount;
     if (collapsed) return;
 
     // determine the correct label
@@ -388,4 +396,10 @@ function Scriptish_showPopup(aEvent) Scriptish.getConfig(function(config) {
       label = Scriptish_stringBundle("statusbar.noScripts.notfound");
     menuitem.setAttribute("label", label);
   }
-})
+});
+
+gBrowser.addProgressListener({
+  onLocationChange: function(aProgress, aRequest, aURI) {
+    Scriptish_setupPopup();
+  }
+});

From e551e38dc274d6ce94187d94413d8a6c1cef1856 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 15 Jul 2011 06:02:11 +0200
Subject: [PATCH 454/829] Pass cookies during script install

Closes #445
---
 extension/modules/script/scriptdownloader.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 76d1c10f..1332fee3 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -53,6 +53,9 @@ ScriptDownloader.prototype.startDownload = function(bypassCache) {
     req.channel.notificationCallbacks =
         new BadCertHandler(!Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
   }
+  if (req.channel instanceof Ci.nsIHttpChannelInternal) {
+    req.channel.forceAllowThirdPartyCookie = true;
+  }
   req.onerror = this.handleErr.bind(this);
   req.onreadystatechange = this.chkContentTypeB4DL.bind(this);
   req.onload = this.handleScriptDownloadComplete.bind(this);
@@ -201,6 +204,9 @@ ScriptDownloader.prototype.downloadNextDependency = function() {
     }
 
     var sourceChannel = Services.io.newChannelFromURI(sourceUri);
+    if (sourceChannel instanceof Ci.nsIHttpChannelInternal) {
+      sourceChannel.forceAllowThirdPartyCookie = true;
+    }
     sourceChannel.notificationCallbacks = (this.secure)
         ? new BadCertHandler(!Scriptish_prefRoot.getValue("update.requireBuiltInCerts"))
         : new NotificationCallbacks();

From 55fda5b3ad94d51177c9fd8acfef43179c99552a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 15 Jul 2011 12:14:59 -0700
Subject: [PATCH 455/829] adding 'install user script' menuitem to about:addons

---
 extension/content/addonstab.xul               |  9 ++++++
 extension/content/js/addonstab.js             | 30 ++++++++++++++++++-
 extension/locale/en-US/scriptish.properties   |  3 ++
 .../modules/utils/Scriptish_getEditor.js      | 21 ++++++-------
 4 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/extension/content/addonstab.xul b/extension/content/addonstab.xul
index a1fa7820..3fc3f1c6 100644
--- a/extension/content/addonstab.xul
+++ b/extension/content/addonstab.xul
@@ -3,6 +3,9 @@
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/x-javascript" src="chrome://scriptish/content/js/addonstab.js" />
 
+  <commandset id="globalCommandSet">
+    <command id="cmd_scriptish_installFromFile"/>
+  </commandset>
   <commandset id="viewCommandSet">
     <!-- looks a little convoluted, but is required for the list-view
          controls binding to work correctly.
@@ -57,4 +60,10 @@
     <spacer class="alert-spacer-after"/>
   </vbox>
   </vbox>
+
+  <menupopup id="utils-menu">
+    <menuitem id="scriptish-installFromFile"
+          command="cmd_scriptish_installFromFile"
+          insertafter="utils-installFromFile"/>
+  </menupopup>
 </overlay>
diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index f67026dd..1221ad9d 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -4,9 +4,10 @@ Cu.import("resource://scriptish/constants.js", tools);
 Cu.import("resource://scriptish/prefmanager.js");
 Cu.import("resource://scriptish/logging.js");
 Cu.import("resource://scriptish/scriptish.js");
-Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 Cu.import("resource://scriptish/utils/Scriptish_ExtendedStringBundle.js");
+Cu.import("resource://scriptish/utils/Scriptish_installUri.js");
 Cu.import("resource://scriptish/utils/Scriptish_openInEditor.js");
+Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js");
 Cu.import("resource://scriptish/addonprovider.js");
 
@@ -24,6 +25,26 @@ window.addEventListener("load", function() {
     return true;
   }
 
+  gViewController.commands.cmd_scriptish_installFromFile = {
+    isEnabled: function() {
+      return true;
+    },
+    doCommand: function() {
+      var nsIFilePicker = Ci.nsIFilePicker;
+      var fp = tools.Instances.fp;
+      fp.init(
+          window,
+          Scriptish_stringBundle("installFromFile.title"),
+          nsIFilePicker.modeOpen);
+      fp.appendFilter(Scriptish_stringBundle("userscript"), "*.js");
+      fp.appendFilters(nsIFilePicker.filterAll);
+
+      if (fp.show() != nsIFilePicker.returnOK || !fp.file.exists())
+        return;
+
+      Scriptish_installUri(tools.Services.io.newFileURI(fp.file));
+    }
+  };
   gViewController.commands.cmd_scriptish_userscript_edit = {
     isEnabled: addonIsInstalledScript,
     doCommand: function(aAddon) { Scriptish_openInEditor(aAddon, window); }
@@ -74,6 +95,13 @@ window.addEventListener("load", function() {
   $("scriptish-detail-contrib-description").textContent =
       Scriptish_stringBundle("contributions.description");
 
+  // localize install us from file menuitem
+  let (mi = $("scriptish-installFromFile")) {
+    mi.setAttribute("label", Scriptish_stringBundle("installFromFile.title"));
+    mi.setAttribute("accesskey", Scriptish_stringBundle("installFromFile.ak"));
+  }
+  
+
   function onViewChanged() {
     let de = document.documentElement;
     let view = /^addons:\/\/([^/]+)(?:\/([^/]+)?)?$/.exec(gViewController.currentViewId);
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 061873c0..54980326 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -45,6 +45,8 @@ install.showScriptSource=Show Script Source
 install.title=User Script Installation
 install.warning1=Malicious scripts can violate your privacy and act on your behalf without your knowledge.
 install.warning2=You should only install scripts from sources that you trust.
+installFromFile.title=Install User Script From File..
+installFromFile.ak=U
 menu.commands=User Script Commands...
 menu.commands.ak=C
 menu.install=Install User Script...
@@ -146,6 +148,7 @@ tooltip.loading=Loading...
 Uninstall=Uninstall
 untitledScript=Untitled Script
 Update=Update
+userscript=User Script
 userscripts=User Scripts
 userscripts.get=Get user scripts
 userscripts.noneInstalled=You don't have any user scripts installed
diff --git a/extension/modules/utils/Scriptish_getEditor.js b/extension/modules/utils/Scriptish_getEditor.js
index a7e128e5..be810b42 100644
--- a/extension/modules/utils/Scriptish_getEditor.js
+++ b/extension/modules/utils/Scriptish_getEditor.js
@@ -32,25 +32,22 @@ const Scriptish_getEditor = function(parentWindow, change) {
   while (true) {
     Scriptish_log("Asking user to choose editor...");
     var nsIFilePicker = Ci.nsIFilePicker;
-    var filePicker = Instances.fp;
-    filePicker.init(
+    var fp = Instances.fp;
+    fp.init(
         parentWindow,
         Scriptish_stringBundle("editor.prompt"),
         nsIFilePicker.modeOpen);
-    filePicker.appendFilters(nsIFilePicker.filterApplication);
-    filePicker.appendFilters(nsIFilePicker.filterAll);
+    fp.appendFilters(nsIFilePicker.filterApplication);
+    fp.appendFilters(nsIFilePicker.filterAll);
 
-    if (filePicker.show() != nsIFilePicker.returnOK) {
-      // The user canceled, return null.
-      Scriptish_log("User canceled file picker dialog");
+    if (fp.show() != nsIFilePicker.returnOK)
       return null;
-    }
 
-    Scriptish_log("User selected: " + filePicker.file.path);
+    Scriptish_log("User selected: " + fp.file.path);
 
-    if (filePicker.file.exists() && filePicker.file.isExecutable()) {
-      Scriptish_prefRoot.setValue("editor", filePicker.file.path);
-      return filePicker.file;
+    if (fp.file.exists() && fp.file.isExecutable()) {
+      Scriptish_prefRoot.setValue("editor", fp.file.path);
+      return fp.file;
     } else {
       Scriptish_alert(Scriptish_stringBundle("editor.pleasePickExecutable"));
     }

From 4ec6911ccbb434bb9b8a446635f5c75162cd033e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 15 Jul 2011 12:56:54 -0700
Subject: [PATCH 456/829] drag and dropping user scrpts over teh EM now works,
 not perfectly though, but better than b4.

---
 extension/content/js/addonstab.js | 44 ++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 1221ad9d..ef227a2a 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -11,6 +11,8 @@ Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
 Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js");
 Cu.import("resource://scriptish/addonprovider.js");
 
+const RE_USERSCRIPT = /^.*\.user(?:-\d+)?\.js$/i;
+
 var Scriptish_bundle = new Scriptish_ExtendedStringBundle(gStrings.ext);
 Scriptish_bundle.strings["header-userscript"] = Scriptish_stringBundle("userscripts");
 gStrings.ext = Scriptish_bundle;
@@ -25,6 +27,47 @@ window.addEventListener("load", function() {
     return true;
   }
 
+  var oldDD = gDragDrop.onDrop;
+  gDragDrop.onDrop = function(aEvt) {
+    var dt = aEvt.dataTransfer;
+    var uris = [];
+
+    function handleStrType(type, i) {
+      let url = dt.mozGetDataAt(type, i);
+      if (url) {
+        url = url.trim().match(/$[^\n\r\t]*/)[0];
+        if (!RE_USERSCRIPT.test(url)) return false;
+        uris.push(Services.io.newURI(url));
+        removeType(type, i);
+        return true;
+      }
+      return false;
+    }
+    function removeType(type, i) {
+      dt.mozClearDataAt(type, i);
+    }
+
+    for (var i = dt.mozItemCount - 1; ~i; i--) {
+      if (handleStrType("text/uri-list", i)) continue;
+      if (handleStrType("text/x-moz-url", i)) continue;
+
+      let file = dt.mozGetDataAt("application/x-moz-file", i);
+      if (file) {
+        let uri = Services.io.newFileURI(file);
+        if (!RE_USERSCRIPT.test(uri.spec)) return;
+        uris.push(uri);
+        removeType("application/x-moz-file", i);
+        continue;
+      }
+    }
+
+    uris.forEach(function(uri) {
+      Scriptish_installUri(uri);
+    });
+
+    oldDD(aEvt)
+  }
+
   gViewController.commands.cmd_scriptish_installFromFile = {
     isEnabled: function() {
       return true;
@@ -100,7 +143,6 @@ window.addEventListener("load", function() {
     mi.setAttribute("label", Scriptish_stringBundle("installFromFile.title"));
     mi.setAttribute("accesskey", Scriptish_stringBundle("installFromFile.ak"));
   }
-  
 
   function onViewChanged() {
     let de = document.documentElement;

From 43b0e77852bd265cc979bbf4c850164536c9b823 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 15 Jul 2011 13:50:12 -0700
Subject: [PATCH 457/829] Closes #448 progress listener should be added after
 the chrome window loads

---
 extension/content/js/browser.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 9b55619b..d0f5ba9f 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -59,6 +59,11 @@ Scriptish_BrowserUI.tbBtnSetup = function() {
   delete Scriptish_BrowserUI["tbBtnSetup"];
 
   Scriptish_setupPopup();
+  gBrowser.addProgressListener({
+    onLocationChange: function(aProgress, aRequest, aURI) {
+      Scriptish_setupPopup();
+    }
+  });
 }
 
 /**
@@ -397,9 +402,3 @@ function Scriptish_setupPopup() Scriptish.getConfig(function(config) {
     menuitem.setAttribute("label", label);
   }
 });
-
-gBrowser.addProgressListener({
-  onLocationChange: function(aProgress, aRequest, aURI) {
-    Scriptish_setupPopup();
-  }
-});

From aa18c6f7900615b783c981467ed593f265f63d64 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 15 Jul 2011 15:41:45 -0500
Subject: [PATCH 458/829] minor changes to 'installFromFile'; adding to all
 locales

---
 extension/content/js/addonstab.js           | 4 ++--
 extension/locale/de/scriptish.properties    | 2 ++
 extension/locale/en-US/scriptish.properties | 2 +-
 extension/locale/es-ES/scriptish.properties | 2 ++
 extension/locale/ja-JP/scriptish.properties | 2 ++
 extension/locale/pt-BR/scriptish.properties | 2 ++
 extension/locale/ru-RU/scriptish.properties | 2 ++
 extension/locale/sv-SE/scriptish.properties | 2 ++
 extension/locale/zh-CN/scriptish.properties | 2 ++
 9 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index ef227a2a..d1040e23 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -77,7 +77,7 @@ window.addEventListener("load", function() {
       var fp = tools.Instances.fp;
       fp.init(
           window,
-          Scriptish_stringBundle("installFromFile.title"),
+          Scriptish_stringBundle("installFromFile"),
           nsIFilePicker.modeOpen);
       fp.appendFilter(Scriptish_stringBundle("userscript"), "*.js");
       fp.appendFilters(nsIFilePicker.filterAll);
@@ -140,7 +140,7 @@ window.addEventListener("load", function() {
 
   // localize install us from file menuitem
   let (mi = $("scriptish-installFromFile")) {
-    mi.setAttribute("label", Scriptish_stringBundle("installFromFile.title"));
+    mi.setAttribute("label", Scriptish_stringBundle("installFromFile"));
     mi.setAttribute("accesskey", Scriptish_stringBundle("installFromFile.ak"));
   }
 
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 700999f5..6fbf027c 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -45,6 +45,8 @@ install.showScriptSource=Quelltext anzeigen
 install.title=Benutzerskript Installation
 install.warning1=Bösartige Benutzerskripte können Ihre Daten auspähen oder ohne Ihre Genehmigung in ihren Namen handeln. Es handelt sich um echte kleine Programme.
 install.warning2=Sie sollten nur Benutzerskripte aus Quellen installieren, denen Sie auch vertrauen.
+installFromFile=
+installFromFile.ak=
 menu.commands=Benutzerskript Befehle...
 menu.commands.ak=B
 menu.install=Benutzerskript installieren...
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 54980326..b6486f62 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -45,7 +45,7 @@ install.showScriptSource=Show Script Source
 install.title=User Script Installation
 install.warning1=Malicious scripts can violate your privacy and act on your behalf without your knowledge.
 install.warning2=You should only install scripts from sources that you trust.
-installFromFile.title=Install User Script From File..
+installFromFile=Install User Script From File...
 installFromFile.ak=U
 menu.commands=User Script Commands...
 menu.commands.ak=C
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 6e671694..7e7fb2f9 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -45,6 +45,8 @@ install.showScriptSource=Mostrar código fuente del script
 install.title=Instalación de script de usuario
 install.warning1=Los scripts maliciosos pueden violar su privacidad y actuar en su nombre sin su conocimiento.
 install.warning2=Sólo debería instalar scripts de fuentes en las que confíe.
+installFromFile=
+installFromFile.ak=
 menu.commands=Comandos del script de usuario...
 menu.commands.ak=M
 menu.install=Instalar script de usuario...
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 95dc99ac..b2c3f6a7 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -45,6 +45,8 @@ install.showScriptSource=スクリプトのソースを表示
 install.title=ユーザースクリプトのインストール
 install.warning1=悪意のあるスクリプトはあなたの知らぬ間にプライバシーを侵害することがあります
 install.warning2=信頼できる場所からのみスクリプトをインストールすべきです
+installFromFile=
+installFromFile.ak=
 menu.commands=ユーザースクリプトのコマンド…
 menu.commands.ak=C
 menu.install=ユーザースクリプトをインストール…
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 57ed5091..6ea614f8 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -45,6 +45,8 @@ install.showScriptSource=Exibir código-fonte do script
 install.title=Instalação de Script de Usuário
 install.warning1=Scripts nocivos podem violar a sua privacidade e agir em seu nome sem o seu conhecimento.
 install.warning2=Você só deve instalar scripts de fontes em que você confia.
+installFromFile=
+installFromFile.ak=
 menu.commands=Comandos de script de usuário
 menu.commands.ak=C
 menu.install=Instalar script de usuário
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index e5cf34f9..ad92b313 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -45,6 +45,8 @@ install.showScriptSource=Показать исходный код скрипта
 install.title=Установщик скриптов
 install.warning1=Вредоносные скрипты могут нарушить Вашу конфиденциальность и действовать от Вашего имени без Вашего согласия.
 install.warning2=Вы должны устанавливать скрипты только из доверенных источников.
+installFromFile=
+installFromFile.ak=
 menu.commands=Команды скрипта...
 menu.commands.ak=
 menu.install=Установить скрипт...
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index c2f19742..1841f611 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -45,6 +45,8 @@ install.showScriptSource=Visa skriptets källa
 install.title=Installation av användarskript
 install.warning1=Skadliga skript kan kränka din integritet och agera för din räkning utan din vetskap.
 install.warning2=Du bör endast installera skript från källor som du litar på.
+installFromFile=
+installFromFile.ak=
 menu.commands=Användarskriptkommandon…
 menu.commands.ak=A
 menu.install=Installera användarskript…
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index 6abea85a..2edf8c38 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -45,6 +45,8 @@ install.showScriptSource=显示脚本源代码
 install.title=安装用户脚本
 install.warning1=恶意脚本可能会侵犯您的隐私并在您不知情的情况下以您的身份运行。
 install.warning2=您应该只安装从可信任来源获得的脚本。
+installFromFile=
+installFromFile.ak=
 menu.commands=用户脚本命令...
 menu.commands.ak=C
 menu.install=安装用户脚本...

From 1d164e7296670c8254ad452a46e532ec30c96543 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 15 Jul 2011 15:43:08 -0500
Subject: [PATCH 459/829] Updating ja-JP with modifications by k2jp
 (BabelZilla).

---
 extension/locale/ja-JP/scriptish.properties | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index b2c3f6a7..0e28e4e4 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -1,5 +1,5 @@
-contributions.description=
-copyDownloadURL=ダウンロードした URL をコピー
+contributions.description=このユーザースクリプト開発者は、少額の寄付による開発継続のための支援をあなたに求めています。
+copyDownloadURL=ダウンロード時の URL をコピー
 copyDownloadURL.ak=C
 edit=編集
 edit.ak=E
@@ -8,7 +8,7 @@ editor.pleasePickExecutable=ユーザースクリプト編集用アプリケー
 editor.prompt=はじめにお好みのエディタを選択してください
 error.api.clipboard.type=は GM_setClipboard がサポートしてない型です
 error.api.noResourceWithName=名前付きリソースがありません
-error.api.noSecondArgValue=２番目の引数が指定されていません： 値
+error.api.noSecondArgValue=２番目の引数が指定されていません：Value
 error.api.reqURL=不正な URL です
 error.api.reqURL.scheme=URL 内で許されないスキームです
 error.api.unsafeAccess=Scriptish アクセス違反： unsafeWindow は以下を呼び出すことが出来ません
@@ -35,12 +35,12 @@ error.script.loading=ユーザースクリプトの読み込みでエラーが
 greeting.btn.ak=I
 greeting.msg=これはユーザースクリプトです。使用するには インストール をクリックして下さい
 install=インストール
-install.domains=
-install.excludes=
-install.includes=
-install.matches=
-install.requires=
-install.resources=
+install.domains=domains：
+install.excludes=does not run on：
+install.includes=runs on：
+install.matches=matches：
+install.requires=requires：
+install.resources=resources：
 install.showScriptSource=スクリプトのソースを表示
 install.title=ユーザースクリプトのインストール
 install.warning1=悪意のあるスクリプトはあなたの知らぬ間にプライバシーを侵害することがあります
@@ -108,7 +108,7 @@ options.enabledSchemes.main=利用プロトコル
 options.enabledSchemes.securityRemark=追加したプロトコルでシステムにフルアクセス可能になることがあります
 options.enabledSchemes.securityRemark2=つまり、信用できないスクリプトと併用すると相当なセキュリティ・リスクになるので注意！
 options.enabledSchemes.unmht=unmht プロトコル（Mozilla Archive フォーマット）
-options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先
+options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先する
 options.excludes.empty=global excludes は指定されていません
 options.excludes.remark=（１行１つずつ除外するものを指定）
 options.logChrome=重大でないエクステンションのメッセージもエラーコンソールに出力
@@ -119,10 +119,10 @@ options.notifications.popup.enable=
 options.notifications.sliding.enable=
 options.notifications.whenDisabled=
 options.pane.advanced=詳細
-options.pane.excludes=
+options.pane.excludes=Global Excludes
 options.pane.main=メイン
 options.pane.ui=ユーザーインタフェース
-options.requireBuiltInCerts=更新に built-in 証明書を利用
+options.requireBuiltInCerts=安全な更新に built-in 証明書を利用
 options.requireSecured=HTTPS でユーザースクリプトを更新
 options.title=Scriptish オプション
 options.translation=翻訳

From 2f48068410acf0a835fc550d41ec3f77963f06cb Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 16 Jul 2011 10:11:06 -0500
Subject: [PATCH 460/829] minor: removing duplicate CSS

---
 extension/content/third-party/firebug/startButton.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/extension/content/third-party/firebug/startButton.css b/extension/content/third-party/firebug/startButton.css
index a8cbb651..c69b5510 100755
--- a/extension/content/third-party/firebug/startButton.css
+++ b/extension/content/third-party/firebug/startButton.css
@@ -33,10 +33,6 @@
   margin-top: 1px;
 }
 
-#addon-bar #scriptish-button .badge {
-  margin-top: 1px;
-}
-
 #TabsToolbar #scriptish-button .badge {
   margin-top: 4px;
 }

From 67487c20a22d294d327a12b7b3986baa61578c6a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 18 Jul 2011 16:23:53 +0200
Subject: [PATCH 461/829] GM_xpath: use resultset iterators

---
 extension/modules/api/sandbox.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extension/modules/api/sandbox.js b/extension/modules/api/sandbox.js
index dce1b2eb..134fd646 100644
--- a/extension/modules/api/sandbox.js
+++ b/extension/modules/api/sandbox.js
@@ -57,17 +57,17 @@ function GM_xpath(details) {
   }
 
   if (details.all) {
-    var rv = [], i, e;
+    var rv = [], n;
     for (var [,path] in Iterator(paths)) {
       result = contextDocument.evaluate(
         path,
         contextNode,
         resolver,
-        XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
+        XPathResult.ORDERED_NODE_ITERATOR_TYPE,
         null
       );
-      for (i = 0, e = result.snapshotLength; i < e; ++i) {
-        rv.push(result.snapshotItem(i));
+      while (n = result.iterateNext()) {
+        rv.push(n);
       }
     }
     return rv;

From 4d2046afc9844d5907eb75b677e095cba77cb36d Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 18 Jul 2011 22:28:52 +0200
Subject: [PATCH 462/829] Stylize script counter in a more Scriptish fashion

Also fix some other issues, such as proper centering
---
 .../third-party/firebug/startButton.css       | 57 +++++--------------
 .../third-party/firebug/startButton.xml       |  6 +-
 2 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/extension/content/third-party/firebug/startButton.css b/extension/content/third-party/firebug/startButton.css
index c69b5510..ea37c96c 100755
--- a/extension/content/third-party/firebug/startButton.css
+++ b/extension/content/third-party/firebug/startButton.css
@@ -1,58 +1,29 @@
 #scriptish-button .badge > .label {
-  -moz-box-sizing: border-box;
-  /*visibility: hidden;*/
-  font-size: 10px;
+  font-size: 9px;
   padding: 0 3px;
-  line-height: 13px;
-  font-family: Arial, Helvetica, sans-serif;
-  text-shadow: 0 0 1px #EEF1F7;
-  color: #900;
-  border-radius: 3px;
-  background-color: rgba(255, 0, 0, 0.9);
-  box-shadow: inset 0px 0px 1px white;
-  background-image: -moz-linear-gradient(
-      center bottom,
-      #DBE1EB 0%,
-      #DEE4EB 80%,
-      #E7EBF3 81%
-  );
-  border-width: 1px;
-  border-style: solid;
-  border-color: #B3BBC4 #9DA4AD #868D96 #9DA4AD;
-  box-shadow: 0 0 1px rgba(255, 255, 255, 0.3) inset,
-              0 1px 0 rgba(180, 189, 202, 0.7),
-              0 0 3px rgba(153, 0, 0, 0.9);
+  color: white;
+  border-radius: 5px;
+  background-color: rgb(51,171,51);
+  border: 1px solid rgba(0,90,0,0.5);
+  margin: 0;
+  margin-left: -3px;
+  margin-right: -5px;
 }
 
-/* Slightly different positions of the badge for individual toolbars */
-#nav-bar #scriptish-button .badge {
-  margin: 3px -10px 0 -8px;
-}
+/* Slightly different sizes for "small" toolbars */
+toolbar[defaulticonsize="small"] #scriptish-button .badge > .label {
+  margin-left: 2px;
+  margin-right: 1px;
+  border: 1px solid rgb(0,80,0);
 
-#addon-bar #scriptish-button .badge {
-  margin-top: 1px;
-}
-
-#TabsToolbar #scriptish-button .badge {
-  margin-top: 4px;
-}
-
-#toolbar-menubar #scriptish-button .badge {
-  margin-top: 4px;
 }
 
 /* Error badge (displays an error counter). The badge is only visible if error count
    should be displayed */
-#scriptish-button .badge {
+#scriptish-button:not([showScripts="true"]) .badge {
   display: none;
 }
 
-#scriptish-button[showScripts="true"] .badge {
-  display: block;
-  -moz-box-sizing: border-box;
-  margin: 0;
-}
-
 #CustomizeToolbarWindow #wrapper-scriptish-button #scriptish-button .badge {
   display: none;
 }
diff --git a/extension/content/third-party/firebug/startButton.xml b/extension/content/third-party/firebug/startButton.xml
index d2d6f224..631c37ce 100755
--- a/extension/content/third-party/firebug/startButton.xml
+++ b/extension/content/third-party/firebug/startButton.xml
@@ -7,10 +7,12 @@
       extends="chrome://global/content/bindings/toolbarbutton.xml#menu-button">
       <content>
           <children includes="observes|template|menupopup|panel|tooltip"/>
-          <xul:stack class="badge">
+          <xul:stack>
+            <xul:hbox class="badge" pack="center" align="center">
               <xul:label class="label" value="0" xbl:inherits="value=scriptCount"/>
+            </xul:hbox>
           </xul:stack>
-  
+
           <xul:toolbarbutton class="scriptish-button box-inherit toolbarbutton-menubutton-button"
               anonid="button" flex="1" allowevents="true"
               xbl:inherits="disabled,crop,image,label,accesskey,command,align,dir,pack,orient"/>

From 97f5fbb422beb192e328538d73cf8a0ff64350fb Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 18 Jul 2011 22:44:28 +0200
Subject: [PATCH 463/829] Fix sync-locales

---
 sync-locales.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sync-locales.py b/sync-locales.py
index 4573f42e..803f1dd9 100644
--- a/sync-locales.py
+++ b/sync-locales.py
@@ -18,7 +18,7 @@ def __init__(self, file):
                 line = line.strip()
                 if line.startswith("#"):
                     continue
-                key, value = line.split("=", 2)
+                key, value = line.split("=", 1)
                 self._items[key] = value
 
     def merge(self, rhs):
@@ -30,7 +30,7 @@ def merge(self, rhs):
         # add new keys
         for k in rhs._items.keys():
             if not k in self._items:
-                self._items[key] = ""
+                self._items[k] = ""
 
     def save(self):
         with copen(self.file, "wb", encoding="utf-8") as op:

From 908d107e970da11996c3f0328d1974fe7052a2a8 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 18 Jul 2011 22:51:01 +0200
Subject: [PATCH 464/829] Pref: Show script count in toolbar button

Pref and Scriptish must be enabled for the counter to show.
Closes #453
---
 extension/content/browser.xul                 |  7 ++---
 extension/content/js/browser.js               | 19 +++++++++++---
 extension/content/options.xul                 | 13 +++++++---
 extension/defaults/preferences/scriptish.js   |  1 +
 extension/locale/de/description.properties    |  2 +-
 extension/locale/de/scriptish.properties      |  7 +++--
 extension/locale/en-US/description.properties | 26 +++++++++----------
 extension/locale/en-US/scriptish.properties   |  2 ++
 extension/locale/es-ES/description.properties |  2 +-
 extension/locale/es-ES/scriptish.properties   |  3 +++
 extension/locale/ja-JP/description.properties |  2 +-
 extension/locale/ja-JP/scriptish.properties   |  3 +++
 extension/locale/pt-BR/description.properties |  2 +-
 extension/locale/pt-BR/scriptish.properties   |  3 +++
 extension/locale/ru-RU/description.properties |  2 +-
 extension/locale/ru-RU/scriptish.properties   |  3 +++
 extension/locale/sv-SE/description.properties |  2 +-
 extension/locale/sv-SE/scriptish.properties   |  3 +++
 extension/locale/zh-CN/description.properties |  2 +-
 extension/locale/zh-CN/scriptish.properties   |  5 +++-
 20 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index 25ed43b9..581a3743 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -9,7 +9,10 @@
   <broadcasterset id="mainBroadcasterSet">
     <broadcaster id="scriptish-options-brd"/>
     <broadcaster id="scriptish-tb-popup-brd"/>
-    <broadcaster id="scriptish-button-brd"/>
+    <broadcaster id="scriptish-button-brd"
+      showScripts="true"
+      scriptCount="0"
+      persist="showScripts"/>
     <broadcaster id="scriptish-tb-cmds-brd"/>
     <broadcaster id="scriptish-tb-new-us-brd"/>
     <broadcaster id="scriptish-tb-show-us-brd"/>
@@ -42,8 +45,6 @@
         observes="scriptish-button-brd"
         type="menu-button"
         context=""
-        scriptCount="1"
-        showScripts="true"
         class="toolbarbutton-1 chromeclass-toolbar-additional"
         label="Scriptish">
       <menupopup id="scriptish-tb-popup" observes="scriptish-tb-popup-brd">
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index d0f5ba9f..69eeb0c4 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -28,8 +28,22 @@ Scriptish_BrowserUI.QueryInterface = tools.XPCOMUtils.generateQI([
     Ci.nsISupports, Ci.nsISupportsWeakReference, Ci.nsIWebProgressListener]);
 
 Scriptish_BrowserUI.tbBtnSetup = function() {
-  $("scriptish-button-brd").setAttribute(
-      "onclick", "Scriptish_BrowserUIM.onIconClick(event)");
+  function updateShowScripts() {
+    tbBtnBrd.setAttribute("showScripts",
+        Scriptish_prefRoot.getValue("toolbarbutton.showScripts")
+        && Scriptish_prefRoot.getValue("enabled")
+        );
+  }
+
+  var tbBtnBrd = $("scriptish-button-brd");
+  tbBtnBrd.setAttribute("onclick", "Scriptish_BrowserUIM.onIconClick(event)");
+  updateShowScripts();
+  Scriptish_prefRoot.watch("enabled", updateShowScripts);
+  Scriptish_prefRoot.watch("toolbarbutton.showScripts", updateShowScripts);
+  window.addEventListener("unload", function() {
+    Scriptish_prefRoot.unwatch("enabled", updateShowScripts);
+    Scriptish_prefRoot.unwatch("toolbarbutton.showScripts", updateShowScripts);
+  });
 
   var sbCmdsEle = $("scriptish-tb-cmds-brd");
   sbCmdsEle.setAttribute("label", Scriptish_stringBundle("menu.commands"));
@@ -235,7 +249,6 @@ Scriptish_BrowserUI.reattachMenuCmds = function() {
  * leak it's memory.
  */
 Scriptish_BrowserUI.chromeUnload = function() {
-  Scriptish_prefRoot.unwatch("enabled", this.statusWatcher);
   gBrowser.removeProgressListener(this);
   delete this.menuCommanders;
 }
diff --git a/extension/content/options.xul b/extension/content/options.xul
index 4e48abc4..31dff92e 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -51,17 +51,22 @@
       <preference id="pref-enablePopupNotifications" name="extensions.scriptish.enabledNotifications.popup" type="bool"/>
       <preference id="pref-enableSlidingNotifications" name="extensions.scriptish.enabledNotifications.sliding" type="bool"/>
       <preference id="pref-enableCopyDownloadURL" name="extensions.scriptish.enableCopyDownloadURL" type="bool"/>
+      <preference id="pref-toolbarbutton-showScripts" name="extensions.scriptish.toolbarbutton.showScripts" type="bool"/>
       <preference id="pref-useDefaultLocale" name="extensions.scriptish.useDefaultLocale" type="bool"/>
     </preferences>
+    <groupbox>
+      <caption label="options.translation" localize="label"/>
+      <checkbox preference="pref-useDefaultLocale" label="options.translation.useEnglish" localize="label"/>
+    </groupbox>
+    <groupbox>
+      <caption label="options.toolbarbutton" localize="label"/>
+      <checkbox preference="pref-toolbarbutton-showScripts" label="options.toolbarbutton.showScripts" localize="label"/>
+    </groupbox>
     <groupbox>
       <caption label="options.notifications" localize="label"/>
       <checkbox preference="pref-enablePopupNotifications" label="options.notifications.popup.enable" tooltiptext="options.notifications.whenDisabled" localize="label,tooltiptext"/>
       <checkbox preference="pref-enableSlidingNotifications" label="options.notifications.sliding.enable" tooltiptext="options.notifications.whenDisabled" localize="label,tooltiptext"/>
     </groupbox>
-    <groupbox>
-      <caption label="options.translation" localize="label"/>
-      <checkbox preference="pref-useDefaultLocale" label="options.translation.useEnglish" localize="label"/>
-    </groupbox>
     <groupbox>
       <caption label="options.addonsManager" localize="label"/>
       <checkbox preference="pref-enableCopyDownloadURL" label="options.enableCopyDownloadURL" localize="label"/>
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 7c27d1cf..737fb437 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -19,6 +19,7 @@ pref("extensions.scriptish.enableScriptRefreshing", true);
 pref("extensions.scriptish.logChrome", false);
 pref("extensions.scriptish.logToErrorConsole", true);
 pref("extensions.scriptish.optimizingRegexpMerge", false);
+pref("extensions.scriptish.toolbarbutton.showScripts", true);
 pref("extensions.scriptish.uninstallPreferences", true);
 pref("extensions.scriptish.update.requireBuiltInCerts", true);
 pref("extensions.scriptish.update.requireSecured", true);
diff --git a/extension/locale/de/description.properties b/extension/locale/de/description.properties
index 34306522..d5579700 100644
--- a/extension/locale/de/description.properties
+++ b/extension/locale/de/description.properties
@@ -1,4 +1,3 @@
-extensions.scriptish@erikvold.com.description=Ein Benutzerskript-Erweiterungen-Manager für Firefox
 amo.description.line1=Scriptish ist eine unabhängige Weiterentwicklung von Greasemonkey und beinhaltet:
 amo.description.line2=Alles, was Greasemoneky kann (was tatsächlich nützlich ist)
 amo.description.line3=Updates: Benutzerskripte können von Scriptish mit @updateURL aktualisiert werden
@@ -11,3 +10,4 @@ amo.developerComments.line1=Scriptish beinhaltet alles, was auch Greasemonkey ka
 amo.developerComments.line2=Bitte schicken Sie alle Bugs oder Funktionsvorschläge zu: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
 amo.developerComments.line3=Wenn sie weitere Fragen haben, dann senden Sie diese bitte auf Englisch an die Mailing-Liste: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=Der beste Benutzerskript Software im Internet
+extensions.scriptish@erikvold.com.description=Ein Benutzerskript-Erweiterungen-Manager für Firefox
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 6fbf027c..5a67642e 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -45,8 +45,8 @@ install.showScriptSource=Quelltext anzeigen
 install.title=Benutzerskript Installation
 install.warning1=Bösartige Benutzerskripte können Ihre Daten auspähen oder ohne Ihre Genehmigung in ihren Namen handeln. Es handelt sich um echte kleine Programme.
 install.warning2=Sie sollten nur Benutzerskripte aus Quellen installieren, denen Sie auch vertrauen.
-installFromFile=
-installFromFile.ak=
+installFromFile=Benutzerskript aus Datei installieren...
+installFromFile.ak=D
 menu.commands=Benutzerskript Befehle...
 menu.commands.ak=B
 menu.install=Benutzerskript installieren...
@@ -125,6 +125,8 @@ options.pane.ui=Benutzeroberfläche
 options.requireBuiltInCerts=Sichere Aktualisierungen müssen eingebaute Zertifikate nutzen
 options.requireSecured=Benutzerskripte müssen über eine sichere Verbindung (https) aktualisiert werden
 options.title=Scriptish Einstellungen
+options.toolbarbutton=Toolbar Button
+options.toolbarbutton.showScripts=Anzahl aktiver Skripte zeigen
 options.translation=Übersetzung
 options.translation.useEnglish=Immer Englisch benutzen
 options.update.security=Aktualisierungsicherheit
@@ -148,6 +150,7 @@ tooltip.loading=Lade...
 Uninstall=Entfernen
 untitledScript=Unbenanntes Script
 Update=Aktualisieren
+userscript=Benutzerskript
 userscripts=Benutzerskripte
 userscripts.get=Benutzerskripte finden
 userscripts.noneInstalled=Sie haben keine Benutzerskripte installiert
diff --git a/extension/locale/en-US/description.properties b/extension/locale/en-US/description.properties
index 4423e92f..7f2d1384 100644
--- a/extension/locale/en-US/description.properties
+++ b/extension/locale/en-US/description.properties
@@ -1,13 +1,13 @@
-extensions.scriptish@erikvold.com.description=A Script Extension Manager for Firefox
-amo.description.line1=Scriptish is a fork of Greasemonkey, offering:
-amo.description.line2=Everything Greasemonkey does (which is actually useful)
-amo.description.line3=Updating: User scripts can be updated in Scriptish using @updateURL
-amo.description.line4=Many new <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">metadata @keys</a>
-amo.description.line5=Many new <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">additions to the GM_ API</a>
-amo.description.line6=Superior Performance: A faster, cleaner code base which takes advantage of all that recent Firefox versions have to offer
-amo.description.line7=Superior Security: Scriptish provides security features you won't find elsewhere
-amo.description.line8=Testing: The developers make use of a lot of tests to ensure the correct functioning of Scriptish and to find any bugs sooner
-amo.developerComments.line1=Scriptish has everything Greasemonkey has, plus many features which you can read about at: <a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
-amo.developerComments.line2=Please submit any bugs or feature requests to: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
-amo.developerComments.line3=If you have any other questions, please send them to the mailing list: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
-amo.summary=The greatest user script engine on the Internet.
+amo.description.line1=Scriptish is a fork of Greasemonkey, offering:
+amo.description.line2=Everything Greasemonkey does (which is actually useful)
+amo.description.line3=Updating: User scripts can be updated in Scriptish using @updateURL
+amo.description.line4=Many new <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">metadata @keys</a>
+amo.description.line5=Many new <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">additions to the GM_ API</a>
+amo.description.line6=Superior Performance: A faster, cleaner code base which takes advantage of all that recent Firefox versions have to offer
+amo.description.line7=Superior Security: Scriptish provides security features you won't find elsewhere
+amo.description.line8=Testing: The developers make use of a lot of tests to ensure the correct functioning of Scriptish and to find any bugs sooner
+amo.developerComments.line1=Scriptish has everything Greasemonkey has, plus many features which you can read about at: <a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
+amo.developerComments.line2=Please submit any bugs or feature requests to: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line3=If you have any other questions, please send them to the mailing list: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=The greatest user script engine on the Internet.
+extensions.scriptish@erikvold.com.description=A Script Extension Manager for Firefox
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index b6486f62..7b45f407 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -125,6 +125,8 @@ options.pane.ui=User Interface
 options.requireBuiltInCerts=Secure update requires using built-in certificates
 options.requireSecured=Require user scripts to update using HTTPS
 options.title=Scriptish Options
+options.toolbarbutton=Toolbar button
+options.toolbarbutton.showScripts=Show active script count
 options.translation=Translation
 options.translation.useEnglish=Always use English
 options.update.security=Update Security
diff --git a/extension/locale/es-ES/description.properties b/extension/locale/es-ES/description.properties
index 858b1bc3..2da80cb1 100644
--- a/extension/locale/es-ES/description.properties
+++ b/extension/locale/es-ES/description.properties
@@ -1,4 +1,3 @@
-extensions.scriptish@erikvold.com.description=Un gestor de scripts de usuario para aplicaciones Mozilla
 amo.description.line1=
 amo.description.line2=
 amo.description.line3=
@@ -11,3 +10,4 @@ amo.developerComments.line1=
 amo.developerComments.line2=
 amo.developerComments.line3=
 amo.summary=
+extensions.scriptish@erikvold.com.description=Un gestor de scripts de usuario para aplicaciones Mozilla
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 7e7fb2f9..7e831361 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -125,6 +125,8 @@ options.pane.ui=Interfaz de usuario
 options.requireBuiltInCerts=Las actualizaciones seguras requieren que el certificado esté incluído
 options.requireSecured=Requerir que los scripts de usuario se actualicen usando HTTPS
 options.title=Opciones de scriptish
+options.toolbarbutton=
+options.toolbarbutton.showScripts=
 options.translation=Traducción
 options.translation.useEnglish=Usar Inglés siempre
 options.update.security=Seguridad de las actualizaciones
@@ -148,6 +150,7 @@ tooltip.loading=Cargando...
 Uninstall=Desinstalar
 untitledScript=Script sin título
 Update=Actualizar
+userscript=
 userscripts=Scripts de usuario
 userscripts.get=Obtener scripts de usuario
 userscripts.noneInstalled=No tiene instalado ningún script de usuario
diff --git a/extension/locale/ja-JP/description.properties b/extension/locale/ja-JP/description.properties
index e2d2eece..0867d0c3 100644
--- a/extension/locale/ja-JP/description.properties
+++ b/extension/locale/ja-JP/description.properties
@@ -1,4 +1,3 @@
-extensions.scriptish@erikvold.com.description=Firefox用のスクリプトマネージャ
 amo.description.line1=
 amo.description.line2=
 amo.description.line3=
@@ -11,3 +10,4 @@ amo.developerComments.line1=
 amo.developerComments.line2=
 amo.developerComments.line3=
 amo.summary=
+extensions.scriptish@erikvold.com.description=Firefox用のスクリプトマネージャ
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 0e28e4e4..46c63d35 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -125,6 +125,8 @@ options.pane.ui=ユーザーインタフェース
 options.requireBuiltInCerts=安全な更新に built-in 証明書を利用
 options.requireSecured=HTTPS でユーザースクリプトを更新
 options.title=Scriptish オプション
+options.toolbarbutton=
+options.toolbarbutton.showScripts=
 options.translation=翻訳
 options.translation.useEnglish=常に英語を使用
 options.update.security=更新に関するセキュリティ
@@ -148,6 +150,7 @@ tooltip.loading=読み込み中…
 Uninstall=アンインストール
 untitledScript=名称未定スクリプト
 Update=更新
+userscript=
 userscripts=ユーザースクリプト
 userscripts.get=ユーザースクリプトを取得
 userscripts.noneInstalled=ユーザースクリプトがインストールされていません
diff --git a/extension/locale/pt-BR/description.properties b/extension/locale/pt-BR/description.properties
index ff519199..b006f603 100644
--- a/extension/locale/pt-BR/description.properties
+++ b/extension/locale/pt-BR/description.properties
@@ -1,4 +1,3 @@
-extensions.scriptish@erikvold.com.description=Um gerenciador de scripts para o Firefox.
 amo.description.line1=O Scriptish é um fork do Greasemonkey, oferecendo:
 amo.description.line2=Tudo que o Greasemonkey faz (o que é realmente útil)
 amo.description.line3=Atualização: os scripts podem ser atualizados usando @updateURL
@@ -11,3 +10,4 @@ amo.developerComments.line1=O Scriptish tem todos os recursos que o Greasemonkey
 amo.developerComments.line2=Por favor, envie informações sobre falhas ou solicite de novos recursos em: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a> .
 amo.developerComments.line3=Se você tiver qualquer dúvida, envie sua pergunta para a lista de discussão: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a> .
 amo.summary=O maior mecanismo de scripts de usuário da Internet.
+extensions.scriptish@erikvold.com.description=Um gerenciador de scripts para o Firefox.
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 6ea614f8..912783b7 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -125,6 +125,8 @@ options.pane.ui=
 options.requireBuiltInCerts=Exigir que atualizações seguras usem os certificados internos
 options.requireSecured=Exigir que scripts de usuário atualizem usando HTTPS
 options.title=Opções do Scriptish
+options.toolbarbutton=
+options.toolbarbutton.showScripts=
 options.translation=Tradução
 options.translation.useEnglish=Sempre usar Inglês
 options.update.security=Segurança na atualização
@@ -148,6 +150,7 @@ tooltip.loading=Carregando...
 Uninstall=Desinstalação
 untitledScript=
 Update=Atualização
+userscript=
 userscripts=Scripts de usuário
 userscripts.get=Obter scripts de usuário
 userscripts.noneInstalled=Você não possui nenhum script de usuário instalado.
diff --git a/extension/locale/ru-RU/description.properties b/extension/locale/ru-RU/description.properties
index bc08fef9..28310d27 100644
--- a/extension/locale/ru-RU/description.properties
+++ b/extension/locale/ru-RU/description.properties
@@ -1,4 +1,3 @@
-extensions.scriptish@erikvold.com.description=Управление пользовательских скриптов для Firefox
 amo.description.line1=
 amo.description.line2=
 amo.description.line3=
@@ -11,3 +10,4 @@ amo.developerComments.line1=
 amo.developerComments.line2=
 amo.developerComments.line3=
 amo.summary=
+extensions.scriptish@erikvold.com.description=Управление пользовательских скриптов для Firefox
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index ad92b313..8894077c 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -125,6 +125,8 @@ options.pane.ui=
 options.requireBuiltInCerts=
 options.requireSecured=Разрешить обновления скриптов только по протоколу HTTPS
 options.title=
+options.toolbarbutton=
+options.toolbarbutton.showScripts=
 options.translation=
 options.translation.useEnglish=
 options.update.security=
@@ -148,6 +150,7 @@ tooltip.loading=Грузим ...
 Uninstall=Удалить
 untitledScript=
 Update=Обновить
+userscript=
 userscripts=Пользовательские скрипты
 userscripts.get=
 userscripts.noneInstalled=
diff --git a/extension/locale/sv-SE/description.properties b/extension/locale/sv-SE/description.properties
index 9cfb8953..33c7c4a8 100644
--- a/extension/locale/sv-SE/description.properties
+++ b/extension/locale/sv-SE/description.properties
@@ -1,4 +1,3 @@
-extensions.scriptish@erikvold.com.description=En skripttilläggshanterare för Firefox
 amo.description.line1=Scriptish är en fristående förgrening av Greasemonkey och erbjuder:
 amo.description.line2=Allting som Greasemonkey erbjuder (vilket faktiskt är riktigt användbart)
 amo.description.line3=Uppdatering: Användarskript kan uppdateras i Scriptish m.h.a. @updateURL
@@ -11,3 +10,4 @@ amo.developerComments.line1=Scriptish har allt som Greasemonkey har, plus flera
 amo.developerComments.line2=Var vänlig skicka in alla buggrapporter och förslag på nya funktioner via: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
 amo.developerComments.line3=Om du har frågor, skicka dem till e-postlistan: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=Den bästa användarskriptmotorn på Internet.
+extensions.scriptish@erikvold.com.description=En skripttilläggshanterare för Firefox
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 1841f611..1595a0ae 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -125,6 +125,8 @@ options.pane.ui=Användargränssnitt
 options.requireBuiltInCerts=Säker uppdatering kräver användning av inbyggda certifikat
 options.requireSecured=Kräv att användarskript uppdateras via HTTPS
 options.title=Inställningar för Scriptish
+options.toolbarbutton=
+options.toolbarbutton.showScripts=
 options.translation=Översättning
 options.translation.useEnglish=Använd alltid engelska
 options.update.security=Uppdateringssäkerhet
@@ -148,6 +150,7 @@ tooltip.loading=Läser in…
 Uninstall=Avinstallera
 untitledScript=(Namnlöst skript)
 Update=Uppdatera
+userscript=
 userscripts=Användarskript
 userscripts.get=Hämta användarskript
 userscripts.noneInstalled=Du har inga användarskript installerade
diff --git a/extension/locale/zh-CN/description.properties b/extension/locale/zh-CN/description.properties
index 8ac4fb8e..3e750fdf 100644
--- a/extension/locale/zh-CN/description.properties
+++ b/extension/locale/zh-CN/description.properties
@@ -1,4 +1,3 @@
-extensions.scriptish@erikvold.com.description=
 amo.description.line1=Scriptish 是 Greasemonkey 的分支，提供:
 amo.description.line2=Greasemonkey 提供的所有功能（都是非常有用的）
 amo.description.line3=更新：用户脚本在 Scriptish 上可以使用 @updateURL 更新
@@ -11,3 +10,4 @@ amo.developerComments.line1=Scriptish 拥有 Greasemonkey 的所有功能，增
 amo.developerComments.line2=请到这里提交 bug 或功能需求：<a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
 amo.developerComments.line3=如果您还有其他问题，请发送邮件到这里：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=互联网上最伟大的用户脚本引擎。
+extensions.scriptish@erikvold.com.description=
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index 2edf8c38..c1709e60 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -9,8 +9,8 @@ editor.prompt=请选择您喜欢的文本编辑器
 error.api.clipboard.type=不是 GM_setClipboard 所支持的类型。
 error.api.noResourceWithName=没有该名称的资源
 error.api.noSecondArgValue=第二个参数未指定：值
-error.api.reqURL.scheme=不允许在 URL 中出现 scheme
 error.api.reqURL=无效的 URL
+error.api.reqURL.scheme=不允许在 URL 中出现 scheme
 error.api.unsafeAccess=Scriptish 访问冲突：unsafeWindow 无法调用
 error.charset=指定的字符集无效。
 error.dependency.loading=加载依赖文件时发生错误
@@ -125,6 +125,8 @@ options.pane.ui=用户界面
 options.requireBuiltInCerts=安全更新需要使用内置的证书
 options.requireSecured=要求用户脚本使用 HTTPS 更新
 options.title=Scriptish 选项
+options.toolbarbutton=
+options.toolbarbutton.showScripts=
 options.translation=翻译
 options.translation.useEnglish=始终使用英语界面
 options.update.security=更新安全
@@ -148,6 +150,7 @@ tooltip.loading=正在加载...
 Uninstall=卸载
 untitledScript=无标题的脚本
 Update=更新
+userscript=
 userscripts=用户脚本
 userscripts.get=获取用户脚本
 userscripts.noneInstalled=您尚未安装任何用户脚本

From 281d4d3a972451aa5daeb2df1e8e1c2a264e1007 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 18 Jul 2011 23:28:23 +0200
Subject: [PATCH 465/829] New regexpmerger upstream correctly handling tainted
 expressions

---
 .../content/tests/testPatternCollection.js    | 22 +++++++++++--
 extension/modules/third-party/regexpmerger.js | 33 +++++++++++++++++--
 extension/modules/utils/PatternCollection.js  | 31 +----------------
 3 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index 978332e0..f32e6db2 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -396,8 +396,14 @@ test("tainted backref", 2, function() {
   var pc = new PatternCollection();
   pc.addPattern("foo");
   pc.addPattern("bar");
+  pc.addPattern("/(foo)bad\\1/i");
   pc.addPattern("/(foo)baz\\1/i");
-  equal(pc.merged.source, undefined, "tainted");
+  if (optimized) {
+    equal(pc.merged.source, "(?:^(?:bar$|foo$))|(?:(foo)bad\\1)|(?:(foo)baz\\1)", "tainted");
+  }
+  else {
+    equal(pc.merged.source, "(?:^foo$)|(?:^bar$)|(?:(foo)bad\\1)|(?:(foo)baz\\1)", "tainted");
+  }
   equal(pc.test("foobazfoo"), true, "test");
 });
 
@@ -408,7 +414,12 @@ test("tainted \\x escape", function() {
   pc.addPattern("foo");
   pc.addPattern("bar");
   pc.addPattern("/(foo)baz\\x25/i");
-  equal(pc.merged.source, undefined, "tainted");
+  if (optimized) {
+    equal(pc.merged.source, "(?:^(?:bar$|foo$))|(?:(foo)baz\\x25)", "tainted");
+  }
+  else {
+    equal(pc.merged.source, "(?:^foo$)|(?:^bar$)|(?:(foo)baz\\x25)", "tainted");
+  }
   equal(pc.test("foobaz\x25"), true, "test");
 });
 
@@ -419,7 +430,12 @@ test("tainted \\u escape", function() {
   pc.addPattern("foo");
   pc.addPattern("bar");
   pc.addPattern("/(foo)baz\\u0025/i");
-  equal(pc.merged.source, undefined, "tainted");
+  if (optimized) {
+    equal(pc.merged.source, "(?:^(?:bar$|foo$))|(?:(foo)baz\\u0025)", "tainted");
+  }
+  else {
+    equal(pc.merged.source, "(?:^foo$)|(?:^bar$)|(?:(foo)baz\\u0025)", "tainted");
+  }
   equal(pc.test("foobaz\u0025"), true, "test");
 });
 
diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index 0150663b..5918eea0 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -39,6 +39,18 @@
 
 const EXPORTED_SYMBOLS = ['merge'];
 
+const REG_TAINTED = /\\[ux]?\d/;
+const REG_TAINTED_ESCAPES = /\\\\/g;
+
+function tainted_filter(r) {
+  // No negative lookbehind in js :p
+  if (REG_TAINTED.test(r.replace(REG_TAINTED_ESCAPES, ""))) {
+    this.push(r);
+    return false;
+  }
+  return true;
+}
+
 /**
  * Array filter function to create an unique array
  * @usage arr.filter(unique_filter, Object.create(null));
@@ -316,6 +328,16 @@ function mergePatterns(patterns, low, high, prefix) {
   return patterns.sort();
 }
 
+function merge_finish_map(e) "(?:" + e + ")";
+
+function merge_finish(patterns, tainted) {
+  patterns = patterns.concat(tainted);
+  if (patterns.length < 2) {
+    return patterns[0];
+  }
+  return patterns.map(merge_finish_map).join("|");
+}
+
 /**
  * Merge patterns with optimizations (prefixes)
  * @param {Array} patterns Patterns to merge
@@ -332,6 +354,11 @@ function merge(patterns) {
     return patterns[0];
   }
 
+  // Remove tainted patterns for now
+  let tainted = [];
+  patterns = patterns.filter(tainted_filter, tainted);
+
+
   // split patterns into pieces by top-level alternates
   let newpatterns = [];
   for (let [,p] in Iterator(patterns)) {
@@ -339,7 +366,7 @@ function merge(patterns) {
   }
   patterns = newpatterns.filter(unique_filter, Object.create(null));
   if (patterns.length < 2) {
-    return patterns[0];
+    return merge_finish(patterns, tainted);
   }
 
   // Good to go
@@ -357,10 +384,10 @@ function merge(patterns) {
   let len = patterns.length;
   if (len == 1) {
     // already merged into a single pattern
-    return patterns[0];
+    return merge_finish(patterns, tainted);
   }
 
   // not yet a single pattern (i.e. not all patterns shared a common prefix)
   // merge without a prefix to get single pattern
-  return mergePatterns(patterns, 0, len, "")[0];
+  return merge_finish(mergePatterns(patterns, 0, len, ""), tainted);
 }
diff --git a/extension/modules/utils/PatternCollection.js b/extension/modules/utils/PatternCollection.js
index 503ec75c..bccb926a 100644
--- a/extension/modules/utils/PatternCollection.js
+++ b/extension/modules/utils/PatternCollection.js
@@ -6,17 +6,6 @@ Components.utils.import("resource://scriptish/utils/Scriptish_getTLDURL.js");
 Components.utils.import("resource://scriptish/utils/Scriptish_mergeRegExps.js");
 
 const FAKE_REGEXP = {test: function() false};
-const REG_TAINTED = /\\[ux]?\d/;
-const REG_TAINTED_ESCAPES = /\\\\/g;
-
-function tainted_filter(r) {
-  // No negative lookbehind in js :p
-  if (REG_TAINTED.test(r.source.replace(REG_TAINTED_ESCAPES, ""))) {
-    this.push(r);
-    return false;
-  }
-  return true;
-}
 
 function merge(regs, flags) {
   if (!regs.length) {
@@ -25,25 +14,7 @@ function merge(regs, flags) {
     // that will always test |true|
     return FAKE_REGEXP;
   }
-
-  // Split the regs into "tainted" ones and those we can merge
-  // Tainted:
-  // - contains back refs /(["']).+?\1/
-  // - contains string escapes /\x00\u0000/
-  let tainted = [];
-  regs = regs.filter(tainted_filter, tainted);
-
-  // merge what we can
-  regs = Scriptish_mergeRegExps(regs, flags);
-
-  if (tainted.length) {
-    // we need to test regs individually
-    tainted.unshift(regs);
-    return {test: function(s) tainted.some(function(r) r.test(s))};
-  }
-
-  // no tainted regs
-  return regs;
+  return Scriptish_mergeRegExps(regs, flags);
 }
 
 function PatternCollection() {

From 5d6c2a991360d07d3c9a721d09fbf28d574850a0 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 19 Jul 2011 09:21:47 -0500
Subject: [PATCH 466/829] Updating ja-JP with modifications by k2jp
 (BabelZilla).

---
 extension/locale/ja-JP/description.properties | 26 +++++++++----------
 extension/locale/ja-JP/scriptish.properties   |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/extension/locale/ja-JP/description.properties b/extension/locale/ja-JP/description.properties
index 0867d0c3..f2b4be8f 100644
--- a/extension/locale/ja-JP/description.properties
+++ b/extension/locale/ja-JP/description.properties
@@ -1,13 +1,13 @@
-amo.description.line1=
-amo.description.line2=
-amo.description.line3=
-amo.description.line4=
-amo.description.line5=
-amo.description.line6=
-amo.description.line7=
-amo.description.line8=
-amo.developerComments.line1=
-amo.developerComments.line2=
-amo.developerComments.line3=
-amo.summary=
-extensions.scriptish@erikvold.com.description=Firefox用のスクリプトマネージャ
+amo.description.line1=Scriptish は Greasemonkey からフォーク（派生）しました。特長は以下の通り：
+amo.description.line2=Greasemonkey がすること全て（実際に素晴らしい）
+amo.description.line3=更新：Scriptish では @updateURL を使用することでユーザースクリプトを簡単に更新することができます。
+amo.description.line4=多数の新たな <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">メタデータ（@keys）</a>
+amo.description.line5=多数の新たな <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">GM_ API</a>
+amo.description.line6=優れたパフォーマンス：最新の Firefox を使い倒したより速く、よりクリーンなコードベース
+amo.description.line7=優れたセキュリティ：Scriptish は他にないセキュリティ機能を提供します
+amo.description.line8=テスト：開発者は Scriptish が正しく機能していることを確認したり、より早くバグを見つけるために多くのテストを利用することができる
+amo.developerComments.line1=Scriptish は Greasemonkey と同じことができます。追加機能については…：<a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
+amo.developerComments.line2=バグや新機能のリクエストは…：<a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line3=他の質問はメーリングリストまで…：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=インターネットで最も優れたユーザースクリプトエンジン。
+extensions.scriptish@erikvold.com.description=Firefox用のユーザースクリプト拡張
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 46c63d35..f8a72dde 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -5,7 +5,7 @@ edit=編集
 edit.ak=E
 editor.couldNotLaunch=エディタの起動に失敗しました
 editor.pleasePickExecutable=ユーザースクリプト編集用アプリケーションを指定してください
-editor.prompt=はじめにお好みのエディタを選択してください
+editor.prompt=エディタを選択してください
 error.api.clipboard.type=は GM_setClipboard がサポートしてない型です
 error.api.noResourceWithName=名前付きリソースがありません
 error.api.noSecondArgValue=２番目の引数が指定されていません：Value

From f40dc0f7c306dd1ee4d63f6a9a19f31bf9e12841 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 19 Jul 2011 09:30:56 -0500
Subject: [PATCH 467/829] Adding zh-TW (Traditional Chinese) courtesy of
 shyangs (BabelZilla).

---
 extension/install.rdf                         |   1 +
 extension/locale/zh-TW/description.properties |  13 ++
 extension/locale/zh-TW/scriptish.properties   | 157 ++++++++++++++++++
 3 files changed, 171 insertions(+)
 create mode 100644 extension/locale/zh-TW/description.properties
 create mode 100644 extension/locale/zh-TW/scriptish.properties

diff --git a/extension/install.rdf b/extension/install.rdf
index 90fd76b1..12a5e46d 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -49,6 +49,7 @@
     <em:translator>Mikael Hiort af Ornäs (sv-SE)</em:translator>
     <em:translator>Nils Maier (de)</em:translator>
     <em:translator>nishikawasasaki (kohsei yamamoto) (ja-JP)</em:translator>
+    <em:translator>shyangs (林郁翔) (zh-TW)</em:translator>
     <em:translator>strel (es-ES)</em:translator>
     <em:translator>yfdyh000 (zh-CN); mailto:yfdyh000@gmail.com</em:translator>
 
diff --git a/extension/locale/zh-TW/description.properties b/extension/locale/zh-TW/description.properties
new file mode 100644
index 00000000..a1548879
--- /dev/null
+++ b/extension/locale/zh-TW/description.properties
@@ -0,0 +1,13 @@
+amo.description.line1=Scriptish 是 Greasemonkey 的分支，提供以下功能:
+amo.description.line2=Greasemonkey 的所有功能（都是非常有用的）
+amo.description.line3=更新：使用者腳本在 Scriptish 裡可以用 @updateURL 更新
+amo.description.line4=新增更多的 <a href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">後設資料 @keys</a>
+amo.description.line5=新增更多的 <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">GM_ API</a>
+amo.description.line6=優秀的性能：憑藉新版 Firefox 的優勢，以更快、更乾淨的程式碼提供更優秀的性能
+amo.description.line7=出色的安全：Scriptish 提供獨一無二的安全功能
+amo.description.line8=測試：開發者利用大量的測試保證 Scriptish 正確的執行，並更快找出程式碼中的錯誤
+amo.developerComments.line1=Scriptish 擁有 Greasemonkey 的所有功能，其他額外增加的特性您可以到這裡瀏覽：<a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
+amo.developerComments.line2=請到這裡提交 bug 或新功能請求：<a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line3=如果您還有其他問題，請發送郵件到這裡：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=網際網路上最傑出的使用者腳本引擎。
+extensions.scriptish@erikvold.com.description=一個 Firefox 的腳本管理器
diff --git a/extension/locale/zh-TW/scriptish.properties b/extension/locale/zh-TW/scriptish.properties
new file mode 100644
index 00000000..9a1cf959
--- /dev/null
+++ b/extension/locale/zh-TW/scriptish.properties
@@ -0,0 +1,157 @@
+contributions.description=此腳本作者請求您贊助，以支持腳本開發。
+copyDownloadURL=複製下載網址
+copyDownloadURL.ak=C
+edit=編輯
+edit.ak=E
+editor.couldNotLaunch=無法開啟編輯器。
+editor.pleasePickExecutable=請挑一個可執行程式來編輯使用者腳本。
+editor.prompt=請先選擇您常用的純文字編輯器
+error.api.clipboard.type=不是 GM_setClipboard 所支援的類型。
+error.api.noResourceWithName=沒有該名稱的資源
+error.api.noSecondArgValue=第二個參數未指定：值
+error.api.reqURL=無效的網址
+error.api.reqURL.scheme=網址中有不支援的協定
+error.api.unsafeAccess=Scriptish 存取失敗: unsafeWindow 無法呼叫
+error.charset=指定的字元編碼無效。
+error.dependency.loading=載入附屬檔案時發生錯誤
+error.dependency.local=安全異常：本地及 chrome 的 URL 要求被禁止
+error.dependency.serverReturned=錯誤！伺服器返回
+error.hash.algorithm=指定的雜湊演算法無效。
+error.icon.dataURL=無效的資料: @icon 網址
+error.icon.notImage=錯誤！@icon 沒有圖像 MIME 類型
+error.icon.URL=無效的 @icon 網址
+error.isInvalidValue=是無效的值
+error.matchPattern.rules=@match 樣式不符合樣式規則
+error.matchPattern.rules.file=檔案協定 @match 樣式不符合樣式規則
+error.notSupported.Firefox=不支持此版本的 Firefox
+error.openingFile=無法開啟檔案
+error.pattern.parsing=樣式無法解析
+error.pref.type=不支援的選項類型。有效的類型有：字串、真假值和32位元整數。
+error.resource.dupName=是一個重複的資源名稱。每一個 @resource 名稱必須唯一。
+error.resource.syntax=無效的 @resource 宣告語法
+error.retrieving=檢索失敗
+error.script.installing=安裝使用者腳本時發生錯誤
+error.script.loading=載入使用者腳本時發生錯誤
+greeting.btn.ak=I
+greeting.msg=這是一個使用者腳本。按一下「安裝」開始使用它。
+install=安裝
+install.domains=域名:
+install.excludes=不執行於:
+install.includes=執行於:
+install.matches=匹配：
+install.requires=需求：
+install.resources=資源：
+install.showScriptSource=顯示腳本程式碼
+install.title=使用者腳本安裝
+install.warning1=惡意腳本可能危害您的隱私，並在您不知情時以您的名義執行。
+install.warning2=您應該只安裝可信任的腳本。.
+installFromFile=
+installFromFile.ak=
+menu.commands=使用者腳本指令…
+menu.commands.ak=C
+menu.install=安裝使用者腳本…
+menu.install.ak=I
+menu.manage=管理使用者腳本…
+menu.manage.ak=M
+menu.new=新增使用者腳本…
+menu.new.ak=N
+menu.options.ak=O
+menu.show=檢視使用者腳本程式碼
+menu.show.ak=V
+menu.title=Scriptish
+menu.title.ak=S
+menuitem.install=安裝此使用者腳本…
+menuitem.manage=管理使用者腳本
+menuitem.new=新增使用者腳本
+moving.dependency=移動附屬檔案，從
+moving.script=移動腳本檔案，從
+newscript.author=作者
+newscript.description=說明
+newscript.excludes=排除網址(每行一條)
+newscript.exists=已安裝了一個同名的腳本。\n確定要覆蓋嗎？
+newscript.id=ID
+newscript.includes=包含網址(每行一條)
+newscript.missing.id=請提供一個 ID
+newscript.missing.name=請提供一個名稱。該名稱將在附加元件管理器裡顯示。
+newscript.name=名稱
+newscript.namespace=命名空間
+newscript.noID=請為你的腳本提供一個有效 ID
+newscript.noName=請為你的腳本命名。
+newscript.runat=執行時機
+newscript.runat.documentend=網頁文件完成載入時
+newscript.runat.documentidle=網頁文件首次閒置時
+newscript.runat.documentstart=網頁文件開始載入時
+newscript.runat.windowload=網頁文件內嵌媒體均完成載入時
+newscript.version=版本
+nothing.timedOut=無 (逾時)
+openFolder=開啟資料夾
+openFolder.ak=O
+openUserScriptsManager=開啟使用者腳本管理器
+openUserScriptsManager.ak=O
+options=選項
+options.addonsManager=附加元件管理器
+options.alsoUninstallPrefs=當移除腳本時，一併移除它的設定值
+options.cache=快取
+options.cache.enabled=快取使用者腳本
+options.changeEditor=設定編輯器
+options.editor=編輯器
+options.editor.notset=未選擇編輯器
+options.enableCopyDownloadURL=允許複製下載網址
+options.enabledSchemes.about=about 協定 (內部)
+options.enabledSchemes.advanced=其他協定
+options.enabledSchemes.chrome=chrome 協定 (內部)
+options.enabledSchemes.data=data 協定
+options.enabledSchemes.file=file 協定 (本機檔案)
+options.enabledSchemes.ftp=ftp 協定
+options.enabledSchemes.http=http/https 協定
+options.enabledSchemes.main=協定
+options.enabledSchemes.securityRemark=其他協定可能有完全的系統存取權限。
+options.enabledSchemes.securityRemark2=因此不受信任的腳本可能造成巨大的安全風險！
+options.enabledSchemes.unmht=unmht 協定 (Mozilla Archive format)
+options.excludes.desc=全域排除規則將覆蓋任何腳本和使用者定義的規則
+options.excludes.empty=沒有定義全域排除規則
+options.excludes.remark=（您可以每行指定一條排除網址）
+options.logChrome=在錯誤主控台記錄非關鍵的擴充套件訊息
+options.logging=記錄
+options.logToErrorConsole=GM_log 使用錯誤主控台
+options.notifications=通知
+options.notifications.popup.enable=
+options.notifications.sliding.enable=
+options.notifications.whenDisabled=
+options.pane.advanced=進階
+options.pane.excludes=全域排除
+options.pane.main=主要
+options.pane.ui=介面
+options.requireBuiltInCerts=安全性更新必須使用內建的憑證
+options.requireSecured=腳本必須使用 HTTPS 更新
+options.title=Scriptish 選項
+options.toolbarbutton=
+options.toolbarbutton.showScripts=
+options.translation=語言
+options.translation.useEnglish=總是使用英文
+options.update.security=安全性更新
+options.useDownloadURL=如果沒有更新網址，則使用下載網址更新
+reinstall=重新安裝
+saving=儲存
+scratchpad.saveAsUserScript=儲存為使用者腳本
+scratchpad.saveAsUserScript.ak=u
+scriptOptions.disableScriptIncludes=禁用此腳本的包含樣式，僅套用使用者定義的樣式。
+scriptOptions.excludes=使用者定義的排除網址：
+scriptOptions.includes=使用者定義的包含網址：
+statusbar.enabled=啟用
+statusbar.enabled.ak=E
+statusbar.installed=安裝成功
+statusbar.modified=已修改
+statusbar.noScripts.excluded=頁面已排除！
+statusbar.noScripts.notfound=沒有在此頁面執行的腳本!
+statusbar.noScripts.scheme=協定已禁用！
+statusbar.updated=更新成功
+tooltip.loading=載入中…
+Uninstall=移除
+untitledScript=無標題的腳本
+Update=更新
+userscript=
+userscripts=使用者腳本
+userscripts.get=取得腳本
+userscripts.noneInstalled=您尚未安裝任何使用者腳本
+warning.returnfrommain=一般不支援從主範圍"return"。您應該在您的腳本中修復這個問題。

From 75ece1188f8c1553eaf2a7dcf3834b422c7bb529 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 19 Jul 2011 09:55:20 -0500
Subject: [PATCH 468/829] erikvold/scriptish --> scriptish/scriptish

---
 README.txt                                    | 6 +++---
 extension/content/aboutScriptish.html         | 8 ++++----
 extension/defaults/preferences/scriptish.js   | 2 +-
 extension/install.rdf                         | 2 +-
 extension/locale/de/description.properties    | 8 ++++----
 extension/locale/en-US/description.properties | 8 ++++----
 extension/locale/ja-JP/description.properties | 8 ++++----
 extension/locale/pt-BR/description.properties | 8 ++++----
 extension/locale/sv-SE/description.properties | 8 ++++----
 extension/locale/zh-CN/description.properties | 8 ++++----
 extension/locale/zh-TW/description.properties | 8 ++++----
 11 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/README.txt b/README.txt
index b25d50d1..45e76831 100644
--- a/README.txt
+++ b/README.txt
@@ -14,7 +14,7 @@ Links
 
 * Addons.Mozilla.Org (AMO): https://addons.mozilla.org/en-US/firefox/addon/scriptish
 * Userscripts:              http://userscripts.org
-* Wiki:                     http://github.com/erikvold/scriptish/wiki
-* Issues:                   http://github.com/erikvold/scriptish/issues
+* Wiki:                     http://github.com/scriptish/scriptish/wiki
+* Issues:                   http://github.com/scriptish/scriptish/issues
 * Google Group:             http://groups.google.com/group/scriptish
-* Source Code:              http://github.com/erikvold/scriptish
+* Source Code:              http://github.com/scriptish/scriptish
diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index fcec647e..39ecaf7d 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -32,7 +32,7 @@ <h1>About:Scriptish</h1>
        <header class="secondary">
          <h2>Learn</h2>
        </header>
-       <p>Check out the <a href="https://github.com/erikvold/scriptish/wiki">Scriptish wiki</a>
+       <p>Check out the <a href="https://github.com/scriptish/scriptish/wiki">Scriptish wiki</a>
        to learn about Scriptish and how to use it.</p>
        <p>There are many resources from which you can obtain users scripts, most notably <a href="http://userscripts.org/">userscripts.org</a>.<br>
        Please <strong>be careful</strong> when installing user scripts, as they can introduce significant security and privacy issues.
@@ -45,9 +45,9 @@ <h2>Help Out</h2>
        </header>
        <p>There are many ways you can help out with Scriptish:</p>
        <ul>
-         <li><a href="https://github.com/erikvold/scriptish/issues">Report a bug</a></li>
-         <li><a href="https://github.com/erikvold/scriptish/issues">Request a feature</a></li>
-         <li>Like coding?  <a href="https://github.com/erikvold/scriptish">Fork us!</a></li>
+         <li><a href="https://github.com/scriptish/scriptish/issues">Report a bug</a></li>
+         <li><a href="https://github.com/scriptish/scriptish/issues">Request a feature</a></li>
+         <li>Like coding?  <a href="https://github.com/scriptish/scriptish">Fork us!</a></li>
        </ul>
      </section>
 
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 737fb437..ed049af4 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -2,7 +2,7 @@ pref("extensions.scriptish@erikvold.com.description", "chrome://scriptish/locale
 pref("extensions.scriptish.blocklist.enabled", true);
 pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
-pref("extensions.scriptish.blocklist.url", "https://github.com/erikvold/scriptish/raw/master/blocklist.json");
+pref("extensions.scriptish.blocklist.url", "https://github.com/scriptish/scriptish/raw/master/blocklist.json");
 pref("extensions.scriptish.cache.enabled", true);
 pref("extensions.scriptish.enabled", true);
 pref("extensions.scriptish.enabledSchemes.about", false);
diff --git a/extension/install.rdf b/extension/install.rdf
index 12a5e46d..ca7fda03 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -10,7 +10,7 @@
     <em:version>0.1.4a1pre</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
-    <em:homepageURL>http://github.com/erikvold/scriptish</em:homepageURL>
+    <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
     <em:iconURL>chrome://scriptish/skin/scriptish32.png</em:iconURL>
     <em:icon64URL>chrome://scriptish/skin/scriptish64.png</em:icon64URL>
diff --git a/extension/locale/de/description.properties b/extension/locale/de/description.properties
index d5579700..6949d914 100644
--- a/extension/locale/de/description.properties
+++ b/extension/locale/de/description.properties
@@ -1,13 +1,13 @@
 amo.description.line1=Scriptish ist eine unabhängige Weiterentwicklung von Greasemonkey und beinhaltet:
 amo.description.line2=Alles, was Greasemoneky kann (was tatsächlich nützlich ist)
 amo.description.line3=Updates: Benutzerskripte können von Scriptish mit @updateURL aktualisiert werden
-amo.description.line4=Viele neue <a title="Scriptish Metadaten-Block Dokumentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">Metadaten @Schlüssel</a>
-amo.description.line5=Viele neue <a title="Scriptish Benutzerskript API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">Funktionen der GM_ API</a>
+amo.description.line4=Viele neue <a title="Scriptish Metadaten-Block Dokumentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">Metadaten @Schlüssel</a>
+amo.description.line5=Viele neue <a title="Scriptish Benutzerskript API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">Funktionen der GM_ API</a>
 amo.description.line6=Überlegene Leistung: Schnellerer, saubererer Code, der von allem, was aktuelle Firefox Versionen zu bieten haben, Gebrauch macht
 amo.description.line7=Überlegene Sicherheit: Scriptish beinhaltet Sicherheitsfunktionen, die Sie nirgendwo anders finden
 amo.description.line8=Tests: Die Entwickler benutzen viele Tests um eine korrekte Arbeitsweise sicherzustellen und Fehler schnell zu entdecken
-amo.developerComments.line1=Scriptish beinhaltet alles, was auch Greasemonkey kann, plus viele neue und verbesserte Funktionen. Erfahren Sie mehr im <a href="http://github.com/erikvold/scriptish/wiki">Scriptish Wiki</a>
-amo.developerComments.line2=Bitte schicken Sie alle Bugs oder Funktionsvorschläge zu: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line1=Scriptish beinhaltet alles, was auch Greasemonkey kann, plus viele neue und verbesserte Funktionen. Erfahren Sie mehr im <a href="http://github.com/scriptish/scriptish/wiki">Scriptish Wiki</a>
+amo.developerComments.line2=Bitte schicken Sie alle Bugs oder Funktionsvorschläge zu: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=Wenn sie weitere Fragen haben, dann senden Sie diese bitte auf Englisch an die Mailing-Liste: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=Der beste Benutzerskript Software im Internet
 extensions.scriptish@erikvold.com.description=Ein Benutzerskript-Erweiterungen-Manager für Firefox
diff --git a/extension/locale/en-US/description.properties b/extension/locale/en-US/description.properties
index 7f2d1384..7cb0fe4f 100644
--- a/extension/locale/en-US/description.properties
+++ b/extension/locale/en-US/description.properties
@@ -1,13 +1,13 @@
 amo.description.line1=Scriptish is a fork of Greasemonkey, offering:
 amo.description.line2=Everything Greasemonkey does (which is actually useful)
 amo.description.line3=Updating: User scripts can be updated in Scriptish using @updateURL
-amo.description.line4=Many new <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">metadata @keys</a>
-amo.description.line5=Many new <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">additions to the GM_ API</a>
+amo.description.line4=Many new <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">metadata @keys</a>
+amo.description.line5=Many new <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">additions to the GM_ API</a>
 amo.description.line6=Superior Performance: A faster, cleaner code base which takes advantage of all that recent Firefox versions have to offer
 amo.description.line7=Superior Security: Scriptish provides security features you won't find elsewhere
 amo.description.line8=Testing: The developers make use of a lot of tests to ensure the correct functioning of Scriptish and to find any bugs sooner
-amo.developerComments.line1=Scriptish has everything Greasemonkey has, plus many features which you can read about at: <a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
-amo.developerComments.line2=Please submit any bugs or feature requests to: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line1=Scriptish has everything Greasemonkey has, plus many features which you can read about at: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=Please submit any bugs or feature requests to: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=If you have any other questions, please send them to the mailing list: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=The greatest user script engine on the Internet.
 extensions.scriptish@erikvold.com.description=A Script Extension Manager for Firefox
diff --git a/extension/locale/ja-JP/description.properties b/extension/locale/ja-JP/description.properties
index f2b4be8f..ac3d5c7e 100644
--- a/extension/locale/ja-JP/description.properties
+++ b/extension/locale/ja-JP/description.properties
@@ -1,13 +1,13 @@
 amo.description.line1=Scriptish は Greasemonkey からフォーク（派生）しました。特長は以下の通り：
 amo.description.line2=Greasemonkey がすること全て（実際に素晴らしい）
 amo.description.line3=更新：Scriptish では @updateURL を使用することでユーザースクリプトを簡単に更新することができます。
-amo.description.line4=多数の新たな <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">メタデータ（@keys）</a>
-amo.description.line5=多数の新たな <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">GM_ API</a>
+amo.description.line4=多数の新たな <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">メタデータ（@keys）</a>
+amo.description.line5=多数の新たな <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">GM_ API</a>
 amo.description.line6=優れたパフォーマンス：最新の Firefox を使い倒したより速く、よりクリーンなコードベース
 amo.description.line7=優れたセキュリティ：Scriptish は他にないセキュリティ機能を提供します
 amo.description.line8=テスト：開発者は Scriptish が正しく機能していることを確認したり、より早くバグを見つけるために多くのテストを利用することができる
-amo.developerComments.line1=Scriptish は Greasemonkey と同じことができます。追加機能については…：<a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
-amo.developerComments.line2=バグや新機能のリクエストは…：<a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line1=Scriptish は Greasemonkey と同じことができます。追加機能については…：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=バグや新機能のリクエストは…：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=他の質問はメーリングリストまで…：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=インターネットで最も優れたユーザースクリプトエンジン。
 extensions.scriptish@erikvold.com.description=Firefox用のユーザースクリプト拡張
diff --git a/extension/locale/pt-BR/description.properties b/extension/locale/pt-BR/description.properties
index b006f603..4f011f74 100644
--- a/extension/locale/pt-BR/description.properties
+++ b/extension/locale/pt-BR/description.properties
@@ -1,13 +1,13 @@
 amo.description.line1=O Scriptish é um fork do Greasemonkey, oferecendo:
 amo.description.line2=Tudo que o Greasemonkey faz (o que é realmente útil)
 amo.description.line3=Atualização: os scripts podem ser atualizados usando @updateURL
-amo.description.line4=Muitos <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">metadados @keys</a> novos
-amo.description.line5=Muitos novos <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">acréscimos à API GM_</a>
+amo.description.line4=Muitos <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">metadados @keys</a> novos
+amo.description.line5=Muitos novos <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">acréscimos à API GM_</a>
 amo.description.line6=Desempenho superior: um código mais rápido e mais limpo, que tira proveito de tudo o que as versões recentes do Firefox tem a oferecer
 amo.description.line7=Segurança superior: o Scriptish fornece recursos de segurança que você não vai encontrar em outro lugar
 amo.description.line8=Testes: os desenvolvedores empregam uma série de testes para garantir o correto funcionamento do Scriptish e encontrar falhas o mais breve possível
-amo.developerComments.line1=O Scriptish tem todos os recursos que o Greasemonkey tem e muitos mais, que você pode descobrir em: <a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a> .
-amo.developerComments.line2=Por favor, envie informações sobre falhas ou solicite de novos recursos em: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a> .
+amo.developerComments.line1=O Scriptish tem todos os recursos que o Greasemonkey tem e muitos mais, que você pode descobrir em: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a> .
+amo.developerComments.line2=Por favor, envie informações sobre falhas ou solicite de novos recursos em: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a> .
 amo.developerComments.line3=Se você tiver qualquer dúvida, envie sua pergunta para a lista de discussão: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a> .
 amo.summary=O maior mecanismo de scripts de usuário da Internet.
 extensions.scriptish@erikvold.com.description=Um gerenciador de scripts para o Firefox.
diff --git a/extension/locale/sv-SE/description.properties b/extension/locale/sv-SE/description.properties
index 33c7c4a8..2afd6cad 100644
--- a/extension/locale/sv-SE/description.properties
+++ b/extension/locale/sv-SE/description.properties
@@ -1,13 +1,13 @@
 amo.description.line1=Scriptish är en fristående förgrening av Greasemonkey och erbjuder:
 amo.description.line2=Allting som Greasemonkey erbjuder (vilket faktiskt är riktigt användbart)
 amo.description.line3=Uppdatering: Användarskript kan uppdateras i Scriptish m.h.a. @updateURL
-amo.description.line4=Flera nya <a title="Scriptishs metadatablocksdokumentation - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">metadatanycklar (@keys)</a>
-amo.description.line5=Flera nya <a title="Scriptishs användarskripts-API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">tillägg till GM_-API:n</a>
+amo.description.line4=Flera nya <a title="Scriptishs metadatablocksdokumentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">metadatanycklar (@keys)</a>
+amo.description.line5=Flera nya <a title="Scriptishs användarskripts-API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">tillägg till GM_-API:n</a>
 amo.description.line6=Överlägsen prestanda: En snabbare, renare kodbas, som drar fördel av allt det som tidigare Firefox-versioner har haft att erbjuda
 amo.description.line7=Överlägsen säkerhet: Scriptish tillhandahåller säkerhetsfunktioner som du inte hittar någon annanstans
 amo.description.line8=Testning: Utvecklarna använder sig av ett flertal tester för att säkerställa att Scriptish fungerar korrekt och för att hitta eventuella fel så tidigt som möjligt
-amo.developerComments.line1=Scriptish har allt som Greasemonkey har, plus flera funktioner som du kan läsa mer om på: <a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
-amo.developerComments.line2=Var vänlig skicka in alla buggrapporter och förslag på nya funktioner via: <a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line1=Scriptish har allt som Greasemonkey har, plus flera funktioner som du kan läsa mer om på: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=Var vänlig skicka in alla buggrapporter och förslag på nya funktioner via: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=Om du har frågor, skicka dem till e-postlistan: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=Den bästa användarskriptmotorn på Internet.
 extensions.scriptish@erikvold.com.description=En skripttilläggshanterare för Firefox
diff --git a/extension/locale/zh-CN/description.properties b/extension/locale/zh-CN/description.properties
index 3e750fdf..ceae9d42 100644
--- a/extension/locale/zh-CN/description.properties
+++ b/extension/locale/zh-CN/description.properties
@@ -1,13 +1,13 @@
 amo.description.line1=Scriptish 是 Greasemonkey 的分支，提供:
 amo.description.line2=Greasemonkey 提供的所有功能（都是非常有用的）
 amo.description.line3=更新：用户脚本在 Scriptish 上可以使用 @updateURL 更新
-amo.description.line4=更多的 <a href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">@keys 元数据支持</a>
-amo.description.line5=更多的 <a href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">用户脚本API支持</a>
+amo.description.line4=更多的 <a href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">@keys 元数据支持</a>
+amo.description.line5=更多的 <a href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">用户脚本API支持</a>
 amo.description.line6=优越的性能：利用一切 Firefox 4所提供的更快、更清洁的代码基础
 amo.description.line7=出众的安全：Scriptish 提供独一无二的安全功能
 amo.description.line8=测试：编写代码测试Scriptish 的功能和特性
-amo.developerComments.line1=Scriptish 拥有 Greasemonkey 的所有功能，增加的很多其他特性您可以到这里查看：<a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
-amo.developerComments.line2=请到这里提交 bug 或功能需求：<a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line1=Scriptish 拥有 Greasemonkey 的所有功能，增加的很多其他特性您可以到这里查看：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=请到这里提交 bug 或功能需求：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=如果您还有其他问题，请发送邮件到这里：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=互联网上最伟大的用户脚本引擎。
 extensions.scriptish@erikvold.com.description=
diff --git a/extension/locale/zh-TW/description.properties b/extension/locale/zh-TW/description.properties
index a1548879..be6d160d 100644
--- a/extension/locale/zh-TW/description.properties
+++ b/extension/locale/zh-TW/description.properties
@@ -1,13 +1,13 @@
 amo.description.line1=Scriptish 是 Greasemonkey 的分支，提供以下功能:
 amo.description.line2=Greasemonkey 的所有功能（都是非常有用的）
 amo.description.line3=更新：使用者腳本在 Scriptish 裡可以用 @updateURL 更新
-amo.description.line4=新增更多的 <a href="https://github.com/erikvold/scriptish/wiki/Manual%3A-Metadata-Block">後設資料 @keys</a>
-amo.description.line5=新增更多的 <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/erikvold/scriptish/wiki/Manual%3A-API">GM_ API</a>
+amo.description.line4=新增更多的 <a href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">後設資料 @keys</a>
+amo.description.line5=新增更多的 <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">GM_ API</a>
 amo.description.line6=優秀的性能：憑藉新版 Firefox 的優勢，以更快、更乾淨的程式碼提供更優秀的性能
 amo.description.line7=出色的安全：Scriptish 提供獨一無二的安全功能
 amo.description.line8=測試：開發者利用大量的測試保證 Scriptish 正確的執行，並更快找出程式碼中的錯誤
-amo.developerComments.line1=Scriptish 擁有 Greasemonkey 的所有功能，其他額外增加的特性您可以到這裡瀏覽：<a href="http://github.com/erikvold/scriptish/wiki">http://github.com/erikvold/scriptish/wiki</a>
-amo.developerComments.line2=請到這裡提交 bug 或新功能請求：<a href="https://github.com/erikvold/scriptish/issues">https://github.com/erikvold/scriptish/issues</a>
+amo.developerComments.line1=Scriptish 擁有 Greasemonkey 的所有功能，其他額外增加的特性您可以到這裡瀏覽：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=請到這裡提交 bug 或新功能請求：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=如果您還有其他問題，請發送郵件到這裡：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=網際網路上最傑出的使用者腳本引擎。
 extensions.scriptish@erikvold.com.description=一個 Firefox 的腳本管理器

From 85d6f6243893e82805bdab671ebeeea4533b60cc Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 20 Jul 2011 13:58:44 -0700
Subject: [PATCH 469/829] no longer using insertbefore=javascriptConsole which
 was moved in FFx

note: this caused a warning in the AMO validator
---
 extension/content/browser.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index 581a3743..e06a46eb 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -20,7 +20,7 @@
   </broadcasterset>
 
   <menupopup id="menu_ToolsPopup">
-    <menu id="scriptish_general_menu" insertbefore="javascriptConsole"/>
+    <menu id="scriptish_general_menu"/>
   </menupopup>
   <menupopup id="taskPopup">
     <menu id="scriptish_general_menu" insertbefore="downloadMgr"/>

From 81efcf8259fb793aebdc3a37d075f65902e7ae07 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 20 Jul 2011 14:04:59 -0700
Subject: [PATCH 470/829] adding <em:type>2</em:type> b/c the AMO validator is
 bitching about it..

---
 extension/install.rdf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/install.rdf b/extension/install.rdf
index ca7fda03..9f09f1be 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -2,6 +2,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
+    <em:type>2</em:type>
     <em:id>scriptish@erikvold.com</em:id>
 
     <em:name>Scriptish</em:name>

From 1cea9c372f6e605e7cb91499e35eb843cf88a221 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 23 Jul 2011 15:25:03 -0700
Subject: [PATCH 471/829] the sync-locales cmd line tool is now written in js
 (works with node), needs cleaup still, but works.

---
 sync-locales.js | 77 +++++++++++++++++++++++++++++++++++++++++++++++++
 sync-locales.py | 55 -----------------------------------
 2 files changed, 77 insertions(+), 55 deletions(-)
 create mode 100644 sync-locales.js
 delete mode 100644 sync-locales.py

diff --git a/sync-locales.js b/sync-locales.js
new file mode 100644
index 00000000..da32291e
--- /dev/null
+++ b/sync-locales.js
@@ -0,0 +1,77 @@
+#!/usr/bin/env node
+
+var path = require("path");
+var glob = require("glob").glob;
+var globSync = require("glob").globSync;
+var fs = require("fs");
+
+
+function Properties(file) {
+  this.file = file;
+  this.items = {};
+  var self = this;
+
+  // store the keys/values
+  var data = fs.readFileSync(file, "utf-8");
+  var list = data.match(/[^\n]*(\n|$)/g);
+
+  for (var i = list.length - 1; ~i; i--) {
+    var m = list[i].match(/(^[^#=]*)=([^\n]*)(\n|$)/, "");
+    if (!m) continue;
+    self.items[m[1]] = m[2];
+  }
+}
+
+Properties.prototype.merge = function(rhs) {
+  // remove the obsolete keys
+  for (var key in this.items)
+    if (!rhs.items[key])
+      delete this.items[key];
+
+  // add new keys
+  for (var key in rhs.items)
+    if (!this.items[key])
+      this.items[key] = "";
+};
+
+Properties.prototype.save = function() {
+  var keys = [], newStr = [], self = this;
+  for (var key in this.items) {
+    keys.push(key);
+  }
+
+  keys.sort(function(a, b) {
+    return (a.toLowerCase() > b.toLowerCase()) ? 1 : -1;
+  });
+  for (var i = 0, e = keys.length; i < e; i++) {
+    newStr.push(keys[i] + "=" + this.items[keys[i]]);
+  }
+  newStr = newStr.join("\n") + "\n";
+  fs.writeFile(self.file, newStr, "utf-8", function(e) {
+    if (e) throw e;
+  });
+};
+
+function process_properties(base, files) {
+  base = new Properties(base);
+
+  for (var i = files.length - 1, file; ~i; i--) {
+    file = files[i];
+    if (file == base.file)
+      continue
+    console.log(file);
+    file = new Properties(file);
+    file.merge(base);
+    file.save();
+  }
+}
+
+glob("extension/locale/en-US/*.properties", function(e, m) {
+  if (e) throw e;
+  m.forEach(function(f) {
+    var fn = f.match(/[^\\\/\.]*.properties$/)[0];
+    var files = globSync("extension/locale/*/" + fn);
+    process_properties(f, files);
+  });
+})
+
diff --git a/sync-locales.py b/sync-locales.py
deleted file mode 100644
index 803f1dd9..00000000
--- a/sync-locales.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env python
-
-# Nils Maier has dedicated this work to the public domain by waiving all of his
-# rights to the work worldwide under copyright law, including all related
-# and neighboring rights, to the extent allowed by law.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-import os, sys, re
-from glob import glob
-from codecs import open as copen
-
-class Properties(object):
-    def __init__(self, file):
-        self.file = file
-        self._items = {}
-        with copen(self.file, "rb", encoding="utf-8") as fp:
-            for line in fp:
-                line = line.strip()
-                if line.startswith("#"):
-                    continue
-                key, value = line.split("=", 1)
-                self._items[key] = value
-
-    def merge(self, rhs):
-        # remove obsolete
-        for k in self._items.keys():
-            if not k in rhs._items:
-                del self._items[key]
-
-        # add new keys
-        for k in rhs._items.keys():
-            if not k in self._items:
-                self._items[k] = ""
-
-    def save(self):
-        with copen(self.file, "wb", encoding="utf-8") as op:
-            for k in sorted(self._items.keys(), key=unicode.lower):
-                op.write("%s=%s\n" % (k, self._items[k]))
-
-def process_properties(base, files):
-    base = Properties(base)
-    base.save()
-    for file in files:
-        if file == base.file:
-            continue
-        print file
-        file = Properties(file)
-        file.merge(base)
-        file.save()
-
-
-if __name__ == "__main__":
-    for f in glob("extension/locale/en-US/*.properties"):
-        fn = os.path.basename(f)
-        process_properties(f, glob("extension/locale/*/" + fn))

From 4ac8235e97be3bda90b94bb3bc82e13ee71a0fe6 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 23 Jul 2011 16:16:38 -0700
Subject: [PATCH 472/829] the test cmd line tool is now written in js (works
 with node)

---
 test.js | 45 +++++++++++++++++++++++++++++++++++++++++++++
 test.sh | 25 -------------------------
 2 files changed, 45 insertions(+), 25 deletions(-)
 create mode 100644 test.js
 delete mode 100755 test.sh

diff --git a/test.js b/test.js
new file mode 100644
index 00000000..aec1d32a
--- /dev/null
+++ b/test.js
@@ -0,0 +1,45 @@
+#!/usr/bin/env node
+
+var exec = require('child_process').exec;
+
+var debug = ("debug" == process.argv[2]);
+
+exec("./build.sh test", function() {
+  console.log("Running mozmill tests...");
+  if (debug) {
+    exec("mozmill -t tests/mozmill-tests -a scriptish-test.xpi --show-all", doAsycTests.bind(null, 0));
+  } else {
+    exec("mozmill -t tests/mozmill-tests -a scriptish-test.xpi", doAsycTests.bind(null, 0));
+  }
+});
+
+function dumpResults(e, out) {
+  if (out) console.log(out);
+}
+
+function doAsycTests(step, e, out) {
+  dumpResults(e, out);
+  step = step || 0;
+  switch (step) {
+  case 4:
+    console.log("Running mozmill-restart tests...");
+    if (debug) {
+      exec("mozmill-restart -t tests/mozmill-tests/tests/restartTests -a scriptish-test.xpi --show-all", dumpResults);
+    } else {
+      exec("mozmill-restart -t tests/mozmill-tests/tests/restartTests -a scriptish-test.xpi", dumpResults);
+    }
+    return;
+  case 0:
+    console.log("Starting restart tests in 10 secs... (Press ctrl+z to cancel)");
+    return setTimeout(doAsycTests.bind(null, ++step), 7000);
+  case 1:
+    console.log("Starting restart tests in 3 secs...");
+    return setTimeout(doAsycTests.bind(null, ++step), 1000);
+  case 2:
+    console.log("Starting restart tests in 2 secs...");
+    return setTimeout(doAsycTests.bind(null, ++step), 1000);
+  case 3:
+    console.log("Starting restart tests in 1 secs...");
+    return setTimeout(doAsycTests.bind(null, ++step), 1000);
+  }
+}
diff --git a/test.sh b/test.sh
deleted file mode 100755
index cfe9b9f0..00000000
--- a/test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-./build.sh test
-echo "Running mozmill tests..."
-if [ "debug" == "$1" ]; then
-  mozmill -t tests/mozmill-tests -a scriptish-test.xpi --show-all
-else
-  mozmill -t tests/mozmill-tests -a scriptish-test.xpi
-fi
-
-echo "Starting restart tests in 10 secs... (Press ctrl+z to cancel)"
-sleep 7
-echo "Starting restart tests in 3 secs..."
-sleep 1
-echo "Starting restart tests in 2 secs..."
-sleep 1
-echo "Starting restart tests in 1 secs..."
-sleep 1
-echo "Running mozmill-restart tests..."
-
-if [ "debug" == "$1" ]; then
-  mozmill-restart -t tests/mozmill-tests/tests/restartTests -a scriptish-test.xpi --show-all
-else
-  mozmill-restart -t tests/mozmill-tests/tests/restartTests -a scriptish-test.xpi
-fi

From 8befdc1950d0336972c2bd081b46486331e0e966 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 23 Jul 2011 17:54:44 -0700
Subject: [PATCH 473/829] bug fix: Error: uncaught exception: [Exception...
 "Not enough arguments"  nsresult: "0x80570001 (NS_ERROR_XPC_NOT_ENOUGH_ARGS)"
  location: "JS frame :: chrome://scriptish/content/js/browser.js ::
 <TOP_LEVEL> :: line 43"  data: no]

---
 extension/content/js/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 69eeb0c4..9be33aaf 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -43,7 +43,7 @@ Scriptish_BrowserUI.tbBtnSetup = function() {
   window.addEventListener("unload", function() {
     Scriptish_prefRoot.unwatch("enabled", updateShowScripts);
     Scriptish_prefRoot.unwatch("toolbarbutton.showScripts", updateShowScripts);
-  });
+  }, false);
 
   var sbCmdsEle = $("scriptish-tb-cmds-brd");
   sbCmdsEle.setAttribute("label", Scriptish_stringBundle("menu.commands"));

From ee28d93afaf9f83166a25740fa8f3ca8a8acd4c5 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 24 Jul 2011 20:14:06 -0700
Subject: [PATCH 474/829] ignoring python, ruby, and bash scripts so that one
 can use them without being asked to commit.

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index b84f6673..082603c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,7 @@ LOCAL.*
 REMOTE.*
 build
 *.DS_Store
+*.py
+*.rb
+*.sh
 

From 3400e207c9d925c7fb6ff29455d92a01b4f310b1 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 24 Jul 2011 20:28:54 -0700
Subject: [PATCH 475/829] converting the README to md

---
 README.txt => README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename README.txt => README.md (93%)

diff --git a/README.txt b/README.md
similarity index 93%
rename from README.txt
rename to README.md
index 45e76831..6235c0a6 100644
--- a/README.txt
+++ b/README.md
@@ -1,16 +1,16 @@
+# About
+
 Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 
 
-Requirements
-----------
+# Requirements
 
 * Using Scriptish: Firefox 4.0b5pre or higher
 * Building an XPI: Unix shell
 * Playing w/ code: Git
 
 
-Links
-----------
+# Links
 
 * Addons.Mozilla.Org (AMO): https://addons.mozilla.org/en-US/firefox/addon/scriptish
 * Userscripts:              http://userscripts.org

From 0c008a211cc4d63d3d0fbeef6e7f1d0c86a072b2 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 25 Jul 2011 06:11:33 +0200
Subject: [PATCH 476/829] Do not remove sync-locales.py just yet

Wait for a stable and reasonable easy-to-use nodejs for Win32
---
 sync-locales.py | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 sync-locales.py

diff --git a/sync-locales.py b/sync-locales.py
new file mode 100644
index 00000000..803f1dd9
--- /dev/null
+++ b/sync-locales.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+# Nils Maier has dedicated this work to the public domain by waiving all of his
+# rights to the work worldwide under copyright law, including all related
+# and neighboring rights, to the extent allowed by law.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+import os, sys, re
+from glob import glob
+from codecs import open as copen
+
+class Properties(object):
+    def __init__(self, file):
+        self.file = file
+        self._items = {}
+        with copen(self.file, "rb", encoding="utf-8") as fp:
+            for line in fp:
+                line = line.strip()
+                if line.startswith("#"):
+                    continue
+                key, value = line.split("=", 1)
+                self._items[key] = value
+
+    def merge(self, rhs):
+        # remove obsolete
+        for k in self._items.keys():
+            if not k in rhs._items:
+                del self._items[key]
+
+        # add new keys
+        for k in rhs._items.keys():
+            if not k in self._items:
+                self._items[k] = ""
+
+    def save(self):
+        with copen(self.file, "wb", encoding="utf-8") as op:
+            for k in sorted(self._items.keys(), key=unicode.lower):
+                op.write("%s=%s\n" % (k, self._items[k]))
+
+def process_properties(base, files):
+    base = Properties(base)
+    base.save()
+    for file in files:
+        if file == base.file:
+            continue
+        print file
+        file = Properties(file)
+        file.merge(base)
+        file.save()
+
+
+if __name__ == "__main__":
+    for f in glob("extension/locale/en-US/*.properties"):
+        fn = os.path.basename(f)
+        process_properties(f, glob("extension/locale/*/" + fn))

From 2cb7af3a27a5c0e0717794a95cc66812196f8354 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 25 Jul 2011 11:26:55 -0700
Subject: [PATCH 477/829] ignore node_modules folder

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 082603c3..fe09d16d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ build
 *.py
 *.rb
 *.sh
+node_modules
 

From 60fdf8214e361ce1bbcd7283941d363985debc3f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 26 Jul 2011 20:49:37 -0700
Subject: [PATCH 478/829] minor simplification in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6235c0a6..293acd2f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 
 # Requirements
 
-* Using Scriptish: Firefox 4.0b5pre or higher
+* Using Scriptish: Firefox 4+
 * Building an XPI: Unix shell
 * Playing w/ code: Git
 

From f20e8235be5669db86e939ea8b591f8aabaf97fd Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 26 Jul 2011 20:50:36 -0700
Subject: [PATCH 479/829] saying Git is req'd in README is redundant

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 293acd2f..398c83ba 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 
 * Using Scriptish: Firefox 4+
 * Building an XPI: Unix shell
-* Playing w/ code: Git
 
 
 # Links

From 34bf1313d33d2c564dbfd6a269a7dcb4c7b875fe Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 26 Jul 2011 20:51:02 -0700
Subject: [PATCH 480/829] using md links in README

---
 README.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 398c83ba..8074df2d 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,11 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 
 # Links
 
-* Addons.Mozilla.Org (AMO): https://addons.mozilla.org/en-US/firefox/addon/scriptish
-* Userscripts:              http://userscripts.org
-* Wiki:                     http://github.com/scriptish/scriptish/wiki
-* Issues:                   http://github.com/scriptish/scriptish/issues
-* Google Group:             http://groups.google.com/group/scriptish
-* Source Code:              http://github.com/scriptish/scriptish
+* [Website](http://scriptish.org)
+* [Blog](http://scriptish.org/blog.html)
+* [Addons.Mozilla.Org (AMO)](https://addons.mozilla.org/en-US/firefox/addon/scriptish)
+* [Userscripts](http://userscripts.org)
+* [Wiki](http://github.com/scriptish/scriptish/wiki)
+* [Issues](http://github.com/scriptish/scriptish/issues)
+* [Google Group](http://groups.google.com/group/scriptish)
+* [Source Code](http://github.com/scriptish/scriptish)

From b446330d24dc47ca31ece68b41712f8364f8105b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 26 Jul 2011 20:54:01 -0700
Subject: [PATCH 481/829] updating blog link in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8074df2d..6b59763c 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 # Links
 
 * [Website](http://scriptish.org)
-* [Blog](http://scriptish.org/blog.html)
+* [Blog](http://scriptish.org/blog)
 * [Addons.Mozilla.Org (AMO)](https://addons.mozilla.org/en-US/firefox/addon/scriptish)
 * [Userscripts](http://userscripts.org)
 * [Wiki](http://github.com/scriptish/scriptish/wiki)

From 4181f0ff167589e077af5603489aa5516b573899 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 26 Jul 2011 21:36:04 -0700
Subject: [PATCH 482/829] Closes #440 chrome messages are not logged if
 logChrome pref is disabled.

---
 extension/content/tests/testScriptishLogger.js | 4 ++--
 extension/modules/config/config.js             | 4 ++--
 extension/modules/script/script.js             | 2 +-
 extension/modules/script/scriptdependency.js   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extension/content/tests/testScriptishLogger.js b/extension/content/tests/testScriptishLogger.js
index dfb4f219..6ba8721c 100644
--- a/extension/content/tests/testScriptishLogger.js
+++ b/extension/content/tests/testScriptishLogger.js
@@ -84,7 +84,7 @@ asyncTest("extensions.scriptish.logChrome = true", 1, function() {
 
 asyncTest("null char removed", 1, function() {
   runListener(function({message}) {
-    equal(message, "[Scriptish] FORCED TEST WITH NULLS");
+    equal(message, "[Scriptish] TEST WITH NULLS");
   });
 
   var logChrome = null;
@@ -95,7 +95,7 @@ asyncTest("null char removed", 1, function() {
   PREF_BRANCH.setBoolPref("logChrome", true);
 
   try {
-    Scriptish_log("FORCED \0TEST \0WITH \0NULLS");
+    Scriptish_log("TEST \0WITH \0NULLS");
   }
   finally {
     if (logChrome !== null) {
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index da73507d..ee97a46f 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -139,7 +139,7 @@ Config.prototype = {
           function() writeStream.finish()
           );
 
-      Scriptish_log("Updated Scriptish blocklist " + SCRIPTISH_BLOCKLIST, true);
+      Scriptish_log("Updated Scriptish blocklist " + SCRIPTISH_BLOCKLIST);
 
       self._blocklist = blocklist;
       self._blocklistHash = hash;
@@ -337,7 +337,7 @@ Config.prototype = {
     (this._configFile = this._scriptDir).append(SCRIPTISH_CONFIG_JSON);
 
     Scriptish_log(
-        Scriptish_stringBundle("saving") + " " + SCRIPTISH_CONFIG_JSON, true);
+        Scriptish_stringBundle("saving") + " " + SCRIPTISH_CONFIG_JSON);
 
     let converter = Instances.suc;
     converter.charset = "UTF-8";
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index eb9dbdce..b4fe67bd 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -613,7 +613,7 @@ Script.prototype = {
     this._filename = file.leafName;
 
     Scriptish_log(Scriptish_stringBundle("moving.script") + " "
-        + tempFile.path + " --> " + file.path, true);
+        + tempFile.path + " --> " + file.path);
 
     file.remove(true);
     tempFile.moveTo(file.parent, file.leafName);
diff --git a/extension/modules/script/scriptdependency.js b/extension/modules/script/scriptdependency.js
index 6b72998b..94e9fef4 100644
--- a/extension/modules/script/scriptdependency.js
+++ b/extension/modules/script/scriptdependency.js
@@ -52,7 +52,7 @@ ScriptDependency.prototype = {
     this._filename = file.leafName;
 
     Scriptish_log(Scriptish_stringBundle("moving.dependency") + " "
-        + this._tempFile.path + " --> " + file.path, true);
+        + this._tempFile.path + " --> " + file.path);
 
     file.remove(true);
     this._tempFile.moveTo(file.parent, file.leafName);

From 19cb317f413ae4882db8666f8ec962a7d45de9d7 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 27 Jul 2011 21:38:57 -0700
Subject: [PATCH 483/829] GM_setClipboard now supports type 'html'

---
 extension/modules/api.js                 |  2 +-
 extension/modules/api/GM_setClipboard.js | 35 ++++++++++++++++++++++--
 extension/modules/constants.js           |  7 +++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index c277d74e..55d47070 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -218,7 +218,7 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
 GM_API.prototype.GM_generateUUID = function GM_generateUUID() (
     Services.uuid.generateUUID().toString());
 
-GM_API.prototype.GM_setClipboard = function GM_setClipboard() {
+GM_API.prototype.GM_setClipboard = function() {
   if (!GM_apiLeakCheck("GM_setClipboard")) return;
   GM_setClipboard.apply(null, arguments);
 }
diff --git a/extension/modules/api/GM_setClipboard.js b/extension/modules/api/GM_setClipboard.js
index 527830e8..192c4ad2 100644
--- a/extension/modules/api/GM_setClipboard.js
+++ b/extension/modules/api/GM_setClipboard.js
@@ -2,8 +2,39 @@ var EXPORTED_SYMBOLS = ["GM_setClipboard"];
 Components.utils.import("resource://scriptish/constants.js");
 lazyUtil(this, "stringBundle");
 
+const FLAVOR_TEXT = "text/unicode";
+const FLAVOR_HTML = "text/html";
+
 function GM_setClipboard(aData, aType) {
-  if (aType && aType != "text")
+  aType = (aType || "text").toLowerCase();
+
+  switch (aType) {
+  case "text":
+    Services.cb.copyString(aData);
+    return;
+  case "html":
+    var trans = Instances.xfr;
+
+    // add text/html flavor
+    var str = Instances.ss;
+    str.data = aData;
+    trans.addDataFlavor(FLAVOR_HTML);
+    trans.setTransferData(FLAVOR_HTML, str, (aData.length * 2));
+
+    // add a text/unicode flavor (html converted to plain text)
+    var str = Instances.ss;
+    let (converter = Instances.ftc) {
+      converter.type = aType;
+      converter.text = aData;
+      str.data = converter.plainText();
+    }
+    trans.addDataFlavor(FLAVOR_TEXT);
+    trans.setTransferData(FLAVOR_TEXT, str, (str.data.length * 2));
+    break;
+  default:
     throw new Error("'" + aType + "' " + Scriptish_stringBundle("error.api.clipboard.type"));
-  Services.cb.copyString(aData);
+  }
+
+  var cbs = Services.cbs;
+  cbs.setData(trans, null, cbs.kGlobalClipboard);
 }
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 854e67d9..e2ea15f0 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -25,6 +25,8 @@ var Instances = {
       .createInstance(Ci.nsIDOMSerializer),
   get fos() Cc["@mozilla.org/network/file-output-stream;1"]
       .createInstance(Ci.nsIFileOutputStream),
+  get ftc() Cc["@mozilla.org/feed-textconstruct;1"]
+      .createInstance(Ci.nsIFeedTextConstruct),
   get sfos() Cc["@mozilla.org/network/safe-file-output-stream;1"]
       .createInstance(Ci.nsIFileOutputStream)
       .QueryInterface(Ci.nsISafeOutputStream),
@@ -40,6 +42,8 @@ var Instances = {
   get timer() Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer),
   get wbp() Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
       .createInstance(Ci.nsIWebBrowserPersist),
+  get xfr() Cc["@mozilla.org/widget/transferable;1"]
+      .createInstance(Ci.nsITransferable),
   get xhr() Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
       .createInstance(Ci.nsIXMLHttpRequest)
 };
@@ -59,6 +63,9 @@ XPCOMUtils.defineLazyServiceGetter(
     Services, "cb", "@mozilla.org/widget/clipboardhelper;1",
     "nsIClipboardHelper");
 
+XPCOMUtils.defineLazyServiceGetter(
+    Services, "cbs", "@mozilla.org/widget/clipboard;1", "nsIClipboard");
+
 XPCOMUtils.defineLazyServiceGetter(
     Services, "cs", "@mozilla.org/consoleservice;1", "nsIConsoleService");
 

From 2bb5cd98adffcb72dd368a401c818ecfc82275ab Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 30 Jul 2011 18:01:15 -0700
Subject: [PATCH 484/829] moving Scriptish_getBrowserForContentWindow to 3rd
 party folder

---
 .../Scriptish_getBrowserForContentWindow.js                       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename extension/modules/{utils => third-party}/Scriptish_getBrowserForContentWindow.js (100%)

diff --git a/extension/modules/utils/Scriptish_getBrowserForContentWindow.js b/extension/modules/third-party/Scriptish_getBrowserForContentWindow.js
similarity index 100%
rename from extension/modules/utils/Scriptish_getBrowserForContentWindow.js
rename to extension/modules/third-party/Scriptish_getBrowserForContentWindow.js

From b99292192632fb8a2488e3c2a2b3f3c53819487b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 30 Jul 2011 18:08:38 -0700
Subject: [PATCH 485/829] adding MPL tri license from HUDService.jsm

---
 extension/components/scriptish.js             |  4 +-
 extension/content/tests/testAvailability.js   |  2 +-
 .../Scriptish_getBrowserForContentWindow.js   | 50 +++++++++++++++++--
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 6dfdf9ab..c5fcba0a 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -16,9 +16,9 @@ lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_sandboxSc
 lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
 lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
 lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
+lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_installUri.js", ["Scriptish_installUri"]);
 
-lazyUtil(this, "getBrowserForContentWindow");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "stringBundle");
 
@@ -73,7 +73,7 @@ ScriptishService.prototype = {
     switch (aTopic) {
       case "chrome-document-global-created":
       case "content-document-global-created":
-        this.docReady(aSubject, Scriptish_getBrowserForContentWindow(aSubject));
+        this.docReady(aSubject, Scriptish_getBrowserForContentWindow(aSubject).wrappedJSObject);
         break;
       case "inner-window-destroyed":
         this.innerWinDestroyed(aSubject.QueryInterface(Components.interfaces.nsISupportsPRUint64).data);
diff --git a/extension/content/tests/testAvailability.js b/extension/content/tests/testAvailability.js
index e293107c..7f6a540c 100644
--- a/extension/content/tests/testAvailability.js
+++ b/extension/content/tests/testAvailability.js
@@ -13,7 +13,7 @@ Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_ExtendedStringBundle.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_findError.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_getBinaryContents.js", tools);
-Cu.import("resource://scriptish/utils/Scriptish_getBrowserForContentWindow.js", tools);
+Cu.import("resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_getContents.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_getEditor.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_getFirebugConsole.js", tools);
diff --git a/extension/modules/third-party/Scriptish_getBrowserForContentWindow.js b/extension/modules/third-party/Scriptish_getBrowserForContentWindow.js
index 19150a17..7cb89d52 100644
--- a/extension/modules/third-party/Scriptish_getBrowserForContentWindow.js
+++ b/extension/modules/third-party/Scriptish_getBrowserForContentWindow.js
@@ -1,13 +1,57 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is DevTools (HeadsUpDisplay) Console Code
+ *
+ * The Initial Developer of the Original Code is
+ *   Mozilla Foundation
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   David Dahl <ddahl@mozilla.com> (original author)
+ *   Rob Campbell <rcampbell@mozilla.com>
+ *   Johnathan Nightingale <jnightingale@mozilla.com>
+ *   Patrick Walton <pcwalton@mozilla.com>
+ *   Julian Viereck <jviereck@mozilla.com>
+ *   Mihai ��ucan <mihai.sucan@gmail.com>
+ *   Greg Parris <greg.parris@gmail.com>
+ *   Erik Vold <erikvvold@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
 var EXPORTED_SYMBOLS = ["Scriptish_getBrowserForContentWindow"];
 Components.utils.import("resource://scriptish/constants.js");
 
-// See _getBrowserWindowForContentWindow in browser.js
 function Scriptish_getBrowserForContentWindow(aContentWindow) {
-  return aContentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+  return aContentWindow
+      .QueryInterface(Ci.nsIInterfaceRequestor)
       .getInterface(Ci.nsIWebNavigation)
       .QueryInterface(Ci.nsIDocShellTreeItem)
       .rootTreeItem
       .QueryInterface(Ci.nsIInterfaceRequestor)
       .getInterface(Ci.nsIDOMWindow)
-      .wrappedJSObject;
+      .QueryInterface(Ci.nsIDOMChromeWindow);
 }

From 1c5d499fa59371e02a4fc8475e38f5bbcf785ab4 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 30 Jul 2011 19:01:22 -0700
Subject: [PATCH 486/829] Closes #452 Needed to call Scriptish_setupPopup after
 the aftercustomization event

---
 extension/content/js/browser.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 9be33aaf..124d5ae7 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -302,6 +302,7 @@ Scriptish_BrowserUI.viewContextItemClicked = function() {
 
 window.addEventListener("load", Scriptish_BrowserUI.chromeLoad.bind(Scriptish_BrowserUI), false);
 window.addEventListener("unload", Scriptish_BrowserUI.chromeUnload.bind(Scriptish_BrowserUI), false);
+window.addEventListener("aftercustomization", Scriptish_setupPopup, false);
 })(Components.utils.import, {})
 
 /**

From 605e4294fd256bae15dd7bacd671c8ba680e43bc Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 1 Aug 2011 19:45:27 +0200
Subject: [PATCH 487/829] Only apply badge binding to the toolbarbutton when in
 toolbar

... but do not apply the custom binding when e.g. in the Customize dialog.

Closes #465
---
 extension/skin/browser.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extension/skin/browser.css b/extension/skin/browser.css
index 21178da1..59771b97 100644
--- a/extension/skin/browser.css
+++ b/extension/skin/browser.css
@@ -1,8 +1,10 @@
 #scriptish-button {
   -moz-box-orient: horizontal;
-  -moz-binding: url("chrome://scriptish/content/third-party/firebug/startButton.xml#scriptish-button");
   list-style-image: url("chrome://scriptish/skin/scriptish24.png");
 }
+toolbar #scriptish-button {
+  -moz-binding: url("chrome://scriptish/content/third-party/firebug/startButton.xml#scriptish-button");
+}
 
 toolbar[iconsize="small"] #scriptish-button {
   list-style-image: url("chrome://scriptish/skin/scriptish16.png");

From 4e66fc13a75b31922da2f5d97eaa34c8594c88c2 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 3 Aug 2011 11:35:41 -0700
Subject: [PATCH 488/829] <em:version>0.1.4a1</em:version>

---
 extension/install.rdf |  6 +++---
 update.rdf            | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 9f09f1be..52976b03 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -8,7 +8,7 @@
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
-    <em:version>0.1.4a1pre</em:version>
+    <em:version>0.1.4a1</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
@@ -69,8 +69,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.1a3</em:minVersion>
-        <em:maxVersion>2.2.*</em:maxVersion>
+        <em:minVersion>2.1</em:minVersion>
+        <em:maxVersion>2.3.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
diff --git a/update.rdf b/update.rdf
index 40454b7d..ea11423b 100644
--- a/update.rdf
+++ b/update.rdf
@@ -6,23 +6,23 @@
       <RDF:Seq>
         <RDF:li>
           <RDF:Description>
-            <em:version>0.1.3</em:version>
+            <em:version>0.1.4a1</em:version>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>4.0</em:minVersion>
-                <em:maxVersion>7.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.3.xpi</em:updateLink>
-                <em:updateHash>sha1:310fc77a9fe8ef89adb6cbfa6cb2914c9381536b</em:updateHash>
+                <em:maxVersion>8.*</em:maxVersion>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.4a1.xpi</em:updateLink>
+                <em:updateHash>sha1:d36eafaeaac0a08ffeac68e67a4348aa6cddc115</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-                <em:minVersion>2.1a3</em:minVersion>
-                <em:maxVersion>2.2.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/erikvold/scriptish/scriptish-0.1.3.xpi</em:updateLink>
-                <em:updateHash>sha1:310fc77a9fe8ef89adb6cbfa6cb2914c9381536b</em:updateHash>
+                <em:minVersion>2.1</em:minVersion>
+                <em:maxVersion>2.3.*</em:maxVersion>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.4a1.xpi</em:updateLink>
+                <em:updateHash>sha1:d36eafaeaac0a08ffeac68e67a4348aa6cddc115</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
           </RDF:Description>
@@ -30,6 +30,6 @@
       </RDF:Seq>
     </em:updates>
 
-    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBADKiVpuXGg62/aYVOBJbNhkNMD2t2baNcxQJPMLitMArMrlOVyvFF9nbOrbeS+sa9RRgo4HLvC5LW4ZgaNIwGxFRMDDEttQ3rueZ1ZYK3EZ8PK8TjiwRh+/s+uyMaFz7i+hSzSoPAzDTe21wTebWMwwteKKmomT3Sa29wPOM4KUQ</em:signature>
+    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAA/qE0SLB4yRVQ/z69KsDvdJN+qka9UIkuzOWooUQb953lVEOwb0G2beubxUOuTvn8t3uMoHCS7eKmbRgD10wFCSHDl2NDK9Zw/Vja/R12BDeVzufTDx974pTSuO4wkWDtOAnA/KbGvqeJQW4OWyC0qnSTnuIhccny4f1BZLLiyU</em:signature>
   </RDF:Description>
 </RDF:RDF>

From 3da05376b7c0a107cba2d85314a0fef3cd92dfec Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 3 Aug 2011 11:39:12 -0700
Subject: [PATCH 489/829] <em:version>0.1.4a2pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 52976b03..c899dcb1 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -8,7 +8,7 @@
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
-    <em:version>0.1.4a1</em:version>
+    <em:version>0.1.4a2pre</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>

From 3673ea2681b85fad0d2bdd5e2ab88f2d8249b2d5 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 3 Aug 2011 11:41:19 -0700
Subject: [PATCH 490/829] 
 <em:updateURL>http://github.com/downloads/scriptish/scriptish/update.rdf</em:updateURL>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index c899dcb1..9778496c 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -54,7 +54,7 @@
     <em:translator>strel (es-ES)</em:translator>
     <em:translator>yfdyh000 (zh-CN); mailto:yfdyh000@gmail.com</em:translator>
 
-    <em:updateURL>http://github.com/downloads/erikvold/scriptish/update.rdf</em:updateURL>
+    <em:updateURL>http://github.com/downloads/scriptish/scriptish/update.rdf</em:updateURL>
     <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjEA/hqcsMgPctoWvqJFfjtNcQbfBi1uP3zoWR3PPMRSXnpBJv/5Kb5lJD9HJ+963CFQ3oFvkgO9+oEWisiKBjxhx94Bynl0Ym2sZ1DdEzTsH9kV4HGFLjeYTix5WkQqdoswyM32ebtDSYrFbSqxpBrgHwVLELfFYM1qZsnWpJKwIDAQAB</em:updateKey>
 
     <!-- Firefox -->

From d782d2d205fec9cf21e622765f1102df29611bcf Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 4 Aug 2011 22:36:13 -0700
Subject: [PATCH 491/829] Closes #443 Removing qunit tests from amo builds

---
 build.sh                               | 6 +++++-
 extension/content/js/aboutScriptish.js | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 34e3a43a..76bdce0d 100755
--- a/build.sh
+++ b/build.sh
@@ -38,10 +38,14 @@ fi
  mv install.rdf.$$ install.rdf)
 
 if [ "test" != "$1" ]; then
-  echo "Cleaning up unwanted files ..."
   find . -depth -name '*~' -exec rm -rf "{}" \;
   find . -depth -name '#*' -exec rm -rf "{}" \;
   find . -depth -name '.DS_Store' -exec rm "{}" \;
+
+  if [ "amo" = "$1" ]; then
+    rm -rf content/tests
+    rm -rf content/js/third-party/qunit
+  fi
 fi
 
 echo "Creating $XPI ..."
diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index eebfdadb..b57c6e6a 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -25,7 +25,6 @@ Cu.import("resource://scriptish/constants.js");
       $("test").style.display = "block";
       runTests();
     });
-    return;
   }
 
   // Show about:scriptish

From b99a49b214574d7b91abea587c41821de8337992 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 6 Aug 2011 21:12:12 -0700
Subject: [PATCH 492/829] removing some unused variables

---
 extension/modules/api.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 55d47070..c4e9cc2b 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -55,16 +55,12 @@ function GM_apiSafeCallback(aWindow, aScript, aThis, aCb, aArgs) {
 
 function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin) {
   var document = aSafeWin.document;
-  var _xmlhttpRequester = null;
-  var _storage = null;
-  var _resources = null;
-  var _logger = null;
   var menuCmdIDs = [];
   var Scriptish_BrowserUI = aChromeWin.Scriptish_BrowserUI;
   var windowID = aWinID;
 
   var lazyLoaders = {};
-  XPCOMUtils.defineLazyGetter(lazyLoaders, "xmlhttpRequester", function() {
+  XPCOMUtils.defineLazyGetter(lazyLoaders, "xhr", function() {
     return new GM_xmlhttpRequester(aUnsafeContentWin, aURL, aScript);
   });
   XPCOMUtils.defineLazyGetter(lazyLoaders, "storage", function() {
@@ -160,7 +156,7 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
 
   this.GM_xmlhttpRequest = function GM_xmlhttpRequest() {
     if (!GM_apiLeakCheck("GM_xmlhttpRequest")) return;
-    let xhr = lazyLoaders.xmlhttpRequester;
+    let xhr = lazyLoaders.xhr;
     return xhr.contentStartRequest.apply(xhr, arguments);
   }
 

From 96a3dc21726616db402a444d4fa80cb2a583099a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 7 Aug 2011 12:55:36 -0700
Subject: [PATCH 493/829] Closes #472 bug fix for
 ba3f1c01a9649b90e52378ea9bde1a6215b790a4

---
 extension/components/scriptish.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index c5fcba0a..1e734d9c 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -282,8 +282,6 @@ ScriptishService.prototype = {
     // don't interrupt the view-source: scheme
     if ("view-source" == cl.scheme) return CP.ACCEPT;
 
-    this.ignoreNextScript_ = false;
-
     // CP.TYPE is not binary, so do not use bitwise logic tricks
     if ((ct == CP.TYPE_DOCUMENT || ct == CP.TYPE_SUBDOCUMENT)
         && this._reg_userjs.test(cl.spec)

From d16cbe995b42b46819315b09cd2264bcc1fc41f5 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 7 Aug 2011 12:59:59 -0700
Subject: [PATCH 494/829] removing a really old dump()..

---
 extension/components/scriptish.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 1e734d9c..98eeca81 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -297,10 +297,7 @@ ScriptishService.prototype = {
 
   shouldProcess: function(ct, cl, org, ctx, mt, ext) CP.ACCEPT,
 
-  ignoreNextScript: function() {
-    dump("ignoring next script...\n");
-    this.ignoreNextScript_ = true;
-  },
+  ignoreNextScript: function() this.ignoreNextScript_ = true,
 
   _tmpDir: Services.dirsvc.get("TmpD", Ci.nsILocalFile),
   isTempScript: function(uri) {

From a8b1ee1a4e5a9d137e6a03dad33111243e15fcaf Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 8 Aug 2011 10:37:27 -0700
Subject: [PATCH 495/829] <em:version>0.1.4</em:version>

---
 extension/install.rdf |  2 +-
 update.rdf            | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 9778496c..757bb065 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -8,7 +8,7 @@
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
-    <em:version>0.1.4a2pre</em:version>
+    <em:version>0.1.4</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
diff --git a/update.rdf b/update.rdf
index ea11423b..585eb82e 100644
--- a/update.rdf
+++ b/update.rdf
@@ -6,14 +6,14 @@
       <RDF:Seq>
         <RDF:li>
           <RDF:Description>
-            <em:version>0.1.4a1</em:version>
+            <em:version>0.1.4</em:version>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>4.0</em:minVersion>
                 <em:maxVersion>8.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.4a1.xpi</em:updateLink>
-                <em:updateHash>sha1:d36eafaeaac0a08ffeac68e67a4348aa6cddc115</em:updateHash>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.4.xpi</em:updateLink>
+                <em:updateHash>sha1:9ce9888d2d61e7179d9c2ef28bbf0c39af542f80</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
             <em:targetApplication>
@@ -21,8 +21,8 @@
                 <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
                 <em:minVersion>2.1</em:minVersion>
                 <em:maxVersion>2.3.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.4a1.xpi</em:updateLink>
-                <em:updateHash>sha1:d36eafaeaac0a08ffeac68e67a4348aa6cddc115</em:updateHash>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.4.xpi</em:updateLink>
+                <em:updateHash>sha1:9ce9888d2d61e7179d9c2ef28bbf0c39af542f80</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
           </RDF:Description>
@@ -30,6 +30,6 @@
       </RDF:Seq>
     </em:updates>
 
-    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAA/qE0SLB4yRVQ/z69KsDvdJN+qka9UIkuzOWooUQb953lVEOwb0G2beubxUOuTvn8t3uMoHCS7eKmbRgD10wFCSHDl2NDK9Zw/Vja/R12BDeVzufTDx974pTSuO4wkWDtOAnA/KbGvqeJQW4OWyC0qnSTnuIhccny4f1BZLLiyU</em:signature>
+    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAHCyTQGatSyu4NSPEHRVwxspBgKiWANjfX0DeH/XdeTkLDSYMFsCC5X3GS70KechHXo9BQpT+w4kyC9NEHM3I0sXXm30RP8YvNrUVPK8gIsZV9UVe2itCyx0YVD6oCrWsmhta03dnEv0mwYtUGJ+RHgVVydGAHldXtHQZOITsuf2</em:signature>
   </RDF:Description>
 </RDF:RDF>

From 37933b4f65bc4d98fc8f8a3d81a075c262b92d0b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 8 Aug 2011 10:46:40 -0700
Subject: [PATCH 496/829] <em:version>0.1.5a1pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 757bb065..8b4415e9 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -8,7 +8,7 @@
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
-    <em:version>0.1.4</em:version>
+    <em:version>0.1.5a1pre</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>

From e571172500858d3ce267b80fa9910a644af8d24f Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 12 Aug 2011 09:47:13 -0500
Subject: [PATCH 497/829] Minor update to ja-JP by k2jp (BabelZilla).

---
 extension/locale/ja-JP/description.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/locale/ja-JP/description.properties b/extension/locale/ja-JP/description.properties
index ac3d5c7e..ff603e0d 100644
--- a/extension/locale/ja-JP/description.properties
+++ b/extension/locale/ja-JP/description.properties
@@ -9,5 +9,5 @@ amo.description.line8=テスト：開発者は Scriptish が正しく機能し
 amo.developerComments.line1=Scriptish は Greasemonkey と同じことができます。追加機能については…：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
 amo.developerComments.line2=バグや新機能のリクエストは…：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=他の質問はメーリングリストまで…：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
-amo.summary=インターネットで最も優れたユーザースクリプトエンジン。
+amo.summary=インターネット上で最も優れたユーザースクリプトエンジン。
 extensions.scriptish@erikvold.com.description=Firefox用のユーザースクリプト拡張

From 3e6c5ca95c1e5680193131aab802c277c3282573 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 12 Aug 2011 10:12:23 -0500
Subject: [PATCH 498/829] adding zh-TW to chrome.manifest

---
 extension/chrome.manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 12355516..9442d1b5 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -31,3 +31,4 @@ locale     scriptish  pt-BR  locale/pt-BR/
 locale     scriptish  ru-RU  locale/ru-RU/
 locale     scriptish  sv-SE  locale/sv-SE/
 locale     scriptish  zh-CN  locale/zh-CN/
+locale     scriptish  zh-TW  locale/zh-TW/

From 9941d4006191f84a4fa10d1ffe642b3dba43a0e3 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 15 Aug 2011 12:12:59 -0500
Subject: [PATCH 499/829] Limit long file names to a reasonable length.

---
 extension/modules/script/script.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index b4fe67bd..0ded2c7e 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -22,6 +22,7 @@ lazyUtil(this, "getContents");
 lazyUtil(this, "memoize");
 lazyUtil(this, "stringBundle");
 
+const MAX_NAME_LENGTH = 60;
 const metaRegExp = /\/\/[ \t]*(?:==\/?UserScript==|\@\S+(?:[ \t]+(?:[^\r\f\n]+))?)/g;
 const nonIdChars = /[^\w@\.\-_]+/g; // any char matched by this is not valid
 const JSVersions = ['1.6', '1.7', '1.8', '1.8.1'];
@@ -594,6 +595,22 @@ Script.prototype = {
     name = name.replace(/[^-_A-Z0-9@]+/gi, "");
     ext = ext.replace(/\s+/g, "_").replace(/[^-_A-Z0-9]+/gi, "");
 
+    // Limit long names to a reasonable length
+    if (name.length > MAX_NAME_LENGTH) {
+      // Try to preserve the namespace
+      var atIndex = name.lastIndexOf("@");
+      var beforeAt = name;
+      var tail = "";
+
+      // 37 == "@".length + approximate_USO_namespace.length
+      if (atIndex >= 0) {
+        beforeAt = name.substring(0, atIndex - 1);
+        tail = name.substring(atIndex).substr(0, 37);
+      }
+
+      name = beforeAt.substr(0, MAX_NAME_LENGTH - tail.length) + tail;
+    }
+
     // If no Latin characters found - use default
     if (!name) name = "user_script";
     if (ext) name += "." + ext;

From 47dd96ed5fcb7a3ca7c6f19cec2fdcff4752d6a5 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 15 Aug 2011 12:52:38 -0500
Subject: [PATCH 500/829] Closes #473  Adding 'config.prettyPrint'

---
 extension/defaults/preferences/scriptish.js |  1 +
 extension/modules/config/config.js          | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index ed049af4..74c7781f 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -4,6 +4,7 @@ pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
 pref("extensions.scriptish.blocklist.url", "https://github.com/scriptish/scriptish/raw/master/blocklist.json");
 pref("extensions.scriptish.cache.enabled", true);
+pref("extensions.scriptish.config.prettyPrint", false);
 pref("extensions.scriptish.enabled", true);
 pref("extensions.scriptish.enabledSchemes.about", false);
 pref("extensions.scriptish.enabledSchemes.chrome", false);
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index ee97a46f..117fc0d1 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -30,6 +30,8 @@ function Config(aBaseDir) {
   this._scripts = [];
   this._scriptFoldername = aBaseDir;
 
+  this._prettyPrint = Scriptish_prefRoot.getValue("config.prettyPrint");
+
   this._useBlocklist = Scriptish_prefRoot.getValue("blocklist.enabled");
   this._blocklistURL = Scriptish_prefRoot.getValue("blocklist.url");
   this._blocklist = {};
@@ -291,6 +293,12 @@ Config.prototype = {
       });
     });
 
+    // Listen for the blocklist pref being modified
+    Scriptish_prefRoot.watch("config.prettyPrint", function() {
+      self._prettyPrint = Scriptish_prefRoot.getValue("config.prettyPrint");
+      self._save();
+    });
+
     // Listen for the blocklist pref being modified
     Scriptish_prefRoot.watch("blocklist.enabled", function() {
       self._useBlocklist = Scriptish_prefRoot.getValue("blocklist.enabled");
@@ -341,7 +349,7 @@ Config.prototype = {
 
     let converter = Instances.suc;
     converter.charset = "UTF-8";
-    let json = JSON.stringify(this.toJSON());
+    let json = JSON.stringify(this.toJSON(), null, this._prettyPrint ? "  " : null);
     let writeStream = Scriptish_getWriteStream(this._configFile, {defer:true, safe:true});
     NetUtil.asyncCopy(
       converter.convertToInputStream(json), // source must be buffered!

From fc38c806db219b6c7a7e7721c4145e70eb81abae Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 15 Aug 2011 12:56:15 -0500
Subject: [PATCH 501/829] 'config.prettyPrint' --> 'config.prettyPrint.enabled'

---
 extension/defaults/preferences/scriptish.js | 2 +-
 extension/modules/config/config.js          | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 74c7781f..551e0199 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -4,7 +4,7 @@ pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
 pref("extensions.scriptish.blocklist.url", "https://github.com/scriptish/scriptish/raw/master/blocklist.json");
 pref("extensions.scriptish.cache.enabled", true);
-pref("extensions.scriptish.config.prettyPrint", false);
+pref("extensions.scriptish.config.prettyPrint.enabled", false);
 pref("extensions.scriptish.enabled", true);
 pref("extensions.scriptish.enabledSchemes.about", false);
 pref("extensions.scriptish.enabledSchemes.chrome", false);
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 117fc0d1..2a2615a9 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -30,7 +30,7 @@ function Config(aBaseDir) {
   this._scripts = [];
   this._scriptFoldername = aBaseDir;
 
-  this._prettyPrint = Scriptish_prefRoot.getValue("config.prettyPrint");
+  this._prettyPrint = Scriptish_prefRoot.getValue("config.prettyPrint.enabled");
 
   this._useBlocklist = Scriptish_prefRoot.getValue("blocklist.enabled");
   this._blocklistURL = Scriptish_prefRoot.getValue("blocklist.url");
@@ -293,13 +293,11 @@ Config.prototype = {
       });
     });
 
-    // Listen for the blocklist pref being modified
-    Scriptish_prefRoot.watch("config.prettyPrint", function() {
-      self._prettyPrint = Scriptish_prefRoot.getValue("config.prettyPrint");
+    Scriptish_prefRoot.watch("config.prettyPrint.enabled", function() {
+      self._prettyPrint = Scriptish_prefRoot.getValue("config.prettyPrint.enabled");
       self._save();
     });
 
-    // Listen for the blocklist pref being modified
     Scriptish_prefRoot.watch("blocklist.enabled", function() {
       self._useBlocklist = Scriptish_prefRoot.getValue("blocklist.enabled");
       if (self._useBlocklist) {

From 0c691afa34913a02aeffe8cbe6c980673c4b63c9 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 15 Aug 2011 13:22:24 -0500
Subject: [PATCH 502/829] Minor update to ja-JP by k2jp (BabelZilla).

---
 extension/locale/ja-JP/scriptish.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index f8a72dde..9dd7b721 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -78,9 +78,9 @@ newscript.namespace=名前空間
 newscript.noID=スクリプトに正しい ID を指定してください
 newscript.noName=スクリプトに名前をつけてください
 newscript.runat=スクリプト実行タイミング
-newscript.runat.documentend=Document 読み込み完了時
-newscript.runat.documentidle=Document 初回アイドル時
-newscript.runat.documentstart=Document 読み込み開始時
+newscript.runat.documentend=Document の読み込み完了時
+newscript.runat.documentidle=Document の初回アイドル時
+newscript.runat.documentstart=Document の読み込み開始時
 newscript.runat.windowload=全メディアを含む Window が完全に読み込まれた時
 newscript.version=バージョン
 nothing.timedOut=なし（タイムアウト）

From a41f1f5e70e75dfb604f2e21865cc7900baa3da4 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 15 Aug 2011 12:39:13 -0700
Subject: [PATCH 503/829] adding global message manager service to Services
 constant

---
 extension/components/scriptish.js | 4 +++-
 extension/modules/constants.js    | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 98eeca81..2f8c7a7d 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -29,6 +29,7 @@ const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "comp
 // .user, like gmScript.user-12.js
 const RE_USERSCRIPT = /\.user(?:-\d+)?\.js$/;
 const RE_CONTENTTYPE = /text\/html/i;
+const e10s = !!Services.mm;
 
 function isScriptRunnable(script, url, topWin) {
   return !(!topWin && script.noframes)
@@ -49,7 +50,8 @@ function ScriptishService() {
     delete this.updateChk;
   }
 
-  Services.obs.addObserver(this, "chrome-document-global-created", false);
+  if (!e10s)
+    Services.obs.addObserver(this, "chrome-document-global-created", false);
   Services.obs.addObserver(this, "content-document-global-created", false);
   Services.obs.addObserver(this, "inner-window-destroyed", false);
   Services.obs.addObserver(this, "install-userscript", false);
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index e2ea15f0..8866a005 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -81,6 +81,12 @@ if (Cc["@mozilla.org/privatebrowsing;1"]) {
   Services.pbs = {privateBrowsingEnabled: false};
 }
 
+if (Cc["@mozilla.org/globalmessagemanager;1"]) {
+  XPCOMUtils.defineLazyServiceGetter(
+      Services, "mm", "@mozilla.org/globalmessagemanager;1",
+      "nsIChromeFrameMessageManager");
+}
+
 XPCOMUtils.defineLazyServiceGetter(
     Services, "sis", "@mozilla.org/scriptableinputstream;1",
     "nsIScriptableInputStream");

From 3a3810a012f56d0db07595f4b085fb545fb9f7c9 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 17 Aug 2011 12:10:42 -0700
Subject: [PATCH 504/829] making e10s boolean a constant

---
 extension/components/scriptish.js | 1 -
 extension/modules/constants.js    | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 2f8c7a7d..357f910d 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -29,7 +29,6 @@ const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "comp
 // .user, like gmScript.user-12.js
 const RE_USERSCRIPT = /\.user(?:-\d+)?\.js$/;
 const RE_CONTENTTYPE = /text\/html/i;
-const e10s = !!Services.mm;
 
 function isScriptRunnable(script, url, topWin) {
   return !(!topWin && script.noframes)
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 8866a005..282f93e5 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -1,8 +1,9 @@
 var EXPORTED_SYMBOLS = [
     "Cc", "Ci", "Cr", "AddonManager", "AddonManagerPrivate", "NetUtil", "XPCOMUtils",
-    "Services", "Instances", "lazyImport", "lazyUtil", "timeout"];
+    "Services", "Instances", "lazyImport", "lazyUtil", "timeout", "e10s"];
 
 const {classes: Cc, interfaces: Ci, results: Cr} = Components;
+const e10s = !!Cc["@mozilla.org/globalmessagemanager;1"];
 const global = this;
 var Services = {};
 (function(inc, tools){
@@ -81,7 +82,7 @@ if (Cc["@mozilla.org/privatebrowsing;1"]) {
   Services.pbs = {privateBrowsingEnabled: false};
 }
 
-if (Cc["@mozilla.org/globalmessagemanager;1"]) {
+if (e10s) {
   XPCOMUtils.defineLazyServiceGetter(
       Services, "mm", "@mozilla.org/globalmessagemanager;1",
       "nsIChromeFrameMessageManager");

From 40456fc2310aa879bfe663afa95f1194d96596a4 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 17 Aug 2011 19:55:49 -0700
Subject: [PATCH 505/829] creating config instance in a separate module now so
 that this code can be ignored by e10s content processes

---
 extension/modules/config.js    | 11 +++++++++++
 extension/modules/scriptish.js | 21 +++------------------
 2 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 extension/modules/config.js

diff --git a/extension/modules/config.js b/extension/modules/config.js
new file mode 100644
index 00000000..d3ba35f8
--- /dev/null
+++ b/extension/modules/config.js
@@ -0,0 +1,11 @@
+var EXPORTED_SYMBOLS = ["Scriptish_config"];
+
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+lazyImport(this, "resource://scriptish/config/config.js", ["Config"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
+
+const Scriptish_config = new Config("scriptish_scripts");
+Scriptish_config.load(function() {
+  Scriptish_log("Scriptish config loaded"); // TODO: force & l10n
+});
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 117b1827..61e4da30 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -3,6 +3,7 @@ const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
+lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 
 function setStatus() (enabled = Scriptish_prefRoot.getValue("enabled", true));
 function notifyStatusChg(aVal) (
@@ -16,9 +17,6 @@ Scriptish_prefRoot.watch("enabled", function() {
 
 var global = this;
 
-// don't delay calling aCallback; keep script injection time consistent post load
-function getConfig(aCallback) aCallback(global.config);
-
 const Scriptish = {
   updateSecurely: Scriptish_prefRoot.getBoolValue("update.requireSecured"),
   notify: function(aSubject, aTopic, aData) {
@@ -35,21 +33,8 @@ const Scriptish = {
     Services.obs.notifyObservers(null, aTopic, JSON.stringify(aData));
   },
   getConfig: function(aCallback) {
-    if (!global.configQueue) {
-      global.configQueue = [aCallback];
-      var tools = {};
-      Cu.import("resource://scriptish/config/config.js", tools);
-      let cf = new tools.Config("scriptish_scripts");
-      cf.load(function() {
-        Scriptish_log("Scriptish config loaded"); // TODO: force & l10n
-        global.config = cf;
-        Scriptish.getConfig = getConfig;
-        global.configQueue.forEach(function(f) f(cf));
-        delete global["configQueue"];
-      });
-    } else {
-      global.configQueue.push(aCallback);
-    }
+    aCallback(Scriptish_config);
+    return Scriptish_config;
   },
   get enabled() enabled,
   set enabled(aVal) {

From 72f12db3965bc26c69efa008a37f4c0373dfb37e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 17 Aug 2011 20:00:28 -0700
Subject: [PATCH 506/829] using Scriptish_config in components/scriptish.js

---
 extension/components/scriptish.js | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 357f910d..411234dd 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -11,6 +11,7 @@ Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
 lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_sandboxScripts"]);
 lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
@@ -106,7 +107,7 @@ ScriptishService.prototype = {
     delete windows[aWinID];
   },
 
-  docReady: function(safeWin, chromeWin) Scriptish.getConfig((function(config) {
+  docReady: function(safeWin, chromeWin) {
     if (!Scriptish.enabled || !chromeWin) return;
 
     let gmBrowserUI = chromeWin.Scriptish_BrowserUI;
@@ -145,7 +146,7 @@ ScriptishService.prototype = {
 
     // check if there are any modified scripts
     if (Scriptish_prefRoot.getValue("enableScriptRefreshing")) {
-       config.updateModifiedScripts(function(script) {
+       Scriptish_config.updateModifiedScripts(function(script) {
         if (shouldNotRun()
             || !isScriptRunnable(script, href, safeWin === safeWin.top))
           return;
@@ -189,7 +190,7 @@ ScriptishService.prototype = {
     }
 
     // if the url is a excluded url then stop
-    if (config.isURLExcluded(href)) return;
+    if (Scriptish_config.isURLExcluded(href)) return;
 
     // find matching scripts
     this.initScripts(href, safeWin, function(scripts) {
@@ -226,7 +227,7 @@ ScriptishService.prototype = {
         self.docUnload(currentInnerWindowID, gmBrowserUI);
       });
     });
-  }).bind(this)),
+  },
 
   docUnload: function(aWinID, aGMBrowserUI) {
     let menuCmders = aGMBrowserUI.menuCommanders;
@@ -317,15 +318,13 @@ ScriptishService.prototype = {
     };
 
     let isTopWin = wrappedContentWin === wrappedContentWin.top;
-    Scriptish.getConfig(function(config) {
-      config.getMatchingScripts(function(script) {
-        let chk = isScriptRunnable(script, url, isTopWin);
-        if (chk) scripts[script.runAt].push(script);
-        return chk;
-      }, [url]);
-
-      aCallback(scripts);
-    });
+    Scriptish_config.getMatchingScripts(function(script) {
+      let chk = isScriptRunnable(script, url, isTopWin);
+      if (chk) scripts[script.runAt].push(script);
+      return chk;
+    }, [url]);
+
+    aCallback(scripts);
   },
 
   injectScripts: function(scripts, url, winID, wrappedContentWin, chromeWin) {

From 2d662684160c6fe3d856610c03c650a7bae95cbb Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 17 Aug 2011 20:40:41 -0700
Subject: [PATCH 507/829] initScripts method no longer takes a window as a arg

---
 extension/components/scriptish.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 411234dd..4e5715e0 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -193,7 +193,7 @@ ScriptishService.prototype = {
     if (Scriptish_config.isURLExcluded(href)) return;
 
     // find matching scripts
-    this.initScripts(href, safeWin, function(scripts) {
+    this.initScripts(href, (safeWin === safeWin.top), function(scripts) {
       if (scripts["document-end"].length || scripts["document-idle"].length) {
         safeWin.addEventListener("DOMContentLoaded", function() {
           if (shouldNotRun()) return;
@@ -309,7 +309,7 @@ ScriptishService.prototype = {
     return file.parent.equals(this._tmpDir) && file.leafName != "newscript.user.js";
   },
 
-  initScripts: function(url, wrappedContentWin, aCallback) {
+  initScripts: function(url, isTopWin, aCallback) {
     let scripts = {
       "document-start": [],
       "document-end": [],
@@ -317,7 +317,6 @@ ScriptishService.prototype = {
       "window-load": []
     };
 
-    let isTopWin = wrappedContentWin === wrappedContentWin.top;
     Scriptish_config.getMatchingScripts(function(script) {
       let chk = isScriptRunnable(script, url, isTopWin);
       if (chk) scripts[script.runAt].push(script);

From cd915b93fac86d6bb18910dde7138f107aaa036f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 17 Aug 2011 21:00:51 -0700
Subject: [PATCH 508/829] moving isScriptRunnable method in to a separate
 module, and moving initScripts method to Config class

---
 extension/components/scriptish.js             | 31 +++----------------
 extension/modules/config/config.js            | 18 +++++++++++
 .../utils/Scriptish_isScriptRunnable.js       |  9 ++++++
 3 files changed, 31 insertions(+), 27 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_isScriptRunnable.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 4e5715e0..de76f0aa 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -20,6 +20,7 @@ lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
 lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_installUri.js", ["Scriptish_installUri"]);
 
+lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "stringBundle");
 
@@ -31,14 +32,6 @@ const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "comp
 const RE_USERSCRIPT = /\.user(?:-\d+)?\.js$/;
 const RE_CONTENTTYPE = /text\/html/i;
 
-function isScriptRunnable(script, url, topWin) {
-  return !(!topWin && script.noframes)
-      && !script.delayInjection
-      && script.enabled
-      && !script.needsUninstall
-      && script.matchesURL(url);
-}
-
 let windows = {};
 
 function ScriptishService() {
@@ -139,6 +132,7 @@ ScriptishService.prototype = {
     let unsafeWin = safeWin.wrappedJSObject;
     let self = this;
     let winClosed = false;
+    let isTop = (safeWin === safeWin.top);
 
     // rechecks values that can change at any moment
     function shouldNotRun() (
@@ -148,7 +142,7 @@ ScriptishService.prototype = {
     if (Scriptish_prefRoot.getValue("enableScriptRefreshing")) {
        Scriptish_config.updateModifiedScripts(function(script) {
         if (shouldNotRun()
-            || !isScriptRunnable(script, href, safeWin === safeWin.top))
+            || !Scriptish_isScriptRunnable(script, href, isTop))
           return;
 
         let rdyStateIdx = docRdyStates.indexOf(safeWin.document.readyState);
@@ -193,7 +187,7 @@ ScriptishService.prototype = {
     if (Scriptish_config.isURLExcluded(href)) return;
 
     // find matching scripts
-    this.initScripts(href, (safeWin === safeWin.top), function(scripts) {
+    Scriptish_config.initScripts(href, isTop, function(scripts) {
       if (scripts["document-end"].length || scripts["document-idle"].length) {
         safeWin.addEventListener("DOMContentLoaded", function() {
           if (shouldNotRun()) return;
@@ -309,23 +303,6 @@ ScriptishService.prototype = {
     return file.parent.equals(this._tmpDir) && file.leafName != "newscript.user.js";
   },
 
-  initScripts: function(url, isTopWin, aCallback) {
-    let scripts = {
-      "document-start": [],
-      "document-end": [],
-      "document-idle": [],
-      "window-load": []
-    };
-
-    Scriptish_config.getMatchingScripts(function(script) {
-      let chk = isScriptRunnable(script, url, isTopWin);
-      if (chk) scripts[script.runAt].push(script);
-      return chk;
-    }, [url]);
-
-    aCallback(scripts);
-  },
-
   injectScripts: function(scripts, url, winID, wrappedContentWin, chromeWin) {
     if (0 >= scripts.length) return;
     let self = this;
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 2a2615a9..8e5ecc21 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -15,6 +15,7 @@ lazyImport(this, "resource://scriptish/script/script.js", ["Script"]);
 lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
 
 lazyUtil(this, "cryptoHash");
+lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "getContents");
 lazyUtil(this, "getProfileFile");
 lazyUtil(this, "getWriteStream");
@@ -453,3 +454,20 @@ Config.prototype = {
   },
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver])
 }
+
+Config.prototype.initScripts = function(url, isTopWin, aCallback) {
+  let scripts = {
+    "document-start": [],
+    "document-end": [],
+    "document-idle": [],
+    "window-load": []
+  };
+
+  this.getMatchingScripts(function(script) {
+    let chk = Scriptish_isScriptRunnable(script, url, isTopWin);
+    if (chk) scripts[script.runAt].push(script);
+    return chk;
+  }, [url]);
+
+  aCallback(scripts);
+};
diff --git a/extension/modules/utils/Scriptish_isScriptRunnable.js b/extension/modules/utils/Scriptish_isScriptRunnable.js
new file mode 100644
index 00000000..1eedecb2
--- /dev/null
+++ b/extension/modules/utils/Scriptish_isScriptRunnable.js
@@ -0,0 +1,9 @@
+var EXPORTED_SYMBOLS = ["Scriptish_isScriptRunnable"];
+
+function Scriptish_isScriptRunnable(script, url, topWin) {
+  return !(!topWin && script.noframes)
+      && !script.delayInjection
+      && script.enabled
+      && !script.needsUninstall
+      && script.matchesURL(url);
+}

From a733c8df4196b3ad54af4837c5439fa2d09eb7b8 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 08:46:44 -0500
Subject: [PATCH 509/829] using Scriptish_config in content/js/browser.js

---
 extension/content/js/browser.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 124d5ae7..5c9c0e41 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -7,6 +7,7 @@ var Scriptish_BrowserUI = {
 inc("resource://scriptish/constants.js", tools);
 const {lazyImport, lazyUtil} = tools;
 
+lazyImport(window, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(window, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(window, "resource://scriptish/content/browser.js", ["Scriptish_BrowserUIM"]);
 lazyImport(window, "resource://scriptish/menucommander.js", ["Scriptish_MenuCommander"]);
@@ -183,12 +184,9 @@ Scriptish_BrowserUI.showInstallBanner = function(browser) {
   var self = this;
   var notificationBox = gBrowser.getNotificationBox(browser);
   var greeting = Scriptish_stringBundle("greeting.msg");
-  var btnLabel;
-  Scriptish.getConfig(function(config) {
-    btnLabel = Scriptish_stringBundle(
-        (config.installIsUpdate(self.scriptDownloader_.script) ? "re" : "")
-        + "install");
-  });
+  var btnLabel = Scriptish_stringBundle(
+      (Scriptish_config.installIsUpdate(self.scriptDownloader_.script) ? "re" : "")
+      + "install");
 
   // Remove existing notifications. Notifications get removed
   // automatically onclick and on page navigation, but we need to remove
@@ -328,17 +326,17 @@ function Scriptish_popupClicked(aEvt) {
 /**
  * Handles a Scriptish menu popup event
  */
-function Scriptish_setupPopup() Scriptish.getConfig(function(config) {
+function Scriptish_setupPopup() {
   var $ = function(aID) document.getElementById(aID);
   var popup = $("scriptish-tb-popup");
   if (!popup) return;
   Scriptish_BrowserUI.reattachMenuCmds();
 
   function okURL(url) (
-      (Scriptish.isGreasemonkeyable(url) && !config.isURLExcluded(url)));
+      (Scriptish.isGreasemonkeyable(url) && !Scriptish_config.isURLExcluded(url)));
 
   function scriptsMatching(urls) {
-    return config.getMatchingScripts(function testMatchURLs(script) {
+    return Scriptish_config.getMatchingScripts(function testMatchURLs(script) {
       return urls.some(function(url) okURL(url) && script.matchesURL(url));
     }).sort(function(a,b) {
       a = a.name.toLocaleLowerCase(), b = b.name.toLocaleLowerCase();
@@ -407,7 +405,7 @@ function Scriptish_setupPopup() Scriptish.getConfig(function(config) {
 
     // determine the correct label
     let label;
-    if (config.isURLExcluded(url))
+    if (Scriptish_config.isURLExcluded(url))
       label = Scriptish_stringBundle("statusbar.noScripts.excluded");
     else if (!Scriptish.isGreasemonkeyable(url))
       label = Scriptish_stringBundle("statusbar.noScripts.scheme");
@@ -415,4 +413,4 @@ function Scriptish_setupPopup() Scriptish.getConfig(function(config) {
       label = Scriptish_stringBundle("statusbar.noScripts.notfound");
     menuitem.setAttribute("label", label);
   }
-});
+}

From e5c0ea6ae1704d44f4e54034b673ca132591dd3a Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 08:49:01 -0500
Subject: [PATCH 510/829] using Scriptish_config in content/js/install.js

---
 extension/content/js/install.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extension/content/js/install.js b/extension/content/js/install.js
index b37cd73f..a68c2e38 100644
--- a/extension/content/js/install.js
+++ b/extension/content/js/install.js
@@ -5,6 +5,7 @@ const valueSplitter = /(\S+)\s+([^\r\f\n]+)/;
 Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://scriptish/logging.js");
 
+lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Scriptish_localizeOnLoad"]);
 lazyUtil(this, "stringBundle");
@@ -57,11 +58,10 @@ on("load", function() {
 
   // setup buttons
   let dialog = document.documentElement;
-  Scriptish.getConfig(function(config) {
-    dialog.getButton("accept").setAttribute("label",
-        Scriptish_stringBundle(
-        (config.installIsUpdate(scriptDownloader.script) ? "re" : "") + "install"));
-  });
+  dialog.getButton("accept").setAttribute("label",
+      Scriptish_stringBundle(
+      (Scriptish_config.installIsUpdate(scriptDownloader.script) ? "re" : "")
+      + "install"));
   dialog.getButton("cancel").focus();
 
   // setup script info

From 1c93656613f52c09aee997f11ab0d5a977b150ef Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 09:03:49 -0500
Subject: [PATCH 511/829] lazy-loading in content/js/newscript.js

---
 extension/content/js/newscript.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index e6a704e7..bd45d0c6 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -1,9 +1,14 @@
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/prefmanager.js");
-Components.utils.import("resource://scriptish/scriptish.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_createUserScriptSource.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_localizeDOM.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Scriptish_localizeOnLoad"]);
+
+lazyUtil(this, "createUserScriptSource");
+lazyUtil(this, "getTempFile");
+lazyUtil(this, "getWriteStream");
+lazyUtil(this, "openInEditor");
+lazyUtil(this, "stringBundle");
 
 var $ = function(aID) document.getElementById(aID);
 var $$ = function(q) document.querySelector(q);
@@ -76,17 +81,12 @@ function doInstall() {
     return false;
   }
 
-  var tools = {};
-  Components.utils.import("resource://scriptish/utils/Scriptish_openInEditor.js", tools);
-  Components.utils.import("resource://scriptish/utils/Scriptish_getTempFile.js", tools);
-  Components.utils.import("resource://scriptish/utils/Scriptish_getWriteStream.js", tools);
-
   var script = createScriptSource();
   if (!script) return false;
 
   // put this created script into a file -- only way to install it
-  var tempFile = tools.Scriptish_getTempFile();
-  var foStream = tools.Scriptish_getWriteStream(tempFile);
+  var tempFile = Scriptish_getTempFile();
+  var foStream = Scriptish_getWriteStream(tempFile);
   foStream.write(script, script.length);
   foStream.close();
 
@@ -107,7 +107,7 @@ function doInstall() {
     config.install(script);
 
     // and fire up the editor!
-    tools.Scriptish_openInEditor(script, window);
+    Scriptish_openInEditor(script, window);
 
     // persist values
     Scriptish_prefRoot.setValue("newscript_namespace", script.namespace);

From f34bc3ef136f7bd554b3069e87d5905c5d9f0604 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 09:08:38 -0500
Subject: [PATCH 512/829] using Scriptish_config in content/js/newscript.js

---
 extension/content/js/newscript.js | 35 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index bd45d0c6..96f3587e 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -1,5 +1,6 @@
 Components.utils.import("resource://scriptish/constants.js");
 
+lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Scriptish_localizeOnLoad"]);
@@ -90,29 +91,27 @@ function doInstall() {
   foStream.write(script, script.length);
   foStream.close();
 
-  Scriptish.getConfig(function(config) {
-    // create a script object with parsed metadata,
-    script = config.parse(script);
+  // create a script object with parsed metadata,
+  script = Scriptish_config.parse(script);
 
-    // make sure entered details will not ruin an existing file
-    if (config.installIsUpdate(script)) {
-      var overwrite = confirm(Scriptish_stringBundle("newscript.exists"));
-      if (!overwrite) return false;
-    }
+  // make sure entered details will not ruin an existing file
+  if (Scriptish_config.installIsUpdate(script)) {
+    var overwrite = confirm(Scriptish_stringBundle("newscript.exists"));
+    if (!overwrite) return false;
+  }
 
-    // finish making the script object ready to install
-    script.setDownloadedFile(tempFile);
+  // finish making the script object ready to install
+  script.setDownloadedFile(tempFile);
 
-    // install this script
-    config.install(script);
+  // install this script
+  Scriptish_config.install(script);
 
-    // and fire up the editor!
-    Scriptish_openInEditor(script, window);
+  // and fire up the editor!
+  Scriptish_openInEditor(script, window);
 
-    // persist values
-    Scriptish_prefRoot.setValue("newscript_namespace", script.namespace);
-    Scriptish_prefRoot.setValue("newscript_author", script.author);
-  })
+  // persist values
+  Scriptish_prefRoot.setValue("newscript_namespace", script.namespace);
+  Scriptish_prefRoot.setValue("newscript_author", script.author);
 
   return true;
 }

From 12a4cd31b9203692d25d20e6cb76238941385a6d Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 09:10:38 -0500
Subject: [PATCH 513/829] removing some unused imports

---
 extension/content/js/install.js   | 2 --
 extension/content/js/newscript.js | 1 -
 2 files changed, 3 deletions(-)

diff --git a/extension/content/js/install.js b/extension/content/js/install.js
index a68c2e38..a16bb60b 100644
--- a/extension/content/js/install.js
+++ b/extension/content/js/install.js
@@ -3,10 +3,8 @@ const scriptDownloader = window.arguments[0];
 const valueSplitter = /(\S+)\s+([^\r\f\n]+)/;
 
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/logging.js");
 
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
-lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Scriptish_localizeOnLoad"]);
 lazyUtil(this, "stringBundle");
 
diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 96f3587e..a7618e3e 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -2,7 +2,6 @@ Components.utils.import("resource://scriptish/constants.js");
 
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
-lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Scriptish_localizeOnLoad"]);
 
 lazyUtil(this, "createUserScriptSource");

From 50b408d3102d783268423d66f67ea347af371679 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 09:27:15 -0500
Subject: [PATCH 514/829] using Scriptish_config and lazy-loading in
 content/js/options.js

---
 extension/content/js/options.js | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index 7670c179..27f4371a 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -1,21 +1,20 @@
 "use strict";
 
-Components.utils.import("resource://scriptish/scriptish.js");
-Components.utils.import("resource://scriptish/logging.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_localizeDOM.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+Components.utils.import("resource://scriptish/constants.js");
+
+lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Scriptish_localizeOnLoad"]);
+
+lazyUtil(this, "getEditor");
+lazyUtil(this, "stringBundle");
 
 function $(aID) document.getElementById(aID);
 
-function changeEditor() {
-  var tools = {};
-  Components.utils.import("resource://scriptish/utils/Scriptish_getEditor.js", tools);
-  tools.Scriptish_getEditor(window, true);
-}
+function changeEditor() Scriptish_getEditor(window, true);
 
 function saveExcludes() {
-  Scriptish.getConfig(function(config) (
-    config.excludes = $("excludes").value.match(/.+/g)));
+  Scriptish_config.excludes = $("excludes").value.match(/.+/g);
   Scriptish.notify(null, "scriptish-preferences-change", true);
 }
 
@@ -24,12 +23,11 @@ Scriptish_localizeOnLoad(this);
 addEventListener("load", function init() {
   removeEventListener("load", init, false);
 
-  let instantApply = $('pref-editor').instantApply;
+  let instantApply = $("pref-editor").instantApply;
 
   // init custom excludes preferences
   let excludes = $("excludes");
-  Scriptish.getConfig(function(config) (
-    excludes.value = config.excludes.join("\n")));
+  excludes.value = Scriptish_config.excludes.join("\n");
   if (instantApply) {
     excludes.addEventListener("input", saveExcludes, false);
   }

From b3272ba17fc79384001dd4e71a548ec462911773 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 09:36:47 -0500
Subject: [PATCH 515/829] using Scriptish_config and lazy-loading in
 content/js/script-options.js

---
 extension/content/js/script-options.js | 37 +++++++++++++-------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/extension/content/js/script-options.js b/extension/content/js/script-options.js
index f67f45b4..63e9e413 100644
--- a/extension/content/js/script-options.js
+++ b/extension/content/js/script-options.js
@@ -1,6 +1,9 @@
 Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/utils/Scriptish_localizeDOM.js");
+
+lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Scriptish_localizeOnLoad"]);
+
 lazyUtil(this, "stringBundle");
 
 var $ = function(aID) document.getElementById(aID);
@@ -16,28 +19,26 @@ window.addEventListener("DOMContentLoaded", function() {
   }
 
   scriptID = scriptID[1];
-  Scriptish.getConfig(function(config) {
-    script = config.getScriptById(scriptID);
+  script = Scriptish_config.getScriptById(scriptID);
 
-    let options = Scriptish_stringBundle("options");
-    let dialog = $("scriptish-script-options-dialog");
-    dialog.setAttribute("title", script.name + " - " + options);
-    dialog.setAttribute("ondialogaccept", "return doSave();");
+  let options = Scriptish_stringBundle("options");
+  let dialog = $("scriptish-script-options-dialog");
+  dialog.setAttribute("title", script.name + " - " + options);
+  dialog.setAttribute("ondialogaccept", "return doSave();");
 
-    // setup script info
-    $("scriptIcon").src = script.iconURL;
+  // setup script info
+  $("scriptIcon").src = script.iconURL;
 
-    let title = (script.name || Scriptish_stringBundle("untitledScript"));
-    if (script.version) {
-      title += " " + script.version;
-    }
-    $("scriptTitle").textContent = title;
+  let title = (script.name || Scriptish_stringBundle("untitledScript"));
+  if (script.version) {
+    title += " " + script.version;
+  }
+  $("scriptTitle").textContent = title;
 
-    $("includes").value = script.getUserIncStr();
-    $("excludes").value = script.getUserIncStr("exclude");
+  $("includes").value = script.getUserIncStr();
+  $("excludes").value = script.getUserIncStr("exclude");
 
-    $("disableScriptIncludes").checked = script.includesDisabled;
-  });
+  $("disableScriptIncludes").checked = script.includesDisabled;
 
   return true;
 }, false);

From 17481a9e39e2537593a89cbcc68df07227a30614 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 09:50:44 -0500
Subject: [PATCH 516/829] using Scriptish_config and lazy-loading in
 content/js/addonstab.js

---
 extension/content/js/addonstab.js | 41 ++++++++++++++-----------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index d1040e23..54f6c3e0 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -1,15 +1,16 @@
 (function($, tools) {
-var Cu = Components.utils;
-Cu.import("resource://scriptish/constants.js", tools);
-Cu.import("resource://scriptish/prefmanager.js");
-Cu.import("resource://scriptish/logging.js");
-Cu.import("resource://scriptish/scriptish.js");
-Cu.import("resource://scriptish/utils/Scriptish_ExtendedStringBundle.js");
-Cu.import("resource://scriptish/utils/Scriptish_installUri.js");
-Cu.import("resource://scriptish/utils/Scriptish_openInEditor.js");
-Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
-Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js");
-Cu.import("resource://scriptish/addonprovider.js");
+Components.utils.import("resource://scriptish/addonprovider.js");
+Components.utils.import("resource://scriptish/constants.js", tools);
+const {lazyImport, lazyUtil} = tools;
+
+lazyImport(window, "resource://scriptish/config.js", ["Scriptish_config"]);
+lazyImport(window, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(window, "resource://scriptish/third-party/Scriptish_openFolder.js", ["Scriptish_openFolder"]);
+
+lazyUtil(window, "ExtendedStringBundle");
+lazyUtil(window, "installUri");
+lazyUtil(window, "openInEditor");
+lazyUtil(window, "stringBundle");
 
 const RE_USERSCRIPT = /^.*\.user(?:-\d+)?\.js$/i;
 
@@ -160,23 +161,19 @@ window.addEventListener("load", function() {
       case "list":
         if (view[2] != "userscript") return reset();
         de.classList.add("scriptish");
-        Scriptish.getConfig(function(config) {
-          if (!config.scripts.length)
-            $("scriptish-list-empty").style.display = "-moz-box";
-        });
+        if (!Scriptish_config.scripts.length)
+          $("scriptish-list-empty").style.display = "-moz-box";
         break;
       case "detail":
-        Scriptish.getConfig(function(config) {
-          let script = config.getScriptById(decodeURIComponent(view[2]));
-          if (script == null || !script.contributionURL) return reset();
-          de.classList.add("scriptish");
-        });
+        let script = Scriptish_config.getScriptById(decodeURIComponent(view[2]));
+        if (script == null || !script.contributionURL) return reset();
+        de.classList.add("scriptish");
         break;
       default:
         reset();
     }
   }
-  window.addEventListener('ViewChanged', onViewChanged, false);
+  window.addEventListener("ViewChanged", onViewChanged, false);
   onViewChanged(); // initialize on load as well as when it changes later
 
   var needToRemoveObserver = true;
@@ -194,7 +191,7 @@ window.addEventListener("load", function() {
   window.addEventListener("unload", function() {
     if (needToRemoveObserver)
       Services.obs.removeObserver(installObserver, "scriptish-script-installed");
-    Scriptish.getConfig(function(config) config.uninstallScripts());
+    Scriptish_config.uninstallScripts();
   }, false);
 }, false);
 

From eea3a696522a74722f6bc84effd9f3aa3395b429 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 09:59:09 -0500
Subject: [PATCH 517/829] using Scriptish_config in modules/addonprovider.js

---
 extension/modules/addonprovider.js | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index 833c6051..91e73402 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -1,14 +1,16 @@
 var EXPORTED_SYMBOLS = [];
 Components.utils.import("resource://scriptish/constants.js");
 
+lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+
 lazyUtil(this, "popupNotification");
 lazyUtil(this, "stringBundle");
 
 const Scriptish_ScriptProvider = {
-  observe: function(aSubject, aTopic, aData) Scriptish.getConfig(function(config) {
+  observe: function(aSubject, aTopic, aData) {
     aData = JSON.parse(aData);
-    let script = config.getScriptById(aData.id);
+    let script = Scriptish_config.getScriptById(aData.id);
     switch(aTopic){
     case "scriptish-script-installed":
       AddonManagerPrivate.callInstallListeners(
@@ -79,7 +81,7 @@ const Scriptish_ScriptProvider = {
       AddonManagerPrivate.callAddonListeners("onUninstalled", script);
       break;
     }
-  }),
+  },
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver])
 };
 
@@ -95,17 +97,13 @@ if (AddonManagerPrivate.AddonType) {
 
 AddonManagerPrivate.registerProvider({
   getAddonByID: function(aId, aCallback) {
-    Scriptish.getConfig(function(config) {
-      aCallback(config.getScriptById(aId));
-    });
+    aCallback(Scriptish_config.getScriptById(aId));
   },
   getAddonsByTypes: function(aTypes, aCallback) {
     if (aTypes && aTypes.indexOf("userscript") < 0) {
       aCallback([]);
     } else {
-      Scriptish.getConfig(function(config) {
-        aCallback(config.scripts);
-      });
+      aCallback(Scriptish_config.scripts);
     }
   },
 
@@ -113,15 +111,13 @@ AddonManagerPrivate.registerProvider({
     if (aTypes && aTypes.indexOf("userscript") < 0) {
       aCallback([]);
     } else {
-      Scriptish.getConfig(function(config) {
-        let updates = [];
-        config.scripts.forEach(function(script) {
-          if (script.updateAvailable
-              && script.updateAvailable.state == AddonManager.STATE_AVAILABLE)
-            updates.push(script.updateAvailable);
-        });
-        aCallback(updates);
+      let updates = [];
+      Scriptish_config.scripts.forEach(function(script) {
+        if (script.updateAvailable
+            && script.updateAvailable.state == AddonManager.STATE_AVAILABLE)
+          updates.push(script.updateAvailable);
       });
+      aCallback(updates);
     }
   }
 }, types);

From 727040e4f7a492d5f7a0558325d0e97757095696 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 10:07:29 -0500
Subject: [PATCH 518/829] using Scriptish_config in
 modules/script/scriptdownloader.js

---
 extension/modules/script/scriptdownloader.js | 123 +++++++++----------
 1 file changed, 61 insertions(+), 62 deletions(-)

diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 1332fee3..fc46c596 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -4,6 +4,7 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/CertUtils.jsm");
 Cu.import("resource://scriptish/constants.js");
 
+lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish_logError"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
@@ -80,74 +81,72 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
   let req = this.req_;
   let self = this;
 
-  Scriptish.getConfig(function(config) {
-    try {
-      // If loading from file, status might be zero on success
-      if (req.status != 200 && req.status != 0) {
-        Scriptish_alert(Scriptish_stringBundle("error.script.loading") + ":\n" +
-        req.status + ": " + req.statusText);
-        return;
-      }
+  try {
+    // If loading from file, status might be zero on success
+    if (req.status != 200 && req.status != 0) {
+      Scriptish_alert(Scriptish_stringBundle("error.script.loading") + ":\n" +
+      req.status + ": " + req.statusText);
+      return;
+    }
 
-      if (self.secure) {
-        // make sure that the final URI is a https url
-        if ("https" != req.channel.URI.scheme)
-          return self.handleErr();
+    if (self.secure) {
+      // make sure that the final URI is a https url
+      if ("https" != req.channel.URI.scheme)
+        return self.handleErr();
 
-        // make sure that the final URI's certificate is valid
-        try {
-          checkCert(req.channel, !Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
-        }
-        catch (e) {
-          return self.handleErr();
-        }
+      // make sure that the final URI's certificate is valid
+      try {
+        checkCert(req.channel, !Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
       }
-
-      if (self.scriptInstaller) {
-        // make sure that the new version is greater than the old version
-        var remoteVersion = Script.parseVersion(req.responseText);
-        if (!remoteVersion || Services.vc.compare(self.scriptInstaller._script.version, remoteVersion) >= 0)
-          return self.handleErr();
+      catch (e) {
+        return self.handleErr();
       }
+    }
 
-      var source = req.responseText;
-      self.script = config.parse(source, self.uri_);
-
-      var file = Services.dirsvc.get("TmpD", Ci.nsILocalFile);
-      var base = self.script.name.replace(/[^A-Z0-9_]/gi, "").toLowerCase();
-      file.append(base + ".user.js");
-      file.createUnique(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0640);
-      self.tempFiles_.push(file);
-
-      var converter = Instances.suc;
-      converter.charset = "UTF-8";
-      source = converter.ConvertFromUnicode(source);
-
-      var ws = Scriptish_getWriteStream(file);
-      ws.write(source, source.length);
-      ws.close();
-
-      self.script.setDownloadedFile(file);
-
-      timeout(self.fetchDependencies.bind(self));
-
-      switch (self.type) {
-        case "install":
-          self._callback = function() {
-            self.showInstallDialog();
-            delete self._callback;
-          }
-          break;
-        case "view":
-          self.showScriptView();
-          break;
-      }
+    if (self.scriptInstaller) {
+      // make sure that the new version is greater than the old version
+      var remoteVersion = Script.parseVersion(req.responseText);
+      if (!remoteVersion || Services.vc.compare(self.scriptInstaller._script.version, remoteVersion) >= 0)
+        return self.handleErr();
+    }
+
+    var source = req.responseText;
+    self.script = Scriptish_config.parse(source, self.uri_);
+
+    var file = Services.dirsvc.get("TmpD", Ci.nsILocalFile);
+    var base = self.script.name.replace(/[^A-Z0-9_]/gi, "").toLowerCase();
+    file.append(base + ".user.js");
+    file.createUnique(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0640);
+    self.tempFiles_.push(file);
+
+    var converter = Instances.suc;
+    converter.charset = "UTF-8";
+    source = converter.ConvertFromUnicode(source);
+
+    var ws = Scriptish_getWriteStream(file);
+    ws.write(source, source.length);
+    ws.close();
+
+    self.script.setDownloadedFile(file);
 
-    } catch (e) {
-      Scriptish_alert(Scriptish_stringBundle("error.script.installing") + ": " + e);
-      throw e;
+    timeout(self.fetchDependencies.bind(self));
+
+    switch (self.type) {
+      case "install":
+        self._callback = function() {
+          self.showInstallDialog();
+          delete self._callback;
+        }
+        break;
+      case "view":
+        self.showScriptView();
+        break;
     }
-  });
+
+  } catch (e) {
+    Scriptish_alert(Scriptish_stringBundle("error.script.installing") + ": " + e);
+    throw e;
+  }
 }
 
 ScriptDownloader.prototype.fetchDependencies = function() {
@@ -338,7 +337,7 @@ ScriptDownloader.prototype.installScript = function() {
     this.scriptInstaller.changed("InstallEnded");
   } else if (this.dependenciesLoaded_) {
     var script = this.script;
-    Scriptish.getConfig(function(config) config.install(script));
+    Scriptish_config.install(script);
   } else {
     this.installOnCompletion_ = true;
   }

From 3b1e64997178b8a325b3784a34fe94f9c6d8d726 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 10:10:10 -0500
Subject: [PATCH 519/829] lazy-loading Scriptish_getTempFile in
 modules/script/scriptdownloader.js

---
 extension/modules/script/scriptdownloader.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index fc46c596..1e85abf3 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -12,6 +12,7 @@ lazyImport(this, "resource://scriptish/script/script.js", ["Script"]);
 lazyImport(this, "resource://scriptish/script/scripticon.js", ["ScriptIcon"]);
 
 lazyUtil(this, "alert");
+lazyUtil(this, "getTempFile");
 lazyUtil(this, "getWriteStream");
 lazyUtil(this, "stringBundle");
 
@@ -185,9 +186,7 @@ ScriptDownloader.prototype.downloadNextDependency = function() {
     return;
   }
 
-  var tools = {};
   var dep = this.depQueue_.pop();
-  Cu.import("resource://scriptish/utils/Scriptish_getTempFile.js", tools);
   try {
     var persist = Instances.wbp;
     persist.persistFlags =
@@ -210,7 +209,7 @@ ScriptDownloader.prototype.downloadNextDependency = function() {
         ? new BadCertHandler(!Scriptish_prefRoot.getValue("update.requireBuiltInCerts"))
         : new NotificationCallbacks();
 
-    var file = tools.Scriptish_getTempFile();
+    var file = Scriptish_getTempFile();
     this.tempFiles_.push(file);
 
     var progressListener = new PersistProgressListener(persist);

From 992813fa4bc9a985d85c92a50dbd46aeebf84567 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 10:22:35 -0500
Subject: [PATCH 520/829] removing unnecessary 'self' due to use of
 'Scriptish_config'

---
 extension/content/js/browser.js              |  3 +-
 extension/modules/script/scriptdownloader.js | 33 ++++++++++----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 5c9c0e41..cd50007f 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -181,11 +181,10 @@ Scriptish_BrowserUI.disableMenuCommand = function(commandUUID, aWinID) {
  * a user selects "show script source" in the install dialog.
  */
 Scriptish_BrowserUI.showInstallBanner = function(browser) {
-  var self = this;
   var notificationBox = gBrowser.getNotificationBox(browser);
   var greeting = Scriptish_stringBundle("greeting.msg");
   var btnLabel = Scriptish_stringBundle(
-      (Scriptish_config.installIsUpdate(self.scriptDownloader_.script) ? "re" : "")
+      (Scriptish_config.installIsUpdate(this.scriptDownloader_.script) ? "re" : "")
       + "install");
 
   // Remove existing notifications. Notifications get removed
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 1e85abf3..f2a962a0 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -80,7 +80,6 @@ ScriptDownloader.prototype.chkContentTypeB4DL = function() {
 ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
   Scriptish_log("Scriptish ScriptDownloader.handleScriptDownloadComplete");
   let req = this.req_;
-  let self = this;
 
   try {
     // If loading from file, status might be zero on success
@@ -90,35 +89,35 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
       return;
     }
 
-    if (self.secure) {
+    if (this.secure) {
       // make sure that the final URI is a https url
       if ("https" != req.channel.URI.scheme)
-        return self.handleErr();
+        return this.handleErr();
 
       // make sure that the final URI's certificate is valid
       try {
         checkCert(req.channel, !Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
       }
       catch (e) {
-        return self.handleErr();
+        return this.handleErr();
       }
     }
 
-    if (self.scriptInstaller) {
+    if (this.scriptInstaller) {
       // make sure that the new version is greater than the old version
       var remoteVersion = Script.parseVersion(req.responseText);
-      if (!remoteVersion || Services.vc.compare(self.scriptInstaller._script.version, remoteVersion) >= 0)
-        return self.handleErr();
+      if (!remoteVersion || Services.vc.compare(this.scriptInstaller._script.version, remoteVersion) >= 0)
+        return this.handleErr();
     }
 
     var source = req.responseText;
-    self.script = Scriptish_config.parse(source, self.uri_);
+    this.script = Scriptish_config.parse(source, this.uri_);
 
     var file = Services.dirsvc.get("TmpD", Ci.nsILocalFile);
-    var base = self.script.name.replace(/[^A-Z0-9_]/gi, "").toLowerCase();
+    var base = this.script.name.replace(/[^A-Z0-9_]/gi, "").toLowerCase();
     file.append(base + ".user.js");
     file.createUnique(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0640);
-    self.tempFiles_.push(file);
+    this.tempFiles_.push(file);
 
     var converter = Instances.suc;
     converter.charset = "UTF-8";
@@ -128,19 +127,19 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
     ws.write(source, source.length);
     ws.close();
 
-    self.script.setDownloadedFile(file);
+    this.script.setDownloadedFile(file);
 
-    timeout(self.fetchDependencies.bind(self));
+    timeout(this.fetchDependencies.bind(this));
 
-    switch (self.type) {
+    switch (this.type) {
       case "install":
-        self._callback = function() {
-          self.showInstallDialog();
-          delete self._callback;
+        this._callback = function() {
+          this.showInstallDialog();
+          delete this._callback;
         }
         break;
       case "view":
-        self.showScriptView();
+        this.showScriptView();
         break;
     }
 

From c9d3f3844445c2e271d3bf1fbfb7d08a58312de6 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 13:42:45 -0500
Subject: [PATCH 521/829] Ensure 'PatternCollection.addPattern' is given a
 string, and that 'PatternCollection.addPatterns' is given something.

---
 extension/modules/utils/PatternCollection.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extension/modules/utils/PatternCollection.js b/extension/modules/utils/PatternCollection.js
index bccb926a..d8dee116 100644
--- a/extension/modules/utils/PatternCollection.js
+++ b/extension/modules/utils/PatternCollection.js
@@ -26,6 +26,9 @@ function PatternCollection() {
 PatternCollection.prototype = {
   _hasTLD: false,
   addPattern: function(pattern) {
+    if (typeof(pattern) != "string") {
+      return;
+    }
     this._patterns.push(pattern);
     var r = Scriptish_convert2RegExp(pattern);
     if (r.isTLD) {
@@ -41,6 +44,9 @@ PatternCollection.prototype = {
     this._merged = this._mergedTLD = null;
   },
   addPatterns: function(patterns) {
+    if (!patterns) {
+      return;
+    }
     if (!patterns.forEach) {
       this.addPattern(patterns);
       return;

From 910cfc94abb7aeb7803ff5b8bc940608d52b2403 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 18 Aug 2011 13:43:15 -0500
Subject: [PATCH 522/829] Test adding bad things to a PatternCollection.

---
 extension/content/tests/testPatternCollection.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index f32e6db2..051a6ba9 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -9,6 +9,18 @@ test("exports", function() checkExports(
     ["PatternCollection"]
     ));
 
+test("adding bad things", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern(null);
+  equal(pc.patterns.length, 0, "adding null does nothing");
+  pc.addPattern(undefined);
+  equal(pc.patterns.length, 0, "adding undefined does nothing");
+  pc.addPatterns([null]);
+  equal(pc.patterns.length, 0, "adding [null] does nothing");
+});
+
 test("empty", function() {
   var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
 

From 9a642aef89a831f34bf4721fc1b4143e40ff3bb1 Mon Sep 17 00:00:00 2001
From: fang5566 <wlq105556@gmail.com>
Date: Fri, 19 Aug 2011 10:54:42 +0800
Subject: [PATCH 523/829] Edited extension/locale/zh-CN/scriptish.properties
 via GitHub

---
 extension/locale/zh-CN/scriptish.properties | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index c1709e60..529f07aa 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -115,9 +115,9 @@ options.logChrome=记录非关键的扩展信息到错误控制台
 options.logging=日志
 options.logToErrorConsole=GM_log 使用错误控制台
 options.notifications=通知
-options.notifications.popup.enable=
-options.notifications.sliding.enable=
-options.notifications.whenDisabled=
+options.notifications.popup.enable=弹窗显示通知
+options.notifications.sliding.enable=滑动显示通知
+options.notifications.whenDisabled=禁用时任何通知都将显示在错误控制台。
 options.pane.advanced=高级
 options.pane.excludes=全局排除
 options.pane.main=常规
@@ -125,8 +125,8 @@ options.pane.ui=用户界面
 options.requireBuiltInCerts=安全更新需要使用内置的证书
 options.requireSecured=要求用户脚本使用 HTTPS 更新
 options.title=Scriptish 选项
-options.toolbarbutton=
-options.toolbarbutton.showScripts=
+options.toolbarbutton=工具栏按钮
+options.toolbarbutton.showScripts=显示激活的脚本数
 options.translation=翻译
 options.translation.useEnglish=始终使用英语界面
 options.update.security=更新安全

From 218b5ec50ec42d374b1635c152aea423ef5bd682 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 18 Aug 2011 20:04:24 -0700
Subject: [PATCH 524/829] adding WIP manager.js, and exporting waitForFrame to
 it.

---
 extension/components/scriptish.js | 21 +---------
 extension/modules/manager.js      | 69 +++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 19 deletions(-)
 create mode 100644 extension/modules/manager.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index de76f0aa..f6615cca 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -11,6 +11,7 @@ Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/manager.js", ["Scriptish_manager"]);
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
 lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_sandboxScripts"]);
@@ -115,7 +116,7 @@ ScriptishService.prototype = {
         || "";
 
     if (!href && safeWin.frameElement) {
-      this.waitForFrame(safeWin, chromeWin);
+      Scriptish_manager.waitForFrame.call(this, safeWin, chromeWin);
       return;
     }
 
@@ -237,24 +238,6 @@ ScriptishService.prototype = {
     return;
   },
 
-  waitForFrame: function(safeWin, chromeWin) {
-    let self = this;
-    safeWin.addEventListener("DOMContentLoaded", function _frame_loader() {
-      // not perfect, but anyway
-      let href = (safeWin.location.href
-          || (safeWin.frameElement && safeWin.frameElement.src));
-
-      if (!href) return; // wait for it :p
-      safeWin.removeEventListener("DOMContentLoaded", _frame_loader, false);
-      self.docReady(safeWin, chromeWin);
-
-      // fake DOMContentLoaded to get things rolling
-      var evt = safeWin.document.createEvent("Events");
-      evt.initEvent("DOMContentLoaded", true, true);
-      safeWin.dispatchEvent(evt);
-    }, false);
-  },
-
   _test_org: {
     "chrome": true,
     "about": true
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
new file mode 100644
index 00000000..f73ea1ba
--- /dev/null
+++ b/extension/modules/manager.js
@@ -0,0 +1,69 @@
+var EXPORTED_SYMBOLS = ["Scriptish_mananger"];
+
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
+lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyUtil(this, "getWindowIDs");
+
+let windows = {};
+
+const Scriptish_mananger = {
+  setup: function(aContentScope) {
+    var observer = {
+      observe: function(aSubject, aTopic, aData) {
+        switch (aTopic) {
+        //case "chrome-document-global-created":
+        case "content-document-global-created":
+          Scriptish_mananger.docReady(aSubject);
+          break;
+        }
+      }
+    }
+
+    Services.obs.addObserver(observer, "content-document-global-created", false);
+    //Services.obs.addObserver(observer, "chrome-document-global-created", false);
+    Services.obs.addObserver(observer, "inner-window-destroyed", false);
+  },
+
+  // TODO: remove chromeWin, or use it
+  docReady: function(safeWin, chromeWin) {
+    if (!Scriptish.enabled) return;
+
+    let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
+    windows[currentInnerWindowID] = {unloaders: []};
+
+    let href = (safeWin.location.href
+        || (safeWin.frameElement && safeWin.frameElement.src))
+        || "";
+
+    if (!href && safeWin.frameElement) {
+      Scriptish_mananger.waitForFrame(safeWin, chromeWin);
+      return;
+    }
+
+    if (!Scriptish.isGreasemonkeyable(href)) return;
+
+    
+  },
+
+  waitForFrame: function(safeWin, chromeWin) {
+    let self = this;
+    safeWin.addEventListener("DOMContentLoaded", function _frame_loader() {
+      // not perfect, but anyway
+      let href = (safeWin.location.href
+          || (safeWin.frameElement && safeWin.frameElement.src));
+
+      if (!href) return; // wait for it :p
+      safeWin.removeEventListener("DOMContentLoaded", _frame_loader, false);
+      self.docReady(safeWin, chromeWin);
+
+      // fake DOMContentLoaded to get things rolling
+      var evt = safeWin.document.createEvent("Events");
+      evt.initEvent("DOMContentLoaded", true, true);
+      safeWin.dispatchEvent(evt);
+    }, false);
+  },
+};

From d348944654eea52481bdd39e2969219f5b0baea2 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 18 Aug 2011 21:58:00 -0700
Subject: [PATCH 525/829] moving a docUnload method to browser.js

---
 extension/components/scriptish.js | 16 +---------------
 extension/content/js/browser.js   | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index f6615cca..59e7e22f 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -219,25 +219,11 @@ ScriptishService.prototype = {
 
       windows[currentInnerWindowID].unloaders.push(function() {
         winClosed = true;
-        self.docUnload(currentInnerWindowID, gmBrowserUI);
+        gmBrowserUI.docUnload(currentInnerWindowID);
       });
     });
   },
 
-  docUnload: function(aWinID, aGMBrowserUI) {
-    let menuCmders = aGMBrowserUI.menuCommanders;
-    if (!menuCmders || 0 == menuCmders.length) return;
-
-    let curMenuCmder = this.currentMenuCommander;
-    for (let [i, item] in Iterator(menuCmders)) {
-      if (item.winID !== aWinID) continue;
-      if (item.commander === curMenuCmder) curMenuCmder = curMenuCmder.detach();
-      menuCmders.splice(i, 1);
-      break;
-    }
-    return;
-  },
-
   _test_org: {
     "chrome": true,
     "about": true
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index cd50007f..3c550c16 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -292,6 +292,20 @@ Scriptish_BrowserUI.getCommander = function(aWinID) {
   return commander;
 }
 
+Scriptish_BrowserUI.docUnload = function(aWinID) {
+  let menuCmders = this.menuCommanders;
+  if (!menuCmders || 0 == menuCmders.length) return;
+
+  let curMenuCmder = this.currentMenuCommander;
+  for (let [i, item] in Iterator(menuCmders)) {
+    if (item.winID !== aWinID) continue;
+    if (item.commander === curMenuCmder) curMenuCmder = curMenuCmder.detach();
+    menuCmders.splice(i, 1);
+    break;
+  }
+  return;
+};
+
 Scriptish_BrowserUI.viewContextItemClicked = function() {
   Scriptish_configDownloader.startViewScript(
       Scriptish_BrowserUI.getUserScriptLinkUnderPointer());

From 70385d9b2b937a5af8e142783896e14b93d4d7c6 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 19 Aug 2011 08:15:40 -0700
Subject: [PATCH 526/829] #480 removing Scriptish.getConfig and related test

---
 extension/content/tests/runTests.js      |  1 -
 extension/content/tests/testGetConfig.js | 22 ----------------------
 extension/modules/scriptish.js           |  4 ----
 3 files changed, 27 deletions(-)
 delete mode 100644 extension/content/tests/testGetConfig.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 68946ae2..645aeb26 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -69,7 +69,6 @@ function runTests() {
     function() include("tests/testScriptHeaderParse.js"),
     function() include("tests/testScriptParseVersion.js"),
     function() include("tests/testToolsMenuItem.js"),
-    function() include("tests/testGetConfig.js"),
     function() include("tests/testIsGMable.js"),
     function() include("tests/testMatchPattern.js"),
     function() include("tests/testPatternCollection.js"),
diff --git a/extension/content/tests/testGetConfig.js b/extension/content/tests/testGetConfig.js
deleted file mode 100644
index 2f035090..00000000
--- a/extension/content/tests/testGetConfig.js
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Components.utils.import("resource://scriptish/scriptish.js");
-Components.utils.import("resource://scriptish/config/config.js");
-
-module("Scriptish.getConfig");
-
-asyncTest("returns config", 3, function() {
-  var gotConfig = false, config1;
-
-  Scriptish.getConfig(function(config) {
-    ok(config instanceof Config, "typeof config is right");
-    gotConfig = true;
-    config1 = config;
-  });
-
-  Scriptish.getConfig(function(config) {
-    ok(config === config1, "Scriptish.getConfig returns the same config");
-  });
-
-  ok(gotConfig, "should have got config synchronously despite the asynchronously signature of Scriptish.getConfig");
-  start();
-});
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 61e4da30..952c6747 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -32,10 +32,6 @@ const Scriptish = {
     if (aData && aSubject) aData.id = aSubject.id;
     Services.obs.notifyObservers(null, aTopic, JSON.stringify(aData));
   },
-  getConfig: function(aCallback) {
-    aCallback(Scriptish_config);
-    return Scriptish_config;
-  },
   get enabled() enabled,
   set enabled(aVal) {
     ignoreEnable = true;

From 477b71dd8b7df17d2b8e64f2c092be2b2da0f38b Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Thu, 18 Aug 2011 16:03:38 -0400
Subject: [PATCH 527/829] Closes #485 Prompt for new editor if getting the
 saved one fails.

Fixed GM #1386
---
 extension/modules/utils/Scriptish_getEditor.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/extension/modules/utils/Scriptish_getEditor.js b/extension/modules/utils/Scriptish_getEditor.js
index be810b42..e9ebd93d 100644
--- a/extension/modules/utils/Scriptish_getEditor.js
+++ b/extension/modules/utils/Scriptish_getEditor.js
@@ -15,10 +15,14 @@ const Scriptish_getEditor = function(parentWindow, change) {
 
     var editor = Instances.lf;
     editor.followLinks = true;
-    editor.initWithPath(editorPath);
+    try {
+      editor.initWithPath(editorPath);
+    } catch (e) {
+      editor = null;
+    }
 
     // make sure the editor preference is still valid
-    if (editor.exists() && editor.isExecutable()) {
+    if (editor && editor.exists() && editor.isExecutable()) {
       return editor;
     } else {
       Scriptish_log("Editor preference either does not exist or is not executable");

From e39716421b88eb2add92d1cfb9d4887b0b4c3808 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 19 Aug 2011 18:51:25 -0700
Subject: [PATCH 528/829] updating License to be a little more clear where
 third-party code cand be found

---
 LICENSE.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index f56769ab..66dd06ca 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -9,10 +9,11 @@ Scriptish contains code derived from FireBug ( http://getfirebug.com/ ),
 reused under the terms of the BSD license; see LICENSE.bsd.
 
 Scriptish also contains code derived from Mozilla projects, including
-Firefox ( http://mozilla.org/ ).  This code is reused under the MPL license;
-see the LICENSE.mpl file.  All such code is located in the content/third-party/
-directory, and all such files contain the appropriate licensing disclaimers
-and notifications.
+Firefox ( http://mozilla.org/ ).  This code is reused under the MPL license.
+
+All code located in the content/third-party/, content/js/third-party/,
+modules/third-party/, and skin/third-party/ directories, contain the appropriate
+licensing disclaimers and notifications.
 
 The icon used was created by Slowpoke for Scriptish.
 

From 60cbecfc1bb618649a462ed23759d288a7b6e53d Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 19 Aug 2011 19:02:34 -0700
Subject: [PATCH 529/829] building args array before using
 Services.as.showAlertNotification so that it can be reused for a osx fallback

---
 extension/modules/utils/Scriptish_notification.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index 6e37650e..751e63d9 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -9,12 +9,17 @@ function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
 
   timeout(function() {
     if (aCallback) var callback = new Observer(aCallback);
+    var args = [
+      aIconURL || "chrome://scriptish/skin/scriptish32.png",
+      aTitle || "Scriptish",
+      aMsg+"", !!callback,
+      "",
+      callback || null
+    ];
 
     // if Growl is not installed or disabled on OSX, then this will error
     try {
-      Services.as.showAlertNotification(
-        aIconURL || "chrome://scriptish/skin/scriptish32.png",
-        aTitle || "Scriptish", aMsg+"", !!callback, "", callback || null);
+      Services.as.showAlertNotification.apply(null, args);
     } catch (e) {}
   });
 };

From 6b36649c4b6e5867961f47f088d87384a854b30a Mon Sep 17 00:00:00 2001
From: Mike Medley <medleymind@gmail.com>
Date: Fri, 12 Aug 2011 16:26:36 -0500
Subject: [PATCH 530/829] Use a chrome window to provide a better notification
 fallback on OSX when growl isn't installed.

---
 extension/modules/utils/Scriptish_notification.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index 751e63d9..105a7ad6 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -17,10 +17,15 @@ function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
       callback || null
     ];
 
-    // if Growl is not installed or disabled on OSX, then this will error
+    // if Growl is not installed or disabled on OSX, then use a fallback
     try {
       Services.as.showAlertNotification.apply(null, args);
-    } catch (e) {}
+    } catch (e) {
+      let win = Services.ww.openWindow(
+          null, 'chrome://global/content/alerts/alert.xul',
+          '_blank', 'chrome,titlebar=no,popup=yes', null);
+      win.arguments = args;
+    }
   });
 };
 

From 852f911ad09ab0d5d7970b489f70212a50f2a01b Mon Sep 17 00:00:00 2001
From: Mike Medley <medleymind@gmail.com>
Date: Tue, 16 Aug 2011 17:41:34 -0500
Subject: [PATCH 531/829] Include the CSS from the windows version of Firefox
 to dupicate the same styling of the chrome notification since this file is
 absent on OSX.

---
 extension/chrome.manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 9442d1b5..5bcf1f38 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -10,6 +10,7 @@ resource   scriptish    modules/
 skin       scriptish    classic/1.0 skin/
 style      chrome://global/content/customizeToolbar.xul chrome://scriptish/skin/browser.css
 style      chrome://global/content/customizeToolbar.xul chrome://scriptish/content/third-party/firebug/startButton.css
+style      chrome://global/content/alerts/alert.xul chrome://scriptish/skin/third-party/alert.css os=Darwin
 
 overlay    chrome://browser/content/browser.xul chrome://scriptish/content/browser.xul
 overlay    chrome://browser/content/scratchpad.xul chrome://scriptish/content/scratchpad.xul

From 704244285e6e8ebcb9efa678c21f075ddc32f1df Mon Sep 17 00:00:00 2001
From: Mike Medley <medleymind@gmail.com>
Date: Tue, 16 Aug 2011 17:52:58 -0500
Subject: [PATCH 532/829] Forgot to add the actual file.

---
 extension/skin/third-party/alert.css | 99 ++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 extension/skin/third-party/alert.css

diff --git a/extension/skin/third-party/alert.css b/extension/skin/third-party/alert.css
new file mode 100644
index 00000000..b5b1c464
--- /dev/null
+++ b/extension/skin/third-party/alert.css
@@ -0,0 +1,99 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Scott MacGregor <mscott@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* ===== alert.css =====================================================
+  == Styles specific to the alerts dialog.
+  ======================================================================= */
+
+@import url("chrome://global/skin/");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.alertBox {
+  border: 2px solid #7B969C;
+  background-color: -moz-Dialog;
+  min-height: 50px;
+}
+
+.alertBox[orient="horizontal"] > .alertImageBox {
+  -moz-margin-start: 4px;
+  -moz-margin-end: 6px;
+  min-height: 46px;
+}
+
+.alertBox[orient="vertical"] > .alertImageBox {
+  margin-top: 6px;
+  margin-bottom: 4px;
+  min-width: 46px;
+}
+
+.alertTitle {
+  font-weight: bold;
+}
+
+.alertText {
+  -moz-margin-end: 6px;
+}
+
+#alertNotification[clickable="true"] {
+  cursor: pointer;
+}
+
+label {
+  cursor: inherit;
+}
+
+.alertText[clickable="true"] {
+  color: -moz-nativehyperlinktext;
+  text-decoration: underline;
+}
+
+.alertText[clickable="true"]:hover:active {
+  color: #424F63;
+}
+
+.alertBox[orient="horizontal"] > .alertTextBox {
+  -moz-padding-end: 10px;
+  padding-top: 5px;
+}
+
+.alertBox[orient="vertical"] > .alertTextBox {
+  -moz-padding-start: 5px;
+  -moz-padding-end: 5px;
+  margin-bottom: 8px;
+  -moz-box-align: center; /* also hard-coded in alert.js, see bug 311557 */
+}

From 4ac0bb9fbda1834e217c9c98ac6e8d7af002432a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 19 Aug 2011 19:29:59 -0700
Subject: [PATCH 533/829] altering args array when using osx fallback to match
 what the xul window used expects

---
 extension/modules/utils/Scriptish_notification.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index 105a7ad6..5077980b 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -8,13 +8,14 @@ function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
     return Scriptish_log(aMsg);
 
   timeout(function() {
-    if (aCallback) var callback = new Observer(aCallback);
+    var callback = (aCallback) ? new Observer(aCallback) : null;
     var args = [
       aIconURL || "chrome://scriptish/skin/scriptish32.png",
       aTitle || "Scriptish",
-      aMsg+"", !!callback,
+      aMsg+"",
+      !!callback,
       "",
-      callback || null
+      callback
     ];
 
     // if Growl is not installed or disabled on OSX, then use a fallback
@@ -24,6 +25,8 @@ function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
       let win = Services.ww.openWindow(
           null, 'chrome://global/content/alerts/alert.xul',
           '_blank', 'chrome,titlebar=no,popup=yes', null);
+      args[6] = callback;
+      args[5] = "";
       win.arguments = args;
     }
   });

From 66d0296834d778d4942916ea1aeaae04888810be Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 19 Aug 2011 21:26:22 -0700
Subject: [PATCH 534/829] moving evalInSandbox method to it's own module

---
 extension/components/scriptish.js             | 68 ++----------------
 extension/content/js/browser.js               |  3 +-
 extension/modules/api.js                      |  4 +-
 .../modules/utils/Scriptish_evalInSandbox.js  | 72 +++++++++++++++++++
 4 files changed, 81 insertions(+), 66 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_evalInSandbox.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 59e7e22f..92e13770 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -3,7 +3,6 @@ const CONTRACTID = "@scriptish.erikvold.com/scriptish-service;1";
 const CLASSID = Components.ID("{ca39e060-88ab-11df-a4ee-0800200c9a66}");
 
 const filename = Components.stack.filename;
-const fileURLPrefix = "chrome://scriptish/content/scriptish.js -> ";
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
@@ -19,8 +18,9 @@ lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
 lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
 lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
 lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
-lazyImport(this, "resource://scriptish/utils/Scriptish_installUri.js", ["Scriptish_installUri"]);
 
+lazyUtil(this, "evalInSandbox");
+lazyUtil(this, "installUri");
 lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "stringBundle");
@@ -323,72 +323,12 @@ ScriptishService.prototype = {
       if (delay || delay === 0) {
         // don't use window's setTimeout, b/c then window could clearTimeout
         delays.push(self.timer.setTimeout(function() {
-          self.evalInSandbox(script, sandbox, wrappedContentWin);
+          Scriptish_evalInSandbox(script, sandbox, wrappedContentWin);
         }, delay));
       } else {
-        this.evalInSandbox(script, sandbox, wrappedContentWin);
+        Scriptish_evalInSandbox(script, sandbox, wrappedContentWin);
       }
     }
-  },
-
-  evalInSandbox: function(aScript, aSandbox, aWindow) {
-    const jsVer = aScript.jsversion;
-
-    try {
-      for (let [, req] in Iterator(aScript.requires)) {
-        var rfileURL = req.fileURL;
-        try {
-          Cu.evalInSandbox(
-            req.textContent + "\n",
-            aSandbox,
-            jsVer,
-            fileURLPrefix + rfileURL,
-            1
-            );
-        } catch (ex) {
-          Scriptish_logScriptError(ex, aWindow, rfileURL, aScript.id);
-        }
-      }
-    } catch (e) {
-      return Scriptish_logError(e, 0, aScript.fileURL, e.lineNumber);
-    }
-
-    try {
-      try {
-        Cu.evalInSandbox(
-          aScript.textContent + "\n",
-          aSandbox,
-          jsVer,
-          fileURLPrefix + aScript.fileURL,
-          1
-          );
-      }
-      catch (e if (e.message == "return not in function"
-          || /\(NS_ERROR_OUT_OF_MEMORY\) \[nsIXPCComponents_Utils.evalInSandbox\]/.test(e.message))) {
-        // catch errors when return is not in a function or when a window global
-        // is being overwritten (which throws NS_ERROR_OUT_OF_MEMORY..)
-        var sw = Instances.se;
-        sw.init(
-          Scriptish_stringBundle("warning.returnfrommain"),
-          aScript.fileURL,
-          "",
-          e.lineNumber || 0,
-          e.columnNumber || 0,
-          sw.warningFlag,
-          "scriptish userscript warnings"
-          );
-        Scriptish_logScriptError(sw, aWindow, aScript.fileURL, aScript.id);
-        Cu.evalInSandbox(
-          "(function(){" + aScript.textContent + "\n})()",
-          aSandbox,
-          jsVer,
-          fileURLPrefix + aScript.fileURL,
-          1
-          );
-      }
-    } catch (e) {
-      Scriptish_logScriptError(e, aWindow, aScript.fileURL, aScript.id);
-    }
   }
 }
 
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 3c550c16..b2cc6e52 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -299,7 +299,8 @@ Scriptish_BrowserUI.docUnload = function(aWinID) {
   let curMenuCmder = this.currentMenuCommander;
   for (let [i, item] in Iterator(menuCmders)) {
     if (item.winID !== aWinID) continue;
-    if (item.commander === curMenuCmder) curMenuCmder = curMenuCmder.detach();
+    if (item.commander === curMenuCmder)
+      curMenuCmder = curMenuCmder.detach();
     menuCmders.splice(i, 1);
     break;
   }
diff --git a/extension/modules/api.js b/extension/modules/api.js
index c4e9cc2b..76b03a01 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -4,8 +4,9 @@ const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError"]);
-lazyImport(this, "resource://scriptish/utils/Scriptish_alert.js", ["Scriptish_alert"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_evalInSandbox.js", ["Scriptish_evalInSandbox_filename"]);
 
+lazyUtil(this, "alert");
 lazyUtil(this, "cryptoHash");
 lazyUtil(this, "notification");
 lazyUtil(this, "openInTab");
@@ -29,6 +30,7 @@ function GM_apiLeakCheck(apiName) {
     // chrome:// URLs and any file name listed in _apiAcceptedFiles.
     if (2 == stack.language &&
         stack.filename != moduleFilename &&
+        stack.filename != Scriptish_evalInSandbox_filename &&
         stack.filename != Services.scriptish.filename &&
         stack.filename.substr(0, 6) != "chrome") {
       Scriptish_logError(new Error(
diff --git a/extension/modules/utils/Scriptish_evalInSandbox.js b/extension/modules/utils/Scriptish_evalInSandbox.js
new file mode 100644
index 00000000..003218f7
--- /dev/null
+++ b/extension/modules/utils/Scriptish_evalInSandbox.js
@@ -0,0 +1,72 @@
+var EXPORTED_SYMBOLS = [
+  "Scriptish_evalInSandbox",
+  "Scriptish_evalInSandbox_filename"
+];
+
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError"]);
+lazyUtil(this, "stringBundle");
+
+const fileURLPrefix = "chrome://scriptish/content/scriptish.js -> ";
+const Scriptish_evalInSandbox_filename = Components.stack.filename;
+
+function Scriptish_evalInSandbox(aScript, aSandbox, aWindow) {
+  const jsVer = aScript.jsversion;
+
+  try {
+    for (let [, req] in Iterator(aScript.requires)) {
+      var rfileURL = req.fileURL;
+      try {
+        Cu.evalInSandbox(
+          req.textContent + "\n",
+          aSandbox,
+          jsVer,
+          fileURLPrefix + rfileURL,
+          1
+          );
+      } catch (ex) {
+        Scriptish_logScriptError(ex, aWindow, rfileURL, aScript.id);
+      }
+    }
+  } catch (e) {
+    return Scriptish_logError(e, 0, aScript.fileURL, e.lineNumber);
+  }
+
+  try {
+    try {
+      Cu.evalInSandbox(
+        aScript.textContent + "\n",
+        aSandbox,
+        jsVer,
+        fileURLPrefix + aScript.fileURL,
+        1
+        );
+    }
+    catch (e if (e.message == "return not in function"
+        || /\(NS_ERROR_OUT_OF_MEMORY\) \[nsIXPCComponents_Utils.evalInSandbox\]/.test(e.message))) {
+      // catch errors when return is not in a function or when a window global
+      // is being overwritten (which throws NS_ERROR_OUT_OF_MEMORY..)
+      var sw = Instances.se;
+      sw.init(
+        Scriptish_stringBundle("warning.returnfrommain"),
+        aScript.fileURL,
+        "",
+        e.lineNumber || 0,
+        e.columnNumber || 0,
+        sw.warningFlag,
+        "scriptish userscript warnings"
+        );
+      Scriptish_logScriptError(sw, aWindow, aScript.fileURL, aScript.id);
+      Cu.evalInSandbox(
+        "(function(){" + aScript.textContent + "\n})()",
+        aSandbox,
+        jsVer,
+        fileURLPrefix + aScript.fileURL,
+        1
+        );
+    }
+  } catch (e) {
+    Scriptish_logScriptError(e, aWindow, aScript.fileURL, aScript.id);
+  }
+}

From f18de299f6059833009da5521172ebcad3c15b47 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 19 Aug 2011 22:09:10 -0700
Subject: [PATCH 535/829] Closes #487 bug fix: 'TypeError: invalid 'in' operand
 aError' error was being suppressed, introduced in
 a86144240b7f88786f7a4fe7cd787df4e695877a

---
 extension/modules/logging.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/logging.js b/extension/modules/logging.js
index c9d94283..f30c5c1f 100644
--- a/extension/modules/logging.js
+++ b/extension/modules/logging.js
@@ -57,7 +57,7 @@ function Scriptish_logScriptError(aError, aWindow, aFileURL, aId) {
       var {message:errorMessage, filename:sourceName, lineNumber, columnNumber} = aError;
     }
     // generic script error
-    else if ("message" in aError) {
+    else if (typeof aError.message !== "undefined") {
       // do not use aError.message, as this might hide the Error prefix
       // such as "SyntaxError: ..."
       errorMessage = aError.toString() || errorMessage;

From 4e745c9acc2831f0f82934141ac4ecc5fd625856 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 19 Aug 2011 22:20:24 -0700
Subject: [PATCH 536/829] fileURL was being built over and over in some cases
 during script injections, when we only needed to build the fileURL once

---
 extension/modules/utils/Scriptish_evalInSandbox.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/extension/modules/utils/Scriptish_evalInSandbox.js b/extension/modules/utils/Scriptish_evalInSandbox.js
index 003218f7..6f1fab69 100644
--- a/extension/modules/utils/Scriptish_evalInSandbox.js
+++ b/extension/modules/utils/Scriptish_evalInSandbox.js
@@ -13,6 +13,7 @@ const Scriptish_evalInSandbox_filename = Components.stack.filename;
 
 function Scriptish_evalInSandbox(aScript, aSandbox, aWindow) {
   const jsVer = aScript.jsversion;
+  const fileURL = aScript.fileURL;
 
   try {
     for (let [, req] in Iterator(aScript.requires)) {
@@ -30,7 +31,7 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow) {
       }
     }
   } catch (e) {
-    return Scriptish_logError(e, 0, aScript.fileURL, e.lineNumber);
+    return Scriptish_logError(e, 0, fileURL, e.lineNumber);
   }
 
   try {
@@ -39,7 +40,7 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow) {
         aScript.textContent + "\n",
         aSandbox,
         jsVer,
-        fileURLPrefix + aScript.fileURL,
+        fileURLPrefix + fileURL,
         1
         );
     }
@@ -50,23 +51,23 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow) {
       var sw = Instances.se;
       sw.init(
         Scriptish_stringBundle("warning.returnfrommain"),
-        aScript.fileURL,
+        fileURL,
         "",
         e.lineNumber || 0,
         e.columnNumber || 0,
         sw.warningFlag,
         "scriptish userscript warnings"
         );
-      Scriptish_logScriptError(sw, aWindow, aScript.fileURL, aScript.id);
+      Scriptish_logScriptError(sw, aWindow, fileURL, aScript.id);
       Cu.evalInSandbox(
         "(function(){" + aScript.textContent + "\n})()",
         aSandbox,
         jsVer,
-        fileURLPrefix + aScript.fileURL,
+        fileURLPrefix + fileURL,
         1
         );
     }
   } catch (e) {
-    Scriptish_logScriptError(e, aWindow, aScript.fileURL, aScript.id);
+    Scriptish_logScriptError(e, aWindow, fileURL, aScript.id);
   }
 }

From f70f7211e1e7963d9277294da74506c73b3fad28 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 19 Aug 2011 22:48:52 -0700
Subject: [PATCH 537/829] Closes #469 webdevs can no longer detect Scriptish by
 changing the location of a window to a user.js file

---
 extension/components/scriptish.js               | 14 +++++---------
 extension/content/js/browser.js                 |  1 +
 extension/modules/config/configdownloader.js    |  4 ++--
 extension/modules/script/scriptdownloader.js    |  7 ++-----
 extension/modules/utils/Scriptish_installUri.js |  7 ++-----
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 92e13770..a5bf5cbd 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -122,7 +122,8 @@ ScriptishService.prototype = {
 
     // Show the scriptish install banner if the user is navigating to a .user.js
     // file in a top-level tab.
-    if (safeWin === safeWin.top && RE_USERSCRIPT.test(href)
+    if (gmBrowserUI.scriptDownloader_
+        && safeWin === safeWin.top && RE_USERSCRIPT.test(href)
         && !RE_CONTENTTYPE.test(safeWin.document.contentType)) {
       gmBrowserUI.showInstallBanner(
           gBrowser.getBrowserForDocument(safeWin.document));
@@ -244,26 +245,21 @@ ScriptishService.prototype = {
 
     // don't intercept anything when Scriptish is not enabled
     if (!Scriptish.enabled) return CP.ACCEPT;
+
     // don't interrupt the view-source: scheme
     if ("view-source" == cl.scheme) return CP.ACCEPT;
 
     // CP.TYPE is not binary, so do not use bitwise logic tricks
     if ((ct == CP.TYPE_DOCUMENT || ct == CP.TYPE_SUBDOCUMENT)
-        && this._reg_userjs.test(cl.spec)
-        && !this.ignoreNextScript_ && !this.isTempScript(cl)) {
-      this.ignoreNextScript_ = false;
-      Scriptish_installUri(cl, ctx.contentWindow);
-      return CP.REJECT_REQUEST;
+        && this._reg_userjs.test(cl.spec) && !this.isTempScript(cl)) {
+      Scriptish_installUri(cl);
     }
 
-    this.ignoreNextScript_ = false;
     return CP.ACCEPT;
   },
 
   shouldProcess: function(ct, cl, org, ctx, mt, ext) CP.ACCEPT,
 
-  ignoreNextScript: function() this.ignoreNextScript_ = true,
-
   _tmpDir: Services.dirsvc.get("TmpD", Ci.nsILocalFile),
   isTempScript: function(uri) {
     if (!(uri instanceof Ci.nsIFileURL)) return false;
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index b2cc6e52..af459eea 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -219,6 +219,7 @@ Scriptish_BrowserUI.showScriptView = function(aSD, aURL) {
 // Handles the install button getting clicked.
 Scriptish_BrowserUI.installCurrentScript = function() {
   this.scriptDownloader_.installScript();
+  delete this.scriptDownloader_;
 }
 
 /**
diff --git a/extension/modules/config/configdownloader.js b/extension/modules/config/configdownloader.js
index cda3f7ff..6c6f7a75 100644
--- a/extension/modules/config/configdownloader.js
+++ b/extension/modules/config/configdownloader.js
@@ -3,8 +3,8 @@ Components.utils.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/script/scriptdownloader.js", ["ScriptDownloader"]);
 
 var Scriptish_configDownloader = {
-  startInstall: function(aURI, aWin) {
-    new ScriptDownloader(aURI, aWin).startInstall();
+  startInstall: function(aURI) {
+    new ScriptDownloader(aURI).startInstall();
   },
   startViewScript: function(aURI) {
     new ScriptDownloader(aURI).startViewScript();
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index f2a962a0..e63e6335 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -16,7 +16,7 @@ lazyUtil(this, "getTempFile");
 lazyUtil(this, "getWriteStream");
 lazyUtil(this, "stringBundle");
 
-function ScriptDownloader(uri, contentWin) {
+function ScriptDownloader(uri) {
   this.uri_ = uri || null;
   this.req_ = null;
   this.script = null;
@@ -25,7 +25,6 @@ function ScriptDownloader(uri, contentWin) {
   this.installOnCompletion_ = false;
   this.tempFiles_ = [];
   this.updateScript = false;
-  this.contentWin = contentWin || null;
 }
 ScriptDownloader.prototype.startInstall = function() {
   this.type = "install";
@@ -72,10 +71,8 @@ ScriptDownloader.prototype.chkContentTypeB4DL = function() {
     return;
 
   // If there is a 'Content-Type' header and it contains 'text/html',
-  // then do not install the file, and display it instead.
+  // then do not attempt to install the file
   this.req_.abort();
-  Services.scriptish.ignoreNextScript();
-  if (this.contentWin) this.contentWin.location.href = this.uri_.spec;
 }
 ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
   Scriptish_log("Scriptish ScriptDownloader.handleScriptDownloadComplete");
diff --git a/extension/modules/utils/Scriptish_installUri.js b/extension/modules/utils/Scriptish_installUri.js
index 5f89a4d8..ebd796c9 100644
--- a/extension/modules/utils/Scriptish_installUri.js
+++ b/extension/modules/utils/Scriptish_installUri.js
@@ -2,12 +2,9 @@ var EXPORTED_SYMBOLS = ["Scriptish_installUri"];
 Components.utils.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
 
-function Scriptish_installUri(aURI, aWin) {
+function Scriptish_installUri(aURI) {
   // docs for nsicontentpolicy say we're not supposed to block, so short timer.
   timeout(function() {
-    Scriptish_configDownloader.startInstall(
-      aURI,
-      aWin || Services.wm.getMostRecentWindow("navigator:browser")
-      );
+    Scriptish_configDownloader.startInstall(aURI);
   });
 }

From e6c1aca9ed34712f130623d4b62ffc3ee6bd492b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 20 Aug 2011 11:20:43 -0700
Subject: [PATCH 538/829] moving inner window unload handling to a separate
 module

---
 extension/components/scriptish.js             | 24 +++-----------
 .../modules/utils/Scriptish_windowUnloader.js | 33 +++++++++++++++++++
 2 files changed, 38 insertions(+), 19 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_windowUnloader.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index a5bf5cbd..6169faca 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -24,6 +24,7 @@ lazyUtil(this, "installUri");
 lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "stringBundle");
+lazyUtil(this, "windowUnloader");
 
 const {nsIContentPolicy: CP, nsIDOMXPathResult: XPATH_RESULT} = Ci;
 const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "complete"];
@@ -33,8 +34,6 @@ const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "comp
 const RE_USERSCRIPT = /\.user(?:-\d+)?\.js$/;
 const RE_CONTENTTYPE = /text\/html/i;
 
-let windows = {};
-
 function ScriptishService() {
   this.wrappedJSObject = this;
   this.timer = new Timer();
@@ -47,7 +46,6 @@ function ScriptishService() {
   if (!e10s)
     Services.obs.addObserver(this, "chrome-document-global-created", false);
   Services.obs.addObserver(this, "content-document-global-created", false);
-  Services.obs.addObserver(this, "inner-window-destroyed", false);
   Services.obs.addObserver(this, "install-userscript", false);
   Services.obs.addObserver(this, "scriptish-enabled", false);
 }
@@ -71,9 +69,6 @@ ScriptishService.prototype = {
       case "content-document-global-created":
         this.docReady(aSubject, Scriptish_getBrowserForContentWindow(aSubject).wrappedJSObject);
         break;
-      case "inner-window-destroyed":
-        this.innerWinDestroyed(aSubject.QueryInterface(Components.interfaces.nsISupportsPRUint64).data);
-        break;
       case "install-userscript":
         let win = Scriptish.getMostRecentWindow("navigator:browser");
         if (win) win.Scriptish_BrowserUI.installCurrentScript();
@@ -93,14 +88,6 @@ ScriptishService.prototype = {
 
   get filename() filename,
 
-  innerWinDestroyed: function(aWinID) {
-    let window = windows[aWinID];
-    if (!window || !window.unloaders || !window.unloaders.length) return;
-    for (var i = window.unloaders.length - 1; ~i; i--)
-      window.unloaders[i]();
-    delete windows[aWinID];
-  },
-
   docReady: function(safeWin, chromeWin) {
     if (!Scriptish.enabled || !chromeWin) return;
 
@@ -109,7 +96,6 @@ ScriptishService.prototype = {
     if (!gmBrowserUI || !gBrowser) return;
 
     let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
-    windows[currentInnerWindowID] = {unloaders: []};
 
     let href = (safeWin.location.href
         || (safeWin.frameElement && safeWin.frameElement.src))
@@ -218,10 +204,10 @@ ScriptishService.prototype = {
       // inject @run-at document-start scripts
       self.injectScripts(scripts["document-start"], href, currentInnerWindowID, safeWin, chromeWin);
 
-      windows[currentInnerWindowID].unloaders.push(function() {
+      Scriptish_windowUnloader(function() {
         winClosed = true;
         gmBrowserUI.docUnload(currentInnerWindowID);
-      });
+      }, currentInnerWindowID);
     });
   },
 
@@ -275,9 +261,9 @@ ScriptishService.prototype = {
 
     let delays = [];
     let winID = Scriptish_getWindowIDs(wrappedContentWin).innerID;
-    windows[winID].unloaders.push(function() {
+    Scriptish_windowUnloader(function() {
       for (let [, id] in Iterator(delays)) self.timer.clearTimeout(id);
-    });
+    }, winID);
 
     for (var i = 0, e = scripts.length; i < e; ++i) {
       // Do not "optimize" |script| out of the loop block and into the loop
diff --git a/extension/modules/utils/Scriptish_windowUnloader.js b/extension/modules/utils/Scriptish_windowUnloader.js
new file mode 100644
index 00000000..cb821a85
--- /dev/null
+++ b/extension/modules/utils/Scriptish_windowUnloader.js
@@ -0,0 +1,33 @@
+var EXPORTED_SYMBOLS = ["Scriptish_windowUnloader"];
+Components.utils.import("resource://scriptish/constants.js");
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
+
+const winUnloaders = {};
+
+function Unloader(aFunc, aInnerID) {
+  this.unload = aFunc;
+  this.innerID = aInnerID;
+}
+
+const observer = {
+  observe: function(aSubject, aTopic, aData) {
+    var innerID = aSubject.QueryInterface(Ci.nsISupportsPRUint64).data;
+    var unloaders = winUnloaders[innerID];
+
+    if (!unloaders) return;
+
+    for (var i = 0, e = unloaders.length - 1; ~i; i--) {
+      unloaders[i].unload();
+    }
+
+    delete winUnloaders[innerID];
+  }
+};
+Services.obs.addObserver(observer, "inner-window-destroyed", false);
+
+const Scriptish_windowUnloader = function(aUnloader, aInnerID) {
+  if (!winUnloaders[aInnerID])
+    winUnloaders[aInnerID] = [];
+
+  winUnloaders[aInnerID].push(new Unloader(aUnloader, aInnerID));
+};

From 1b13b5ef0175660520ab80163cff08ec44c79438 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 20 Aug 2011 11:20:59 -0700
Subject: [PATCH 539/829] minor whitespace change

---
 extension/modules/utils/Scriptish_getTLDURL.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/utils/Scriptish_getTLDURL.js b/extension/modules/utils/Scriptish_getTLDURL.js
index a4dc6465..2e6cfc93 100644
--- a/extension/modules/utils/Scriptish_getTLDURL.js
+++ b/extension/modules/utils/Scriptish_getTLDURL.js
@@ -9,5 +9,5 @@ const Scriptish_getTLDURL = Scriptish_memoize(function(aURL) {
     return uri.spec;
   } catch (e) {}
 
-  return aURL	;
+  return aURL;
 }, 200);

From 46f36dd41b8a0ee35a7d918e95349809f0fb2007 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 20 Aug 2011 12:50:34 -0700
Subject: [PATCH 540/829] moving injectScripts method it a separate module

---
 extension/components/scriptish.js             | 79 ++----------------
 extension/modules/api.js                      |  2 +
 .../modules/utils/Scriptish_injectScripts.js  | 81 +++++++++++++++++++
 3 files changed, 90 insertions(+), 72 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_injectScripts.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 6169faca..e2a99f4a 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -12,21 +12,16 @@ lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/manager.js", ["Scriptish_manager"]);
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
-lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
-lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_sandboxScripts"]);
-lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
-lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
-lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
 lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
 
-lazyUtil(this, "evalInSandbox");
+lazyUtil(this, "injectScripts");
 lazyUtil(this, "installUri");
 lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "stringBundle");
 lazyUtil(this, "windowUnloader");
 
-const {nsIContentPolicy: CP, nsIDOMXPathResult: XPATH_RESULT} = Ci;
+const {nsIContentPolicy: CP} = Ci;
 const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "complete"];
 
 // If the file was previously cached it might have been given a number after
@@ -36,7 +31,6 @@ const RE_CONTENTTYPE = /text\/html/i;
 
 function ScriptishService() {
   this.wrappedJSObject = this;
-  this.timer = new Timer();
   this.updateChk = function() {
     Services.scriptloader
         .loadSubScript("chrome://scriptish/content/js/updatecheck.js");
@@ -136,7 +130,7 @@ ScriptishService.prototype = {
         let rdyStateIdx = docRdyStates.indexOf(safeWin.document.readyState);
         function inject() {
           if (shouldNotRun()) return;
-          self.injectScripts([script], href, currentInnerWindowID, safeWin, chromeWin);
+          Scriptish_injectScripts([script], href, currentInnerWindowID, safeWin, chromeWin);
         }
         switch (script.runAt) {
         case "document-end":
@@ -184,12 +178,12 @@ ScriptishService.prototype = {
           if (scripts["document-idle"].length)
             timeout(function() {
               if (shouldNotRun()) return;
-              self.injectScripts(
+              Scriptish_injectScripts(
                   scripts["document-idle"], href, currentInnerWindowID, safeWin, chromeWin);
             });
 
           // inject @run-at document-end scripts
-          self.injectScripts(scripts["document-end"], href, currentInnerWindowID, safeWin, chromeWin);
+          Scriptish_injectScripts(scripts["document-end"], href, currentInnerWindowID, safeWin, chromeWin);
         }, true);
       }
 
@@ -197,12 +191,12 @@ ScriptishService.prototype = {
         safeWin.addEventListener("load", function() {
           if (shouldNotRun()) return;
           // inject @run-at window-load scripts
-          self.injectScripts(scripts["window-load"], href, currentInnerWindowID, safeWin, chromeWin);
+          Scriptish_injectScripts(scripts["window-load"], href, currentInnerWindowID, safeWin, chromeWin);
         }, true);
       }
 
       // inject @run-at document-start scripts
-      self.injectScripts(scripts["document-start"], href, currentInnerWindowID, safeWin, chromeWin);
+      Scriptish_injectScripts(scripts["document-start"], href, currentInnerWindowID, safeWin, chromeWin);
 
       Scriptish_windowUnloader(function() {
         winClosed = true;
@@ -252,65 +246,6 @@ ScriptishService.prototype = {
 
     var file = uri.file;
     return file.parent.equals(this._tmpDir) && file.leafName != "newscript.user.js";
-  },
-
-  injectScripts: function(scripts, url, winID, wrappedContentWin, chromeWin) {
-    if (0 >= scripts.length) return;
-    let self = this;
-    let unsafeContentWin = wrappedContentWin.wrappedJSObject;
-
-    let delays = [];
-    let winID = Scriptish_getWindowIDs(wrappedContentWin).innerID;
-    Scriptish_windowUnloader(function() {
-      for (let [, id] in Iterator(delays)) self.timer.clearTimeout(id);
-    }, winID);
-
-    for (var i = 0, e = scripts.length; i < e; ++i) {
-      // Do not "optimize" |script| out of the loop block and into the loop
-      // declaration!
-      // Need to keep a valid reference to |script| around so that GM_log
-      // and the delay code (and probably other consumer work).
-      let script = scripts[i];
-      let sandbox = new Cu.Sandbox(wrappedContentWin);
-      Cu.evalInSandbox(GM_sandboxScripts, sandbox);
-
-      let GM_api = new GM_API(
-          script, url, winID, wrappedContentWin, unsafeContentWin, chromeWin);
-
-      // hack XPathResult since that is so commonly used
-      sandbox.XPathResult = XPATH_RESULT;
-
-      // add GM_* API to sandbox
-      for (var funcName in GM_api) {
-        sandbox[funcName] = GM_api[funcName];
-      }
-      XPCOMUtils.defineLazyGetter(sandbox, "console", function() {
-        return GM_console(script, wrappedContentWin, chromeWin);
-      });
-      XPCOMUtils.defineLazyGetter(sandbox, "GM_log", function() {
-        if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
-          var logger = new GM_ScriptLogger(script);
-          return function() {
-            logger.log(Array.slice(arguments).join(" "));
-            sandbox.console.log.apply(sandbox.console, arguments);
-          }
-        }
-        return sandbox.console.log.bind(sandbox.console);
-      });
-
-      sandbox.unsafeWindow = unsafeContentWin;
-      sandbox.__proto__ = wrappedContentWin;
-
-      let delay = script.delay;
-      if (delay || delay === 0) {
-        // don't use window's setTimeout, b/c then window could clearTimeout
-        delays.push(self.timer.setTimeout(function() {
-          Scriptish_evalInSandbox(script, sandbox, wrappedContentWin);
-        }, delay));
-      } else {
-        Scriptish_evalInSandbox(script, sandbox, wrappedContentWin);
-      }
-    }
   }
 }
 
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 76b03a01..39b55323 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -5,6 +5,7 @@ Cu.import("resource://scriptish/constants.js");
 
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_evalInSandbox.js", ["Scriptish_evalInSandbox_filename"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_injectScripts.js", ["Scriptish_injectScripts_filename"]);
 
 lazyUtil(this, "alert");
 lazyUtil(this, "cryptoHash");
@@ -31,6 +32,7 @@ function GM_apiLeakCheck(apiName) {
     if (2 == stack.language &&
         stack.filename != moduleFilename &&
         stack.filename != Scriptish_evalInSandbox_filename &&
+        stack.filename != Scriptish_injectScripts_filename &&
         stack.filename != Services.scriptish.filename &&
         stack.filename.substr(0, 6) != "chrome") {
       Scriptish_logError(new Error(
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
new file mode 100644
index 00000000..527b7d01
--- /dev/null
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -0,0 +1,81 @@
+var EXPORTED_SYMBOLS = [
+  "Scriptish_injectScripts",
+  "Scriptish_injectScripts_filename"
+];
+
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
+lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_sandboxScripts"]);
+lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
+lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
+lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
+
+const Scriptish_injectScripts_filename = Components.stack.filename;
+const gTimer = new Timer();
+const {nsIDOMXPathResult: XPATH_RESULT} = Ci;
+
+lazyUtil(this, "evalInSandbox");
+lazyUtil(this, "getWindowIDs");
+lazyUtil(this, "windowUnloader");
+
+function Scriptish_injectScripts(scripts, url, winID, wrappedContentWin, chromeWin) {
+  if (0 >= scripts.length) return;
+  let unsafeContentWin = wrappedContentWin.wrappedJSObject;
+
+  let delays = [];
+  let winID = Scriptish_getWindowIDs(wrappedContentWin).innerID;
+  Scriptish_windowUnloader(function() {
+    for (let [, id] in Iterator(delays)) gTimer.clearTimeout(id);
+  }, winID);
+
+  for (var i = 0, e = scripts.length; i < e; ++i) {
+    // Do not "optimize" |script| out of the loop block and into the loop
+    // declaration!
+    // Need to keep a valid reference to |script| around so that GM_log
+    // and the delay code (and probably other consumer work).
+    let script = scripts[i];
+    let sandbox = new Cu.Sandbox(wrappedContentWin);
+    Cu.evalInSandbox(GM_sandboxScripts, sandbox);
+
+    let GM_api = new GM_API(
+        script, url, winID, wrappedContentWin, unsafeContentWin, chromeWin);
+
+    // hack XPathResult since that is so commonly used
+    sandbox.XPathResult = XPATH_RESULT;
+
+    // add GM_* API to sandbox
+    for (var funcName in GM_api) {
+      sandbox[funcName] = GM_api[funcName];
+    }
+    XPCOMUtils.defineLazyGetter(sandbox, "console", function() {
+      return GM_console(script, wrappedContentWin, chromeWin);
+    });
+    XPCOMUtils.defineLazyGetter(sandbox, "GM_log", function() {
+      if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
+        var logger = new GM_ScriptLogger(script);
+        return function() {
+          logger.log(Array.slice(arguments).join(" "));
+          sandbox.console.log.apply(sandbox.console, arguments);
+        }
+      }
+      return sandbox.console.log.bind(sandbox.console);
+    });
+
+    sandbox.unsafeWindow = unsafeContentWin;
+    sandbox.__proto__ = wrappedContentWin;
+
+    let delay = script.delay;
+    if (delay || delay === 0) {
+      // don't use window's setTimeout, b/c then window could clearTimeout
+      delays.push(gTimer.setTimeout(function() {
+        Scriptish_evalInSandbox(script, sandbox, wrappedContentWin);
+      }, delay));
+    } else {
+      Scriptish_evalInSandbox(script, sandbox, wrappedContentWin);
+    }
+  }
+}

From 07ad389691af10000189d785ad02893e4f810930 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 21 Aug 2011 12:30:35 -0700
Subject: [PATCH 541/829] simplifying the signature of docReady

---
 extension/components/scriptish.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index e2a99f4a..cfb67eb9 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -61,7 +61,7 @@ ScriptishService.prototype = {
     switch (aTopic) {
       case "chrome-document-global-created":
       case "content-document-global-created":
-        this.docReady(aSubject, Scriptish_getBrowserForContentWindow(aSubject).wrappedJSObject);
+        this.docReady(aSubject);
         break;
       case "install-userscript":
         let win = Scriptish.getMostRecentWindow("navigator:browser");
@@ -82,7 +82,8 @@ ScriptishService.prototype = {
 
   get filename() filename,
 
-  docReady: function(safeWin, chromeWin) {
+  docReady: function(safeWin) {
+    var chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
     if (!Scriptish.enabled || !chromeWin) return;
 
     let gmBrowserUI = chromeWin.Scriptish_BrowserUI;

From d48ac7a77d18deba331e5058fe2d8094fcf6e5bf Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 21 Aug 2011 12:31:57 -0700
Subject: [PATCH 542/829] minor style change, moving a couple of styling
 properties to css

---
 extension/content/install.xul | 2 +-
 extension/skin/install.css    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/extension/content/install.xul b/extension/content/install.xul
index cb1956cf..593fd3cd 100644
--- a/extension/content/install.xul
+++ b/extension/content/install.xul
@@ -54,7 +54,7 @@
         <description id="resources-desc"/>
       </vbox>
     </vbox>
-    <hbox id="showSource-box" flex="1" pack="end" align="end">
+    <hbox id="showSource-box">
       <label id="showSource" class="text-link" value="install.showScriptSource" localize="value"/>
     </hbox>
   </vbox>
diff --git a/extension/skin/install.css b/extension/skin/install.css
index e8979bfb..c41054cb 100644
--- a/extension/skin/install.css
+++ b/extension/skin/install.css
@@ -47,7 +47,12 @@
   margin-bottom: 1ex;
 }
 
-#showSource-box{margin: 1ex;}
+#showSource-box{
+  margin: 1ex;
+  -moz-box-flex: 1;
+  -moz-box-pack: end;
+  -moz-box-align: end;
+}
 
 #itemBox vbox:not(#script-desc-vbox){
   margin:0 0 1em 1em;

From d499a8122df36b7dbb67ec2ff93e08099f993593 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 21 Aug 2011 12:55:00 -0700
Subject: [PATCH 543/829] using Scriptish_manager.setup a little more.

---
 extension/components/scriptish.js | 11 +++--------
 extension/modules/manager.js      | 15 +++++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index cfb67eb9..f280e278 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -7,13 +7,14 @@ const filename = Components.stack.filename;
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 
-lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError", "Scriptish_log"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/manager.js", ["Scriptish_manager"]);
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
 
+lazyUtil(this, "alert");
 lazyUtil(this, "injectScripts");
 lazyUtil(this, "installUri");
 lazyUtil(this, "isScriptRunnable");
@@ -37,9 +38,7 @@ function ScriptishService() {
     delete this.updateChk;
   }
 
-  if (!e10s)
-    Services.obs.addObserver(this, "chrome-document-global-created", false);
-  Services.obs.addObserver(this, "content-document-global-created", false);
+  Scriptish_manager.setup.call(this);
   Services.obs.addObserver(this, "install-userscript", false);
   Services.obs.addObserver(this, "scriptish-enabled", false);
 }
@@ -59,10 +58,6 @@ ScriptishService.prototype = {
 
   observe: function(aSubject, aTopic, aData) {
     switch (aTopic) {
-      case "chrome-document-global-created":
-      case "content-document-global-created":
-        this.docReady(aSubject);
-        break;
       case "install-userscript":
         let win = Scriptish.getMostRecentWindow("navigator:browser");
         if (win) win.Scriptish_BrowserUI.installCurrentScript();
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index f73ea1ba..d59197a0 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -1,4 +1,4 @@
-var EXPORTED_SYMBOLS = ["Scriptish_mananger"];
+var EXPORTED_SYMBOLS = ["Scriptish_manager"];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
@@ -10,22 +10,21 @@ lazyUtil(this, "getWindowIDs");
 
 let windows = {};
 
-const Scriptish_mananger = {
+const Scriptish_manager = {
   setup: function(aContentScope) {
     var observer = {
-      observe: function(aSubject, aTopic, aData) {
+      observe: (function(aSubject, aTopic, aData) {
         switch (aTopic) {
-        //case "chrome-document-global-created":
+        case "chrome-document-global-created":
         case "content-document-global-created":
-          Scriptish_mananger.docReady(aSubject);
+          this.docReady(aSubject);
           break;
         }
-      }
+      }).bind(this)
     }
 
     Services.obs.addObserver(observer, "content-document-global-created", false);
-    //Services.obs.addObserver(observer, "chrome-document-global-created", false);
-    Services.obs.addObserver(observer, "inner-window-destroyed", false);
+    Services.obs.addObserver(observer, "chrome-document-global-created", false);
   },
 
   // TODO: remove chromeWin, or use it

From fea1342cec4cd44024038f239aa7c33ac84c8dfe Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 21 Aug 2011 14:24:26 -0700
Subject: [PATCH 544/829] AddonManager.js related vars are no longer constants

---
 extension/content/js/aboutScriptish.js      | 1 +
 extension/content/js/updatecheck.js         | 1 +
 extension/modules/addonprovider.js          | 1 +
 extension/modules/constants.js              | 3 +--
 extension/modules/script/script.js          | 1 +
 extension/modules/script/scriptinstaller.js | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index b57c6e6a..cc67ebc5 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -12,6 +12,7 @@ function include(aSrc) {
 
 
 Cu.import("resource://scriptish/constants.js");
+lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "AddonManagerPrivate"]);
 
 (function() {
   "use strict";
diff --git a/extension/content/js/updatecheck.js b/extension/content/js/updatecheck.js
index 86bbe1cb..84adaa7b 100644
--- a/extension/content/js/updatecheck.js
+++ b/extension/content/js/updatecheck.js
@@ -2,6 +2,7 @@
 (function(inc, tools) {
   inc("resource://scriptish/prefmanager.js", tools);
   inc("resource://scriptish/constants.js", tools);
+  inc("resource://gre/modules/AddonManager.jsm", tools);
   var pref = tools.Scriptish_prefRoot;
   var currentVer = pref.getValue("version", "0.0");
 
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index 91e73402..5dd3581f 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -3,6 +3,7 @@ Components.utils.import("resource://scriptish/constants.js");
 
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "AddonManagerPrivate"]);
 
 lazyUtil(this, "popupNotification");
 lazyUtil(this, "stringBundle");
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 282f93e5..b7e5fc42 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -1,5 +1,5 @@
 var EXPORTED_SYMBOLS = [
-    "Cc", "Ci", "Cr", "AddonManager", "AddonManagerPrivate", "NetUtil", "XPCOMUtils",
+    "Cc", "Ci", "Cr", "NetUtil", "XPCOMUtils",
     "Services", "Instances", "lazyImport", "lazyUtil", "timeout", "e10s"];
 
 const {classes: Cc, interfaces: Ci, results: Cr} = Components;
@@ -9,7 +9,6 @@ var Services = {};
 (function(inc, tools){
   inc("resource://gre/modules/XPCOMUtils.jsm");
   inc("resource://gre/modules/NetUtil.jsm");
-  inc("resource://gre/modules/AddonManager.jsm");
   inc("resource://gre/modules/Services.jsm", tools);
 
   Services.__proto__ = tools.Services;
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index b4fe67bd..9fda8a88 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -16,6 +16,7 @@ lazyImport(this, "resource://scriptish/script/scriptrequire.js", ["ScriptRequire
 lazyImport(this, "resource://scriptish/script/scriptresource.js", ["ScriptResource"]);
 lazyImport(this, "resource://scriptish/third-party/MatchPattern.js", ["MatchPattern"]);
 lazyImport(this, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
+lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "AddonManagerPrivate"]);
 
 lazyUtil(this, "getUriFromFile");
 lazyUtil(this, "getContents");
diff --git a/extension/modules/script/scriptinstaller.js b/extension/modules/script/scriptinstaller.js
index a4300d82..5c48694b 100644
--- a/extension/modules/script/scriptinstaller.js
+++ b/extension/modules/script/scriptinstaller.js
@@ -1,6 +1,7 @@
 var EXPORTED_SYMBOLS = ["ScriptInstall"];
 Components.utils.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
+lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "AddonManagerPrivate"]);
 
 // Implements https://developer.mozilla.org/en/Addons/Add-on_Manager/AddonInstall
 function ScriptInstall(aScript) {

From f1134dc5c6f942efb9575f64d2232e3e4a76e2fd Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 21 Aug 2011 19:39:25 -0700
Subject: [PATCH 545/829] adding separate browser overlay for Fennec

---
 extension/chrome.manifest          |  4 +++-
 extension/content/e10s/browser.js  | 16 ++++++++++++++++
 extension/content/e10s/browser.xul |  4 ++++
 extension/install.rdf              |  8 ++++++++
 extension/modules/manager.js       |  4 ++--
 5 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 extension/content/e10s/browser.js
 create mode 100644 extension/content/e10s/browser.xul

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 5bcf1f38..9d497dc3 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -12,7 +12,9 @@ style      chrome://global/content/customizeToolbar.xul chrome://scriptish/skin/
 style      chrome://global/content/customizeToolbar.xul chrome://scriptish/content/third-party/firebug/startButton.css
 style      chrome://global/content/alerts/alert.xul chrome://scriptish/skin/third-party/alert.css os=Darwin
 
-overlay    chrome://browser/content/browser.xul chrome://scriptish/content/browser.xul
+overlay    chrome://browser/content/browser.xul chrome://scriptish/content/browser.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+overlay    chrome://browser/content/browser.xul chrome://scriptish/content/browser.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+overlay    chrome://browser/content/browser.xul chrome://scriptish/content/e10s/browser.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
 overlay    chrome://browser/content/scratchpad.xul chrome://scriptish/content/scratchpad.xul
 overlay    chrome://navigator/content/navigator.xul chrome://scriptish/content/browser.xul
 overlay    about:addons chrome://scriptish/content/addonstab.xul
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
new file mode 100644
index 00000000..e8061eee
--- /dev/null
+++ b/extension/content/e10s/browser.js
@@ -0,0 +1,16 @@
+
+
+(function(inc, tools){
+
+inc("resource://scriptish/constants.js", tools);
+const {lazyImport, lazyUtil} = tools;
+
+
+
+})(Components.utils.import, {});
+
+
+
+addEventListener("DOMContentLoaded", function() {
+  content.alert("yes!");
+}, true);
diff --git a/extension/content/e10s/browser.xul b/extension/content/e10s/browser.xul
new file mode 100644
index 00000000..3f1c8207
--- /dev/null
+++ b/extension/content/e10s/browser.xul
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<overlay id="scriptish-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/javascript" src="chrome://scriptish/content/e10s/browser.js"/>
+</overlay>
diff --git a/extension/install.rdf b/extension/install.rdf
index 8b4415e9..c3835745 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -73,5 +73,13 @@
         <em:maxVersion>2.3.*</em:maxVersion>
       </Description>
     </em:targetApplication>
+    <!-- Fennec -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
+        <em:minVersion>4.0</em:minVersion>
+        <em:maxVersion>6.*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
   </Description>
 </RDF>
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index d59197a0..e98e476e 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -28,7 +28,7 @@ const Scriptish_manager = {
   },
 
   // TODO: remove chromeWin, or use it
-  docReady: function(safeWin, chromeWin) {
+  docReady: function(safeWin) {
     if (!Scriptish.enabled) return;
 
     let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
@@ -39,7 +39,7 @@ const Scriptish_manager = {
         || "";
 
     if (!href && safeWin.frameElement) {
-      Scriptish_mananger.waitForFrame(safeWin, chromeWin);
+      Scriptish_mananger.waitForFrame(safeWin);
       return;
     }
 

From f72744fa5c6e5ddb986980b26b6819105f9b1196 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 22 Aug 2011 07:30:54 -0500
Subject: [PATCH 546/829] Closes #490  Updating es-ES courtesy of strel.

---
 extension/locale/es-ES/description.properties | 26 +++++++++----------
 extension/locale/es-ES/scriptish.properties   | 16 ++++++------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/extension/locale/es-ES/description.properties b/extension/locale/es-ES/description.properties
index 2da80cb1..42bad372 100644
--- a/extension/locale/es-ES/description.properties
+++ b/extension/locale/es-ES/description.properties
@@ -1,13 +1,13 @@
-amo.description.line1=
-amo.description.line2=
-amo.description.line3=
-amo.description.line4=
-amo.description.line5=
-amo.description.line6=
-amo.description.line7=
-amo.description.line8=
-amo.developerComments.line1=
-amo.developerComments.line2=
-amo.developerComments.line3=
-amo.summary=
-extensions.scriptish@erikvold.com.description=Un gestor de scripts de usuario para aplicaciones Mozilla
+amo.description.line1=Scriptish es una ramificación de Greasemonkey, que ofrece:
+amo.description.line2=Todo lo que hace Greasemonkey (que de hecho es útil)
+amo.description.line3=Actualización: Los scripts de usuario pueden ser actualizados en Scriptish usando @updateURL
+amo.description.line4=Muchas nuevas <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">metadata @keys</a>
+amo.description.line5=Muchas nuevas <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">características añadidas a la GM_ API</a>
+amo.description.line6=Rendimiento Superior: Un código base más rápido y limpio, que aprovecha todo lo que las versiones recientes de Firefox ofrecen
+amo.description.line7=Seguridad Superior: Scriptish proporciona características de seguridad que no encontrará en otro sitio
+amo.description.line8=Testeo: Los desarrolladores realizan muchos tests para asegurar el correcto funcionamiento de Scriptish y encontrar cualquier error cuanto antes
+amo.developerComments.line1=Scriptish tiene todo lo que tiene Greasemonkey, además de otras muchas características sobre las que puedes leer en: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=Por favor remite cualquier error o solicitud de característica a: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
+amo.developerComments.line3=Si tienes alguna otra pregunta, por favor envialá a la lista de correo: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=El motor de scripts de usuario más avanzado en Internet.
+extensions.scriptish@erikvold.com.description=Un gestor de scripts de usuario para aplicaciones Mozilla
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 7e831361..bdf2573c 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -96,7 +96,7 @@ options.cache.enabled=Cargar los scripts de usuario en cache
 options.changeEditor=Cambiar editor
 options.editor=Editor
 options.editor.notset=No se ha seleccionado editor
-options.enableCopyDownloadURL=Activar copiado de URL de descarga
+options.enableCopyDownloadURL=Activar opción Copiar URL de Descarga
 options.enabledSchemes.about=Protocolo about (interno)
 options.enabledSchemes.advanced=Protocolos adicionales
 options.enabledSchemes.chrome=Protocolo chrome (interno)
@@ -115,9 +115,9 @@ options.logChrome=Registrar en log mensajes de extensión no críticos a la cons
 options.logging=Registro de eventos (logging)
 options.logToErrorConsole=GM_log usa la consola de errores
 options.notifications=Notificaciones
-options.notifications.popup.enable=
-options.notifications.sliding.enable=
-options.notifications.whenDisabled=
+options.notifications.popup.enable=Activar notificaciones emergentes
+options.notifications.sliding.enable=Activar notificaciones deslizantes
+options.notifications.whenDisabled=Cuando está deshabilitado, cualquier notificación aparecerá en la Consola de Errores.
 options.pane.advanced=Avanzado
 options.pane.excludes=Exclusiones globales
 options.pane.main=Principal
@@ -125,8 +125,8 @@ options.pane.ui=Interfaz de usuario
 options.requireBuiltInCerts=Las actualizaciones seguras requieren que el certificado esté incluído
 options.requireSecured=Requerir que los scripts de usuario se actualicen usando HTTPS
 options.title=Opciones de scriptish
-options.toolbarbutton=
-options.toolbarbutton.showScripts=
+options.toolbarbutton=Botón de la Barra de Herramientas
+options.toolbarbutton.showScripts=Mostra la cuenta de scripts activos
 options.translation=Traducción
 options.translation.useEnglish=Usar Inglés siempre
 options.update.security=Seguridad de las actualizaciones
@@ -150,8 +150,8 @@ tooltip.loading=Cargando...
 Uninstall=Desinstalar
 untitledScript=Script sin título
 Update=Actualizar
-userscript=
+userscript=Script de usuario
 userscripts=Scripts de usuario
 userscripts.get=Obtener scripts de usuario
 userscripts.noneInstalled=No tiene instalado ningún script de usuario
-warning.returnfrommain="return" desde el ámbito principal no está soportado generalmente. Debería arreglar eso en su script
+warning.returnfrommain="return" desde el ámbito principal no está soportado generalmente. Debería arreglar esto en su script

From 9be37ccebb071b92d5688240f1ee426deb84116a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 22 Aug 2011 06:57:17 -0700
Subject: [PATCH 547/829] adding comment about #252

---
 extension/modules/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index b7e5fc42..376c1b2a 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -141,7 +141,7 @@ function timeout(cb, delay) {
   }
 
   if (!global.setTimeout) {
-    global.setTimeout = (new Timer()).setTimeout;
+    global.setTimeout = (new Timer()).setTimeout; // see bug #252
   }
 
   setTimeout(callback, delay);

From 2b11499df140fcead9cc95239b5a43e1bf3dcb43 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 22 Aug 2011 07:32:39 -0700
Subject: [PATCH 548/829] Starting WIP to support Fennec, so far only
 about:scriptish works..

---
 extension/components/scriptish.js         |  8 ++++--
 extension/content/e10s/browser-content.js | 16 +++++++++++
 extension/content/e10s/browser.js         | 20 ++++++++-----
 extension/content/js/updatecheck.js       | 35 +++++++++++++----------
 4 files changed, 54 insertions(+), 25 deletions(-)
 create mode 100644 extension/content/e10s/browser-content.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index f280e278..4e258e20 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -38,9 +38,11 @@ function ScriptishService() {
     delete this.updateChk;
   }
 
-  Scriptish_manager.setup.call(this);
-  Services.obs.addObserver(this, "install-userscript", false);
-  Services.obs.addObserver(this, "scriptish-enabled", false);
+  if (!e10s) {
+    Scriptish_manager.setup.call(this);
+    Services.obs.addObserver(this, "install-userscript", false);
+    Services.obs.addObserver(this, "scriptish-enabled", false);
+  }
 }
 
 ScriptishService.prototype = {
diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
new file mode 100644
index 00000000..482f375b
--- /dev/null
+++ b/extension/content/e10s/browser-content.js
@@ -0,0 +1,16 @@
+
+(function(inc, tools, global){
+
+inc("resource://scriptish/constants.js", tools);
+const {lazyImport, lazyUtil} = tools;
+lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
+lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
+
+Scriptish_log("step 2");
+
+})(Components.utils.import, {}, this);
+
+
+addEventListener("DOMContentLoaded", function() {
+  //content.alert("window");
+}, true);
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index e8061eee..af5cf52a 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -1,16 +1,22 @@
 
-
-(function(inc, tools){
+(function(inc, tools, global){
 
 inc("resource://scriptish/constants.js", tools);
-const {lazyImport, lazyUtil} = tools;
+const {lazyImport, lazyUtil, Services} = tools;
+lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
+lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
+
+Scriptish_log("step 1a");
 
+// Check if Scriptish has been updated/installed
+Services.scriptish.updateChk && setTimeout(function() {
+  Services.scriptish.updateChk();
+}, 750);
 
+Scriptish_log("step 1b");
 
-})(Components.utils.import, {});
+})(Components.utils.import, {}, this);
 
 
 
-addEventListener("DOMContentLoaded", function() {
-  content.alert("yes!");
-}, true);
+messageManager.loadFrameScript("chrome://scriptish/content/e10s/browser-content.js", true);
diff --git a/extension/content/js/updatecheck.js b/extension/content/js/updatecheck.js
index 84adaa7b..7ad5b905 100644
--- a/extension/content/js/updatecheck.js
+++ b/extension/content/js/updatecheck.js
@@ -3,6 +3,7 @@
   inc("resource://scriptish/prefmanager.js", tools);
   inc("resource://scriptish/constants.js", tools);
   inc("resource://gre/modules/AddonManager.jsm", tools);
+
   var pref = tools.Scriptish_prefRoot;
   var currentVer = pref.getValue("version", "0.0");
 
@@ -13,21 +14,25 @@
 
   if (0 >= tools.Services.vc.compare(currentVer, "0.1b5")) {
     var chromeWin = tools.Services.wm.getMostRecentWindow("navigator:browser");
-    chromeWin.gBrowser.addTab("about:scriptish");
+    if ("Fennec" == tools.Services.appinfo.name) {
+      chromeWin.Browser.addTab("about:scriptish", false, chromeWin.Browser.selectedTab)
+    } else {
+      chromeWin.gBrowser.addTab("about:scriptish");
 
-    // add toolbaritem to add-on bar
-    var addToBar = chromeWin.document.getElementById("addon-bar");
-    if (!addToBar || chromeWin.document.getElementById("scriptish-button"))
-      return;
-    var addonSet = (addToBar.getAttribute("currentset") || addToBar.getAttribute("defaultset")).split(",");
-    var addonPos = addonSet.indexOf("status-bar");
-    if (addonPos == -1) addonPos = addonSet.length;
-    addonSet.splice(addonPos, 0, "scriptish-button");
-    addonSet = addonSet.join(",");
-    addToBar.setAttribute("currentset", addonSet);
-    addToBar.currentSet = addonSet;
-    chromeWin.BrowserToolboxCustomizeDone(true);
-    chromeWin.document.persist(addToBar.getAttribute("id"), "currentset");
-    if ("addon-bar" == addToBar.getAttribute("id")) addToBar.collapsed = false;
+      // add toolbaritem to add-on bar
+      var addToBar = chromeWin.document.getElementById("addon-bar");
+      if (!addToBar || chromeWin.document.getElementById("scriptish-button"))
+        return;
+      var addonSet = (addToBar.getAttribute("currentset") || addToBar.getAttribute("defaultset")).split(",");
+      var addonPos = addonSet.indexOf("status-bar");
+      if (addonPos == -1) addonPos = addonSet.length;
+      addonSet.splice(addonPos, 0, "scriptish-button");
+      addonSet = addonSet.join(",");
+      addToBar.setAttribute("currentset", addonSet);
+      addToBar.currentSet = addonSet;
+      chromeWin.BrowserToolboxCustomizeDone(true);
+      chromeWin.document.persist(addToBar.getAttribute("id"), "currentset");
+      if ("addon-bar" == addToBar.getAttribute("id")) addToBar.collapsed = false;
+    }
   }
 })(Components.utils.import, {})

From ed2f90813563658eaffd62a905df623308440eec Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 22 Aug 2011 09:04:58 -0700
Subject: [PATCH 549/829] moving openManager method to a new module

---
 extension/modules/addonprovider.js               |  5 +++--
 extension/modules/content/browser.js             |  5 +++--
 extension/modules/scriptish.js                   |  7 -------
 extension/modules/utils/Scriptish_openManager.js | 10 ++++++++++
 4 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_openManager.js

diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index 5dd3581f..3df177c8 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -5,6 +5,7 @@ lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "AddonManagerPrivate"]);
 
+lazyUtil(this, "openManager");
 lazyUtil(this, "popupNotification");
 lazyUtil(this, "stringBundle");
 
@@ -21,7 +22,7 @@ const Scriptish_ScriptProvider = {
       var msg = "'" + script.name;
       if (script.version) msg += " " + script.version;
       msg += "' " + Scriptish_stringBundle("statusbar.installed");
-      var callback = function() Scriptish.openManager();
+      var callback = Scriptish_openManager;
 
       Scriptish_popupNotification({
         id: "scriptish-install-popup-notification",
@@ -59,7 +60,7 @@ const Scriptish_ScriptProvider = {
       msg += "' " + (("scriptish-script-updated" == aTopic)
           ? Scriptish_stringBundle("statusbar.updated")
           : Scriptish_stringBundle("statusbar.modified"));
-      var callback = function() Scriptish.openManager();
+      var callback = Scriptish_openManager;
 
       Scriptish_popupNotification({
         id: "scriptish-install-popup-notification",
diff --git a/extension/modules/content/browser.js b/extension/modules/content/browser.js
index 83372bfc..e9849f70 100644
--- a/extension/modules/content/browser.js
+++ b/extension/modules/content/browser.js
@@ -3,6 +3,7 @@ var EXPORTED_SYMBOLS = ["Scriptish_BrowserUIM"];
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyUtil(this, "openManager");
 
 const ICON_16_ON = "chrome://scriptish/skin/scriptish16.png";
 const ICON_16_OFF = "chrome://scriptish/skin/scriptish16_disabled.png";
@@ -23,7 +24,7 @@ Scriptish_BrowserUIM.prototype = {
         this.onToggleStatus();
         break;
       case 1:
-        Scriptish.openManager();
+        Scriptish_openManager();
         break;
       case 2:
         this.$("scriptish-tb-popup").openPopup(this.$("scriptish-button"), "before_end", 0, 0, false, false);
@@ -78,6 +79,6 @@ Scriptish_BrowserUIM.prototype = {
   },
   showUserscriptList: function() {
     Cu.import("resource://scriptish/addonprovider.js");
-    timeout(Scriptish.openManager);
+    timeout(Scriptish_openManager);
   }
 }
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 952c6747..03d75fa4 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -39,13 +39,6 @@ const Scriptish = {
     notifyStatusChg(enabled);
     Scriptish_prefRoot.setValue("enabled", enabled);
   },
-  openManager: function Scriptish_openManager() {
-    var browserWin = Services.wm.getMostRecentWindow("navigator:browser");
-    if (browserWin.BrowserOpenAddonsMgr)
-      browserWin.BrowserOpenAddonsMgr("addons://list/userscript");
-    else if (browserWin.toEM)
-      browserWin.toEM("addons://list/userscript");
-  },
   isGreasemonkeyable: function Scriptish_isGreasemonkeyable(aURL) {
     if (!aURL) return false;
 
diff --git a/extension/modules/utils/Scriptish_openManager.js b/extension/modules/utils/Scriptish_openManager.js
new file mode 100644
index 00000000..6ee9967f
--- /dev/null
+++ b/extension/modules/utils/Scriptish_openManager.js
@@ -0,0 +1,10 @@
+var EXPORTED_SYMBOLS = ["Scriptish_openManager"];
+Components.utils.import("resource://scriptish/constants.js");
+
+function Scriptish_openManager() {
+  var browserWin = Services.wm.getMostRecentWindow("navigator:browser");
+  if (browserWin.BrowserOpenAddonsMgr) // ff
+    browserWin.BrowserOpenAddonsMgr("addons://list/userscript");
+  else if (browserWin.toEM) // sm
+    browserWin.toEM("addons://list/userscript");
+}

From 9b0a8e9dd9245b70b55ca45641351f2cbf298823 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 22 Aug 2011 09:16:03 -0700
Subject: [PATCH 550/829] FF is working again..

---
 extension/components/scriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 4e258e20..5c7cb2b1 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -38,7 +38,7 @@ function ScriptishService() {
     delete this.updateChk;
   }
 
-  if (!e10s) {
+  if ("Fennec" != Services.appinfo.name) {
     Scriptish_manager.setup.call(this);
     Services.obs.addObserver(this, "install-userscript", false);
     Services.obs.addObserver(this, "scriptish-enabled", false);

From dfbb709221e7bb5cb97e98cd8014bf9f753b5766 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 22 Aug 2011 09:17:04 -0700
Subject: [PATCH 551/829] minor style changes in browser-contents.js

---
 extension/content/e10s/browser.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index af5cf52a..4a24e7fe 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -8,15 +8,18 @@ lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
 
 Scriptish_log("step 1a");
 
-// Check if Scriptish has been updated/installed
-Services.scriptish.updateChk && setTimeout(function() {
-  Services.scriptish.updateChk();
-}, 750);
+Scriptish_manager.setup(content);
 
-Scriptish_log("step 1b");
+messageManager.loadFrameScript("chrome://scriptish/content/e10s/browser-content.js", true);
 
-})(Components.utils.import, {}, this);
+addEventListener("load", function() {
+  // Check if Scriptish has been updated/installed
+  Services.scriptish.updateChk && setTimeout(function() {
+    Services.scriptish.updateChk();
+  }, 750);
+}, false);
 
 
+Scriptish_log("step 1b");
 
-messageManager.loadFrameScript("chrome://scriptish/content/e10s/browser-content.js", true);
+})(Components.utils.import, {}, this);

From a0f24d1631400187e180d33081a53a8e3571162e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 22 Aug 2011 19:51:32 -0700
Subject: [PATCH 552/829] Made Scriptish_isGreasemonkeyable.js and
 Scriptish_isURLExcluded.js modules, and a few other minor things..

---
 extension/components/scriptish.js             | 94 +++++++++----------
 extension/content/e10s/browser-content.js     |  2 +
 extension/content/e10s/browser.js             |  2 -
 extension/content/js/browser.js               |  8 +-
 extension/content/js/options.js               | 10 +-
 extension/content/tests/testIsGMable.js       | 52 +++++-----
 extension/modules/config/config.js            | 21 ++---
 extension/modules/manager.js                  | 41 +++++---
 extension/modules/script/script.js            |  3 +-
 extension/modules/scriptish.js                | 29 ------
 .../modules/utils/Scriptish_injectScripts.js  | 30 +++---
 .../utils/Scriptish_isGreasemonkeyable.js     | 35 +++++++
 .../modules/utils/Scriptish_isURLExcluded.js  | 21 +++++
 13 files changed, 200 insertions(+), 148 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_isGreasemonkeyable.js
 create mode 100644 extension/modules/utils/Scriptish_isURLExcluded.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 5c7cb2b1..91cd67f2 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -17,6 +17,7 @@ lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForConten
 lazyUtil(this, "alert");
 lazyUtil(this, "injectScripts");
 lazyUtil(this, "installUri");
+lazyUtil(this, "isGreasemonkeyable");
 lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "stringBundle");
@@ -42,6 +43,8 @@ function ScriptishService() {
     Scriptish_manager.setup.call(this);
     Services.obs.addObserver(this, "install-userscript", false);
     Services.obs.addObserver(this, "scriptish-enabled", false);
+    Services.obs.addObserver(this, "content-document-global-created", false);
+    Services.obs.addObserver(this, "chrome-document-global-created", false);
   }
 }
 
@@ -60,6 +63,40 @@ ScriptishService.prototype = {
 
   observe: function(aSubject, aTopic, aData) {
     switch (aTopic) {
+      case "content-document-global-created":
+      case "chrome-document-global-created":
+        let safeWin = aSubject;
+        let chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
+        if (!chromeWin) return;
+
+        let gmBrowserUI = chromeWin.Scriptish_BrowserUI;
+        let gBrowser = chromeWin.gBrowser;
+        if (!gmBrowserUI || !gBrowser) return;
+
+        // Show the scriptish install banner if the user is navigating to a .user.js
+        // file in a top-level tab.
+        if (gmBrowserUI.scriptDownloader_
+            && safeWin === safeWin.top
+            && RE_USERSCRIPT.test(safeWin.location.href)
+            && !RE_CONTENTTYPE.test(safeWin.document.contentType)) {
+          gmBrowserUI.showInstallBanner(
+              gBrowser.getBrowserForDocument(safeWin.document));
+        }
+
+        // if the focused tab's window is the one loading, then attach menuCommander
+        if (safeWin === gBrowser.selectedBrowser.contentWindow) {
+          if (gmBrowserUI.currentMenuCommander)
+            gmBrowserUI.currentMenuCommander.detach();
+
+          let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
+          gmBrowserUI.currentMenuCommander =
+              gmBrowserUI.getCommander(currentInnerWindowID).attach();
+
+          Scriptish_windowUnloader(function() {
+            gmBrowserUI.docUnload(currentInnerWindowID);
+          }, currentInnerWindowID);
+        }
+        break;
       case "install-userscript":
         let win = Scriptish.getMostRecentWindow("navigator:browser");
         if (win) win.Scriptish_BrowserUI.installCurrentScript();
@@ -79,36 +116,7 @@ ScriptishService.prototype = {
 
   get filename() filename,
 
-  docReady: function(safeWin) {
-    var chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
-    if (!Scriptish.enabled || !chromeWin) return;
-
-    let gmBrowserUI = chromeWin.Scriptish_BrowserUI;
-    let gBrowser = chromeWin.gBrowser;
-    if (!gmBrowserUI || !gBrowser) return;
-
-    let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
-
-    let href = (safeWin.location.href
-        || (safeWin.frameElement && safeWin.frameElement.src))
-        || "";
-
-    if (!href && safeWin.frameElement) {
-      Scriptish_manager.waitForFrame.call(this, safeWin, chromeWin);
-      return;
-    }
-
-    // Show the scriptish install banner if the user is navigating to a .user.js
-    // file in a top-level tab.
-    if (gmBrowserUI.scriptDownloader_
-        && safeWin === safeWin.top && RE_USERSCRIPT.test(href)
-        && !RE_CONTENTTYPE.test(safeWin.document.contentType)) {
-      gmBrowserUI.showInstallBanner(
-          gBrowser.getBrowserForDocument(safeWin.document));
-    }
-
-    if (!Scriptish.isGreasemonkeyable(href)) return;
-
+  docReady: function(href, safeWin) {
     let unsafeWin = safeWin.wrappedJSObject;
     let self = this;
     let winClosed = false;
@@ -116,7 +124,7 @@ ScriptishService.prototype = {
 
     // rechecks values that can change at any moment
     function shouldNotRun() (
-      winClosed || !Scriptish.enabled || !Scriptish.isGreasemonkeyable(href));
+      winClosed || !Scriptish.enabled || !Scriptish_isGreasemonkeyable(href));
 
     // check if there are any modified scripts
     if (Scriptish_prefRoot.getValue("enableScriptRefreshing")) {
@@ -128,7 +136,7 @@ ScriptishService.prototype = {
         let rdyStateIdx = docRdyStates.indexOf(safeWin.document.readyState);
         function inject() {
           if (shouldNotRun()) return;
-          Scriptish_injectScripts([script], href, currentInnerWindowID, safeWin, chromeWin);
+          Scriptish_injectScripts([script], href, safeWin);
         }
         switch (script.runAt) {
         case "document-end":
@@ -155,17 +163,6 @@ ScriptishService.prototype = {
       });
     }
 
-    // if the focused tab's window is the one loading, then attach menuCommander
-    if (safeWin === gBrowser.selectedBrowser.contentWindow) {
-      if (gmBrowserUI.currentMenuCommander)
-        gmBrowserUI.currentMenuCommander.detach();
-      gmBrowserUI.currentMenuCommander =
-          gmBrowserUI.getCommander(currentInnerWindowID).attach();
-    }
-
-    // if the url is a excluded url then stop
-    if (Scriptish_config.isURLExcluded(href)) return;
-
     // find matching scripts
     Scriptish_config.initScripts(href, isTop, function(scripts) {
       if (scripts["document-end"].length || scripts["document-idle"].length) {
@@ -177,11 +174,11 @@ ScriptishService.prototype = {
             timeout(function() {
               if (shouldNotRun()) return;
               Scriptish_injectScripts(
-                  scripts["document-idle"], href, currentInnerWindowID, safeWin, chromeWin);
+                  scripts["document-idle"], href, safeWin);
             });
 
           // inject @run-at document-end scripts
-          Scriptish_injectScripts(scripts["document-end"], href, currentInnerWindowID, safeWin, chromeWin);
+          Scriptish_injectScripts(scripts["document-end"], href, safeWin);
         }, true);
       }
 
@@ -189,17 +186,16 @@ ScriptishService.prototype = {
         safeWin.addEventListener("load", function() {
           if (shouldNotRun()) return;
           // inject @run-at window-load scripts
-          Scriptish_injectScripts(scripts["window-load"], href, currentInnerWindowID, safeWin, chromeWin);
+          Scriptish_injectScripts(scripts["window-load"], href, safeWin);
         }, true);
       }
 
       // inject @run-at document-start scripts
-      Scriptish_injectScripts(scripts["document-start"], href, currentInnerWindowID, safeWin, chromeWin);
+      Scriptish_injectScripts(scripts["document-start"], href, safeWin);
 
       Scriptish_windowUnloader(function() {
         winClosed = true;
-        gmBrowserUI.docUnload(currentInnerWindowID);
-      }, currentInnerWindowID);
+      }, Scriptish_getWindowIDs(safeWin).innerID);
     });
   },
 
diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
index 482f375b..04a8305b 100644
--- a/extension/content/e10s/browser-content.js
+++ b/extension/content/e10s/browser-content.js
@@ -8,6 +8,8 @@ lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
 
 Scriptish_log("step 2");
 
+Scriptish_manager.setup(content);
+
 })(Components.utils.import, {}, this);
 
 
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 4a24e7fe..96f69285 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -8,8 +8,6 @@ lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
 
 Scriptish_log("step 1a");
 
-Scriptish_manager.setup(content);
-
 messageManager.loadFrameScript("chrome://scriptish/content/e10s/browser-content.js", true);
 
 addEventListener("load", function() {
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index af459eea..edbed32f 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -15,6 +15,8 @@ lazyImport(window, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(window, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
 
 lazyUtil(window, "installUri");
+lazyUtil(window, "isGreasemonkeyable");
+lazyUtil(window, "isURLExcluded");
 lazyUtil(window, "openInEditor");
 lazyUtil(window, "stringBundle");
 lazyUtil(window, "getURLsForContentWindow");
@@ -348,7 +350,7 @@ function Scriptish_setupPopup() {
   Scriptish_BrowserUI.reattachMenuCmds();
 
   function okURL(url) (
-      (Scriptish.isGreasemonkeyable(url) && !Scriptish_config.isURLExcluded(url)));
+      (Scriptish_isGreasemonkeyable(url) && !Scriptish_isURLExcluded(url)));
 
   function scriptsMatching(urls) {
     return Scriptish_config.getMatchingScripts(function testMatchURLs(script) {
@@ -420,9 +422,9 @@ function Scriptish_setupPopup() {
 
     // determine the correct label
     let label;
-    if (Scriptish_config.isURLExcluded(url))
+    if (Scriptish_isURLExcluded(url))
       label = Scriptish_stringBundle("statusbar.noScripts.excluded");
-    else if (!Scriptish.isGreasemonkeyable(url))
+    else if (!Scriptish_isGreasemonkeyable(url))
       label = Scriptish_stringBundle("statusbar.noScripts.scheme");
     else
       label = Scriptish_stringBundle("statusbar.noScripts.notfound");
diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index 27f4371a..bb80fb16 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -5,6 +5,12 @@ Components.utils.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Scriptish_localizeOnLoad"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
+  "Scriptish_isURLExcluded",
+  "Scriptish_addExcludes",
+  "Scriptish_setExcludes",
+  "Scriptish_getExcludes"
+]);
 
 lazyUtil(this, "getEditor");
 lazyUtil(this, "stringBundle");
@@ -14,7 +20,7 @@ function $(aID) document.getElementById(aID);
 function changeEditor() Scriptish_getEditor(window, true);
 
 function saveExcludes() {
-  Scriptish_config.excludes = $("excludes").value.match(/.+/g);
+  Scriptish_setExcludes($("excludes").value.match(/.+/g));
   Scriptish.notify(null, "scriptish-preferences-change", true);
 }
 
@@ -27,7 +33,7 @@ addEventListener("load", function init() {
 
   // init custom excludes preferences
   let excludes = $("excludes");
-  excludes.value = Scriptish_config.excludes.join("\n");
+  excludes.value = Scriptish_getExcludes().join("\n");
   if (instantApply) {
     excludes.addEventListener("input", saveExcludes, false);
   }
diff --git a/extension/content/tests/testIsGMable.js b/extension/content/tests/testIsGMable.js
index 85684a02..bec7d25c 100644
--- a/extension/content/tests/testIsGMable.js
+++ b/extension/content/tests/testIsGMable.js
@@ -1,26 +1,26 @@
 
-Components.utils.import("resource://scriptish/scriptish.js");
+Components.utils.import("resource://scriptish/utils/Scriptish_isGreasemonkeyable.js");
 
-module("Scriptish.isGreasemonkeyable");
+module("Scriptish_isGreasemonkeyable");
 var PREF_BRANCH = Services.prefs.getBranch("extensions.scriptish.");
 
 test("HTTP", function() {
   expect(4);
 
   equal(
-      Scriptish.isGreasemonkeyable("http://google.com"),
+      Scriptish_isGreasemonkeyable("http://google.com"),
       true,
       "http://google.com should be ok");
   equal(
-      Scriptish.isGreasemonkeyable("HTTP://"),
+      Scriptish_isGreasemonkeyable("HTTP://"),
       false,
       "HTTP:// should not be ok");
   equal(
-      Scriptish.isGreasemonkeyable("http://"),
+      Scriptish_isGreasemonkeyable("http://"),
       true,
       "http:// should be ok");
   equal(
-      Scriptish.isGreasemonkeyable("http"),
+      Scriptish_isGreasemonkeyable("http"),
       false,
       "http not should be ok");
 });
@@ -29,19 +29,19 @@ test("HTTPS", function() {
   expect(4);
 
   equal(
-      Scriptish.isGreasemonkeyable("https://google.com"),
+      Scriptish_isGreasemonkeyable("https://google.com"),
       true,
       "https://google.com should be ok");
   equal(
-      Scriptish.isGreasemonkeyable("HTTPS://"),
+      Scriptish_isGreasemonkeyable("HTTPS://"),
       false,
       "HTTPS:// should not be ok");
   equal(
-      Scriptish.isGreasemonkeyable("https://"),
+      Scriptish_isGreasemonkeyable("https://"),
       true,
       "https:// should be ok");
   equal(
-      Scriptish.isGreasemonkeyable("https"),
+      Scriptish_isGreasemonkeyable("https"),
       false,
       "https not should be ok");
 });
@@ -55,27 +55,27 @@ test("ABOUT", function() {
   }
 
   equal(
-      Scriptish.isGreasemonkeyable("about:blank"),
+      Scriptish_isGreasemonkeyable("about:blank"),
       true,
       "about:blank is always ok");
   equal(
-      Scriptish.isGreasemonkeyable("about:blank?test"),
+      Scriptish_isGreasemonkeyable("about:blank?test"),
       true,
       "about:blank?test is always ok");
   equal(
-      Scriptish.isGreasemonkeyable("about:home"),
+      Scriptish_isGreasemonkeyable("about:home"),
       aboutIsGMable,
       "about:home is " + (aboutIsGMable ? "ok" : "not ok"));
   equal(
-      Scriptish.isGreasemonkeyable("about:"),
+      Scriptish_isGreasemonkeyable("about:"),
       aboutIsGMable,
       "about: is ok");
   equal(
-      Scriptish.isGreasemonkeyable("ABOUT:"),
+      Scriptish_isGreasemonkeyable("ABOUT:"),
       false,
       "ABOUT: is not ok");
   equal(
-      Scriptish.isGreasemonkeyable("about"),
+      Scriptish_isGreasemonkeyable("about"),
       false,
       "about is not ok");
 });
@@ -89,23 +89,23 @@ test("FILE", function() {
   }
 
   equal(
-      Scriptish.isGreasemonkeyable("file://"),
+      Scriptish_isGreasemonkeyable("file://"),
       fileIsGMable,
       "file:// is " + (fileIsGMable ? "ok" : "not ok"));
   equal(
-      Scriptish.isGreasemonkeyable("file:"),
+      Scriptish_isGreasemonkeyable("file:"),
       fileIsGMable,
       "file: is " + (fileIsGMable ? "ok" : "not ok"));
   equal(
-      Scriptish.isGreasemonkeyable("file:///test.html"),
+      Scriptish_isGreasemonkeyable("file:///test.html"),
       fileIsGMable,
       "file:///test.html is " + (fileIsGMable ? "ok" : "not ok"));
   equal(
-      Scriptish.isGreasemonkeyable("FILE:"),
+      Scriptish_isGreasemonkeyable("FILE:"),
       false,
       "FILE: is not ok");
   equal(
-      Scriptish.isGreasemonkeyable("file"),
+      Scriptish_isGreasemonkeyable("file"),
       false,
       "file is not ok");
 });
@@ -119,23 +119,23 @@ test("UNMHT", function() {
   }
 
   equal(
-      Scriptish.isGreasemonkeyable("unmht://"),
+      Scriptish_isGreasemonkeyable("unmht://"),
       unmhtIsGMable,
       "unmht:// is " + (unmhtIsGMable ? "ok" : "not ok"));
   equal(
-      Scriptish.isGreasemonkeyable("unmht:"),
+      Scriptish_isGreasemonkeyable("unmht:"),
       unmhtIsGMable,
       "unmht: is " + (unmhtIsGMable ? "ok" : "not ok"));
   equal(
-      Scriptish.isGreasemonkeyable("unmht:///test.html"),
+      Scriptish_isGreasemonkeyable("unmht:///test.html"),
       unmhtIsGMable,
       "unmht:///test.html is " + (unmhtIsGMable ? "ok" : "not ok"));
   equal(
-      Scriptish.isGreasemonkeyable("UNMHT:"),
+      Scriptish_isGreasemonkeyable("UNMHT:"),
       false,
       "UNMHT: is not ok");
   equal(
-      Scriptish.isGreasemonkeyable("unmht"),
+      Scriptish_isGreasemonkeyable("unmht"),
       false,
       "unmht is not ok");
 });
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 8e5ecc21..37297e0a 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -10,8 +10,13 @@ Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
-lazyImport(this, "resource://scriptish/utils/PatternCollection.js", ["PatternCollection"]);
 lazyImport(this, "resource://scriptish/script/script.js", ["Script"]);
+lazyImport(this, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
+  "Scriptish_isURLExcluded",
+  "Scriptish_addExcludes",
+  "Scriptish_setExcludes",
+  "Scriptish_getExcludes"
+]);
 lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
 
 lazyUtil(this, "cryptoHash");
@@ -27,7 +32,6 @@ function Config(aBaseDir) {
   this.timer = new Timer();
   this._observers = [];
   this._saveTimer = null;
-  this._excludes = new PatternCollection();
   this._scripts = [];
   this._scriptFoldername = aBaseDir;
 
@@ -195,7 +199,7 @@ Config.prototype = {
           break;
         }
       }
-      self.addExclude(excludes);
+      Scriptish_addExcludes(excludes);
 
       return aCallback(true);
     }
@@ -225,7 +229,7 @@ Config.prototype = {
         fileModified = Script.loadFromJSON(self, scripts[i]) || fileModified;
 
       // load global excludes
-      config.excludes.forEach(function(i) self.addExclude(i));
+      Scriptish_addExcludes(config.excludes);
 
       return aCallback(true, fileModified);
     }
@@ -312,7 +316,7 @@ Config.prototype = {
   },
 
   toJSON: function() ({
-    excludes: this.excludes,
+    excludes: Scriptish_getExcludes(),
     scripts: this.scripts.map(function(script) script.toJSON())
   }),
 
@@ -412,14 +416,7 @@ Config.prototype = {
     }
   },
 
-  get excludes() this._excludes.patterns,
-  set excludes(excludes) {
-    this._excludes.clear();
-    this._excludes.addPatterns(excludes);
-  },
-  addExclude: function(excludes) this._excludes.addPatterns(excludes),
   get scripts() this._scripts.concat(),
-  isURLExcluded: function(url) this._excludes.test(url),
   getMatchingScripts: function(testFunc) this.scripts.filter(testFunc),
   sortScripts: function() this._scripts.sort(function(a, b) b.priority - a.priority),
   injectScript: function(script) {
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index e98e476e..b66dbc05 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -6,7 +6,12 @@ Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+
+lazyUtil(this, "injectScripts");
+lazyUtil(this, "isGreasemonkeyable");
+lazyUtil(this, "isURLExcluded");
 lazyUtil(this, "getWindowIDs");
+lazyUtil(this, "windowUnloader");
 
 let windows = {};
 
@@ -17,7 +22,7 @@ const Scriptish_manager = {
         switch (aTopic) {
         case "chrome-document-global-created":
         case "content-document-global-created":
-          this.docReady(aSubject);
+          Scriptish_manager.docReady_start.call(this, aSubject, aContentScope);
           break;
         }
       }).bind(this)
@@ -27,28 +32,42 @@ const Scriptish_manager = {
     Services.obs.addObserver(observer, "chrome-document-global-created", false);
   },
 
-  // TODO: remove chromeWin, or use it
-  docReady: function(safeWin) {
+  docReady_start: function(safeWin, aContentScope) {
+    // TODO: disable observer that calls this when Scriptish is disabled
     if (!Scriptish.enabled) return;
 
-    let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
-    windows[currentInnerWindowID] = {unloaders: []};
-
+    // try to get the windows href..
     let href = (safeWin.location.href
         || (safeWin.frameElement && safeWin.frameElement.src))
         || "";
 
+    // if we don't have a href and the window is a frame, then wait until we do
     if (!href && safeWin.frameElement) {
-      Scriptish_mananger.waitForFrame(safeWin);
+      Scriptish_manager.waitForFrame.call(this, safeWin);
       return;
     }
 
-    if (!Scriptish.isGreasemonkeyable(href)) return;
+    if (!Scriptish_isGreasemonkeyable(href)) return;
+
+    // if the url is a excluded url then stop
+    if (Scriptish_isURLExcluded(href)) return;
+
+    this.docReady(href, safeWin, aContentScope);
+  },
+
+  docReady: function(href, safeWin, aContentScope) {
+    let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
+    windows[currentInnerWindowID] = {unloaders: []};
+
+    // ignore window if it is not the same window used by aContentScope
+    if (JSON.stringify(Scriptish_getWindowIDs(aContentScope)) != JSON.stringify(Scriptish_getWindowIDs(safeWin)))
+      return;
+    //Scriptish_log(JSON.stringify(Scriptish_getWindowIDs(safeWin)));
 
-    
+    Scriptish_log("try to run something right here!!");
   },
 
-  waitForFrame: function(safeWin, chromeWin) {
+  waitForFrame: function(safeWin) {
     let self = this;
     safeWin.addEventListener("DOMContentLoaded", function _frame_loader() {
       // not perfect, but anyway
@@ -57,7 +76,7 @@ const Scriptish_manager = {
 
       if (!href) return; // wait for it :p
       safeWin.removeEventListener("DOMContentLoaded", _frame_loader, false);
-      self.docReady(safeWin, chromeWin);
+      Scriptish_manager.docReady_start.call(self, safeWin);
 
       // fake DOMContentLoaded to get things rolling
       var evt = safeWin.document.createEvent("Events");
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 9fda8a88..77f8d92a 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -18,6 +18,7 @@ lazyImport(this, "resource://scriptish/third-party/MatchPattern.js", ["MatchPatt
 lazyImport(this, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
 lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "AddonManagerPrivate"]);
 
+lazyUtil(this, "isGreasemonkeyable");
 lazyUtil(this, "getUriFromFile");
 lazyUtil(this, "getContents");
 lazyUtil(this, "memoize");
@@ -317,7 +318,7 @@ Script.prototype = {
     } catch (e) {
       // If true, we're allowing a scheme that doesn't have a host.
       // i.e. "about:scriptish"
-      return Scriptish.isGreasemonkeyable(aURL);
+      return Scriptish_isGreasemonkeyable(aURL);
     }
 
     var i = this.domains.length - 1;
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 03d75fa4..92ffebe3 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -39,35 +39,6 @@ const Scriptish = {
     notifyStatusChg(enabled);
     Scriptish_prefRoot.setValue("enabled", enabled);
   },
-  isGreasemonkeyable: function Scriptish_isGreasemonkeyable(aURL) {
-    if (!aURL) return false;
-
-    // if the url provide is not a valid url, then an error could be thrown
-    try {
-      var scheme = Services.io.extractScheme(aURL);
-      if (!scheme) {
-        return false;
-      }
-    } catch (e) {
-      return false;
-    }
-    switch (scheme) {
-      case "http":
-      case "https":
-        return Scriptish_prefRoot.getBoolValue("enabledSchemes.http", true);
-
-      case "ftp":
-      case "data":
-        return Scriptish_prefRoot.getBoolValue("enabledSchemes." + scheme, true);
-
-      case "about":
-        // Always allow "about:blank".
-        if (/^about:blank(?:[#?].*)?$/.test(aURL)) return true;
-        // no break
-      default:
-        return Scriptish_prefRoot.getBoolValue("enabledSchemes." + scheme, false);
-    }
-  },
   getMostRecentWindow: function() Services.wm.getMostRecentWindow("navigator:browser"),
   getWindows: function() Services.wm.getEnumerator("navigator:browser")
 }
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 527b7d01..4ba5c060 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -13,21 +13,25 @@ lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_sandboxSc
 lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
 lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
 lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
-
-const Scriptish_injectScripts_filename = Components.stack.filename;
-const gTimer = new Timer();
-const {nsIDOMXPathResult: XPATH_RESULT} = Ci;
+lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
 
 lazyUtil(this, "evalInSandbox");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "windowUnloader");
 
-function Scriptish_injectScripts(scripts, url, winID, wrappedContentWin, chromeWin) {
+const Scriptish_injectScripts_filename = Components.stack.filename;
+const gTimer = new Timer();
+const {nsIDOMXPathResult: XPATH_RESULT} = Ci;
+
+function Scriptish_injectScripts(scripts, url, safeWin) {
+  var chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
+  if (!chromeWin || !chromeWin.Scriptish_BrowserUI) return;
   if (0 >= scripts.length) return;
-  let unsafeContentWin = wrappedContentWin.wrappedJSObject;
 
+  let unsafeContentWin = safeWin.wrappedJSObject;
   let delays = [];
-  let winID = Scriptish_getWindowIDs(wrappedContentWin).innerID;
+  let winID = Scriptish_getWindowIDs(safeWin).innerID;
+
   Scriptish_windowUnloader(function() {
     for (let [, id] in Iterator(delays)) gTimer.clearTimeout(id);
   }, winID);
@@ -38,11 +42,11 @@ function Scriptish_injectScripts(scripts, url, winID, wrappedContentWin, chromeW
     // Need to keep a valid reference to |script| around so that GM_log
     // and the delay code (and probably other consumer work).
     let script = scripts[i];
-    let sandbox = new Cu.Sandbox(wrappedContentWin);
+    let sandbox = new Cu.Sandbox(safeWin);
     Cu.evalInSandbox(GM_sandboxScripts, sandbox);
 
     let GM_api = new GM_API(
-        script, url, winID, wrappedContentWin, unsafeContentWin, chromeWin);
+        script, url, winID, safeWin, unsafeContentWin, chromeWin);
 
     // hack XPathResult since that is so commonly used
     sandbox.XPathResult = XPATH_RESULT;
@@ -52,7 +56,7 @@ function Scriptish_injectScripts(scripts, url, winID, wrappedContentWin, chromeW
       sandbox[funcName] = GM_api[funcName];
     }
     XPCOMUtils.defineLazyGetter(sandbox, "console", function() {
-      return GM_console(script, wrappedContentWin, chromeWin);
+      return GM_console(script, safeWin, chromeWin);
     });
     XPCOMUtils.defineLazyGetter(sandbox, "GM_log", function() {
       if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
@@ -66,16 +70,16 @@ function Scriptish_injectScripts(scripts, url, winID, wrappedContentWin, chromeW
     });
 
     sandbox.unsafeWindow = unsafeContentWin;
-    sandbox.__proto__ = wrappedContentWin;
+    sandbox.__proto__ = safeWin;
 
     let delay = script.delay;
     if (delay || delay === 0) {
       // don't use window's setTimeout, b/c then window could clearTimeout
       delays.push(gTimer.setTimeout(function() {
-        Scriptish_evalInSandbox(script, sandbox, wrappedContentWin);
+        Scriptish_evalInSandbox(script, sandbox, safeWin);
       }, delay));
     } else {
-      Scriptish_evalInSandbox(script, sandbox, wrappedContentWin);
+      Scriptish_evalInSandbox(script, sandbox, safeWin);
     }
   }
 }
diff --git a/extension/modules/utils/Scriptish_isGreasemonkeyable.js b/extension/modules/utils/Scriptish_isGreasemonkeyable.js
new file mode 100644
index 00000000..21a6c03f
--- /dev/null
+++ b/extension/modules/utils/Scriptish_isGreasemonkeyable.js
@@ -0,0 +1,35 @@
+var EXPORTED_SYMBOLS = ["Scriptish_isGreasemonkeyable"];
+
+Components.utils.import("resource://scriptish/constants.js");
+
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+
+function Scriptish_isGreasemonkeyable(aURL) {
+  if (!aURL) return false;
+
+  // if the url provide is not a valid url, then an error could be thrown
+  try {
+    var scheme = Services.io.extractScheme(aURL);
+    if (!scheme) {
+      return false;
+    }
+  } catch (e) {
+    return false;
+  }
+  switch (scheme) {
+    case "http":
+    case "https":
+      return Scriptish_prefRoot.getBoolValue("enabledSchemes.http", true);
+
+    case "ftp":
+    case "data":
+      return Scriptish_prefRoot.getBoolValue("enabledSchemes." + scheme, true);
+
+    case "about":
+      // Always allow "about:blank".
+      if (/^about:blank(?:[#?].*)?$/.test(aURL)) return true;
+      // no break
+    default:
+      return Scriptish_prefRoot.getBoolValue("enabledSchemes." + scheme, false);
+  }
+};
\ No newline at end of file
diff --git a/extension/modules/utils/Scriptish_isURLExcluded.js b/extension/modules/utils/Scriptish_isURLExcluded.js
new file mode 100644
index 00000000..ccbbb870
--- /dev/null
+++ b/extension/modules/utils/Scriptish_isURLExcluded.js
@@ -0,0 +1,21 @@
+var EXPORTED_SYMBOLS = [
+  "Scriptish_isURLExcluded",
+  "Scriptish_addExcludes",
+  "Scriptish_setExcludes",
+  "Scriptish_getExcludes"
+];
+
+Components.utils.import("resource://scriptish/utils/PatternCollection.js");
+
+var excludes = new PatternCollection();
+
+function Scriptish_isURLExcluded(url) excludes.test(url);
+
+function Scriptish_addExcludes(aExcludes) excludes.addPatterns(aExcludes);
+
+function Scriptish_setExcludes(aExcludes) {
+  excludes.clear();
+  excludes.addPatterns(aExcludes);
+};
+
+function Scriptish_getExcludes() excludes.patterns;

From 8646182f81f9ee8cf6dc9506a029e89e7f8df7d3 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 22 Aug 2011 21:06:15 -0700
Subject: [PATCH 553/829] loading global excludes into content processes

---
 extension/components/scriptish.js             |  2 +
 extension/content/e10s/browser-content.js     | 14 +++++-
 extension/content/e10s/browser.js             | 47 +++++++++++--------
 extension/content/js/options.js               |  3 ++
 .../utils/Scriptish_sendAsyncE10SMessage.js   | 10 ++++
 5 files changed, 55 insertions(+), 21 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_sendAsyncE10SMessage.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 91cd67f2..e661e1a6 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -45,6 +45,8 @@ function ScriptishService() {
     Services.obs.addObserver(this, "scriptish-enabled", false);
     Services.obs.addObserver(this, "content-document-global-created", false);
     Services.obs.addObserver(this, "chrome-document-global-created", false);
+  } else {
+    //Services.mm.
   }
 }
 
diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
index 04a8305b..176bacc2 100644
--- a/extension/content/e10s/browser-content.js
+++ b/extension/content/e10s/browser-content.js
@@ -1,18 +1,30 @@
 
+var erik = "";
 (function(inc, tools, global){
 
 inc("resource://scriptish/constants.js", tools);
 const {lazyImport, lazyUtil} = tools;
 lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
+lazyImport(global, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
+  "Scriptish_isURLExcluded",
+  "Scriptish_addExcludes",
+  "Scriptish_setExcludes",
+  "Scriptish_getExcludes"
+]);
 
 Scriptish_log("step 2");
 
+Scriptish_setExcludes(sendSyncMessage("Scriptish:GlobalExcludesUpdate"));
+addMessageListener("Scriptish:GlobalExcludesUpdate", function({json}) {
+  Scriptish_setExcludes(json);
+});
+
 Scriptish_manager.setup(content);
 
 })(Components.utils.import, {}, this);
 
 
 addEventListener("DOMContentLoaded", function() {
-  //content.alert("window");
+  //content.alert(erik);
 }, true);
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 96f69285..908c793b 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -1,23 +1,30 @@
 
 (function(inc, tools, global){
-
-inc("resource://scriptish/constants.js", tools);
-const {lazyImport, lazyUtil, Services} = tools;
-lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
-lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
-
-Scriptish_log("step 1a");
-
-messageManager.loadFrameScript("chrome://scriptish/content/e10s/browser-content.js", true);
-
-addEventListener("load", function() {
-  // Check if Scriptish has been updated/installed
-  Services.scriptish.updateChk && setTimeout(function() {
-    Services.scriptish.updateChk();
-  }, 750);
-}, false);
-
-
-Scriptish_log("step 1b");
-
+  inc("resource://scriptish/constants.js", tools);
+  const {lazyImport, lazyUtil, Services} = tools;
+  lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
+  lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
+  lazyImport(this, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
+    "Scriptish_isURLExcluded",
+    "Scriptish_addExcludes",
+    "Scriptish_setExcludes",
+    "Scriptish_getExcludes"
+  ]);
+
+  Scriptish_log("step 1a");
+  addEventListener("load", function() {
+    // Check if Scriptish has been updated/installed
+    Services.scriptish.updateChk && setTimeout(function() {
+      Services.scriptish.updateChk();
+    }, 750);
+  }, false);
+
+  var mm = messageManager;
+
+  mm.addMessageListener("Scriptish:GlobalExcludesUpdate", Scriptish_getExcludes);
+
+  mm.loadFrameScript(
+      "chrome://scriptish/content/e10s/browser-content.js",
+      true); // no delay loading frame script
+  Scriptish_log("step 1b");
 })(Components.utils.import, {}, this);
diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index bb80fb16..b21f9f8f 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -13,6 +13,7 @@ lazyImport(this, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
 ]);
 
 lazyUtil(this, "getEditor");
+lazyUtil(this, "sendAsyncE10SMessage");
 lazyUtil(this, "stringBundle");
 
 function $(aID) document.getElementById(aID);
@@ -21,6 +22,8 @@ function changeEditor() Scriptish_getEditor(window, true);
 
 function saveExcludes() {
   Scriptish_setExcludes($("excludes").value.match(/.+/g));
+  if (e10s)
+    Scriptish_sendAsyncE10SMessage("Scriptish:GlobalExcludesUpdate", Scriptish_getExcludes());
   Scriptish.notify(null, "scriptish-preferences-change", true);
 }
 
diff --git a/extension/modules/utils/Scriptish_sendAsyncE10SMessage.js b/extension/modules/utils/Scriptish_sendAsyncE10SMessage.js
new file mode 100644
index 00000000..8be4dde2
--- /dev/null
+++ b/extension/modules/utils/Scriptish_sendAsyncE10SMessage.js
@@ -0,0 +1,10 @@
+var EXPORTED_SYMBOLS = ["Scriptish_sendAsyncE10SMessage"];
+Components.utils.import("resource://scriptish/constants.js");
+
+function Scriptish_sendAsyncE10SMessage(aName, aJSON) {
+  let bWins = Scriptish.getWindows();
+  while (bWins.hasMoreElements()) {
+    let bWin = bWins.getNext();
+    bWin.messageManager.sendAsyncMessage(aName, aJSON)
+  }
+}

From 707e906434dd048009146a2a34e2bd2c1b9a17ed Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 22 Aug 2011 21:41:22 -0700
Subject: [PATCH 554/829] creating Scriptish_updateChk.js and
 Scriptish_updateModifiedScripts.js modules, removing Services.scriptish, and
 a couple other minor things..

---
 extension/components/scriptish.js             | 52 ++-----------------
 extension/content/e10s/browser.js             |  6 +--
 extension/content/js/browser.js               |  3 +-
 extension/content/tests/testAvailability.js   |  6 ---
 extension/modules/api.js                      |  1 -
 extension/modules/config/config.js            |  3 +-
 extension/modules/constants.js                |  4 --
 .../modules/utils/Scriptish_updateChk.js      |  8 +++
 .../utils/Scriptish_updateModifiedScripts.js  | 51 ++++++++++++++++++
 9 files changed, 67 insertions(+), 67 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_updateChk.js
 create mode 100644 extension/modules/utils/Scriptish_updateModifiedScripts.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index e661e1a6..74ae836b 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -2,8 +2,6 @@ const DESCRIPTION = "ScriptishService";
 const CONTRACTID = "@scriptish.erikvold.com/scriptish-service;1";
 const CLASSID = Components.ID("{ca39e060-88ab-11df-a4ee-0800200c9a66}");
 
-const filename = Components.stack.filename;
-
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 
@@ -21,10 +19,10 @@ lazyUtil(this, "isGreasemonkeyable");
 lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "stringBundle");
+lazyUtil(this, "updateModifiedScripts");
 lazyUtil(this, "windowUnloader");
 
 const {nsIContentPolicy: CP} = Ci;
-const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "complete"];
 
 // If the file was previously cached it might have been given a number after
 // .user, like gmScript.user-12.js
@@ -32,13 +30,6 @@ const RE_USERSCRIPT = /\.user(?:-\d+)?\.js$/;
 const RE_CONTENTTYPE = /text\/html/i;
 
 function ScriptishService() {
-  this.wrappedJSObject = this;
-  this.updateChk = function() {
-    Services.scriptloader
-        .loadSubScript("chrome://scriptish/content/js/updatecheck.js");
-    delete this.updateChk;
-  }
-
   if ("Fennec" != Services.appinfo.name) {
     Scriptish_manager.setup.call(this);
     Services.obs.addObserver(this, "install-userscript", false);
@@ -116,57 +107,20 @@ ScriptishService.prototype = {
     }
   },
 
-  get filename() filename,
-
   docReady: function(href, safeWin) {
     let unsafeWin = safeWin.wrappedJSObject;
     let self = this;
     let winClosed = false;
-    let isTop = (safeWin === safeWin.top);
 
     // rechecks values that can change at any moment
     function shouldNotRun() (
       winClosed || !Scriptish.enabled || !Scriptish_isGreasemonkeyable(href));
 
     // check if there are any modified scripts
-    if (Scriptish_prefRoot.getValue("enableScriptRefreshing")) {
-       Scriptish_config.updateModifiedScripts(function(script) {
-        if (shouldNotRun()
-            || !Scriptish_isScriptRunnable(script, href, isTop))
-          return;
-
-        let rdyStateIdx = docRdyStates.indexOf(safeWin.document.readyState);
-        function inject() {
-          if (shouldNotRun()) return;
-          Scriptish_injectScripts([script], href, safeWin);
-        }
-        switch (script.runAt) {
-        case "document-end":
-          if (2 > rdyStateIdx) {
-            safeWin.addEventListener("DOMContentLoaded", inject, true);
-            return;
-          }
-          break;
-        case "document-idle":
-          if (2 > rdyStateIdx) {
-            safeWin.addEventListener(
-                "DOMContentLoaded", function() timeout(inject), true);
-            return;
-          }
-          break;
-        case "window-load":
-          if (4 > rdyStateIdx) {
-            safeWin.addEventListener("load", inject, true);
-            return;
-          }
-          break;
-        }
-        inject();
-      });
-    }
+    Scriptish_updateModifiedScripts(href, safeWin, shouldNotRun);
 
     // find matching scripts
-    Scriptish_config.initScripts(href, isTop, function(scripts) {
+    Scriptish_config.initScripts(href, (safeWin === safeWin.top), function(scripts) {
       if (scripts["document-end"].length || scripts["document-idle"].length) {
         safeWin.addEventListener("DOMContentLoaded", function() {
           if (shouldNotRun()) return;
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 908c793b..aa411ae5 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -4,7 +4,7 @@
   const {lazyImport, lazyUtil, Services} = tools;
   lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
   lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
-  lazyImport(this, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
+  lazyImport(global, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
     "Scriptish_isURLExcluded",
     "Scriptish_addExcludes",
     "Scriptish_setExcludes",
@@ -14,9 +14,7 @@
   Scriptish_log("step 1a");
   addEventListener("load", function() {
     // Check if Scriptish has been updated/installed
-    Services.scriptish.updateChk && setTimeout(function() {
-      Services.scriptish.updateChk();
-    }, 750);
+    inc("resource://scriptish/utils/Scriptish_updateChk.js");
   }, false);
 
   var mm = messageManager;
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index edbed32f..beaf3d52 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -24,7 +24,6 @@ lazyUtil(window, "getWindowIDs");
 
 var Ci = tools.Ci;
 var Services = tools.Services;
-var gmSvc = Services.scriptish;
 var $ = function(aID) document.getElementById(aID);
 
 Scriptish_BrowserUI.QueryInterface = tools.XPCOMUtils.generateQI([
@@ -152,7 +151,7 @@ Scriptish_BrowserUI.chromeLoad = function(e) {
   Scriptish_BrowserUIM.refreshStatus();
 
   // Check if Scriptish has been updated/installed
-  gmSvc.updateChk && setTimeout(function() gmSvc.updateChk(), 1000);
+  Components.utils.import("resource://scriptish/utils/Scriptish_updateChk.js");
 }
 
 Scriptish_BrowserUI.registerMenuCommand = function(menuCommand) {
diff --git a/extension/content/tests/testAvailability.js b/extension/content/tests/testAvailability.js
index 7f6a540c..fa6a0814 100644
--- a/extension/content/tests/testAvailability.js
+++ b/extension/content/tests/testAvailability.js
@@ -37,12 +37,6 @@ Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js", tools);
 Cu.import("resource://scriptish/third-party/Timer.js", tools);
 })(Components.utils);
 
-test("Scriptish", function() {
-    expect(2);
-    equals(typeof(Services.scriptish), "object", "Scriptish service is available");
-    equals(typeof(Services.scriptish.shouldLoad), "function", "shouldLoad is available");
-  });
-
 test("Utils", function() {
   expect(28);
 
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 39b55323..59e0c148 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -33,7 +33,6 @@ function GM_apiLeakCheck(apiName) {
         stack.filename != moduleFilename &&
         stack.filename != Scriptish_evalInSandbox_filename &&
         stack.filename != Scriptish_injectScripts_filename &&
-        stack.filename != Services.scriptish.filename &&
         stack.filename.substr(0, 6) != "chrome") {
       Scriptish_logError(new Error(
           Scriptish_stringBundle("error.api.unsafeAccess") + ": " + apiName));
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 37297e0a..dd767a6d 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -20,6 +20,7 @@ lazyImport(this, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
 lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
 
 lazyUtil(this, "cryptoHash");
+lazyUtil(this, "injectScripts");
 lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "getContents");
 lazyUtil(this, "getProfileFile");
@@ -425,7 +426,7 @@ Config.prototype = {
     var href = new XPCNativeWrapper(unsafeLoc, "href").href;
 
     if (script.enabled && !script.needsUninstall && script.matchesURL(href))
-      Services.scriptish.injectScripts([script], href, unsafeWin, this.chromeWin);
+      Scriptish_injectScripts([script], href, unsafeWin, this.chromeWin);
   },
 
   updateModifiedScripts: function(scriptInjector) {
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 376c1b2a..fbefacd7 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -48,10 +48,6 @@ var Instances = {
       .createInstance(Ci.nsIXMLHttpRequest)
 };
 
-XPCOMUtils.defineLazyGetter(Services, "scriptish", function() (
-    Cc["@scriptish.erikvold.com/scriptish-service;1"]
-        .getService().wrappedJSObject));
-
 XPCOMUtils.defineLazyServiceGetter(
      Services, "as", "@mozilla.org/alerts-service;1", "nsIAlertsService");
 
diff --git a/extension/modules/utils/Scriptish_updateChk.js b/extension/modules/utils/Scriptish_updateChk.js
new file mode 100644
index 00000000..20d77648
--- /dev/null
+++ b/extension/modules/utils/Scriptish_updateChk.js
@@ -0,0 +1,8 @@
+var EXPORTED_SYMBOLS = [];
+
+Components.utils.import("resource://scriptish/constants.js");
+
+timeout(function() {
+  Services.scriptloader
+      .loadSubScript("chrome://scriptish/content/js/updatecheck.js");
+}, 750);
diff --git a/extension/modules/utils/Scriptish_updateModifiedScripts.js b/extension/modules/utils/Scriptish_updateModifiedScripts.js
new file mode 100644
index 00000000..5c198ed7
--- /dev/null
+++ b/extension/modules/utils/Scriptish_updateModifiedScripts.js
@@ -0,0 +1,51 @@
+var EXPORTED_SYMBOLS = ["Scriptish_updateModifiedScripts"];
+
+Components.utils.import("resource://scriptish/constants.js");
+
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
+lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
+
+lazyUtil(this, "injectScripts");
+lazyUtil(this, "isScriptRunnable");
+
+const docRdyStates = ["uninitialized", "loading", "loaded", "interactive", "complete"];
+
+function Scriptish_updateModifiedScripts(href, safeWin, shouldNotRun) {
+  if (!Scriptish_prefRoot.getValue("enableScriptRefreshing"))
+    return;
+
+  Scriptish_config.updateModifiedScripts(function(script) {
+   if (shouldNotRun()
+       || !Scriptish_isScriptRunnable(script, href, (safeWin === safeWin.top)))
+     return;
+
+   let rdyStateIdx = docRdyStates.indexOf(safeWin.document.readyState);
+   function inject() {
+     if (shouldNotRun()) return;
+     Scriptish_injectScripts([script], href, safeWin);
+   }
+
+   switch (script.runAt) {
+   case "document-end":
+     if (2 > rdyStateIdx) {
+       safeWin.addEventListener("DOMContentLoaded", inject, true);
+       return;
+     }
+     break;
+   case "document-idle":
+     if (2 > rdyStateIdx) {
+       safeWin.addEventListener(
+           "DOMContentLoaded", function() timeout(inject), true);
+       return;
+     }
+     break;
+   case "window-load":
+     if (4 > rdyStateIdx) {
+       safeWin.addEventListener("load", inject, true);
+       return;
+     }
+     break;
+   }
+   inject();
+ });
+}

From 169422113c0a35a329de676858cef8200a45ffda Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 23 Aug 2011 09:26:46 -0700
Subject: [PATCH 555/829] removing unused 'windows' variable

---
 extension/modules/manager.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index b66dbc05..ab86758e 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -13,8 +13,6 @@ lazyUtil(this, "isURLExcluded");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "windowUnloader");
 
-let windows = {};
-
 const Scriptish_manager = {
   setup: function(aContentScope) {
     var observer = {
@@ -56,9 +54,6 @@ const Scriptish_manager = {
   },
 
   docReady: function(href, safeWin, aContentScope) {
-    let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
-    windows[currentInnerWindowID] = {unloaders: []};
-
     // ignore window if it is not the same window used by aContentScope
     if (JSON.stringify(Scriptish_getWindowIDs(aContentScope)) != JSON.stringify(Scriptish_getWindowIDs(safeWin)))
       return;

From 4f9dc793f269e4e7acfe04d03342c92ea5b6a80f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 23 Aug 2011 12:07:51 -0700
Subject: [PATCH 556/829] passing in the config info to content processes when
 they load

---
 extension/content/e10s/browser-content.js | 23 +++++++++++++++--------
 extension/content/e10s/browser.js         | 11 ++++-------
 extension/modules/manager.js              |  2 +-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
index 176bacc2..11571639 100644
--- a/extension/content/e10s/browser-content.js
+++ b/extension/content/e10s/browser-content.js
@@ -7,21 +7,28 @@ const {lazyImport, lazyUtil} = tools;
 lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
 lazyImport(global, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
-  "Scriptish_isURLExcluded",
-  "Scriptish_addExcludes",
-  "Scriptish_setExcludes",
-  "Scriptish_getExcludes"
+  "Scriptish_setExcludes"
 ]);
 
-Scriptish_log("step 2");
+Scriptish_log("step 2a");
 
-Scriptish_setExcludes(sendSyncMessage("Scriptish:GlobalExcludesUpdate"));
-addMessageListener("Scriptish:GlobalExcludesUpdate", function({json}) {
+
+function updateExcludes({json}) {
   Scriptish_setExcludes(json);
-});
+}
+
+(function(configJSON) {
+  Scriptish_setExcludes(configJSON.excludes);
+
+  var scripts = configJSON.scripts;
+})(sendSyncMessage("Scriptish:FrameSetup", ""));
+
+addMessageListener("Scriptish:GlobalExcludesUpdate", updateExcludes);
 
 Scriptish_manager.setup(content);
 
+
+Scriptish_log("step 2b");
 })(Components.utils.import, {}, this);
 
 
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index aa411ae5..77ece223 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -4,12 +4,7 @@
   const {lazyImport, lazyUtil, Services} = tools;
   lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
   lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
-  lazyImport(global, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
-    "Scriptish_isURLExcluded",
-    "Scriptish_addExcludes",
-    "Scriptish_setExcludes",
-    "Scriptish_getExcludes"
-  ]);
+  lazyImport(global, "resource://scriptish/config.js", ["Scriptish_config"]);
 
   Scriptish_log("step 1a");
   addEventListener("load", function() {
@@ -19,7 +14,9 @@
 
   var mm = messageManager;
 
-  mm.addMessageListener("Scriptish:GlobalExcludesUpdate", Scriptish_getExcludes);
+  mm.addMessageListener("Scriptish:FrameSetup", function() {
+    return Scriptish_config.toJSON();
+  });
 
   mm.loadFrameScript(
       "chrome://scriptish/content/e10s/browser-content.js",
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index ab86758e..b497824d 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -24,7 +24,7 @@ const Scriptish_manager = {
           break;
         }
       }).bind(this)
-    }
+    };
 
     Services.obs.addObserver(observer, "content-document-global-created", false);
     Services.obs.addObserver(observer, "chrome-document-global-created", false);

From c4fef3f8a7b8f571421ee8f5c87109b65de14075 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 23 Aug 2011 12:28:17 -0700
Subject: [PATCH 557/829] loading addonprovider.js module when scriptish
 service loads so that scriptish scripts can be reached at any moment after
 load.

---
 extension/components/scriptish.js    | 1 +
 extension/content/js/addonstab.js    | 1 -
 extension/modules/config/config.js   | 2 --
 extension/modules/content/browser.js | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 74ae836b..02cb21df 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -4,6 +4,7 @@ const CLASSID = Components.ID("{ca39e060-88ab-11df-a4ee-0800200c9a66}");
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
+Cu.import("resource://scriptish/addonprovider.js");
 
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError", "Scriptish_log"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index 54f6c3e0..c962221d 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -1,5 +1,4 @@
 (function($, tools) {
-Components.utils.import("resource://scriptish/addonprovider.js");
 Components.utils.import("resource://scriptish/constants.js", tools);
 const {lazyImport, lazyUtil} = tools;
 
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index dd767a6d..83d2bd3c 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -60,8 +60,6 @@ function Config(aBaseDir) {
     "scriptish-preferences-change",
     "scriptish-config-saved"
   ].forEach(function(i) Services.obs.addObserver(self, i, false));
-
-  Components.utils.import("resource://scriptish/addonprovider.js");
 }
 Config.prototype = {
   get _scriptDir() Scriptish_getProfileFile(this._scriptFoldername),
diff --git a/extension/modules/content/browser.js b/extension/modules/content/browser.js
index e9849f70..ed6e9e9b 100644
--- a/extension/modules/content/browser.js
+++ b/extension/modules/content/browser.js
@@ -78,7 +78,6 @@ Scriptish_BrowserUIM.prototype = {
     this._optionsWin.focus();
   },
   showUserscriptList: function() {
-    Cu.import("resource://scriptish/addonprovider.js");
     timeout(Scriptish_openManager);
   }
 }

From 2363eeaeaa1d263040b963e1925e8a61c02a80ef Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 23 Aug 2011 18:39:39 -0700
Subject: [PATCH 558/829] nerfing Scriptish_injectScripts for the time being..

---
 .../modules/utils/Scriptish_injectScripts.js    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 4ba5c060..d61ceb02 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -24,8 +24,12 @@ const gTimer = new Timer();
 const {nsIDOMXPathResult: XPATH_RESULT} = Ci;
 
 function Scriptish_injectScripts(scripts, url, safeWin) {
+  // TODO: re-support below lines!
+  /*
   var chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
   if (!chromeWin || !chromeWin.Scriptish_BrowserUI) return;
+  */
+
   if (0 >= scripts.length) return;
 
   let unsafeContentWin = safeWin.wrappedJSObject;
@@ -43,21 +47,25 @@ function Scriptish_injectScripts(scripts, url, safeWin) {
     // and the delay code (and probably other consumer work).
     let script = scripts[i];
     let sandbox = new Cu.Sandbox(safeWin);
-    Cu.evalInSandbox(GM_sandboxScripts, sandbox);
-
-    let GM_api = new GM_API(
-        script, url, winID, safeWin, unsafeContentWin, chromeWin);
 
     // hack XPathResult since that is so commonly used
     sandbox.XPathResult = XPATH_RESULT;
 
+    // TODO: re-support below lines!
+    /*
+    Cu.evalInSandbox(GM_sandboxScripts, sandbox);
+
+    let GM_api = new GM_API(
+        script, url, winID, safeWin, unsafeContentWin, chromeWin);
     // add GM_* API to sandbox
     for (var funcName in GM_api) {
       sandbox[funcName] = GM_api[funcName];
     }
+
     XPCOMUtils.defineLazyGetter(sandbox, "console", function() {
       return GM_console(script, safeWin, chromeWin);
     });
+
     XPCOMUtils.defineLazyGetter(sandbox, "GM_log", function() {
       if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
         var logger = new GM_ScriptLogger(script);
@@ -68,6 +76,7 @@ function Scriptish_injectScripts(scripts, url, safeWin) {
       }
       return sandbox.console.log.bind(sandbox.console);
     });
+    */
 
     sandbox.unsafeWindow = unsafeContentWin;
     sandbox.__proto__ = safeWin;

From 1ccca07264300d7a80b8d15d484e92e283a243c0 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 24 Aug 2011 10:37:35 -0500
Subject: [PATCH 559/829] Closes #495  Support getting Scratchpad contents from
 both the Orion and textarea editors.

---
 extension/content/js/scratchpad.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/scratchpad.js b/extension/content/js/scratchpad.js
index cee9be05..0dae1960 100644
--- a/extension/content/js/scratchpad.js
+++ b/extension/content/js/scratchpad.js
@@ -5,8 +5,8 @@
   function $(aID) document.getElementById(aID);
 
   this.saveAsUserscript = function() {
-    let content = $('scratchpad-textbox').value;
-    this.browserWindow.Scriptish_BrowserUIM.newUserScript(content);
+    let txt = (this.getText && this.getText()) || $("scratchpad-textbox").value;
+    this.browserWindow.Scriptish_BrowserUIM.newUserScript(txt);
   };
 
   window.addEventListener("DOMContentLoaded", function init() {

From e01b3ee35b25adf828f68443a177db92048c7ec4 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 24 Aug 2011 13:56:25 -0500
Subject: [PATCH 560/829] Use Scratchpad as the default editor.

Also introduces 'reset' to Scriptish_PrefManager to set a preference (e.g. the editor) back to its default value.
---
 extension/defaults/preferences/scriptish.js   |  1 +
 extension/locale/en-US/scriptish.properties   |  3 ++
 extension/modules/prefmanager.js              |  3 ++
 .../modules/utils/Scriptish_getEditor.js      | 31 ++++++++++++++++++-
 .../modules/utils/Scriptish_openInEditor.js   | 18 ++++++++---
 5 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 551e0199..1c8b25c1 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -5,6 +5,7 @@ pref("extensions.scriptish.blocklist.lastFetch", 0);
 pref("extensions.scriptish.blocklist.url", "https://github.com/scriptish/scriptish/raw/master/blocklist.json");
 pref("extensions.scriptish.cache.enabled", true);
 pref("extensions.scriptish.config.prettyPrint.enabled", false);
+pref("extensions.scriptish.editor", "Scratchpad");
 pref("extensions.scriptish.enabled", true);
 pref("extensions.scriptish.enabledSchemes.about", false);
 pref("extensions.scriptish.enabledSchemes.chrome", false);
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 7b45f407..863ba8ce 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -6,6 +6,9 @@ edit.ak=E
 editor.couldNotLaunch=Could not launch editor.
 editor.pleasePickExecutable=Please pick an executable application to use for editing user scripts.
 editor.prompt=Please choose your preferred text editor first
+editor.useScratchpad=Do you want to use Scratchpad as your editor?
+editor.useScratchpad.no=No (I will pick my own)
+editor.useScratchpad.yes=Yes
 error.api.clipboard.type=is not a type that is supported by GM_setClipboard.
 error.api.noResourceWithName=No resource with name
 error.api.noSecondArgValue=Second argument not specified: Value
diff --git a/extension/modules/prefmanager.js b/extension/modules/prefmanager.js
index 075a2b3d..7d59445b 100644
--- a/extension/modules/prefmanager.js
+++ b/extension/modules/prefmanager.js
@@ -107,6 +107,9 @@ function Scriptish_PrefManager(startPoint) {
   // deletes the named preference or subtree
   this.remove = function(prefName) { pref.deleteBranch(prefName); }
 
+  // resets the preference to the default, or removes if there is none
+  this.reset = function(prefName) { pref.clearUserPref(prefName); }
+
   // call a function whenever the named preference subtree changes
   this.watch = function(prefName, watcher) {
     // construct an observer
diff --git a/extension/modules/utils/Scriptish_getEditor.js b/extension/modules/utils/Scriptish_getEditor.js
index e9ebd93d..34c534f4 100644
--- a/extension/modules/utils/Scriptish_getEditor.js
+++ b/extension/modules/utils/Scriptish_getEditor.js
@@ -13,6 +13,10 @@ const Scriptish_getEditor = function(parentWindow, change) {
   if (!change && editorPath) {
     Scriptish_log("Found saved editor preference: " + editorPath);
 
+    // Check if Scratchpad
+    if ("Scratchpad" == editorPath)
+      return editorPath;
+
     var editor = Instances.lf;
     editor.followLinks = true;
     try {
@@ -26,7 +30,7 @@ const Scriptish_getEditor = function(parentWindow, change) {
       return editor;
     } else {
       Scriptish_log("Editor preference either does not exist or is not executable");
-      Scriptish_prefRoot.remove("editor");
+      Scriptish_prefRoot.reset("editor");
     }
   }
 
@@ -35,6 +39,31 @@ const Scriptish_getEditor = function(parentWindow, change) {
   // that we can give them an error and try again.
   while (true) {
     Scriptish_log("Asking user to choose editor...");
+
+    // Ask if the user wants to use Scratchpad
+    var sp = Services.prompt;
+    var flags = sp.BUTTON_POS_0 * sp.BUTTON_TITLE_IS_STRING
+        + sp.BUTTON_POS_1 * sp.BUTTON_TITLE_IS_STRING;
+
+    // Note: confirmEx always returns 1 if prompt is closed w/ the close button,
+    //       so we need to keep the negative answer at button index 1.
+    var answer = sp.confirmEx(
+        null,
+        Scriptish_stringBundle("editor.useScratchpad"),
+        Scriptish_stringBundle("editor.useScratchpad"),
+        flags,
+        Scriptish_stringBundle("editor.useScratchpad.yes"),
+        Scriptish_stringBundle("editor.useScratchpad.no"),
+        "",
+        null,
+        {value:false});
+
+    // The user answered Yes.  Set 'editor' back to the default ("Scratchpad").
+    if (0 === answer) {
+      Scriptish_prefRoot.reset("editor");
+      return Scriptish_prefRoot.getValue("editor");
+    }
+
     var nsIFilePicker = Ci.nsIFilePicker;
     var fp = Instances.fp;
     fp.init(
diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index 0903935b..c23ff589 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -15,12 +15,22 @@ function Scriptish_openInEditor(script, parentWindow) {
   if (!editor) return;
 
   try {
-    Scriptish_launchApplicationWithDoc(editor, file);
+    if ("Scratchpad" == editor) {
+      let spWin = parentWindow.Scratchpad.openScratchpad();
+      spWin.addEventListener("load", function spWinLoaded() {
+        spWin.removeEventListener("load", spWinLoaded, false);
+        spWin.document.title = spWin.Scratchpad.filename = file.path;
+        spWin.Scratchpad.importFromFile(file);
+      }, false);
+    }
+    else {
+      Scriptish_launchApplicationWithDoc(editor, file);
+    }
   } catch (e) {
-    // Something may be wrong with the editor the user selected. Remove so that
-    // next time they can pick a different one.
+    // Something may be wrong with the editor the user selected. Reset to
+    // the default ("Scratchpad").
     Scriptish_alert(Scriptish_stringBundle("editor.couldNotLaunch") + "\n" + e);
-    Scriptish_prefRoot.remove("editor");
+    Scriptish_prefRoot.reset("editor");
     throw e;
   }
 }

From 81025e8d60b703ee7ae87ac12c06587ab9dd15f8 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 24 Aug 2011 14:08:09 -0500
Subject: [PATCH 561/829] Adding 'editor.useScratchpad' keys to all locales.

---
 extension/locale/de/scriptish.properties    | 3 +++
 extension/locale/es-ES/scriptish.properties | 3 +++
 extension/locale/ja-JP/scriptish.properties | 3 +++
 extension/locale/pt-BR/scriptish.properties | 3 +++
 extension/locale/ru-RU/scriptish.properties | 3 +++
 extension/locale/sv-SE/scriptish.properties | 3 +++
 extension/locale/zh-CN/scriptish.properties | 3 +++
 extension/locale/zh-TW/scriptish.properties | 3 +++
 8 files changed, 24 insertions(+)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 5a67642e..9985c04a 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -6,6 +6,9 @@ edit.ak=B
 editor.couldNotLaunch=Konnte den Editor nicht starten.
 editor.pleasePickExecutable=Bitte wählen sie eine ausführbare Anwendung zum Bearbeiten von Benutzerskripten aus.
 editor.prompt=Bitte erst den bevorzugten Texteditor wählen
+editor.useScratchpad=
+editor.useScratchpad.no=
+editor.useScratchpad.yes=
 error.api.clipboard.type=ist kein von GM_setClipboard unterstützter Typ.
 error.api.noResourceWithName=Keine Resource mit dem Namen
 error.api.noSecondArgValue=Zweites Argument nicht spezifiziert: Value
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index bdf2573c..0f6297a4 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -6,6 +6,9 @@ edit.ak=E
 editor.couldNotLaunch=Error al abrir el editor.
 editor.pleasePickExecutable=Por favor, elija un programa para editar sus scripts de usuario.
 editor.prompt=Por favor, elija antes su editor de texto favorito
+editor.useScratchpad=
+editor.useScratchpad.no=
+editor.useScratchpad.yes=
 error.api.clipboard.type=no es un tipo soportado por GM_setClipboard.
 error.api.noResourceWithName=No hay recursos con ese nombre
 error.api.noSecondArgValue=Segundo argumento no especificado: Valor
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 9dd7b721..7ea3fed5 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -6,6 +6,9 @@ edit.ak=E
 editor.couldNotLaunch=エディタの起動に失敗しました
 editor.pleasePickExecutable=ユーザースクリプト編集用アプリケーションを指定してください
 editor.prompt=エディタを選択してください
+editor.useScratchpad=
+editor.useScratchpad.no=
+editor.useScratchpad.yes=
 error.api.clipboard.type=は GM_setClipboard がサポートしてない型です
 error.api.noResourceWithName=名前付きリソースがありません
 error.api.noSecondArgValue=２番目の引数が指定されていません：Value
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 912783b7..8f3f08a4 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -6,6 +6,9 @@ edit.ak=E
 editor.couldNotLaunch=Não foi possível iniciar o editor.
 editor.pleasePickExecutable=Por favor, escolha um aplicativo para ser usado como editor de scripts de usuário.
 editor.prompt=Escolha seu editor de texto preferido
+editor.useScratchpad=
+editor.useScratchpad.no=
+editor.useScratchpad.yes=
 error.api.clipboard.type=não é um tipo suportado por GM_setClipboard.
 error.api.noResourceWithName=Nenhum recurso com o nome
 error.api.noSecondArgValue=Segundo argumento não especificado: Valor
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 8894077c..fe89cb2f 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -6,6 +6,9 @@ edit.ak=
 editor.couldNotLaunch=Не могу запустить редактор.
 editor.pleasePickExecutable=Пожалуйста, выберите приложение для редактирования скриптов
 editor.prompt=Пожалуйста сначала выберите ваш редактор скриптов
+editor.useScratchpad=
+editor.useScratchpad.no=
+editor.useScratchpad.yes=
 error.api.clipboard.type=Тип данных не подходит для GM_setClipboard.
 error.api.noResourceWithName=Нет ресурса с таким именем
 error.api.noSecondArgValue=Второй аргумент - значение - не задан
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 1595a0ae..579e904a 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -6,6 +6,9 @@ edit.ak=e
 editor.couldNotLaunch=Det gick inte att starta redigeringsprogrammet.
 editor.pleasePickExecutable=Var vänlig välj ett körbart program att använda för redigering av användarskript.
 editor.prompt=Var vänlig välj först det textredigeringsprogram du föredrar
+editor.useScratchpad=
+editor.useScratchpad.no=
+editor.useScratchpad.yes=
 error.api.clipboard.type=är inte en typ som stöds av GM_setClipboard.
 error.api.noResourceWithName=Det finns ingen resurs med namnet
 error.api.noSecondArgValue=Det andra argumentet har inte angivits: Värde
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index 529f07aa..8f26a4cd 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -6,6 +6,9 @@ edit.ak=E
 editor.couldNotLaunch=无法启动编辑器。
 editor.pleasePickExecutable=请选择一个可执行程序用来编辑用户脚本。
 editor.prompt=请选择您喜欢的文本编辑器
+editor.useScratchpad=
+editor.useScratchpad.no=
+editor.useScratchpad.yes=
 error.api.clipboard.type=不是 GM_setClipboard 所支持的类型。
 error.api.noResourceWithName=没有该名称的资源
 error.api.noSecondArgValue=第二个参数未指定：值
diff --git a/extension/locale/zh-TW/scriptish.properties b/extension/locale/zh-TW/scriptish.properties
index 9a1cf959..a2ff6e98 100644
--- a/extension/locale/zh-TW/scriptish.properties
+++ b/extension/locale/zh-TW/scriptish.properties
@@ -6,6 +6,9 @@ edit.ak=E
 editor.couldNotLaunch=無法開啟編輯器。
 editor.pleasePickExecutable=請挑一個可執行程式來編輯使用者腳本。
 editor.prompt=請先選擇您常用的純文字編輯器
+editor.useScratchpad=
+editor.useScratchpad.no=
+editor.useScratchpad.yes=
 error.api.clipboard.type=不是 GM_setClipboard 所支援的類型。
 error.api.noResourceWithName=沒有該名稱的資源
 error.api.noSecondArgValue=第二個參數未指定：值

From eb5a0ef9943449e6d747440a9f8ad069e7d53e63 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 25 Aug 2011 18:11:22 -0700
Subject: [PATCH 562/829] finally got simple userscripts working on Fennec.

---
 extension/content/e10s/browser-content.js     |  19 ++-
 extension/content/e10s/browser.js             |   4 +
 extension/modules/manager.js                  |  49 +++++-
 extension/modules/script/simple-script.js     | 140 ++++++++++++++++++
 .../modules/utils/Scriptish_evalInSandbox.js  |   2 +
 .../utils/Scriptish_isScriptRunnable.js       |   2 +
 6 files changed, 204 insertions(+), 12 deletions(-)
 create mode 100644 extension/modules/script/simple-script.js

diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
index 11571639..c21d3ac6 100644
--- a/extension/content/e10s/browser-content.js
+++ b/extension/content/e10s/browser-content.js
@@ -6,6 +6,7 @@ inc("resource://scriptish/constants.js", tools);
 const {lazyImport, lazyUtil} = tools;
 lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
+lazyImport(global, "resource://scriptish/script/simple-script.js", ["SimpleScript"]);
 lazyImport(global, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
   "Scriptish_setExcludes"
 ]);
@@ -17,15 +18,25 @@ function updateExcludes({json}) {
   Scriptish_setExcludes(json);
 }
 
+
+var configJSON = sendSyncMessage("Scriptish:FrameSetup", "")[0];
+
 (function(configJSON) {
   Scriptish_setExcludes(configJSON.excludes);
 
-  var scripts = configJSON.scripts;
-})(sendSyncMessage("Scriptish:FrameSetup", ""));
+  var scripts = configJSON.scripts.map(function(i) {
+    var script = SimpleScript.loadFromJSON(i);
+    script.textContent = sendSyncMessage("Scriptish:GetScriptContents", script.id);
+    return script;
+  });
 
-addMessageListener("Scriptish:GlobalExcludesUpdate", updateExcludes);
+  Scriptish_manager.setup({
+    content: content,
+    scripts: scripts
+  });
+})(configJSON);
 
-Scriptish_manager.setup(content);
+addMessageListener("Scriptish:GlobalExcludesUpdate", updateExcludes);
 
 
 Scriptish_log("step 2b");
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 77ece223..6f001765 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -18,6 +18,10 @@
     return Scriptish_config.toJSON();
   });
 
+  mm.addMessageListener("Scriptish:GetScriptContents", function({json}) {
+    return Scriptish_config.getScriptById(json).textContent;
+  });
+
   mm.loadFrameScript(
       "chrome://scriptish/content/e10s/browser-content.js",
       true); // no delay loading frame script
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index b497824d..b53734e1 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -9,18 +9,21 @@ lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 
 lazyUtil(this, "injectScripts");
 lazyUtil(this, "isGreasemonkeyable");
+lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "isURLExcluded");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "windowUnloader");
 
 const Scriptish_manager = {
-  setup: function(aContentScope) {
+  setup: function(options) {
+    options = options || {};
+
     var observer = {
       observe: (function(aSubject, aTopic, aData) {
         switch (aTopic) {
         case "chrome-document-global-created":
         case "content-document-global-created":
-          Scriptish_manager.docReady_start.call(this, aSubject, aContentScope);
+          Scriptish_manager.docReady_start.call(this, aSubject, options);
           break;
         }
       }).bind(this)
@@ -30,7 +33,7 @@ const Scriptish_manager = {
     Services.obs.addObserver(observer, "chrome-document-global-created", false);
   },
 
-  docReady_start: function(safeWin, aContentScope) {
+  docReady_start: function(safeWin, options) {
     // TODO: disable observer that calls this when Scriptish is disabled
     if (!Scriptish.enabled) return;
 
@@ -50,16 +53,46 @@ const Scriptish_manager = {
     // if the url is a excluded url then stop
     if (Scriptish_isURLExcluded(href)) return;
 
-    this.docReady(href, safeWin, aContentScope);
+    this.docReady(href, safeWin, options);
   },
 
-  docReady: function(href, safeWin, aContentScope) {
-    // ignore window if it is not the same window used by aContentScope
-    if (JSON.stringify(Scriptish_getWindowIDs(aContentScope)) != JSON.stringify(Scriptish_getWindowIDs(safeWin)))
+  docReady: function(href, safeWin, options) {
+    // ignore window if it is not the same window used by options
+    if (JSON.stringify(Scriptish_getWindowIDs(options.content))
+        != JSON.stringify(Scriptish_getWindowIDs(safeWin)))
       return;
     //Scriptish_log(JSON.stringify(Scriptish_getWindowIDs(safeWin)));
 
-    Scriptish_log("try to run something right here!!");
+    var scripts = {
+      "document-start": [],
+      "document-end": [],
+      "document-idle": [],
+      "window-load": []
+    };
+
+    options.scripts.forEach(function(script) {
+      if (Scriptish_isScriptRunnable(script, href, (safeWin === safeWin.top))) {
+        scripts[script.runAt].push(script);
+      }
+    });
+
+    if (scripts["document-end"].length || scripts["document-idle"].length) {
+      safeWin.addEventListener("DOMContentLoaded", function() {
+        //if (shouldNotRun()) return;
+
+        // inject @run-at document-idle scripts
+        if (scripts["document-idle"].length) {
+          timeout(function() {
+            //if (shouldNotRun()) return;
+            Scriptish_injectScripts(
+                scripts["document-idle"], href, safeWin);
+          });
+        }
+
+        // inject @run-at document-end scripts
+        Scriptish_injectScripts(scripts["document-end"], href, safeWin);
+      }, true);
+    }
   },
 
   waitForFrame: function(safeWin) {
diff --git a/extension/modules/script/simple-script.js b/extension/modules/script/simple-script.js
new file mode 100644
index 00000000..94e0f2e1
--- /dev/null
+++ b/extension/modules/script/simple-script.js
@@ -0,0 +1,140 @@
+var EXPORTED_SYMBOLS = ["SimpleScript"];
+
+const Cu = Components.utils;
+Cu.import("resource://scriptish/constants.js");
+
+lazyImport(this, "resource://scriptish/utils/PatternCollection.js", ["PatternCollection"]);
+lazyImport(this, "resource://scriptish/third-party/MatchPattern.js", ["MatchPattern"]);
+
+lazyUtil(this, "memoize");
+lazyUtil(this, "isGreasemonkeyable");
+
+const JSVersions = ['1.6', '1.7', '1.8', '1.8.1'];
+const maxJSVer = JSVersions[2];
+const runAtValues = ["document-start", "document-end", "document-idle", "window-load"];
+const defaultRunAt = runAtValues[1];
+
+function SimpleScript() {
+  this.name = null;
+  this.namespace = "";
+  this.enabled = true;
+  this.domains = [];
+  this._includes = new PatternCollection();
+  this._excludes = new PatternCollection();
+  this._matches = [];
+  this._user_includes = new PatternCollection();
+  this._user_excludes = new PatternCollection();
+  this._delay = null;
+  this.priority = 0;
+  this._requires = [];
+  this._resources = [];
+  this._noframes = false;
+  this._jsversion = null;
+  this["_run-at"] = null;
+}
+
+SimpleScript.prototype = {
+  get jsversion() this._jsversion || maxJSVer,
+  get runAt() this["_run-at"] || defaultRunAt,
+  get matches() this._matches.concat(),
+  addInclude: function(aPattern, aUserVal) {
+    this[aUserVal ? "_user_includes" : "_includes"].addPatterns(aPattern);
+    this.__all_includes = null;
+  },
+  addExclude: function(aPattern, aUserVal) {
+    this[aUserVal ? "_user_excludes" : "_excludes"].addPatterns(aPattern);
+    this.__all_excludes = null;
+  },
+  get _all_includes() {
+    if (!this.__all_includes) {
+      this.__all_includes = new PatternCollection();
+      this.__all_includes.addPatterns(this._includes.patterns);
+      this.__all_includes.addPatterns(this._user_includes.patterns);
+    }
+    return this.__all_includes;
+  },
+  get _all_excludes() {
+    if (!this.__all_excludes) {
+      this.__all_excludes = new PatternCollection();
+      this.__all_excludes.addPatterns(this._excludes.patterns);
+      this.__all_excludes.addPatterns(this._user_excludes.patterns);
+    }
+    return this.__all_excludes;
+  },
+  matchesDomain: function(aURL) {
+    try {
+      var host = NetUtil.newURI(aURL).host;
+    } catch (e) {
+      // If true, we're allowing a scheme that doesn't have a host.
+      // i.e. "about:scriptish"
+      return Scriptish_isGreasemonkeyable(aURL);
+    }
+
+    var i = this.domains.length - 1;
+    if (!~i) return true; // when there are no @domains, then allow the host
+    for (; ~i; i--) if (host == this.domains[i]) return true;
+    return false;
+  }
+};
+
+SimpleScript.prototype._make_matchesURL = function() {
+  if (this.includesDisabled) {
+    this.matchesURL = this._matchesURL_noincludes.bind(this);
+  }
+  else {
+    this.matchesURL = this._matchesURL_includes.bind(this);
+  }
+  this.matchesURL = Scriptish_memoize(this.matchesURL, 100);
+};
+SimpleScript.prototype.matchesURL = null;
+SimpleScript.prototype._matchesURL_noincludes = function(aURL) {
+  // check if the domain is ok
+  if (!this.matchesDomain(aURL)) return false;
+
+  return this._user_includes.test(aURL)
+      && !this._user_excludes.test(aURL);
+};
+SimpleScript.prototype._matchesURL_includes = function(aURL) {
+  // check if the domain is ok
+  if (!this.matchesDomain(aURL)) return false;
+
+  return (this._all_includes.test(aURL)
+    || this._matches.some(function(m) m.doMatch(aURL)))
+    && !this._all_excludes.test(aURL);
+};
+
+SimpleScript.prototype.update = function() {
+  this._make_matchesURL();
+};
+
+
+SimpleScript.loadFromJSON = function(aSkeleton) {
+  var script = new SimpleScript();
+
+  script._jsversion = aSkeleton.jsversion;
+  script["_run-at"] = aSkeleton["run-at"];
+  script.includesDisabled = aSkeleton.includesDisabled;
+  script._noframes = aSkeleton.noframes;
+  script.addInclude(aSkeleton.includes);
+  script.addExclude(aSkeleton.excludes);
+  // TODO: need to have the below updated when they are changed...
+  script.addInclude(aSkeleton.user_includes, true);
+  script.addExclude(aSkeleton.user_excludes, true);
+  aSkeleton.matches.forEach(function(i) script._matches.push(new MatchPattern(i)));
+  aSkeleton.requires.forEach(function(i) {
+    script._requires.push(i);
+  });
+  aSkeleton.resources.forEach(function(i) {
+    script._resources.push(i);
+  });
+
+  script.id = aSkeleton.id;
+  script.name = aSkeleton.name;
+  script.namespace = aSkeleton.namespace;
+  script.enabled = aSkeleton.enabled;
+  script.delay = aSkeleton.delay;
+  script.priority = aSkeleton.priority;
+
+  script.update();
+  return script;
+};
diff --git a/extension/modules/utils/Scriptish_evalInSandbox.js b/extension/modules/utils/Scriptish_evalInSandbox.js
index 6f1fab69..6426061e 100644
--- a/extension/modules/utils/Scriptish_evalInSandbox.js
+++ b/extension/modules/utils/Scriptish_evalInSandbox.js
@@ -15,6 +15,7 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow) {
   const jsVer = aScript.jsversion;
   const fileURL = aScript.fileURL;
 
+  /*
   try {
     for (let [, req] in Iterator(aScript.requires)) {
       var rfileURL = req.fileURL;
@@ -33,6 +34,7 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow) {
   } catch (e) {
     return Scriptish_logError(e, 0, fileURL, e.lineNumber);
   }
+  */
 
   try {
     try {
diff --git a/extension/modules/utils/Scriptish_isScriptRunnable.js b/extension/modules/utils/Scriptish_isScriptRunnable.js
index 1eedecb2..a41a3ae4 100644
--- a/extension/modules/utils/Scriptish_isScriptRunnable.js
+++ b/extension/modules/utils/Scriptish_isScriptRunnable.js
@@ -1,5 +1,7 @@
 var EXPORTED_SYMBOLS = ["Scriptish_isScriptRunnable"];
 
+Components.utils.import("resource://scriptish/logging.js");
+
 function Scriptish_isScriptRunnable(script, url, topWin) {
   return !(!topWin && script.noframes)
       && !script.delayInjection

From 95ffe8db1fb710234ca646c8abadf50d5b76e2f7 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 25 Aug 2011 21:08:02 -0500
Subject: [PATCH 563/829] Closes #496 Don't ignore @noframes if a value is set.

@noframes now accepts no value, '1' and 'true' as meaning the script should not run against frames.
---
 extension/modules/script/script.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index b4fe67bd..7bea9b23 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -900,14 +900,18 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript) {
     var header = match[1].toLowerCase();
     var value = match[2];
 
-    if (!value) {
-      switch (header) {
-        case "noframes":
-          script["_noframes"] = true;
-          continue;
-      }
-    } else {
+    if (value)
       value = value.trimRight();
+
+    // Keys with optional values
+    switch (header) {
+      case "noframes":
+        script["_noframes"] = (!value || "true" == value || "1" == value);
+        continue;
+    }
+
+    // Keys with required values
+    if (value) {
       switch (header) {
         case "id":
         case "delay":

From 40fd4f8bda3b225a5f2f33a9f98462cdb1e3c4a2 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 27 Aug 2011 06:37:35 -0700
Subject: [PATCH 564/829] Closes #498 Adding a 'Install User Script' context
 menu item for .user.js links

---
 extension/content/e10s/browser-content.js        | 15 +++++++++------
 extension/content/e10s/browser.js                |  2 ++
 extension/content/e10s/browser.xul               |  9 +++++++++
 extension/modules/addonprovider.js               | 16 ++++++++++++++--
 extension/modules/utils/Scriptish_installUri.js  |  3 +++
 .../modules/utils/Scriptish_notification.js      | 13 ++++++++++++-
 .../modules/utils/Scriptish_popupNotification.js | 13 +++++++++----
 7 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
index c21d3ac6..964b6b7e 100644
--- a/extension/content/e10s/browser-content.js
+++ b/extension/content/e10s/browser-content.js
@@ -1,5 +1,3 @@
-
-var erik = "";
 (function(inc, tools, global){
 
 inc("resource://scriptish/constants.js", tools);
@@ -11,14 +9,14 @@ lazyImport(global, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
   "Scriptish_setExcludes"
 ]);
 
-Scriptish_log("step 2a");
+lazyUtil(global, "installUri");
 
+Scriptish_log("step 2a");
 
 function updateExcludes({json}) {
   Scriptish_setExcludes(json);
 }
 
-
 var configJSON = sendSyncMessage("Scriptish:FrameSetup", "")[0];
 
 (function(configJSON) {
@@ -43,6 +41,11 @@ Scriptish_log("step 2b");
 })(Components.utils.import, {}, this);
 
 
-addEventListener("DOMContentLoaded", function() {
-  //content.alert(erik);
+addEventListener("load", function() {
+  ContextHandler.registerType("userscript-install", function(popupState, element) {
+    if (/\.user\.js$/.test(element.href)) {
+      return true;
+    }
+    return false;
+  });
 }, true);
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 6f001765..7d4eb67e 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -6,6 +6,8 @@
   lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
   lazyImport(global, "resource://scriptish/config.js", ["Scriptish_config"]);
 
+  lazyUtil(global, "installUri");
+
   Scriptish_log("step 1a");
   addEventListener("load", function() {
     // Check if Scriptish has been updated/installed
diff --git a/extension/content/e10s/browser.xul b/extension/content/e10s/browser.xul
index 3f1c8207..6b00b48c 100644
--- a/extension/content/e10s/browser.xul
+++ b/extension/content/e10s/browser.xul
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <overlay id="scriptish-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript" src="chrome://scriptish/content/e10s/browser.js"/>
+
+  <richlistbox id="context-commands">
+    <richlistitem id="scriptish-userscript-install-context-command"
+                  class="context-command"
+                  type="userscript-install"
+                  onclick="Scriptish_installUri(ContextHelper.popupState.linkURL);">
+      <label value="Install User Script"/>
+    </richlistitem>
+  </richlistbox> 
 </overlay>
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index 3df177c8..fb8a5ee1 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -2,9 +2,11 @@ var EXPORTED_SYMBOLS = [];
 Components.utils.import("resource://scriptish/constants.js");
 
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "AddonManagerPrivate"]);
 
+lazyUtil(this, "notification");
 lazyUtil(this, "openManager");
 lazyUtil(this, "popupNotification");
 lazyUtil(this, "stringBundle");
@@ -24,7 +26,7 @@ const Scriptish_ScriptProvider = {
       msg += "' " + Scriptish_stringBundle("statusbar.installed");
       var callback = Scriptish_openManager;
 
-      Scriptish_popupNotification({
+      var showedMsg = Scriptish_popupNotification({
         id: "scriptish-install-popup-notification",
         message: msg,
         mainAction: {
@@ -37,6 +39,11 @@ const Scriptish_ScriptProvider = {
           persistWhileVisible: true
         }
       });
+
+      if (!showedMsg) {
+        Scriptish_notification(msg, null, null, callback);
+      }
+
       break;
     case "scriptish-script-edit-enabling":
       AddonManagerPrivate.callAddonListeners(
@@ -62,7 +69,7 @@ const Scriptish_ScriptProvider = {
           : Scriptish_stringBundle("statusbar.modified"));
       var callback = Scriptish_openManager;
 
-      Scriptish_popupNotification({
+      var showedMsg = Scriptish_popupNotification({
         id: "scriptish-install-popup-notification",
         message: msg,
         mainAction: {
@@ -75,6 +82,11 @@ const Scriptish_ScriptProvider = {
           persistWhileVisible: true
         }
       });
+
+      if (!showedMsg) {
+        Scriptish_notification(msg, null, null, callback);
+      }
+
       break;
     case "scriptish-script-uninstalling":
       AddonManagerPrivate.callAddonListeners("onUninstalling", script, false);
diff --git a/extension/modules/utils/Scriptish_installUri.js b/extension/modules/utils/Scriptish_installUri.js
index ebd796c9..5f6b2a31 100644
--- a/extension/modules/utils/Scriptish_installUri.js
+++ b/extension/modules/utils/Scriptish_installUri.js
@@ -1,8 +1,11 @@
 var EXPORTED_SYMBOLS = ["Scriptish_installUri"];
 Components.utils.import("resource://scriptish/constants.js");
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyImport(this, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
 
 function Scriptish_installUri(aURI) {
+  aURI = (typeof aURI == "string") ? NetUtil.newURI(aURI) : aURI;
+
   // docs for nsicontentpolicy say we're not supposed to block, so short timer.
   timeout(function() {
     Scriptish_configDownloader.startInstall(aURI);
diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index 5077980b..36a4fc63 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -3,6 +3,17 @@ Components.utils.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
+function showAlertNotification() {
+  if ("Fennec" == Services.appinfo.name) {
+    return showAlertNotification =
+        Cc["@mozilla.org/toaster-alerts-service;1"]
+        .getService(Ci.nsIAlertsService)
+        .showAlertNotification;
+  }
+
+  return Services.as.showAlertNotification;
+}
+
 function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
   if (!Scriptish_prefRoot.getValue("enabledNotifications.sliding"))
     return Scriptish_log(aMsg);
@@ -20,7 +31,7 @@ function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
 
     // if Growl is not installed or disabled on OSX, then use a fallback
     try {
-      Services.as.showAlertNotification.apply(null, args);
+      showAlertNotification().apply(null, args);
     } catch (e) {
       let win = Services.ww.openWindow(
           null, 'chrome://global/content/alerts/alert.xul',
diff --git a/extension/modules/utils/Scriptish_popupNotification.js b/extension/modules/utils/Scriptish_popupNotification.js
index ac0e268d..a053c2c2 100644
--- a/extension/modules/utils/Scriptish_popupNotification.js
+++ b/extension/modules/utils/Scriptish_popupNotification.js
@@ -1,4 +1,3 @@
-
 var EXPORTED_SYMBOLS = ["Scriptish_popupNotification"];
 Components.utils.import("resource://gre/modules/PopupNotifications.jsm");
 Components.utils.import("resource://scriptish/constants.js");
@@ -10,8 +9,9 @@ function Scriptish_popupNotification(details) {
   if (!Scriptish_prefRoot.getValue("enabledNotifications.popup"))
     return Scriptish_log(details.message);
 
-  timeout(function() {
-      var win = Scriptish.getMostRecentWindow();
+  var win = Scriptish.getMostRecentWindow();
+  if (win.PopupNotifications) {
+    timeout(function() {
       win.PopupNotifications.show(
         win.gBrowser.selectedBrowser,
         details.id,
@@ -27,5 +27,10 @@ function Scriptish_popupNotification(details) {
         null  /* secondary action */,
         details.options
       );
-  });
+    });
+
+    return true;
+  }
+
+  return false;
 };

From 513fccedf8a5188e1725b0a1861ba80be7d0ab98 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 28 Aug 2011 23:06:34 -0700
Subject: [PATCH 565/829] ignore .komodoproject files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index fe09d16d..45a71c17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ build
 *.rb
 *.sh
 node_modules
+*.komodoproject
 

From cdc04e2049b41e8439ffc332a69320462a1e8178 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 29 Aug 2011 08:57:19 -0500
Subject: [PATCH 566/829] minor fix: parentWindow.Scratchpad is undefined in
 certain windows (e.g. the Add-ons Manager)

---
 extension/modules/utils/Scriptish_openInEditor.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index c23ff589..6d53f20e 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -16,7 +16,9 @@ function Scriptish_openInEditor(script, parentWindow) {
 
   try {
     if ("Scratchpad" == editor) {
-      let spWin = parentWindow.Scratchpad.openScratchpad();
+      let spWin = (parentWindow.Scratchpad
+          || Services.wm.getMostRecentWindow("navigator:browser").Scratchpad)
+          .openScratchpad();
       spWin.addEventListener("load", function spWinLoaded() {
         spWin.removeEventListener("load", spWinLoaded, false);
         spWin.document.title = spWin.Scratchpad.filename = file.path;

From 2cff36a1db9f4db6d867b0e06ac4279cb6097c8e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 29 Aug 2011 09:10:34 -0700
Subject: [PATCH 567/829] re-enable the sandboxed part of the GM_api

---
 extension/modules/api/GM_sandboxScripts.js    | 19 +++++++++----------
 .../modules/utils/Scriptish_injectScripts.js  |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/extension/modules/api/GM_sandboxScripts.js b/extension/modules/api/GM_sandboxScripts.js
index 4aae7dd3..7a625429 100644
--- a/extension/modules/api/GM_sandboxScripts.js
+++ b/extension/modules/api/GM_sandboxScripts.js
@@ -1,14 +1,13 @@
 "use strict";
 const EXPORTED_SYMBOLS = ["GM_sandboxScripts"];
 
-if (!('XMLHttpRequest' in this)) {
-  this.XMLHttpRequest = Components.Constructor("@mozilla.org/xmlextras/xmlhttprequest;1", "nsIXMLHttpRequest");
-}
+if (!('XMLHttpRequest' in this))
+  this.XMLHttpRequest = Components.Constructor(
+      "@mozilla.org/xmlextras/xmlhttprequest;1", "nsIXMLHttpRequest");
 
-let r = new XMLHttpRequest();
-// don't try to parse as XML
-r.overrideMimeType('text/javascript');
-r.open('GET', 'resource://scriptish/api/sandbox.js', false);
-r.send(null);
-
-const GM_sandboxScripts = r.responseText;
+const GM_sandboxScripts = (function(r) {
+  r.overrideMimeType('text/javascript'); // don't try to parse as XML
+  r.open('GET', 'resource://scriptish/api/sandbox.js', false);
+  r.send(null);
+  return r.responseText;
+})(new XMLHttpRequest());
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index d61ceb02..cf11211d 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -51,10 +51,10 @@ function Scriptish_injectScripts(scripts, url, safeWin) {
     // hack XPathResult since that is so commonly used
     sandbox.XPathResult = XPATH_RESULT;
 
-    // TODO: re-support below lines!
-    /*
     Cu.evalInSandbox(GM_sandboxScripts, sandbox);
 
+    // TODO: re-support below lines!
+    /*
     let GM_api = new GM_API(
         script, url, winID, safeWin, unsafeContentWin, chromeWin);
     // add GM_* API to sandbox

From c4b11dbe2b45d0e0d23f47597e728c08ff3425af Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 29 Aug 2011 17:10:03 -0700
Subject: [PATCH 568/829] aChromeWin is now optional for GM_api

---
 extension/modules/api.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 59e0c148..2afa5c95 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -56,10 +56,11 @@ function GM_apiSafeCallback(aWindow, aScript, aThis, aCb, aArgs) {
   }, 0);
 }
 
+// note: must not depend on aChromeWin below, it should always be optional!
 function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin) {
   var document = aSafeWin.document;
   var menuCmdIDs = [];
-  var Scriptish_BrowserUI = aChromeWin.Scriptish_BrowserUI;
+  var Scriptish_BrowserUI = aChromeWin ? aChromeWin.Scriptish_BrowserUI : null;
   var windowID = aWinID;
 
   var lazyLoaders = {};
@@ -163,7 +164,7 @@ function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin)
     return xhr.contentStartRequest.apply(xhr, arguments);
   }
 
-  if (aSafeWin !== aSafeWin.top) {
+  if (!Scriptish_BrowserUI || aSafeWin !== aSafeWin.top) {
     this.GM_unregisterMenuCommand = this.GM_registerMenuCommand
         = this.GM_disableMenuCommand = this.GM_enableMenuCommand = DOLITTLE;
   } else {

From 44b26b69d0afce47f19df29f523ca154d75b31e1 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 29 Aug 2011 17:10:37 -0700
Subject: [PATCH 569/829] using strict mode for the GM_xhr module

---
 extension/modules/api/GM_xmlhttpRequester.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 1c064a2e..1d27ea94 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -1,3 +1,4 @@
+"use strict";
 var EXPORTED_SYMBOLS = ["GM_xmlhttpRequester"];
 
 Components.utils.import("resource://scriptish/constants.js");

From d24f5fa25c96b90d7bbb634e3d533ed73eb194ea Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 29 Aug 2011 17:44:26 -0700
Subject: [PATCH 570/829] denerfing GM_menu related commands for FF and
 Seamonkey, but they are disabled for Fennec

---
 extension/modules/api.js                      | 10 ++++++-
 extension/modules/api/GM_Resources.js         |  2 +-
 .../modules/utils/Scriptish_injectScripts.js  | 28 +++++++++++--------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 2afa5c95..bf597f2c 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -57,7 +57,15 @@ function GM_apiSafeCallback(aWindow, aScript, aThis, aCb, aArgs) {
 }
 
 // note: must not depend on aChromeWin below, it should always be optional!
-function GM_API(aScript, aURL, aWinID, aSafeWin, aUnsafeContentWin, aChromeWin) {
+function GM_API(options) {
+  var {
+    script: aScript,
+    url: aURL,
+    winID: aWinID,
+    safeWin: aSafeWin,
+    unsafeWin: aUnsafeContentWin,
+    chromeWin: aChromeWin
+  } = options;
   var document = aSafeWin.document;
   var menuCmdIDs = [];
   var Scriptish_BrowserUI = aChromeWin ? aChromeWin.Scriptish_BrowserUI : null;
diff --git a/extension/modules/api/GM_Resources.js b/extension/modules/api/GM_Resources.js
index 22f698d1..467a77a0 100644
--- a/extension/modules/api/GM_Resources.js
+++ b/extension/modules/api/GM_Resources.js
@@ -26,5 +26,5 @@ GM_Resources.prototype.getDep = function(name) {
     }
   }
   throw new Error(
-    Scriptish_stringBundle("error.api.noResourceWithName") + ": '" + name + "'");
+      Scriptish_stringBundle("error.api.noResourceWithName") + ": '" + name + "'");
 }
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index cf11211d..fb76b088 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -24,11 +24,10 @@ const gTimer = new Timer();
 const {nsIDOMXPathResult: XPATH_RESULT} = Ci;
 
 function Scriptish_injectScripts(scripts, url, safeWin) {
-  // TODO: re-support below lines!
-  /*
-  var chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
-  if (!chromeWin || !chromeWin.Scriptish_BrowserUI) return;
-  */
+  if ("Fennec" != Services.appinfo.name) {
+    var chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
+    if (!chromeWin || !chromeWin.Scriptish_BrowserUI) return;
+  }
 
   if (0 >= scripts.length) return;
 
@@ -53,15 +52,22 @@ function Scriptish_injectScripts(scripts, url, safeWin) {
 
     Cu.evalInSandbox(GM_sandboxScripts, sandbox);
 
-    // TODO: re-support below lines!
-    /*
-    let GM_api = new GM_API(
-        script, url, winID, safeWin, unsafeContentWin, chromeWin);
     // add GM_* API to sandbox
-    for (var funcName in GM_api) {
-      sandbox[funcName] = GM_api[funcName];
+    let (GM_api = new GM_API({
+      script: script,
+      url: url,
+      winID: winID,
+      safeWin: safeWin,
+      unsafeWin: unsafeContentWin,
+      chromeWin: chromeWin
+    })) {
+      for (var funcName in GM_api) {
+        sandbox[funcName] = GM_api[funcName];
+      }
     }
 
+    // TODO: re-support below lines!
+    /*
     XPCOMUtils.defineLazyGetter(sandbox, "console", function() {
       return GM_console(script, safeWin, chromeWin);
     });

From 461f1d81e4d64f35bf1819d534a1377496fb86fa Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 29 Aug 2011 18:24:45 -0700
Subject: [PATCH 571/829] denerfing most of the remaining GM_api, need to test
 the resource changes on Fennec still too

---
 extension/components/scriptish.js             | 25 +++++--
 extension/content/e10s/browser.js             |  9 +++
 extension/modules/api.js                      | 20 +++++-
 extension/modules/config/config.js            | 12 +++-
 extension/modules/constants.js                |  9 ++-
 extension/modules/manager.js                  | 19 +++--
 .../modules/utils/Scriptish_injectScripts.js  |  8 ++-
 .../utils/Scriptish_updateModifiedScripts.js  | 71 ++++++++++---------
 8 files changed, 120 insertions(+), 53 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 02cb21df..6c45e76c 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -130,12 +130,19 @@ ScriptishService.prototype = {
           if (scripts["document-idle"].length)
             timeout(function() {
               if (shouldNotRun()) return;
-              Scriptish_injectScripts(
-                  scripts["document-idle"], href, safeWin);
+              Scriptish_injectScripts({
+                scripts: scripts["document-idle"],
+                url: href,
+                safeWin: safeWin
+              });
             });
 
           // inject @run-at document-end scripts
-          Scriptish_injectScripts(scripts["document-end"], href, safeWin);
+          Scriptish_injectScripts({
+            scripts: scripts["document-end"],
+            url: href,
+            safeWin: safeWin
+          });
         }, true);
       }
 
@@ -143,12 +150,20 @@ ScriptishService.prototype = {
         safeWin.addEventListener("load", function() {
           if (shouldNotRun()) return;
           // inject @run-at window-load scripts
-          Scriptish_injectScripts(scripts["window-load"], href, safeWin);
+          Scriptish_injectScripts({
+            scripts: scripts["window-load"],
+            url: href,
+            safeWin: safeWin
+          });
         }, true);
       }
 
       // inject @run-at document-start scripts
-      Scriptish_injectScripts(scripts["document-start"], href, safeWin);
+      Scriptish_injectScripts({
+        scripts: scripts["document-start"],
+        url: href,
+        safeWin: safeWin
+      });
 
       Scriptish_windowUnloader(function() {
         winClosed = true;
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 7d4eb67e..845063d6 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -5,6 +5,7 @@
   lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
   lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
   lazyImport(global, "resource://scriptish/config.js", ["Scriptish_config"]);
+  lazyImport(this, "resource://scriptish/api/GM_Resources.js", ["GM_Resources"]);
 
   lazyUtil(global, "installUri");
 
@@ -24,6 +25,14 @@
     return Scriptish_config.getScriptById(json).textContent;
   });
 
+  mm.addMessageListener("Scriptish:GetScriptResourceURL", function({json}) {
+    return new GM_Resources(Scriptish_config.getScriptById(json.scriptID)).getResourceURL(json.resource);
+  });
+
+  mm.addMessageListener("Scriptish:GetScriptResourceText", function({json}) {
+    return new GM_Resources(Scriptish_config.getScriptById(json.scriptID)).getResourceText(json.resource);
+  });
+
   mm.loadFrameScript(
       "chrome://scriptish/content/e10s/browser-content.js",
       true); // no delay loading frame script
diff --git a/extension/modules/api.js b/extension/modules/api.js
index bf597f2c..0d968bfc 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -119,12 +119,28 @@ function GM_API(options) {
     return lazyLoaders.storage.listValues.apply(lazyLoaders.storage, arguments);
   }
 
-  this.GM_getResourceURL = function GM_getResourceURL() {
+  this.GM_getResourceURL = function GM_getResourceURL(aName) {
     if (!GM_apiLeakCheck("GM_getResourceURL")) return;
+
+    if (options.content) {
+      return options.content.sendSyncMessage("Scriptish:GetScriptResourceURL", {
+        scriptID: aScript.id,
+        resource: aName
+      });
+    }
+
     return lazyLoaders.resources.getResourceURL.apply(lazyLoaders.resources, arguments)
   }
-  this.GM_getResourceText = function GM_getResourceText() {
+  this.GM_getResourceText = function GM_getResourceText(aName) {
     if (!GM_apiLeakCheck("GM_getResourceText")) return;
+
+    if (options.content) {
+      return options.content.sendSyncMessage("Scriptish:GetScriptResourceText", {
+        scriptID: aScript.id,
+        resource: aName
+      });
+    }
+
     return lazyLoaders.resources.getResourceText.apply(lazyLoaders.resources, arguments)
   }
 
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 83d2bd3c..a2053a93 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -419,12 +419,18 @@ Config.prototype = {
   getMatchingScripts: function(testFunc) this.scripts.filter(testFunc),
   sortScripts: function() this._scripts.sort(function(a, b) b.priority - a.priority),
   injectScript: function(script) {
-    var unsafeWin = this.wrappedContentWin.wrappedJSObject;
+    var safeWin = this.wrappedContentWin;
+    var unsafeWin = safeWin.wrappedJSObject;
     var unsafeLoc = new XPCNativeWrapper(unsafeWin, "location").location;
     var href = new XPCNativeWrapper(unsafeLoc, "href").href;
 
-    if (script.enabled && !script.needsUninstall && script.matchesURL(href))
-      Scriptish_injectScripts([script], href, unsafeWin, this.chromeWin);
+    if (script.enabled && !script.needsUninstall && script.matchesURL(href)) {
+      Scriptish_injectScripts({
+        scripts: [script],
+        url: href,
+        safeWin: safeWin
+      });
+    }
   },
 
   updateModifiedScripts: function(scriptInjector) {
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index fbefacd7..ae61e8ca 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -1,5 +1,5 @@
 var EXPORTED_SYMBOLS = [
-    "Cc", "Ci", "Cr", "NetUtil", "XPCOMUtils",
+    "Cc", "Ci", "Cr", "NetUtil", "XPCOMUtils", "extend",
     "Services", "Instances", "lazyImport", "lazyUtil", "timeout", "e10s"];
 
 const {classes: Cc, interfaces: Ci, results: Cr} = Components;
@@ -142,3 +142,10 @@ function timeout(cb, delay) {
 
   setTimeout(callback, delay);
 }
+
+function extend(a, o) {
+  for (var k in a) {
+    o[k] = a[k];
+  }
+  return o;
+}
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index b53734e1..345900f2 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -44,7 +44,7 @@ const Scriptish_manager = {
 
     // if we don't have a href and the window is a frame, then wait until we do
     if (!href && safeWin.frameElement) {
-      Scriptish_manager.waitForFrame.call(this, safeWin);
+      Scriptish_manager.waitForFrame.call(this, safeWin, options);
       return;
     }
 
@@ -84,18 +84,25 @@ const Scriptish_manager = {
         if (scripts["document-idle"].length) {
           timeout(function() {
             //if (shouldNotRun()) return;
-            Scriptish_injectScripts(
-                scripts["document-idle"], href, safeWin);
+            Scriptish_injectScripts(extend(options, {
+              scripts: scripts["document-idle"],
+              url: href,
+              safeWin: safeWin
+            }));
           });
         }
 
         // inject @run-at document-end scripts
-        Scriptish_injectScripts(scripts["document-end"], href, safeWin);
+        Scriptish_injectScripts(extend(options, {
+          scripts: scripts["document-end"],
+          url: href,
+          safeWin: safeWin
+        }));
       }, true);
     }
   },
 
-  waitForFrame: function(safeWin) {
+  waitForFrame: function(safeWin, options) {
     let self = this;
     safeWin.addEventListener("DOMContentLoaded", function _frame_loader() {
       // not perfect, but anyway
@@ -104,7 +111,7 @@ const Scriptish_manager = {
 
       if (!href) return; // wait for it :p
       safeWin.removeEventListener("DOMContentLoaded", _frame_loader, false);
-      Scriptish_manager.docReady_start.call(self, safeWin);
+      Scriptish_manager.docReady_start.call(self, safeWin, options);
 
       // fake DOMContentLoaded to get things rolling
       var evt = safeWin.document.createEvent("Events");
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index fb76b088..501a9036 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -23,7 +23,9 @@ const Scriptish_injectScripts_filename = Components.stack.filename;
 const gTimer = new Timer();
 const {nsIDOMXPathResult: XPATH_RESULT} = Ci;
 
-function Scriptish_injectScripts(scripts, url, safeWin) {
+function Scriptish_injectScripts(options) {
+  var {scripts, url, safeWin} = options;
+
   if ("Fennec" != Services.appinfo.name) {
     var chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
     if (!chromeWin || !chromeWin.Scriptish_BrowserUI) return;
@@ -53,14 +55,14 @@ function Scriptish_injectScripts(scripts, url, safeWin) {
     Cu.evalInSandbox(GM_sandboxScripts, sandbox);
 
     // add GM_* API to sandbox
-    let (GM_api = new GM_API({
+    let (GM_api = new GM_API(extend(options, {
       script: script,
       url: url,
       winID: winID,
       safeWin: safeWin,
       unsafeWin: unsafeContentWin,
       chromeWin: chromeWin
-    })) {
+    }))) {
       for (var funcName in GM_api) {
         sandbox[funcName] = GM_api[funcName];
       }
diff --git a/extension/modules/utils/Scriptish_updateModifiedScripts.js b/extension/modules/utils/Scriptish_updateModifiedScripts.js
index 5c198ed7..245645a6 100644
--- a/extension/modules/utils/Scriptish_updateModifiedScripts.js
+++ b/extension/modules/utils/Scriptish_updateModifiedScripts.js
@@ -15,37 +15,42 @@ function Scriptish_updateModifiedScripts(href, safeWin, shouldNotRun) {
     return;
 
   Scriptish_config.updateModifiedScripts(function(script) {
-   if (shouldNotRun()
-       || !Scriptish_isScriptRunnable(script, href, (safeWin === safeWin.top)))
-     return;
-
-   let rdyStateIdx = docRdyStates.indexOf(safeWin.document.readyState);
-   function inject() {
-     if (shouldNotRun()) return;
-     Scriptish_injectScripts([script], href, safeWin);
-   }
-
-   switch (script.runAt) {
-   case "document-end":
-     if (2 > rdyStateIdx) {
-       safeWin.addEventListener("DOMContentLoaded", inject, true);
-       return;
-     }
-     break;
-   case "document-idle":
-     if (2 > rdyStateIdx) {
-       safeWin.addEventListener(
-           "DOMContentLoaded", function() timeout(inject), true);
-       return;
-     }
-     break;
-   case "window-load":
-     if (4 > rdyStateIdx) {
-       safeWin.addEventListener("load", inject, true);
-       return;
-     }
-     break;
-   }
-   inject();
- });
+    if (shouldNotRun()
+        || !Scriptish_isScriptRunnable(script, href, (safeWin === safeWin.top)))
+      return;
+
+    let rdyStateIdx = docRdyStates.indexOf(safeWin.document.readyState);
+    function inject() {
+      if (shouldNotRun()) return;
+      Scriptish_injectScripts({
+        scripts: [script],
+        url: href,
+        safeWin: safeWin
+      });
+    }
+
+    switch (script.runAt) {
+    case "document-end":
+      if (2 > rdyStateIdx) {
+        safeWin.addEventListener("DOMContentLoaded", inject, true);
+        return;
+      }
+      break;
+    case "document-idle":
+      if (2 > rdyStateIdx) {
+        safeWin.addEventListener(
+            "DOMContentLoaded", function() timeout(inject), true);
+        return;
+      }
+      break;
+    case "window-load":
+      if (4 > rdyStateIdx) {
+        safeWin.addEventListener("load", inject, true);
+        return;
+      }
+      break;
+    }
+
+    inject();
+  });
 }

From 8cdfa25292300432b1b1bb9d7875f77553debf42 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 29 Aug 2011 18:55:05 -0700
Subject: [PATCH 572/829] <em:maxVersion>9.*</em:maxVersion>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 8b4415e9..1682c838 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -62,7 +62,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>8.*</em:maxVersion>
+        <em:maxVersion>9.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- SeaMonkey -->

From 93c2714fdd9f674009f04740700cafa3f5d33c12 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 30 Aug 2011 12:05:50 -0700
Subject: [PATCH 573/829] bug fix: send userscript install messages to the
 chrome process so that it can handle the isntall (b/c only the chrome process
 should be touching Scriptish_config)

---
 extension/content/e10s/browser-content.js | 6 ++++--
 extension/content/e10s/browser.js         | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
index 964b6b7e..1179366f 100644
--- a/extension/content/e10s/browser-content.js
+++ b/extension/content/e10s/browser-content.js
@@ -9,10 +9,12 @@ lazyImport(global, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
   "Scriptish_setExcludes"
 ]);
 
-lazyUtil(global, "installUri");
-
 Scriptish_log("step 2a");
 
+global.Scriptish_installUri = function(aURL) {
+  sendSyncMessage("Scriptish:InstallScriptURL", aURL);
+}
+
 function updateExcludes({json}) {
   Scriptish_setExcludes(json);
 }
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 845063d6..fc0d5f4a 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -17,6 +17,10 @@
 
   var mm = messageManager;
 
+  mm.addMessageListener("Scriptish:InstallScriptURL", function({json}) {
+    return Scriptish_installUri(json);
+  });
+
   mm.addMessageListener("Scriptish:FrameSetup", function() {
     return Scriptish_config.toJSON();
   });

From 2b3a82abb75c32abe9c69a5f3db0a13eb13b6a55 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Tue, 30 Aug 2011 12:41:49 -0700
Subject: [PATCH 574/829] console.log and GM_log work on Fennec now

---
 extension/modules/api/GM_ScriptLogger.js          |  1 +
 extension/modules/api/GM_console.js               | 15 ++++++++-------
 .../modules/utils/Scriptish_getFirebugConsole.js  |  1 +
 .../modules/utils/Scriptish_injectScripts.js      |  8 ++++----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/extension/modules/api/GM_ScriptLogger.js b/extension/modules/api/GM_ScriptLogger.js
index e6b1e8bf..19e32be9 100644
--- a/extension/modules/api/GM_ScriptLogger.js
+++ b/extension/modules/api/GM_ScriptLogger.js
@@ -1,3 +1,4 @@
+"use strict";
 var EXPORTED_SYMBOLS = ["GM_ScriptLogger"];
 Components.utils.import("resource://scriptish/logging.js");
 
diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index 2ffe4606..c51811e5 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -16,14 +16,15 @@ const aux_functions = ["assert", "dir", "dirxml", "group", "groupEnd", "time",
                         ];
 
 function getConsoleFor(contentWindow, chromeWindow) {
+  // we dont have a chromeWindow for e10s atm, see Scriptish_injectScripts impl
+  if (chromeWindow) {
+    let (rv = Scriptish_getFirebugConsole(contentWindow, chromeWindow)) {
+      if (rv) return rv;
+    }
 
-  let rv = Scriptish_getFirebugConsole(contentWindow, chromeWindow);
-  if (rv) {
-    return rv;
-  }
-
-  if (contentWindow.console) {
-    return contentWindow.console;
+    if (contentWindow.console) {
+      return contentWindow.console;
+    }
   }
 
   return {
diff --git a/extension/modules/utils/Scriptish_getFirebugConsole.js b/extension/modules/utils/Scriptish_getFirebugConsole.js
index 943c8d6e..6307f3eb 100644
--- a/extension/modules/utils/Scriptish_getFirebugConsole.js
+++ b/extension/modules/utils/Scriptish_getFirebugConsole.js
@@ -1,3 +1,4 @@
+"use strict";
 var EXPORTED_SYMBOLS = ["Scriptish_getFirebugConsole"];
 
 function Scriptish_getFirebugConsole(win, chromeWin) {
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 501a9036..01e5f5ac 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -26,10 +26,13 @@ const {nsIDOMXPathResult: XPATH_RESULT} = Ci;
 function Scriptish_injectScripts(options) {
   var {scripts, url, safeWin} = options;
 
+  try {
   if ("Fennec" != Services.appinfo.name) {
     var chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
     if (!chromeWin || !chromeWin.Scriptish_BrowserUI) return;
   }
+  }
+  catch (e) {}
 
   if (0 >= scripts.length) return;
 
@@ -67,13 +70,11 @@ function Scriptish_injectScripts(options) {
         sandbox[funcName] = GM_api[funcName];
       }
     }
-
-    // TODO: re-support below lines!
-    /*
     XPCOMUtils.defineLazyGetter(sandbox, "console", function() {
       return GM_console(script, safeWin, chromeWin);
     });
 
+
     XPCOMUtils.defineLazyGetter(sandbox, "GM_log", function() {
       if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
         var logger = new GM_ScriptLogger(script);
@@ -84,7 +85,6 @@ function Scriptish_injectScripts(options) {
       }
       return sandbox.console.log.bind(sandbox.console);
     });
-    */
 
     sandbox.unsafeWindow = unsafeContentWin;
     sandbox.__proto__ = safeWin;

From 81ea5a87733343ba33540bf6bf9d2c0181aea06f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 31 Aug 2011 11:50:30 -0700
Subject: [PATCH 575/829] minor change

---
 extension/content/js/updatecheck.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/extension/content/js/updatecheck.js b/extension/content/js/updatecheck.js
index 7ad5b905..3e32b73f 100644
--- a/extension/content/js/updatecheck.js
+++ b/extension/content/js/updatecheck.js
@@ -14,11 +14,10 @@
 
   if (0 >= tools.Services.vc.compare(currentVer, "0.1b5")) {
     var chromeWin = tools.Services.wm.getMostRecentWindow("navigator:browser");
-    if ("Fennec" == tools.Services.appinfo.name) {
-      chromeWin.Browser.addTab("about:scriptish", false, chromeWin.Browser.selectedTab)
-    } else {
-      chromeWin.gBrowser.addTab("about:scriptish");
+    (chromeWin.Browser ? chromeWin.Browser : chromeWin.gBrowser)
+        .addTab("about:scriptish");
 
+    if ("Fennec" != tools.Services.appinfo.name) {
       // add toolbaritem to add-on bar
       var addToBar = chromeWin.document.getElementById("addon-bar");
       if (!addToBar || chromeWin.document.getElementById("scriptish-button"))

From 179d3fa36505534738f2841992ab2f708aa3c319 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 1 Sep 2011 14:23:47 -0700
Subject: [PATCH 576/829] Closes #493 listing userscripts in Fennec's AOM

---
 extension/content/e10s/browser.js  | 16 ++++++++++++++++
 extension/content/e10s/browser.xul |  7 +++++++
 extension/modules/addonprovider.js |  1 +
 extension/modules/script/script.js | 12 +++++++++---
 extension/skin/browser-fennec.css  |  7 +++++++
 5 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 extension/skin/browser-fennec.css

diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index fc0d5f4a..f871331b 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -9,10 +9,26 @@
 
   lazyUtil(global, "installUri");
 
+  var $ = function(id) document.getElementById(id);
+
   Scriptish_log("step 1a");
   addEventListener("load", function() {
     // Check if Scriptish has been updated/installed
     inc("resource://scriptish/utils/Scriptish_updateChk.js");
+
+    var us_head = $("addons-userscripts");
+    var next = us_head.nextSibling;
+    var parent = us_head.parentNode;
+    Scriptish_config.scripts.forEach(function(script) {
+      var ele = ExtensionsView._createItem(script, "userscript");
+      ele.setAttribute("typeLabel", "User Script");
+      // TODO: implement for Fennec..
+      //ele.setAttribute("optionsURL", script.optionsURL);
+      ele.setAttribute("isDisabled", !script.enabled);
+      ele.setAttribute("data-scriptish-scriptid", script.id);
+      ele.addon = script;
+      parent.insertBefore(ele, next);
+    });
   }, false);
 
   var mm = messageManager;
diff --git a/extension/content/e10s/browser.xul b/extension/content/e10s/browser.xul
index 6b00b48c..7f56538a 100644
--- a/extension/content/e10s/browser.xul
+++ b/extension/content/e10s/browser.xul
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="chrome://scriptish/skin/browser-fennec.css" type="text/css"?>
 <overlay id="scriptish-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript" src="chrome://scriptish/content/e10s/browser.js"/>
 
@@ -10,4 +11,10 @@
       <label value="Install User Script"/>
     </richlistitem>
   </richlistbox> 
+
+  <richlistbox id="addons-list">
+    <richlistitem id="addons-userscripts" insertbefore="addons-local" class="section-header" align="center">
+      <label value="Your User Scripts" flex="1"/>
+    </richlistitem>
+  </richlistbox>
 </overlay>
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index fb8a5ee1..b56a2d43 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -15,6 +15,7 @@ const Scriptish_ScriptProvider = {
   observe: function(aSubject, aTopic, aData) {
     aData = JSON.parse(aData);
     let script = Scriptish_config.getScriptById(aData.id);
+
     switch(aTopic){
     case "scriptish-script-installed":
       AddonManagerPrivate.callInstallListeners(
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index ac19cf4a..65f0630f 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -279,7 +279,12 @@ Script.prototype = {
   uninstall: function() {
     Scriptish.notify(this, "scriptish-script-uninstalling");
     this.needsUninstall = true;
-    this.pendingOperations = AddonManager.PENDING_UNINSTALL;
+    if ("Fennec" == Services.appinfo.name) {
+      this._config.uninstallScripts();
+    }
+    else {
+      this.pendingOperations = AddonManager.PENDING_UNINSTALL;
+    }
     Scriptish.notify(this, "scriptish-script-uninstalled");
   },
   uninstallProcess: function() {
@@ -802,7 +807,8 @@ Script.prototype = {
     averageRating: this.averageRating,
     reviewCount: this.reviewCount,
     totalDownloads: this.totalDownloads,
-    applyBackgroundUpdates: this._applyBackgroundUpdates
+    applyBackgroundUpdates: this._applyBackgroundUpdates,
+    needsUninstall: this.needsUninstall
   }),
 
   // TODO: DRY
@@ -1199,7 +1205,7 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
   script.averageRating = aSkeleton.averageRating;
   script.reviewCount = aSkeleton.reviewCount;
   script.totalDownloads = aSkeleton.totalDownloads;
-  script._applyBackgroundUpdates = aSkeleton.applyBackgroundUpdates
+  script._applyBackgroundUpdates = aSkeleton.applyBackgroundUpdates;
 
   script.update();
 
diff --git a/extension/skin/browser-fennec.css b/extension/skin/browser-fennec.css
new file mode 100644
index 00000000..c1bc6d43
--- /dev/null
+++ b/extension/skin/browser-fennec.css
@@ -0,0 +1,7 @@
+#tool-userscripts {
+  list-style-image: url("chrome://scriptish/skin/scriptish32.png");
+}
+
+richlistitem[typeName="userscript"] {
+  -moz-binding: url("chrome://browser/content/bindings/extensions.xml#extension-local")
+}

From 1773e98c0b745d0f9d4c844b49aecbfee8941412 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 1 Sep 2011 19:42:51 -0700
Subject: [PATCH 577/829] adding
 http://mxr.mozilla.org/mobile-browser/source/components/XPIDialogService.js

---
 .../third-party/fennec/XPIDialogService.js    | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 extension/modules/third-party/fennec/XPIDialogService.js

diff --git a/extension/modules/third-party/fennec/XPIDialogService.js b/extension/modules/third-party/fennec/XPIDialogService.js
new file mode 100644
index 00000000..db070e6b
--- /dev/null
+++ b/extension/modules/third-party/fennec/XPIDialogService.js
@@ -0,0 +1,80 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is XPI Dialog Service.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Mark Finkle <mfinkle@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+// -----------------------------------------------------------------------
+// Web Install Prompt service
+// -----------------------------------------------------------------------
+
+function WebInstallPrompt() { }
+
+WebInstallPrompt.prototype = {
+  classID: Components.ID("{c1242012-27d8-477e-a0f1-0b098ffc329b}"),
+  QueryInterface: XPCOMUtils.generateQI([Ci.amIWebInstallPrompt]),
+
+  confirm: function(aWindow, aURL, aInstalls) {
+    // first check if the extensions panel is open : fast path to return true
+    let browser = Services.wm.getMostRecentWindow("navigator:browser");
+    if (browser.ExtensionsView.visible) {
+      aInstalls.forEach(function(install) {
+        install.install();
+      });
+      return;
+    }
+    
+    let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
+
+    let prompt = Services.prompt;
+    let flags = prompt.BUTTON_POS_0 * prompt.BUTTON_TITLE_IS_STRING + prompt.BUTTON_POS_1 * prompt.BUTTON_TITLE_CANCEL;
+    let title = bundle.GetStringFromName("addonsConfirmInstall.title");
+    let button = bundle.GetStringFromName("addonsConfirmInstall.install");
+
+    aInstalls.forEach(function(install) {
+      let result = (prompt.confirmEx(aWindow, title, install.name, flags, button, null, null, null, {value: false}) == 0);
+      if (result)
+        install.install();
+      else
+        install.cancel();
+    });
+  }
+};
+
+const NSGetFactory = XPCOMUtils.generateNSGetFactory([WebInstallPrompt]);

From 9019806fe9d61187fcbcd1bcae0f5dd17e60cc1a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 1 Sep 2011 20:11:58 -0700
Subject: [PATCH 578/829] Closes #491 Implemented a install window for Fennec
 to match the one used for addons, even though it sucks.

---
 extension/content/e10s/browser-content.js     |  3 ++-
 extension/modules/manager.js                  | 24 +++++++++++++++++++
 extension/modules/script/scriptdownloader.js  | 23 ++++++++++++++----
 .../third-party/fennec/XPIDialogService.js    | 23 +++++-------------
 4 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
index 1179366f..b0c9a6cb 100644
--- a/extension/content/e10s/browser-content.js
+++ b/extension/content/e10s/browser-content.js
@@ -12,7 +12,7 @@ lazyImport(global, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
 Scriptish_log("step 2a");
 
 global.Scriptish_installUri = function(aURL) {
-  sendSyncMessage("Scriptish:InstallScriptURL", aURL);
+  sendAsyncMessage("Scriptish:InstallScriptURL", aURL);
 }
 
 function updateExcludes({json}) {
@@ -31,6 +31,7 @@ var configJSON = sendSyncMessage("Scriptish:FrameSetup", "")[0];
   });
 
   Scriptish_manager.setup({
+    global: global,
     content: content,
     scripts: scripts
   });
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index 345900f2..6fecb0c7 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -14,6 +14,24 @@ lazyUtil(this, "isURLExcluded");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "windowUnloader");
 
+const tests = {
+  _test_org: {
+    "chrome": true,
+    "about": true
+  },
+  _test_cl: {
+    "chrome": true,
+    "resource": true
+  },
+  _reg_userjs: /\.user\.js$/,
+  isTempScript: function(uri) {
+    if (!(uri instanceof Ci.nsIFileURL)) return false;
+
+    var file = uri.file;
+    return file.parent.equals(this._tmpDir) && file.leafName != "newscript.user.js";
+  }
+}
+
 const Scriptish_manager = {
   setup: function(options) {
     options = options || {};
@@ -63,6 +81,12 @@ const Scriptish_manager = {
       return;
     //Scriptish_log(JSON.stringify(Scriptish_getWindowIDs(safeWin)));
 
+    var uri = Services.io.newURI(href, null, null);
+    if (tests._reg_userjs.test(href) && !tests.isTempScript(uri)
+        && "view-source" != uri.scheme) {
+      options.global.sendAsyncMessage("Scriptish:InstallScriptURL", href);
+    }
+
     var scripts = {
       "document-start": [],
       "document-end": [],
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index e63e6335..4e6bb59b 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -10,6 +10,7 @@ lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/script/script.js", ["Script"]);
 lazyImport(this, "resource://scriptish/script/scripticon.js", ["ScriptIcon"]);
+lazyImport(this, "resource://scriptish/third-party/fennec/XPIDialogService.js", ["WebInstallPrompt"]);
 
 lazyUtil(this, "alert");
 lazyUtil(this, "getTempFile");
@@ -343,12 +344,24 @@ ScriptDownloader.prototype.cleanupTempFiles = function() {
     file.exists() && file.remove(false);
 }
 ScriptDownloader.prototype.showInstallDialog = function(aTimer) {
-  if (!aTimer)
-    return timeout(this.showInstallDialog.bind(this, 1));
+  let self = this;
+  if ("Fennec" == Services.appinfo.name) {
+    WebInstallPrompt.confirm(Scriptish.getMostRecentWindow(), [{
+      name: this.script.name,
+      install: function() {
+        self.installScript();
+      },
+      cancel: function() {}
+    }]);
+  }
+  else {
+    if (!aTimer)
+      return timeout(this.showInstallDialog.bind(this, 1));
 
-  Services.wm.getMostRecentWindow("navigator:browser").openDialog(
-      "chrome://scriptish/content/install.xul", "",
-      "chrome,centerscreen,modal,dialog,titlebar,resizable", this);
+    Services.wm.getMostRecentWindow("navigator:browser").openDialog(
+        "chrome://scriptish/content/install.xul", "",
+        "chrome,centerscreen,modal,dialog,titlebar,resizable", this);
+  }
 }
 ScriptDownloader.prototype.showScriptView = function() {
   Services.wm.getMostRecentWindow("navigator:browser")
diff --git a/extension/modules/third-party/fennec/XPIDialogService.js b/extension/modules/third-party/fennec/XPIDialogService.js
index db070e6b..1fd171f9 100644
--- a/extension/modules/third-party/fennec/XPIDialogService.js
+++ b/extension/modules/third-party/fennec/XPIDialogService.js
@@ -34,23 +34,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+var EXPORTED_SYMBOLS = ["WebInstallPrompt"];
+
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-// -----------------------------------------------------------------------
-// Web Install Prompt service
-// -----------------------------------------------------------------------
-
-function WebInstallPrompt() { }
-
-WebInstallPrompt.prototype = {
-  classID: Components.ID("{c1242012-27d8-477e-a0f1-0b098ffc329b}"),
-  QueryInterface: XPCOMUtils.generateQI([Ci.amIWebInstallPrompt]),
-
-  confirm: function(aWindow, aURL, aInstalls) {
+const WebInstallPrompt = {
+  confirm: function(aWindow, aInstalls) {
     // first check if the extensions panel is open : fast path to return true
     let browser = Services.wm.getMostRecentWindow("navigator:browser");
     if (browser.ExtensionsView.visible) {
@@ -59,13 +52,11 @@ WebInstallPrompt.prototype = {
       });
       return;
     }
-    
-    let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
 
     let prompt = Services.prompt;
     let flags = prompt.BUTTON_POS_0 * prompt.BUTTON_TITLE_IS_STRING + prompt.BUTTON_POS_1 * prompt.BUTTON_TITLE_CANCEL;
-    let title = bundle.GetStringFromName("addonsConfirmInstall.title");
-    let button = bundle.GetStringFromName("addonsConfirmInstall.install");
+    let title = "Installing User Script";
+    let button = "Install";
 
     aInstalls.forEach(function(install) {
       let result = (prompt.confirmEx(aWindow, title, install.name, flags, button, null, null, null, {value: false}) == 0);
@@ -76,5 +67,3 @@ WebInstallPrompt.prototype = {
     });
   }
 };
-
-const NSGetFactory = XPCOMUtils.generateNSGetFactory([WebInstallPrompt]);

From 83c3dfb1327f2db194da3fac657071889d7ffb03 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 1 Sep 2011 20:23:44 -0700
Subject: [PATCH 579/829] Closes #509
 extensions.scriptish.enableScriptRefreshing default is now false

---
 extension/defaults/preferences/scriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 1c8b25c1..51d2a053 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -17,7 +17,7 @@ pref("extensions.scriptish.enabledSchemes.unmht", false);
 pref("extensions.scriptish.enableCopyDownloadURL", false);
 pref("extensions.scriptish.enabledNotifications.popup", true);
 pref("extensions.scriptish.enabledNotifications.sliding", true);
-pref("extensions.scriptish.enableScriptRefreshing", true);
+pref("extensions.scriptish.enableScriptRefreshing", false);
 pref("extensions.scriptish.logChrome", false);
 pref("extensions.scriptish.logToErrorConsole", true);
 pref("extensions.scriptish.optimizingRegexpMerge", false);

From e275f8e13e1c6cf021334a55dc747b6f8ccb0c13 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 1 Sep 2011 20:43:41 -0700
Subject: [PATCH 580/829] <em:version>0.1.5a2pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index eb56e7cf..717d06aa 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -8,7 +8,7 @@
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
 
-    <em:version>0.1.5a1pre</em:version>
+    <em:version>0.1.5a2pre</em:version>
     <em:creator>Erik Vold; http://erikvold.com/</em:creator>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>

From 09a5aaf0bf93862cc426f05650a2b03d5ab52488 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 1 Sep 2011 20:51:48 -0700
Subject: [PATCH 581/829] Closes #502 adding a optional node argument to
 GM_addStyle

---
 extension/modules/api/sandbox.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extension/modules/api/sandbox.js b/extension/modules/api/sandbox.js
index 134fd646..6f221f25 100644
--- a/extension/modules/api/sandbox.js
+++ b/extension/modules/api/sandbox.js
@@ -2,13 +2,13 @@
 
 const GM_updatingEnabled = true;
 
-function GM_addStyle(css) {
-  var head = document.getElementsByTagName("head")[0];
-  if (head) {
+function GM_addStyle(css, node) {
+  node = node || document.getElementsByTagName("head")[0];
+  if (node) {
     var style = document.createElement("style");
     style.textContent = css;
     style.type = "text/css";
-    head.appendChild(style);
+    node.appendChild(style);
   }
   return style;
 }

From 31c0d7cd8c0831b11aa784b7768fa22de4bf3995 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 2 Sep 2011 00:14:06 -0700
Subject: [PATCH 582/829] mentioning #517 in a TODO comment

---
 extension/content/e10s/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index f871331b..01519d25 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -22,7 +22,7 @@
     Scriptish_config.scripts.forEach(function(script) {
       var ele = ExtensionsView._createItem(script, "userscript");
       ele.setAttribute("typeLabel", "User Script");
-      // TODO: implement for Fennec..
+      // TODO: implement for Fennec.. #517
       //ele.setAttribute("optionsURL", script.optionsURL);
       ele.setAttribute("isDisabled", !script.enabled);
       ele.setAttribute("data-scriptish-scriptid", script.id);

From dcd81f9dfff4d595a8d7a50077865247a3777980 Mon Sep 17 00:00:00 2001
From: qufighter <qufighter@gmail.com>
Date: Mon, 22 Aug 2011 15:57:48 -0400
Subject: [PATCH 583/829] adding self as contributor

---
 extension/install.rdf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/install.rdf b/extension/install.rdf
index 717d06aa..d1ade51f 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -40,6 +40,7 @@
     <em:contributor>Nikolas Coukouma; http://atrus.org/</em:contributor>
     <em:contributor>Ori Avtallon</em:contributor>
     <em:contributor>Pak Kei (logo); http://arkidect.com/</em:contributor>
+    <em:contributor>Sam Larison; http://samlarison.com/</em:contributor>
     <em:contributor>Sergio Abreu; http://sitedosergio.sitesbr.net/</em:contributor>
     <em:contributor>Slowpoke</em:contributor>
     <em:contributor>Tommi Rautava</em:contributor>

From bcefee52c8c1b28c64e34eabba3eeae2ea5a91d1 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 2 Sep 2011 14:23:50 -0500
Subject: [PATCH 584/829] Closes #494  Make 'Show Script Source' reuse the
 existing '.user.js' source tab and display the install banner.  Related to
 #469 .

---
 extension/content/js/browser.js              | 7 ++++---
 extension/modules/script/script.js           | 2 --
 extension/modules/script/scriptdownloader.js | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index beaf3d52..1e01aec4 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -14,13 +14,14 @@ lazyImport(window, "resource://scriptish/menucommander.js", ["Scriptish_MenuComm
 lazyImport(window, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(window, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
 
+lazyUtil(window, "getURLsForContentWindow");
+lazyUtil(window, "getWindowIDs");
 lazyUtil(window, "installUri");
 lazyUtil(window, "isGreasemonkeyable");
 lazyUtil(window, "isURLExcluded");
 lazyUtil(window, "openInEditor");
+lazyUtil(window, "openInTab");
 lazyUtil(window, "stringBundle");
-lazyUtil(window, "getURLsForContentWindow");
-lazyUtil(window, "getWindowIDs");
 
 var Ci = tools.Ci;
 var Services = tools.Services;
@@ -214,7 +215,7 @@ Scriptish_BrowserUI.showInstallBanner = function(browser) {
  */
 Scriptish_BrowserUI.showScriptView = function(aSD, aURL) {
   this.scriptDownloader_ = aSD;
-  gBrowser.selectedTab = gBrowser.addTab(aURL);
+  this.showInstallBanner(Scriptish_openInTab(aURL, false, true).contentWindow);
 }
 
 // Handles the install button getting clicked.
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 65f0630f..c5f2a3b8 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -629,8 +629,6 @@ Script.prototype = {
   get urlToDownload() this._downloadURL,
   setDownloadedFile: function(file) { this._tempFile = file; },
 
-  get previewURL() Services.io.newFileURI(this._tempFile).spec,
-
   isModified: function() {
     let now = Date.now();
     if (now - this._isModified_lastcheck < 1000) {
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 4e6bb59b..39c06db1 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -365,7 +365,7 @@ ScriptDownloader.prototype.showInstallDialog = function(aTimer) {
 }
 ScriptDownloader.prototype.showScriptView = function() {
   Services.wm.getMostRecentWindow("navigator:browser")
-      .Scriptish_BrowserUI.showScriptView(this, this.script.previewURL);
+      .Scriptish_BrowserUI.showScriptView(this, this.uri_.spec);
 }
 
 

From 0850ce7aedd8e2bf9b12bbf6708955e8638726cf Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 2 Sep 2011 14:49:44 -0500
Subject: [PATCH 585/829] Updating pt-BR with modifications by maurojs10
 (BabelZilla).

---
 extension/locale/pt-BR/description.properties |  8 +-
 extension/locale/pt-BR/scriptish.properties   | 90 +++++++++----------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/extension/locale/pt-BR/description.properties b/extension/locale/pt-BR/description.properties
index 4f011f74..983cb65e 100644
--- a/extension/locale/pt-BR/description.properties
+++ b/extension/locale/pt-BR/description.properties
@@ -1,13 +1,13 @@
-amo.description.line1=O Scriptish é um fork do Greasemonkey, oferecendo:
-amo.description.line2=Tudo que o Greasemonkey faz (o que é realmente útil)
+amo.description.line1=O Scriptish é um fork do Greasemonkey que oferece:
+amo.description.line2=Tudo que o Greasemonkey faz (que é realmente útil)
 amo.description.line3=Atualização: os scripts podem ser atualizados usando @updateURL
 amo.description.line4=Muitos <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">metadados @keys</a> novos
-amo.description.line5=Muitos novos <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">acréscimos à API GM_</a>
+amo.description.line5=Muitos <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">acréscimos à API GM_</a>
 amo.description.line6=Desempenho superior: um código mais rápido e mais limpo, que tira proveito de tudo o que as versões recentes do Firefox tem a oferecer
 amo.description.line7=Segurança superior: o Scriptish fornece recursos de segurança que você não vai encontrar em outro lugar
 amo.description.line8=Testes: os desenvolvedores empregam uma série de testes para garantir o correto funcionamento do Scriptish e encontrar falhas o mais breve possível
 amo.developerComments.line1=O Scriptish tem todos os recursos que o Greasemonkey tem e muitos mais, que você pode descobrir em: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a> .
-amo.developerComments.line2=Por favor, envie informações sobre falhas ou solicite de novos recursos em: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a> .
+amo.developerComments.line2=Por favor, envie informações sobre falhas ou solicitações de novos recursos em: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a> .
 amo.developerComments.line3=Se você tiver qualquer dúvida, envie sua pergunta para a lista de discussão: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a> .
 amo.summary=O maior mecanismo de scripts de usuário da Internet.
 extensions.scriptish@erikvold.com.description=Um gerenciador de scripts para o Firefox.
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 8f3f08a4..02dcace3 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -4,11 +4,11 @@ copyDownloadURL.ak=C
 edit=Editar
 edit.ak=E
 editor.couldNotLaunch=Não foi possível iniciar o editor.
-editor.pleasePickExecutable=Por favor, escolha um aplicativo para ser usado como editor de scripts de usuário.
+editor.pleasePickExecutable=Por favor, escolha um aplicativo para ser usado como editor de scripts.
 editor.prompt=Escolha seu editor de texto preferido
-editor.useScratchpad=
-editor.useScratchpad.no=
-editor.useScratchpad.yes=
+editor.useScratchpad=Você gostaria de usar o Scratchpad como seu editor?
+editor.useScratchpad.no=Não (eu vou escolher outro)
+editor.useScratchpad.yes=Sim
 error.api.clipboard.type=não é um tipo suportado por GM_setClipboard.
 error.api.noResourceWithName=Nenhum recurso com o nome
 error.api.noSecondArgValue=Segundo argumento não especificado: Valor
@@ -33,8 +33,8 @@ error.pref.type=Tipo de preferência não suportado. Os tipos válidos são: str
 error.resource.dupName=é um nome de recurso duplicado. Cada item de @resource precisa ter um nome exclusivo.
 error.resource.syntax=sintaxe inválida para a declaração @resource.
 error.retrieving=Falha ao obter
-error.script.installing=Erro ao instalar script de usuário
-error.script.loading=Erro ao carregar script de usuário
+error.script.installing=Erro ao instalar script
+error.script.loading=Erro ao carregar script
 greeting.btn.ak=I
 greeting.msg=Este é um script de usuário. Clique no botão "Instalar" para começar a usá-lo.
 install=Instalar
@@ -45,27 +45,27 @@ install.matches=funciona em (@match):
 install.requires=necessita de:
 install.resources=recursos:
 install.showScriptSource=Exibir código-fonte do script
-install.title=Instalação de Script de Usuário
+install.title=Instalação de Script
 install.warning1=Scripts nocivos podem violar a sua privacidade e agir em seu nome sem o seu conhecimento.
 install.warning2=Você só deve instalar scripts de fontes em que você confia.
-installFromFile=
-installFromFile.ak=
-menu.commands=Comandos de script de usuário
+installFromFile=Instalar script de um arquivo...
+installFromFile.ak=S
+menu.commands=Comandos de script
 menu.commands.ak=C
-menu.install=Instalar script de usuário
+menu.install=Instalar script
 menu.install.ak=I
-menu.manage=Gerenciar scripts de usuário
+menu.manage=Gerenciar scripts
 menu.manage.ak=G
-menu.new=Novo script de usuário...
+menu.new=Novo script...
 menu.new.ak=N
 menu.options.ak=O
-menu.show=Exibir código-fonte do script de usuário
+menu.show=Exibir código-fonte do script
 menu.show.ak=E
 menu.title=Scriptish
 menu.title.ak=S
-menuitem.install=Instalar este script de usuário...
-menuitem.manage=Gerenciar scripts de usuário
-menuitem.new=Novo script de usuário
+menuitem.install=Instalar este script...
+menuitem.manage=Gerenciar scripts
+menuitem.new=Novo script
 moving.dependency=Movendo arquivo de dependência:
 moving.script=Movendo arquivo de script:
 newscript.author=Autor
@@ -80,22 +80,22 @@ newscript.name=Nome
 newscript.namespace=Espaço de nomes
 newscript.noID=Por favor, informe um identificador válido para o seu script.
 newscript.noName=Por favor, informe um nome para o seu script.
-newscript.runat=
-newscript.runat.documentend=
-newscript.runat.documentidle=
-newscript.runat.documentstart=
-newscript.runat.windowload=
-newscript.version=
+newscript.runat=Executar quando
+newscript.runat.documentend=o documento terminar de carregar
+newscript.runat.documentidle=o documento estiver ocioso
+newscript.runat.documentstart=o documento começar a carregar
+newscript.runat.windowload=a janela estiver completamente carregada
+newscript.version=Versão
 nothing.timedOut=nada (excedido o tempo limite)
 openFolder=Abrir pasta
 openFolder.ak=A
-openUserScriptsManager=
-openUserScriptsManager.ak=
+openUserScriptsManager=Abrir gerenciador de scripts
+openUserScriptsManager.ak=A
 options=Opções
 options.addonsManager=Gerenciador de complementos
 options.alsoUninstallPrefs=Ao desinstalar um script, remover também as configurações dele
 options.cache=Cache
-options.cache.enabled=Usar cache para scripts de usuário
+options.cache.enabled=Usar cache para scripts
 options.changeEditor=Alterar editor
 options.editor=Editor
 options.editor.notset=Nenhum editor selecionado
@@ -114,29 +114,29 @@ options.enabledSchemes.unmht=Protocolo unmht (formato de arquivamento da Mozilla
 options.excludes.desc=Exclusões globais substituem qualquer regra especificada por scripts ou pelo usuário.
 options.excludes.empty=Nenhuma exclusão global
 options.excludes.remark=(Informe uma exclusão por linha)
-options.logChrome=Registrar mensagens da extensão não-críticas no console de erros
+options.logChrome=Registrar mensagens não-críticas da extensão no console de erros
 options.logging=Log
-options.logToErrorConsole=
+options.logToErrorConsole=GM_log usa o console de erros
 options.notifications=Notificações
-options.notifications.popup.enable=
-options.notifications.sliding.enable=
-options.notifications.whenDisabled=
+options.notifications.popup.enable=Habilitar notificações popup
+options.notifications.sliding.enable=Habilitar notificações deslizantes
+options.notifications.whenDisabled=Se esta opção estiver desabilitada, todas as notificações serão registradas no console de erros.
 options.pane.advanced=Avançado
 options.pane.excludes=Exclusões Globais
 options.pane.main=Principal
-options.pane.ui=
-options.requireBuiltInCerts=Exigir que atualizações seguras usem os certificados internos
-options.requireSecured=Exigir que scripts de usuário atualizem usando HTTPS
+options.pane.ui=Interface
+options.requireBuiltInCerts=Exigir que as atualizações seguras usem os certificados internos
+options.requireSecured=Exigir que os scripts atualizem usando HTTPS
 options.title=Opções do Scriptish
-options.toolbarbutton=
-options.toolbarbutton.showScripts=
+options.toolbarbutton=Botão da barra de ferramentas
+options.toolbarbutton.showScripts=Exibir contador de scripts ativos
 options.translation=Tradução
-options.translation.useEnglish=Sempre usar Inglês
+options.translation.useEnglish=Sempre exibir no idioma inglês
 options.update.security=Segurança na atualização
 options.useDownloadURL=Usar endereço de download para atualizações se não houver endereço de atualização
 reinstall=Reinstalar
 saving=Salvando
-scratchpad.saveAsUserScript=Salvar como script de usuário
+scratchpad.saveAsUserScript=Salvar como script
 scratchpad.saveAsUserScript.ak=u
 scriptOptions.disableScriptIncludes=Desativar as inclusões originais deste script e usar somente as inclusões personalizadas.
 scriptOptions.excludes=Exclusões personalizadas:
@@ -145,16 +145,16 @@ statusbar.enabled=Ativado
 statusbar.enabled.ak=A
 statusbar.installed=instalado com sucesso
 statusbar.modified=modificado
-statusbar.noScripts.excluded=
+statusbar.noScripts.excluded=Scripts desabilitados nesta página!
 statusbar.noScripts.notfound=Nenhum script para esta página!
-statusbar.noScripts.scheme=
+statusbar.noScripts.scheme=Scripts desabilitados para este protocolo!
 statusbar.updated=atualizado com sucesso
 tooltip.loading=Carregando...
 Uninstall=Desinstalação
-untitledScript=
+untitledScript=Script sem nome
 Update=Atualização
-userscript=
-userscripts=Scripts de usuário
-userscripts.get=Obter scripts de usuário
-userscripts.noneInstalled=Você não possui nenhum script de usuário instalado.
+userscript=Script
+userscripts=Scripts
+userscripts.get=Obter scripts
+userscripts.noneInstalled=Você não possui nenhum script instalado.
 warning.returnfrommain=Não é geralmente suportado usar "return" no escopo principal. Você precisa corrigir isso no seu script.

From a2b2ed372070bda83ad2f347e907aaa749c2d6bc Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 2 Sep 2011 14:52:43 -0500
Subject: [PATCH 586/829] Updating zh-CN with modifications by yfdyh000
 (BabelZilla).

---
 extension/locale/zh-CN/description.properties | 16 ++++++------
 extension/locale/zh-CN/scriptish.properties   | 26 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/extension/locale/zh-CN/description.properties b/extension/locale/zh-CN/description.properties
index ceae9d42..6fe50c14 100644
--- a/extension/locale/zh-CN/description.properties
+++ b/extension/locale/zh-CN/description.properties
@@ -1,13 +1,13 @@
 amo.description.line1=Scriptish 是 Greasemonkey 的分支，提供:
 amo.description.line2=Greasemonkey 提供的所有功能（都是非常有用的）
 amo.description.line3=更新：用户脚本在 Scriptish 上可以使用 @updateURL 更新
-amo.description.line4=更多的 <a href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">@keys 元数据支持</a>
-amo.description.line5=更多的 <a href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">用户脚本API支持</a>
-amo.description.line6=优越的性能：利用一切 Firefox 4所提供的更快、更清洁的代码基础
-amo.description.line7=出众的安全：Scriptish 提供独一无二的安全功能
-amo.description.line8=测试：编写代码测试Scriptish 的功能和特性
-amo.developerComments.line1=Scriptish 拥有 Greasemonkey 的所有功能，增加的很多其他特性您可以到这里查看：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.description.line4=许多新的 <a title="Scriptish 元数据块文档 - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">@keys 元数据支持</a>
+amo.description.line5=增加了很多新的 <a title="Scriptish 用户脚本 API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">GM_API 支持</a>
+amo.description.line6=优越的性能：利用一切 Firefox 最新版本所提供的更快、更清洁的代码
+amo.description.line7=出众的安全：Scriptish 提供独一无二的安全特性
+amo.description.line8=测试：开发者能进行大量地测试，确保您编写的代码功能正常并且更早的发现缺陷
+amo.developerComments.line1=Scriptish 拥有 Greasemonkey 的所有功能，增加的很多特性您可以到这里查看：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
 amo.developerComments.line2=请到这里提交 bug 或功能需求：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
-amo.developerComments.line3=如果您还有其他问题，请发送邮件到这里：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.developerComments.line3=如果您还有其他问题，请发送到邮件列表：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=互联网上最伟大的用户脚本引擎。
-extensions.scriptish@erikvold.com.description=
+extensions.scriptish@erikvold.com.description=Firefox 的脚本扩展管理器
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index 8f26a4cd..a0e97a49 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -1,4 +1,4 @@
-contributions.description=
+contributions.description=这个用户脚本的开发者希望您能捐助，以支持他继续开发这个脚本。
 copyDownloadURL=复制下载 URL
 copyDownloadURL.ak=C
 edit=编辑
@@ -6,9 +6,9 @@ edit.ak=E
 editor.couldNotLaunch=无法启动编辑器。
 editor.pleasePickExecutable=请选择一个可执行程序用来编辑用户脚本。
 editor.prompt=请选择您喜欢的文本编辑器
-editor.useScratchpad=
-editor.useScratchpad.no=
-editor.useScratchpad.yes=
+editor.useScratchpad=您想使用暂存器作为您的编辑器吗？
+editor.useScratchpad.no=不（我要选择我自己喜欢的）
+editor.useScratchpad.yes=是
 error.api.clipboard.type=不是 GM_setClipboard 所支持的类型。
 error.api.noResourceWithName=没有该名称的资源
 error.api.noSecondArgValue=第二个参数未指定：值
@@ -48,8 +48,8 @@ install.showScriptSource=显示脚本源代码
 install.title=安装用户脚本
 install.warning1=恶意脚本可能会侵犯您的隐私并在您不知情的情况下以您的身份运行。
 install.warning2=您应该只安装从可信任来源获得的脚本。
-installFromFile=
-installFromFile.ak=
+installFromFile=从文件安装用户脚本...
+installFromFile.ak=U
 menu.commands=用户脚本命令...
 menu.commands.ak=C
 menu.install=安装用户脚本...
@@ -80,7 +80,7 @@ newscript.name=名称
 newscript.namespace=命名空间
 newscript.noID=请为您的脚本提供一个有效的 ID。
 newscript.noName=请为您的脚本命名。
-newscript.runat=运行当
+newscript.runat=运行时机（@run-at）
 newscript.runat.documentend=文档加载完成时
 newscript.runat.documentidle=文档首次闲置时
 newscript.runat.documentstart=文档加载开始时
@@ -93,12 +93,12 @@ openUserScriptsManager=打开用户脚本管理器
 openUserScriptsManager.ak=O
 options=选项
 options.addonsManager=附加组件管理器
-options.alsoUninstallPrefs=当卸载脚本时，同时清除相关的首选项。
+options.alsoUninstallPrefs=卸载脚本的同时，清除有关它的首选项。
 options.cache=缓存
 options.cache.enabled=缓存用户脚本
 options.changeEditor=更换编辑器
 options.editor=编辑器
-options.editor.notset=未选择编辑器
+options.editor.notset=尚未选择编辑器
 options.enableCopyDownloadURL=启用复制下载 URL
 options.enabledSchemes.about=about 协议（内部）
 options.enabledSchemes.advanced=额外的协议
@@ -120,7 +120,7 @@ options.logToErrorConsole=GM_log 使用错误控制台
 options.notifications=通知
 options.notifications.popup.enable=弹窗显示通知
 options.notifications.sliding.enable=滑动显示通知
-options.notifications.whenDisabled=禁用时任何通知都将显示在错误控制台。
+options.notifications.whenDisabled=当禁用时，任何通知都将显示在错误控制台中。
 options.pane.advanced=高级
 options.pane.excludes=全局排除
 options.pane.main=常规
@@ -129,7 +129,7 @@ options.requireBuiltInCerts=安全更新需要使用内置的证书
 options.requireSecured=要求用户脚本使用 HTTPS 更新
 options.title=Scriptish 选项
 options.toolbarbutton=工具栏按钮
-options.toolbarbutton.showScripts=显示激活的脚本数
+options.toolbarbutton.showScripts=显示活动的脚本数
 options.translation=翻译
 options.translation.useEnglish=始终使用英语界面
 options.update.security=更新安全
@@ -153,8 +153,8 @@ tooltip.loading=正在加载...
 Uninstall=卸载
 untitledScript=无标题的脚本
 Update=更新
-userscript=
+userscript=用户脚本
 userscripts=用户脚本
 userscripts.get=获取用户脚本
 userscripts.noneInstalled=您尚未安装任何用户脚本
-warning.returnfrommain=一般不支持从主体范围“返回”。您需要在您的用户脚本中修复这个问题。
+warning.returnfrommain=一般不支持从主体范围“return”。您需要在您的用户脚本中修复这个问题。

From a1fbdae5280b4f2cdcf59ec762cad64843fa30f7 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 3 Sep 2011 09:25:54 -0500
Subject: [PATCH 587/829] Updating zh-TW with modifications by shyangs
 (BabelZilla).

---
 extension/locale/zh-TW/description.properties |  4 +-
 extension/locale/zh-TW/scriptish.properties   | 48 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/extension/locale/zh-TW/description.properties b/extension/locale/zh-TW/description.properties
index be6d160d..7ebb124a 100644
--- a/extension/locale/zh-TW/description.properties
+++ b/extension/locale/zh-TW/description.properties
@@ -4,10 +4,10 @@ amo.description.line3=更新：使用者腳本在 Scriptish 裡可以用 @update
 amo.description.line4=新增更多的 <a href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">後設資料 @keys</a>
 amo.description.line5=新增更多的 <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">GM_ API</a>
 amo.description.line6=優秀的性能：憑藉新版 Firefox 的優勢，以更快、更乾淨的程式碼提供更優秀的性能
-amo.description.line7=出色的安全：Scriptish 提供獨一無二的安全功能
+amo.description.line7=出色的安全：Scriptish 提供獨一無二的安全特性
 amo.description.line8=測試：開發者利用大量的測試保證 Scriptish 正確的執行，並更快找出程式碼中的錯誤
 amo.developerComments.line1=Scriptish 擁有 Greasemonkey 的所有功能，其他額外增加的特性您可以到這裡瀏覽：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
 amo.developerComments.line2=請到這裡提交 bug 或新功能請求：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
-amo.developerComments.line3=如果您還有其他問題，請發送郵件到這裡：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.developerComments.line3=如果您還有其他問題，請寄發電子郵件到這裡：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=網際網路上最傑出的使用者腳本引擎。
 extensions.scriptish@erikvold.com.description=一個 Firefox 的腳本管理器
diff --git a/extension/locale/zh-TW/scriptish.properties b/extension/locale/zh-TW/scriptish.properties
index a2ff6e98..1ad44e68 100644
--- a/extension/locale/zh-TW/scriptish.properties
+++ b/extension/locale/zh-TW/scriptish.properties
@@ -1,14 +1,14 @@
-contributions.description=此腳本作者請求您贊助，以支持腳本開發。
+contributions.description=此腳本作者請求您贊助，以支持腳本持續地開發。
 copyDownloadURL=複製下載網址
 copyDownloadURL.ak=C
 edit=編輯
 edit.ak=E
 editor.couldNotLaunch=無法開啟編輯器。
-editor.pleasePickExecutable=請挑一個可執行程式來編輯使用者腳本。
-editor.prompt=請先選擇您常用的純文字編輯器
-editor.useScratchpad=
-editor.useScratchpad.no=
-editor.useScratchpad.yes=
+editor.pleasePickExecutable=請選擇一個可執行程式來編輯使用者腳本。
+editor.prompt=請先選擇您常用的文字編輯器
+editor.useScratchpad=您想使用程式碼片段速記本作為您的編輯器嗎？
+editor.useScratchpad.no=不（我要自己選擇）
+editor.useScratchpad.yes=是
 error.api.clipboard.type=不是 GM_setClipboard 所支援的類型。
 error.api.noResourceWithName=沒有該名稱的資源
 error.api.noSecondArgValue=第二個參數未指定：值
@@ -17,7 +17,7 @@ error.api.reqURL.scheme=網址中有不支援的協定
 error.api.unsafeAccess=Scriptish 存取失敗: unsafeWindow 無法呼叫
 error.charset=指定的字元編碼無效。
 error.dependency.loading=載入附屬檔案時發生錯誤
-error.dependency.local=安全異常：本地及 chrome 的 URL 要求被禁止
+error.dependency.local=安全異常：本地及 chrome 的連線要求被禁止
 error.dependency.serverReturned=錯誤！伺服器返回
 error.hash.algorithm=指定的雜湊演算法無效。
 error.icon.dataURL=無效的資料: @icon 網址
@@ -26,7 +26,7 @@ error.icon.URL=無效的 @icon 網址
 error.isInvalidValue=是無效的值
 error.matchPattern.rules=@match 樣式不符合樣式規則
 error.matchPattern.rules.file=檔案協定 @match 樣式不符合樣式規則
-error.notSupported.Firefox=不支持此版本的 Firefox
+error.notSupported.Firefox=不支援此版本的 Firefox
 error.openingFile=無法開啟檔案
 error.pattern.parsing=樣式無法解析
 error.pref.type=不支援的選項類型。有效的類型有：字串、真假值和32位元整數。
@@ -47,9 +47,9 @@ install.resources=資源：
 install.showScriptSource=顯示腳本程式碼
 install.title=使用者腳本安裝
 install.warning1=惡意腳本可能危害您的隱私，並在您不知情時以您的名義執行。
-install.warning2=您應該只安裝可信任的腳本。.
-installFromFile=
-installFromFile.ak=
+install.warning2=您應該只安裝可信任的腳本。
+installFromFile=從檔案安裝使用者腳本…
+installFromFile.ak=U
 menu.commands=使用者腳本指令…
 menu.commands.ak=C
 menu.install=安裝使用者腳本…
@@ -75,7 +75,7 @@ newscript.exists=已安裝了一個同名的腳本。\n確定要覆蓋嗎？
 newscript.id=ID
 newscript.includes=包含網址(每行一條)
 newscript.missing.id=請提供一個 ID
-newscript.missing.name=請提供一個名稱。該名稱將在附加元件管理器裡顯示。
+newscript.missing.name=請提供一個名稱。該名稱將顯示在附加元件管理員裡。
 newscript.name=名稱
 newscript.namespace=命名空間
 newscript.noID=請為你的腳本提供一個有效 ID
@@ -92,13 +92,13 @@ openFolder.ak=O
 openUserScriptsManager=開啟使用者腳本管理器
 openUserScriptsManager.ak=O
 options=選項
-options.addonsManager=附加元件管理器
+options.addonsManager=附加元件管理員
 options.alsoUninstallPrefs=當移除腳本時，一併移除它的設定值
 options.cache=快取
 options.cache.enabled=快取使用者腳本
 options.changeEditor=設定編輯器
 options.editor=編輯器
-options.editor.notset=未選擇編輯器
+options.editor.notset=尚未選擇編輯器
 options.enableCopyDownloadURL=允許複製下載網址
 options.enabledSchemes.about=about 協定 (內部)
 options.enabledSchemes.advanced=其他協定
@@ -112,15 +112,15 @@ options.enabledSchemes.securityRemark=其他協定可能有完全的系統存取
 options.enabledSchemes.securityRemark2=因此不受信任的腳本可能造成巨大的安全風險！
 options.enabledSchemes.unmht=unmht 協定 (Mozilla Archive format)
 options.excludes.desc=全域排除規則將覆蓋任何腳本和使用者定義的規則
-options.excludes.empty=沒有定義全域排除規則
+options.excludes.empty=沒有設定全域排除規則
 options.excludes.remark=（您可以每行指定一條排除網址）
 options.logChrome=在錯誤主控台記錄非關鍵的擴充套件訊息
 options.logging=記錄
 options.logToErrorConsole=GM_log 使用錯誤主控台
 options.notifications=通知
-options.notifications.popup.enable=
-options.notifications.sliding.enable=
-options.notifications.whenDisabled=
+options.notifications.popup.enable=啟用彈出式訊息通知
+options.notifications.sliding.enable=啟用滑動式訊息通知
+options.notifications.whenDisabled=停用時，所有的訊息通知將顯示於錯誤主控台。
 options.pane.advanced=進階
 options.pane.excludes=全域排除
 options.pane.main=主要
@@ -128,8 +128,8 @@ options.pane.ui=介面
 options.requireBuiltInCerts=安全性更新必須使用內建的憑證
 options.requireSecured=腳本必須使用 HTTPS 更新
 options.title=Scriptish 選項
-options.toolbarbutton=
-options.toolbarbutton.showScripts=
+options.toolbarbutton=工具列按鈕
+options.toolbarbutton.showScripts=顯示作用中的腳本數
 options.translation=語言
 options.translation.useEnglish=總是使用英文
 options.update.security=安全性更新
@@ -138,7 +138,7 @@ reinstall=重新安裝
 saving=儲存
 scratchpad.saveAsUserScript=儲存為使用者腳本
 scratchpad.saveAsUserScript.ak=u
-scriptOptions.disableScriptIncludes=禁用此腳本的包含樣式，僅套用使用者定義的樣式。
+scriptOptions.disableScriptIncludes=停用此腳本的包含樣式，僅套用使用者定義的樣式。
 scriptOptions.excludes=使用者定義的排除網址：
 scriptOptions.includes=使用者定義的包含網址：
 statusbar.enabled=啟用
@@ -146,14 +146,14 @@ statusbar.enabled.ak=E
 statusbar.installed=安裝成功
 statusbar.modified=已修改
 statusbar.noScripts.excluded=頁面已排除！
-statusbar.noScripts.notfound=沒有在此頁面執行的腳本!
-statusbar.noScripts.scheme=協定已禁用！
+statusbar.noScripts.notfound=沒有在此頁面執行的腳本！
+statusbar.noScripts.scheme=協定已停用！
 statusbar.updated=更新成功
 tooltip.loading=載入中…
 Uninstall=移除
 untitledScript=無標題的腳本
 Update=更新
-userscript=
+userscript=使用者腳本
 userscripts=使用者腳本
 userscripts.get=取得腳本
 userscripts.noneInstalled=您尚未安裝任何使用者腳本

From 6c55f8f80a1c9ad3003afe66233c08cfd776795c Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 3 Sep 2011 09:28:20 -0500
Subject: [PATCH 588/829] Updating ja-JP with modifications by k2jp
 (BabelZilla).

---
 extension/locale/ja-JP/description.properties |  8 +--
 extension/locale/ja-JP/scriptish.properties   | 50 +++++++++----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/extension/locale/ja-JP/description.properties b/extension/locale/ja-JP/description.properties
index ff603e0d..634c1222 100644
--- a/extension/locale/ja-JP/description.properties
+++ b/extension/locale/ja-JP/description.properties
@@ -1,8 +1,8 @@
 amo.description.line1=Scriptish は Greasemonkey からフォーク（派生）しました。特長は以下の通り：
-amo.description.line2=Greasemonkey がすること全て（実際に素晴らしい）
-amo.description.line3=更新：Scriptish では @updateURL を使用することでユーザースクリプトを簡単に更新することができます。
+amo.description.line2=Greasemonkey ができること全て（これホントに便利）
+amo.description.line3=更新：Scriptish では @updateURL を使用することでユーザースクリプトを更新することができます。
 amo.description.line4=多数の新たな <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">メタデータ（@keys）</a>
-amo.description.line5=多数の新たな <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">GM_ API</a>
+amo.description.line5=多数の新たな <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">追加 GM_ API</a>
 amo.description.line6=優れたパフォーマンス：最新の Firefox を使い倒したより速く、よりクリーンなコードベース
 amo.description.line7=優れたセキュリティ：Scriptish は他にないセキュリティ機能を提供します
 amo.description.line8=テスト：開発者は Scriptish が正しく機能していることを確認したり、より早くバグを見つけるために多くのテストを利用することができる
@@ -10,4 +10,4 @@ amo.developerComments.line1=Scriptish は Greasemonkey と同じことができ
 amo.developerComments.line2=バグや新機能のリクエストは…：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=他の質問はメーリングリストまで…：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=インターネット上で最も優れたユーザースクリプトエンジン。
-extensions.scriptish@erikvold.com.description=Firefox用のユーザースクリプト拡張
+extensions.scriptish@erikvold.com.description=Firefox 用のユーザースクリプト拡張
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 7ea3fed5..8b5271f9 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -6,37 +6,37 @@ edit.ak=E
 editor.couldNotLaunch=エディタの起動に失敗しました
 editor.pleasePickExecutable=ユーザースクリプト編集用アプリケーションを指定してください
 editor.prompt=エディタを選択してください
-editor.useScratchpad=
-editor.useScratchpad.no=
-editor.useScratchpad.yes=
+editor.useScratchpad=エディタとしてスクラッチパッドを使用しますか？
+editor.useScratchpad.no=No（自分でエディタを指定）
+editor.useScratchpad.yes=Yes
 error.api.clipboard.type=は GM_setClipboard がサポートしてない型です
-error.api.noResourceWithName=名前付きリソースがありません
+error.api.noResourceWithName=名前付きリソースが見つかりません
 error.api.noSecondArgValue=２番目の引数が指定されていません：Value
 error.api.reqURL=不正な URL です
-error.api.reqURL.scheme=URL 内で許されないスキームです
+error.api.reqURL.scheme=URL 内で許されないスキーム（scheme）です
 error.api.unsafeAccess=Scriptish アクセス違反： unsafeWindow は以下を呼び出すことが出来ません
 error.charset=不正な文字セットが指定されました
 error.dependency.loading=依存関係の読み込みでエラーが発生しました
 error.dependency.local=セキュリティ例外： ローカル及び chrome URL へのリクエストは禁止されています
-error.dependency.serverReturned=エラー！ サーバーからの返答：
+error.dependency.serverReturned=エラー！ サーバーからの応答：
 error.hash.algorithm=不正なハッシュ・アルゴリズムが指定されました
 error.icon.dataURL=不正なデータ： @icon 用 URL
 error.icon.notImage=エラー！ @icon が画像の MIME タイプではありません
 error.icon.URL=@icon の URL が不正です
 error.isInvalidValue=は不正な値です
-error.matchPattern.rules=@match のパターンが適合していません
-error.matchPattern.rules.file=ファイル・スキームの @match パターンが適合していません
+error.matchPattern.rules=@match のパターンが記法に適合していません
+error.matchPattern.rules.file=ファイル・スキーム（scheme）の @match パターンが記法に適合していません
 error.notSupported.Firefox=はこのバージョンの Firefox でサポートされていません
 error.openingFile=ファイルを開くことが出来ませんでした
-error.pattern.parsing=パターンをパースできませんでした
+error.pattern.parsing=パターンを構文解析（parse）できませんでした
 error.pref.type=サポートしてない設定の型です。正しい型は次の通り： string, bool, 32-bit integers
-error.resource.dupName=はソース名として重複しています。@resource の名前は一意でなければなりません
+error.resource.dupName=はリソース名として重複しています。@resource の名前は一意でなければなりません
 error.resource.syntax=@resource 宣言の構文が不正です
 error.retrieving=取得に失敗しました
 error.script.installing=ユーザースクリプトのインストールでエラーが発生しました
 error.script.loading=ユーザースクリプトの読み込みでエラーが発生しました
 greeting.btn.ak=I
-greeting.msg=これはユーザースクリプトです。使用するには インストール をクリックして下さい
+greeting.msg=これはユーザースクリプトです。使用を開始するには「インストール」をクリック
 install=インストール
 install.domains=domains：
 install.excludes=does not run on：
@@ -48,8 +48,8 @@ install.showScriptSource=スクリプトのソースを表示
 install.title=ユーザースクリプトのインストール
 install.warning1=悪意のあるスクリプトはあなたの知らぬ間にプライバシーを侵害することがあります
 install.warning2=信頼できる場所からのみスクリプトをインストールすべきです
-installFromFile=
-installFromFile.ak=
+installFromFile=ファイルからのユーザースクリプトをインストールする…
+installFromFile.ak=U
 menu.commands=ユーザースクリプトのコマンド…
 menu.commands.ak=C
 menu.install=ユーザースクリプトをインストール…
@@ -59,7 +59,7 @@ menu.manage.ak=M
 menu.new=新規ユーザースクリプト…
 menu.new.ak=N
 menu.options.ak=O
-menu.show=ユーザースクリプトのソースを見る
+menu.show=ユーザースクリプトのソースコードを表示
 menu.show.ak=V
 menu.title=Scriptish
 menu.title.ak=S
@@ -67,7 +67,7 @@ menuitem.install=このユーザースクリプトをインストール…
 menuitem.manage=ユーザースクリプトを管理
 menuitem.new=新規ユーザースクリプト
 moving.dependency=依存関係ファイルを次から移動：
-moving.script=スクリプトを次から移動：
+moving.script=スクリプトファイルを次から移動：
 newscript.author=作者
 newscript.description=スクリプトの説明
 newscript.excludes=Excludes（１行１つずつ）
@@ -98,7 +98,7 @@ options.cache=キャッシュ
 options.cache.enabled=ユーザースクリプトをキャッシュ
 options.changeEditor=エディタ変更
 options.editor=エディタ
-options.editor.notset=エディタは指定されていません
+options.editor.notset=エディタが指定されていません
 options.enableCopyDownloadURL=ダウンロード URL のコピーを有効
 options.enabledSchemes.about=about プロトコル（内部）
 options.enabledSchemes.advanced=利用プロトコルの追加
@@ -111,16 +111,16 @@ options.enabledSchemes.main=利用プロトコル
 options.enabledSchemes.securityRemark=追加したプロトコルでシステムにフルアクセス可能になることがあります
 options.enabledSchemes.securityRemark2=つまり、信用できないスクリプトと併用すると相当なセキュリティ・リスクになるので注意！
 options.enabledSchemes.unmht=unmht プロトコル（Mozilla Archive フォーマット）
-options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先する
+options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先
 options.excludes.empty=global excludes は指定されていません
 options.excludes.remark=（１行１つずつ除外するものを指定）
-options.logChrome=重大でないエクステンションのメッセージもエラーコンソールに出力
+options.logChrome=重大（Critical）でないエクステンションのメッセージをエラーコンソールに出力
 options.logging=ログ
 options.logToErrorConsole=GM_log でエラーコンソールを使用
 options.notifications=通知
-options.notifications.popup.enable=
-options.notifications.sliding.enable=
-options.notifications.whenDisabled=
+options.notifications.popup.enable=ポップアップ通知する
+options.notifications.sliding.enable=スライド通知する
+options.notifications.whenDisabled=無効の場合はエラーコンソールに出力されます。
 options.pane.advanced=詳細
 options.pane.excludes=Global Excludes
 options.pane.main=メイン
@@ -128,8 +128,8 @@ options.pane.ui=ユーザーインタフェース
 options.requireBuiltInCerts=安全な更新に built-in 証明書を利用
 options.requireSecured=HTTPS でユーザースクリプトを更新
 options.title=Scriptish オプション
-options.toolbarbutton=
-options.toolbarbutton.showScripts=
+options.toolbarbutton=ツールバーのボタン
+options.toolbarbutton.showScripts=アクティブなスクリプト数を表示
 options.translation=翻訳
 options.translation.useEnglish=常に英語を使用
 options.update.security=更新に関するセキュリティ
@@ -147,13 +147,13 @@ statusbar.installed=のインストールに成功しました
 statusbar.modified=は変更されました
 statusbar.noScripts.excluded=ページが除外（exclude）されました！
 statusbar.noScripts.notfound=このページ用のスクリプトはありません！
-statusbar.noScripts.scheme=スキームが無効になっています！
+statusbar.noScripts.scheme=スキーム（Scheme）が無効になっています！
 statusbar.updated=は正常に更新されました
 tooltip.loading=読み込み中…
 Uninstall=アンインストール
 untitledScript=名称未定スクリプト
 Update=更新
-userscript=
+userscript=ユーザースクリプト
 userscripts=ユーザースクリプト
 userscripts.get=ユーザースクリプトを取得
 userscripts.noneInstalled=ユーザースクリプトがインストールされていません

From e481f02c31c42a3831438b58a9478a863f9c13b2 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 3 Sep 2011 09:07:05 -0700
Subject: [PATCH 589/829] Closes #522 @requires work again

---
 extension/content/e10s/browser-content.js     |  7 +-----
 extension/content/e10s/browser.js             | 16 +++++++++++--
 .../modules/utils/Scriptish_evalInSandbox.js  | 23 +++++++++++++------
 .../modules/utils/Scriptish_injectScripts.js  |  4 ++--
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
index b0c9a6cb..a434090c 100644
--- a/extension/content/e10s/browser-content.js
+++ b/extension/content/e10s/browser-content.js
@@ -9,8 +9,6 @@ lazyImport(global, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
   "Scriptish_setExcludes"
 ]);
 
-Scriptish_log("step 2a");
-
 global.Scriptish_installUri = function(aURL) {
   sendAsyncMessage("Scriptish:InstallScriptURL", aURL);
 }
@@ -26,7 +24,7 @@ var configJSON = sendSyncMessage("Scriptish:FrameSetup", "")[0];
 
   var scripts = configJSON.scripts.map(function(i) {
     var script = SimpleScript.loadFromJSON(i);
-    script.textContent = sendSyncMessage("Scriptish:GetScriptContents", script.id);
+    script.textContent = sendSyncMessage("Scriptish:GetScriptContents", script.id)[0];
     return script;
   });
 
@@ -38,9 +36,6 @@ var configJSON = sendSyncMessage("Scriptish:FrameSetup", "")[0];
 })(configJSON);
 
 addMessageListener("Scriptish:GlobalExcludesUpdate", updateExcludes);
-
-
-Scriptish_log("step 2b");
 })(Components.utils.import, {}, this);
 
 
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 01519d25..285286fb 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -11,7 +11,6 @@
 
   var $ = function(id) document.getElementById(id);
 
-  Scriptish_log("step 1a");
   addEventListener("load", function() {
     // Check if Scriptish has been updated/installed
     inc("resource://scriptish/utils/Scriptish_updateChk.js");
@@ -53,8 +52,21 @@
     return new GM_Resources(Scriptish_config.getScriptById(json.scriptID)).getResourceText(json.resource);
   });
 
+  mm.addMessageListener("Scriptish:GetScriptRequires", function({json}) {
+    var script = Scriptish_config.getScriptById(json);
+    if (!script) return [];
+
+    var rtnAry = [];
+    script.requires.forEach(function(req) {
+      rtnAry.push({
+        fileURL: req.fileURL,
+        textContent: req.textContent
+      });
+    });
+    return rtnAry;
+  });
+
   mm.loadFrameScript(
       "chrome://scriptish/content/e10s/browser-content.js",
       true); // no delay loading frame script
-  Scriptish_log("step 1b");
 })(Components.utils.import, {}, this);
diff --git a/extension/modules/utils/Scriptish_evalInSandbox.js b/extension/modules/utils/Scriptish_evalInSandbox.js
index 6426061e..46d9e904 100644
--- a/extension/modules/utils/Scriptish_evalInSandbox.js
+++ b/extension/modules/utils/Scriptish_evalInSandbox.js
@@ -11,13 +11,22 @@ lazyUtil(this, "stringBundle");
 const fileURLPrefix = "chrome://scriptish/content/scriptish.js -> ";
 const Scriptish_evalInSandbox_filename = Components.stack.filename;
 
-function Scriptish_evalInSandbox(aScript, aSandbox, aWindow) {
+function Scriptish_evalInSandbox(aScript, aSandbox, aWindow, options) {
   const jsVer = aScript.jsversion;
   const fileURL = aScript.fileURL;
+  const id = aScript.id;
 
-  /*
+  // e10s
+  if (options && options.global && options.global.sendSyncMessage) {
+    var reqAry = options.global.sendSyncMessage("Scriptish:GetScriptRequires", id)[0];
+  }
+  else {
+    var reqAry = aScript.requires;
+  }
+
+  // eval script @requires
   try {
-    for (let [, req] in Iterator(aScript.requires)) {
+    for (let [, req] in Iterator(reqAry)) {
       var rfileURL = req.fileURL;
       try {
         Cu.evalInSandbox(
@@ -28,14 +37,14 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow) {
           1
           );
       } catch (ex) {
-        Scriptish_logScriptError(ex, aWindow, rfileURL, aScript.id);
+        Scriptish_logScriptError(ex, aWindow, rfileURL, id);
       }
     }
   } catch (e) {
     return Scriptish_logError(e, 0, fileURL, e.lineNumber);
   }
-  */
 
+  // eval script
   try {
     try {
       Cu.evalInSandbox(
@@ -60,7 +69,7 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow) {
         sw.warningFlag,
         "scriptish userscript warnings"
         );
-      Scriptish_logScriptError(sw, aWindow, fileURL, aScript.id);
+      Scriptish_logScriptError(sw, aWindow, fileURL, id);
       Cu.evalInSandbox(
         "(function(){" + aScript.textContent + "\n})()",
         aSandbox,
@@ -70,6 +79,6 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow) {
         );
     }
   } catch (e) {
-    Scriptish_logScriptError(e, aWindow, fileURL, aScript.id);
+    Scriptish_logScriptError(e, aWindow, fileURL, id);
   }
 }
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 01e5f5ac..7645242e 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -93,10 +93,10 @@ function Scriptish_injectScripts(options) {
     if (delay || delay === 0) {
       // don't use window's setTimeout, b/c then window could clearTimeout
       delays.push(gTimer.setTimeout(function() {
-        Scriptish_evalInSandbox(script, sandbox, safeWin);
+        Scriptish_evalInSandbox(script, sandbox, safeWin, options);
       }, delay));
     } else {
-      Scriptish_evalInSandbox(script, sandbox, safeWin);
+      Scriptish_evalInSandbox(script, sandbox, safeWin, options);
     }
   }
 }

From 32421ad18dd8046f9c6de71feaecbce4aa5f1b71 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 3 Sep 2011 10:36:39 -0700
Subject: [PATCH 590/829] bug fixes: scripts were being injected when they
 should not have been on Fennec b/c @noframes were ignored and filtered script
 array was ignored during inject..

---
 extension/modules/constants.js                        | 4 +++-
 extension/modules/script/simple-script.js             | 5 +++--
 extension/modules/utils/Scriptish_isScriptRunnable.js | 2 --
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index ae61e8ca..7d6cf736 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -145,7 +145,9 @@ function timeout(cb, delay) {
 
 function extend(a, o) {
   for (var k in a) {
-    o[k] = a[k];
+    if (!o[k]) {
+      o[k] = a[k];
+    }
   }
   return o;
 }
diff --git a/extension/modules/script/simple-script.js b/extension/modules/script/simple-script.js
index 94e0f2e1..2c87fb5b 100644
--- a/extension/modules/script/simple-script.js
+++ b/extension/modules/script/simple-script.js
@@ -28,12 +28,13 @@ function SimpleScript() {
   this.priority = 0;
   this._requires = [];
   this._resources = [];
-  this._noframes = false;
+  this.noframes = false;
   this._jsversion = null;
   this["_run-at"] = null;
 }
 
 SimpleScript.prototype = {
+  needsUninstall: false,
   get jsversion() this._jsversion || maxJSVer,
   get runAt() this["_run-at"] || defaultRunAt,
   get matches() this._matches.concat(),
@@ -114,7 +115,7 @@ SimpleScript.loadFromJSON = function(aSkeleton) {
   script._jsversion = aSkeleton.jsversion;
   script["_run-at"] = aSkeleton["run-at"];
   script.includesDisabled = aSkeleton.includesDisabled;
-  script._noframes = aSkeleton.noframes;
+  script.noframes = aSkeleton.noframes;
   script.addInclude(aSkeleton.includes);
   script.addExclude(aSkeleton.excludes);
   // TODO: need to have the below updated when they are changed...
diff --git a/extension/modules/utils/Scriptish_isScriptRunnable.js b/extension/modules/utils/Scriptish_isScriptRunnable.js
index a41a3ae4..1eedecb2 100644
--- a/extension/modules/utils/Scriptish_isScriptRunnable.js
+++ b/extension/modules/utils/Scriptish_isScriptRunnable.js
@@ -1,7 +1,5 @@
 var EXPORTED_SYMBOLS = ["Scriptish_isScriptRunnable"];
 
-Components.utils.import("resource://scriptish/logging.js");
-
 function Scriptish_isScriptRunnable(script, url, topWin) {
   return !(!topWin && script.noframes)
       && !script.delayInjection

From c2410ddae0146150eb89ef7fe1c39a2053164468 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 3 Sep 2011 10:37:43 -0700
Subject: [PATCH 591/829] Revert "Closes #509
 extensions.scriptish.enableScriptRefreshing default is now false"

This reverts commit 83c3dfb1327f2db194da3fac657071889d7ffb03.
---
 extension/defaults/preferences/scriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 51d2a053..1c8b25c1 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -17,7 +17,7 @@ pref("extensions.scriptish.enabledSchemes.unmht", false);
 pref("extensions.scriptish.enableCopyDownloadURL", false);
 pref("extensions.scriptish.enabledNotifications.popup", true);
 pref("extensions.scriptish.enabledNotifications.sliding", true);
-pref("extensions.scriptish.enableScriptRefreshing", false);
+pref("extensions.scriptish.enableScriptRefreshing", true);
 pref("extensions.scriptish.logChrome", false);
 pref("extensions.scriptish.logToErrorConsole", true);
 pref("extensions.scriptish.optimizingRegexpMerge", false);

From 8f83c5e43dee4fde8704df34af487180e9531fc4 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 3 Sep 2011 10:42:36 -0700
Subject: [PATCH 592/829] Closes #515 @run-at document-start and window-load
 are supported on Fennec now

---
 extension/modules/manager.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index 6fecb0c7..0e934757 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -124,6 +124,25 @@ const Scriptish_manager = {
         }));
       }, true);
     }
+
+    if (scripts["window-load"].length) {
+      safeWin.addEventListener("load", function() {
+        if (shouldNotRun()) return;
+        // inject @run-at window-load scripts
+        Scriptish_injectScripts(extend(options, {
+          scripts: scripts["window-load"],
+          url: href,
+          safeWin: safeWin
+        }));
+      }, true);
+    }
+
+    // inject @run-at document-start scripts
+    Scriptish_injectScripts(extend(options, {
+      scripts: scripts["document-start"],
+      url: href,
+      safeWin: safeWin
+    }));
   },
 
   waitForFrame: function(safeWin, options) {

From 2b454a6fadd99df7104c0fe42634432bb7447cbe Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 3 Sep 2011 10:56:44 -0700
Subject: [PATCH 593/829] just mentioning browsers required to use Scriptish on
 readme now

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6b59763c..8a4851e5 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,11 @@
 Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 
 
-# Requirements
+# Browsers Supported
 
-* Using Scriptish: Firefox 4+
-* Building an XPI: Unix shell
+* Firefox 4+
+* Fennec 4+
+* Seamonkey 2.1+
 
 
 # Links

From 60ddbb60279292a0968b7188d46c3fd78dcbe304 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 3 Sep 2011 15:26:16 -0500
Subject: [PATCH 594/829] Prompting users to pick Scratchpad (if available) or
 a different editor.  Removed 'Scratchpad' as the default, since it isn't
 always available (introduced in Gecko 6.0).

---
 extension/defaults/preferences/scriptish.js   |  1 -
 .../modules/utils/Scriptish_getEditor.js      | 43 ++++++++++---------
 .../modules/utils/Scriptish_openInEditor.js   |  5 +--
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 1c8b25c1..551e0199 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -5,7 +5,6 @@ pref("extensions.scriptish.blocklist.lastFetch", 0);
 pref("extensions.scriptish.blocklist.url", "https://github.com/scriptish/scriptish/raw/master/blocklist.json");
 pref("extensions.scriptish.cache.enabled", true);
 pref("extensions.scriptish.config.prettyPrint.enabled", false);
-pref("extensions.scriptish.editor", "Scratchpad");
 pref("extensions.scriptish.enabled", true);
 pref("extensions.scriptish.enabledSchemes.about", false);
 pref("extensions.scriptish.enabledSchemes.chrome", false);
diff --git a/extension/modules/utils/Scriptish_getEditor.js b/extension/modules/utils/Scriptish_getEditor.js
index 34c534f4..014b44df 100644
--- a/extension/modules/utils/Scriptish_getEditor.js
+++ b/extension/modules/utils/Scriptish_getEditor.js
@@ -30,38 +30,41 @@ const Scriptish_getEditor = function(parentWindow, change) {
       return editor;
     } else {
       Scriptish_log("Editor preference either does not exist or is not executable");
-      Scriptish_prefRoot.reset("editor");
+      Scriptish_prefRoot.remove("editor");
     }
   }
 
   // Ask the user to choose a new editor. Sometimes users get confused and
   // pick a non-executable file, so we set this up in a loop so that if they do
   // that we can give them an error and try again.
+  var hasScratchpad =
+      !!Services.wm.getMostRecentWindow("navigator:browser").Scratchpad;
+  var sp = Services.prompt;
+  var flags = sp.BUTTON_POS_0 * sp.BUTTON_TITLE_IS_STRING
+      + sp.BUTTON_POS_1 * sp.BUTTON_TITLE_IS_STRING;
+
   while (true) {
     Scriptish_log("Asking user to choose editor...");
 
-    // Ask if the user wants to use Scratchpad
-    var sp = Services.prompt;
-    var flags = sp.BUTTON_POS_0 * sp.BUTTON_TITLE_IS_STRING
-        + sp.BUTTON_POS_1 * sp.BUTTON_TITLE_IS_STRING;
-
+    // If available, ask if the user wants to use Scratchpad.
     // Note: confirmEx always returns 1 if prompt is closed w/ the close button,
     //       so we need to keep the negative answer at button index 1.
-    var answer = sp.confirmEx(
-        null,
-        Scriptish_stringBundle("editor.useScratchpad"),
-        Scriptish_stringBundle("editor.useScratchpad"),
-        flags,
-        Scriptish_stringBundle("editor.useScratchpad.yes"),
-        Scriptish_stringBundle("editor.useScratchpad.no"),
-        "",
-        null,
-        {value:false});
+    if (hasScratchpad) {
+      var answer = sp.confirmEx(
+          null,
+          Scriptish_stringBundle("editor.useScratchpad"),
+          Scriptish_stringBundle("editor.useScratchpad"),
+          flags,
+          Scriptish_stringBundle("editor.useScratchpad.yes"),
+          Scriptish_stringBundle("editor.useScratchpad.no"),
+          "",
+          null,
+          {value:false});
 
-    // The user answered Yes.  Set 'editor' back to the default ("Scratchpad").
-    if (0 === answer) {
-      Scriptish_prefRoot.reset("editor");
-      return Scriptish_prefRoot.getValue("editor");
+      // The user answered Yes.  Set Scratchpad as the editor.
+      if (0 === answer) {
+        return Scriptish_prefRoot.setValue("editor", "Scratchpad");
+      }
     }
 
     var nsIFilePicker = Ci.nsIFilePicker;
diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index 6d53f20e..6fcdef0b 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -29,10 +29,9 @@ function Scriptish_openInEditor(script, parentWindow) {
       Scriptish_launchApplicationWithDoc(editor, file);
     }
   } catch (e) {
-    // Something may be wrong with the editor the user selected. Reset to
-    // the default ("Scratchpad").
+    // Something may be wrong with the editor the user selected. Remove it.
     Scriptish_alert(Scriptish_stringBundle("editor.couldNotLaunch") + "\n" + e);
-    Scriptish_prefRoot.reset("editor");
+    Scriptish_prefRoot.remove("editor");
     throw e;
   }
 }

From 2fc483f86bae9e52051bd673d41ff03aedabeb63 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 3 Sep 2011 15:39:13 -0500
Subject: [PATCH 595/829] Don't ask about using Scratchpad if it is disabled by
 the 'devtools.scratchpad.enabled' pref.

---
 extension/modules/utils/Scriptish_getEditor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/modules/utils/Scriptish_getEditor.js b/extension/modules/utils/Scriptish_getEditor.js
index 014b44df..3d1a8695 100644
--- a/extension/modules/utils/Scriptish_getEditor.js
+++ b/extension/modules/utils/Scriptish_getEditor.js
@@ -38,7 +38,8 @@ const Scriptish_getEditor = function(parentWindow, change) {
   // pick a non-executable file, so we set this up in a loop so that if they do
   // that we can give them an error and try again.
   var hasScratchpad =
-      !!Services.wm.getMostRecentWindow("navigator:browser").Scratchpad;
+      !!Services.wm.getMostRecentWindow("navigator:browser").Scratchpad
+      && Services.prefs.getBoolPref("devtools.scratchpad.enabled");
   var sp = Services.prompt;
   var flags = sp.BUTTON_POS_0 * sp.BUTTON_TITLE_IS_STRING
       + sp.BUTTON_POS_1 * sp.BUTTON_TITLE_IS_STRING;

From 8061d971c594379d862c49522c8e56834de3ae46 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 3 Sep 2011 15:46:21 -0500
Subject: [PATCH 596/829] Don't die if we found Scratchpad but the 'enabled'
 pref doesn't exist.

---
 extension/modules/utils/Scriptish_getEditor.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/extension/modules/utils/Scriptish_getEditor.js b/extension/modules/utils/Scriptish_getEditor.js
index 3d1a8695..2b3982cc 100644
--- a/extension/modules/utils/Scriptish_getEditor.js
+++ b/extension/modules/utils/Scriptish_getEditor.js
@@ -38,8 +38,12 @@ const Scriptish_getEditor = function(parentWindow, change) {
   // pick a non-executable file, so we set this up in a loop so that if they do
   // that we can give them an error and try again.
   var hasScratchpad =
-      !!Services.wm.getMostRecentWindow("navigator:browser").Scratchpad
-      && Services.prefs.getBoolPref("devtools.scratchpad.enabled");
+      !!Services.wm.getMostRecentWindow("navigator:browser").Scratchpad;
+  try {
+    hasScratchpad = hasScratchpad
+        && Services.prefs.getBoolPref("devtools.scratchpad.enabled");
+  } catch(e) {}
+
   var sp = Services.prompt;
   var flags = sp.BUTTON_POS_0 * sp.BUTTON_TITLE_IS_STRING
       + sp.BUTTON_POS_1 * sp.BUTTON_TITLE_IS_STRING;

From f1b9adf863c8a63320a8dc68807367bb49990130 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 3 Sep 2011 18:50:16 -0500
Subject: [PATCH 597/829] Make sure the Scratchpad 'redo/undo' stack is cleared
 when opening a user script.

---
 extension/modules/utils/Scriptish_openInEditor.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index 6fcdef0b..719d4149 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -22,7 +22,20 @@ function Scriptish_openInEditor(script, parentWindow) {
       spWin.addEventListener("load", function spWinLoaded() {
         spWin.removeEventListener("load", spWinLoaded, false);
         spWin.document.title = spWin.Scratchpad.filename = file.path;
-        spWin.Scratchpad.importFromFile(file);
+        spWin.Scratchpad.importFromFile(file, false, function() {
+          let spEditor = spWin.Scratchpad.editor;
+          if (spEditor._undoStack && spEditor._undoStack.reset) {
+            // Reset "undo/redo" for the Orion editor
+            spEditor._undoStack.reset();
+          } else if (spEditor._editor
+              && spEditor._editor.resetModificationCount
+              && spEditor._editor.transactionManager
+              && spEditor._editor.transactionManager.clear) {
+            // Reset "undo/redo" for the textarea editor
+            spEditor._editor.resetModificationCount();
+            spEditor._editor.transactionManager.clear();
+          }
+        });
       }, false);
     }
     else {

From c3fc1cce6e0b5f01f62fc942e7d53b6276021aa2 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 3 Sep 2011 18:12:32 -0700
Subject: [PATCH 598/829] Closes #514 and #523 Fetching user script textContent
 from chrome process, adding installed user scripts to already open content
 processes, and adding installed user scripts to EM.

---
 extension/content/e10s/browser-content.js     | 10 ++++----
 extension/content/e10s/browser.js             | 23 +++++++++++++++----
 extension/modules/addonprovider.js            |  5 ++++
 extension/modules/api.js                      |  4 ++--
 .../modules/utils/Scriptish_evalInSandbox.js  |  6 +++--
 .../utils/Scriptish_sendAsyncE10SMessage.js   |  1 +
 6 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
index a434090c..231f306f 100644
--- a/extension/content/e10s/browser-content.js
+++ b/extension/content/e10s/browser-content.js
@@ -18,14 +18,13 @@ function updateExcludes({json}) {
 }
 
 var configJSON = sendSyncMessage("Scriptish:FrameSetup", "")[0];
+var scripts;
 
 (function(configJSON) {
   Scriptish_setExcludes(configJSON.excludes);
 
-  var scripts = configJSON.scripts.map(function(i) {
-    var script = SimpleScript.loadFromJSON(i);
-    script.textContent = sendSyncMessage("Scriptish:GetScriptContents", script.id)[0];
-    return script;
+  scripts = configJSON.scripts.map(function(i) {
+    return SimpleScript.loadFromJSON(i);
   });
 
   Scriptish_manager.setup({
@@ -36,6 +35,9 @@ var configJSON = sendSyncMessage("Scriptish:FrameSetup", "")[0];
 })(configJSON);
 
 addMessageListener("Scriptish:GlobalExcludesUpdate", updateExcludes);
+addMessageListener("Scriptish:ScriptInstalled", function(data) {
+  scripts.push(SimpleScript.loadFromJSON(data.json));
+});
 })(Components.utils.import, {}, this);
 
 
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 285286fb..6584bf66 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -16,9 +16,9 @@
     inc("resource://scriptish/utils/Scriptish_updateChk.js");
 
     var us_head = $("addons-userscripts");
-    var next = us_head.nextSibling;
     var parent = us_head.parentNode;
-    Scriptish_config.scripts.forEach(function(script) {
+
+    function createNode(script) {
       var ele = ExtensionsView._createItem(script, "userscript");
       ele.setAttribute("typeLabel", "User Script");
       // TODO: implement for Fennec.. #517
@@ -26,8 +26,23 @@
       ele.setAttribute("isDisabled", !script.enabled);
       ele.setAttribute("data-scriptish-scriptid", script.id);
       ele.addon = script;
-      parent.insertBefore(ele, next);
-    });
+      return ele;
+    }
+
+    function insertScript(script) {
+      parent.insertBefore(createNode(script), us_head.nextSibling);
+    }
+
+    // insert script nodes into the EM
+    Scriptish_config.scripts.forEach(insertScript);
+    Services.obs.addObserver({
+      observe: function(aSubject, aTopic, aData) {
+        tools.timeout(function() {
+          var script = Scriptish_config.getScriptById(JSON.parse(aData).id);
+          insertScript(script);
+        });
+      }
+    }, "scriptish-script-installed", false);
   }, false);
 
   var mm = messageManager;
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index b56a2d43..e4aadf3e 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -9,6 +9,7 @@ lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "Ad
 lazyUtil(this, "notification");
 lazyUtil(this, "openManager");
 lazyUtil(this, "popupNotification");
+lazyUtil(this, "sendAsyncE10SMessage");
 lazyUtil(this, "stringBundle");
 
 const Scriptish_ScriptProvider = {
@@ -45,6 +46,10 @@ const Scriptish_ScriptProvider = {
         Scriptish_notification(msg, null, null, callback);
       }
 
+      if ("Fennec" == Services.appinfo.name) {
+        Scriptish_sendAsyncE10SMessage("Scriptish:ScriptInstalled", script.toJSON());
+      }
+
       break;
     case "scriptish-script-edit-enabling":
       AddonManagerPrivate.callAddonListeners(
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 0d968bfc..e9ca7f4d 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -123,7 +123,7 @@ function GM_API(options) {
     if (!GM_apiLeakCheck("GM_getResourceURL")) return;
 
     if (options.content) {
-      return options.content.sendSyncMessage("Scriptish:GetScriptResourceURL", {
+      return options.global.sendSyncMessage("Scriptish:GetScriptResourceURL", {
         scriptID: aScript.id,
         resource: aName
       });
@@ -135,7 +135,7 @@ function GM_API(options) {
     if (!GM_apiLeakCheck("GM_getResourceText")) return;
 
     if (options.content) {
-      return options.content.sendSyncMessage("Scriptish:GetScriptResourceText", {
+      return options.global.sendSyncMessage("Scriptish:GetScriptResourceText", {
         scriptID: aScript.id,
         resource: aName
       });
diff --git a/extension/modules/utils/Scriptish_evalInSandbox.js b/extension/modules/utils/Scriptish_evalInSandbox.js
index 46d9e904..5257905f 100644
--- a/extension/modules/utils/Scriptish_evalInSandbox.js
+++ b/extension/modules/utils/Scriptish_evalInSandbox.js
@@ -19,9 +19,11 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow, options) {
   // e10s
   if (options && options.global && options.global.sendSyncMessage) {
     var reqAry = options.global.sendSyncMessage("Scriptish:GetScriptRequires", id)[0];
+    var scriptText = options.global.sendSyncMessage("Scriptish:GetScriptContents", id)[0];
   }
   else {
     var reqAry = aScript.requires;
+    var scriptText = aScript.textContent;
   }
 
   // eval script @requires
@@ -48,7 +50,7 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow, options) {
   try {
     try {
       Cu.evalInSandbox(
-        aScript.textContent + "\n",
+        scriptText + "\n",
         aSandbox,
         jsVer,
         fileURLPrefix + fileURL,
@@ -71,7 +73,7 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow, options) {
         );
       Scriptish_logScriptError(sw, aWindow, fileURL, id);
       Cu.evalInSandbox(
-        "(function(){" + aScript.textContent + "\n})()",
+        "(function(){" + scriptText + "\n})()",
         aSandbox,
         jsVer,
         fileURLPrefix + fileURL,
diff --git a/extension/modules/utils/Scriptish_sendAsyncE10SMessage.js b/extension/modules/utils/Scriptish_sendAsyncE10SMessage.js
index 8be4dde2..726d85f0 100644
--- a/extension/modules/utils/Scriptish_sendAsyncE10SMessage.js
+++ b/extension/modules/utils/Scriptish_sendAsyncE10SMessage.js
@@ -1,5 +1,6 @@
 var EXPORTED_SYMBOLS = ["Scriptish_sendAsyncE10SMessage"];
 Components.utils.import("resource://scriptish/constants.js");
+Components.utils.import("resource://scriptish/scriptish.js");
 
 function Scriptish_sendAsyncE10SMessage(aName, aJSON) {
   let bWins = Scriptish.getWindows();

From 1bde7cd51d2a19eae3b231aead6bda5c1a653963 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 4 Sep 2011 17:16:10 -0700
Subject: [PATCH 599/829] Closes #525 GM_notification now works on Fennec

---
 extension/content/e10s/browser.js                |  5 +++++
 extension/modules/api.js                         | 16 ++++++++++++----
 .../modules/utils/Scriptish_notification.js      |  3 +--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 6584bf66..e1bfb30c 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -8,6 +8,7 @@
   lazyImport(this, "resource://scriptish/api/GM_Resources.js", ["GM_Resources"]);
 
   lazyUtil(global, "installUri");
+  lazyUtil(this, "notification");
 
   var $ = function(id) document.getElementById(id);
 
@@ -81,6 +82,10 @@
     return rtnAry;
   });
 
+  mm.addMessageListener("Scriptish:ScriptNotification", function({json}) {
+    Scriptish_notification.apply(null, json);
+  });
+
   mm.loadFrameScript(
       "chrome://scriptish/content/e10s/browser-content.js",
       true); // no delay loading frame script
diff --git a/extension/modules/api.js b/extension/modules/api.js
index e9ca7f4d..758bf262 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -96,10 +96,18 @@ function GM_API(options) {
     if (!GM_apiLeakCheck("GM_notification")) return;
     if (typeof aTitle != "string") aTitle = aScript.name;
     if (typeof aIcon != "string") aIcon = aScript.iconURL;
-    var callback = null;
-    if (typeof aCallback == "function")
-      callback = function() GM_apiSafeCallback(aSafeWin, aScript, null, aCallback);
-    Scriptish_notification(aMsg, aTitle, aIcon, callback);
+
+
+    if (options.global && options.global.sendAsyncMessage) {
+      options.global.sendAsyncMessage("Scriptish:ScriptNotification", [
+          aMsg, aTitle, aIcon]);
+    }
+    else {
+      var callback = null;
+      if (typeof aCallback == "function")
+        callback = function() GM_apiSafeCallback(aSafeWin, aScript, null, aCallback);
+      Scriptish_notification(aMsg, aTitle, aIcon, callback);
+    }
   }
 
   this.GM_setValue = function GM_setValue() {
diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index 36a4fc63..71f0222c 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -5,8 +5,7 @@ lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
 function showAlertNotification() {
   if ("Fennec" == Services.appinfo.name) {
-    return showAlertNotification =
-        Cc["@mozilla.org/toaster-alerts-service;1"]
+    return Cc["@mozilla.org/toaster-alerts-service;1"]
         .getService(Ci.nsIAlertsService)
         .showAlertNotification;
   }

From 9d0fb7b4e8dcd0c80a2419157fad0a756e072f4b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 4 Sep 2011 18:19:25 -0700
Subject: [PATCH 600/829] Closes #512 GM_getMetadata works on Fennec now

---
 extension/content/e10s/browser.js             |  7 ++-
 extension/content/js/install.js               |  4 +-
 .../content/tests/testScriptHeaderParse.js    | 14 +++---
 extension/modules/api.js                      | 40 +++++------------
 extension/modules/script/script.js            | 43 ++-----------------
 .../modules/utils/Scriptish_getProfileFile.js |  1 +
 .../utils/Scriptish_getScriptHeader.js        | 42 ++++++++++++++++++
 extension/modules/utils/Scriptish_parser.js   | 32 ++++++++++++++
 8 files changed, 106 insertions(+), 77 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_getScriptHeader.js
 create mode 100644 extension/modules/utils/Scriptish_parser.js

diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index e1bfb30c..8cb20322 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -8,7 +8,8 @@
   lazyImport(this, "resource://scriptish/api/GM_Resources.js", ["GM_Resources"]);
 
   lazyUtil(global, "installUri");
-  lazyUtil(this, "notification");
+  lazyUtil(global, "getScriptHeader");
+  lazyUtil(global, "notification");
 
   var $ = function(id) document.getElementById(id);
 
@@ -86,6 +87,10 @@
     Scriptish_notification.apply(null, json);
   });
 
+  mm.addMessageListener("Scriptish:GetScriptMetadata", function({json}) {
+    return Scriptish_getScriptHeader(Scriptish_config.getScriptById(json.id), json.key, json.localVal);
+  });
+
   mm.loadFrameScript(
       "chrome://scriptish/content/e10s/browser-content.js",
       true); // no delay loading frame script
diff --git a/extension/content/js/install.js b/extension/content/js/install.js
index a16bb60b..00534af9 100644
--- a/extension/content/js/install.js
+++ b/extension/content/js/install.js
@@ -6,6 +6,8 @@ Components.utils.import("resource://scriptish/constants.js");
 
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Scriptish_localizeOnLoad"]);
+
+lazyUtil(this, "getScriptHeader");
 lazyUtil(this, "stringBundle");
 
 Scriptish_localizeOnLoad(this);
@@ -45,7 +47,7 @@ function delayedClose() timeout(close);
 
 on("load", function() {
   let script = scriptDownloader.script;
-  let headers = script.getScriptHeader();
+  let headers = Scriptish_getScriptHeader(script);
 
   // setup lists
   ["domains", "matches", "includes", "excludes"].forEach(function(i) {
diff --git a/extension/content/tests/testScriptHeaderParse.js b/extension/content/tests/testScriptHeaderParse.js
index 5b874e7d..fdaca6a0 100644
--- a/extension/content/tests/testScriptHeaderParse.js
+++ b/extension/content/tests/testScriptHeaderParse.js
@@ -1,7 +1,7 @@
-module("Script.header_parse");
+module("Scriptish_parser");
 
 test("normal @keys (with space b4 @)", function() {
-  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var parser = importModule("resource://scriptish/utils/Scriptish_parser.js").Scriptish_parser;
   var header = (<><![CDATA[
   // ==UserScript==
   // @id test-id
@@ -22,7 +22,7 @@ test("normal @keys (with space b4 @)", function() {
 });
 
 test("normal @keys and following @fail", function() {
-  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var parser = importModule("resource://scriptish/utils/Scriptish_parser.js").Scriptish_parser;
   var header = (<><![CDATA[
   // ==UserScript==
   // @id test-id
@@ -41,7 +41,7 @@ test("normal @keys and following @fail", function() {
 });
 
 test("normal @keys and leading @fail", function() {
-  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var parser = importModule("resource://scriptish/utils/Scriptish_parser.js").Scriptish_parser;
   var header = (<><![CDATA[
   // @fail test-fail
   // ==UserScript==
@@ -60,7 +60,7 @@ test("normal @keys and leading @fail", function() {
 });
 
 test("two sets of normal @keys", function() {
-  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var parser = importModule("resource://scriptish/utils/Scriptish_parser.js").Scriptish_parser;
   var header = (<><![CDATA[
   // ==UserScript==
   // @id test-id
@@ -81,7 +81,7 @@ test("two sets of normal @keys", function() {
 });
 
 test("@keys without space b4 @", function() {
-  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var parser = importModule("resource://scriptish/utils/Scriptish_parser.js").Scriptish_parser;
   var header = (<><![CDATA[
   //==UserScript==
   //@id test-id
@@ -103,7 +103,7 @@ test("@keys without space b4 @", function() {
 });
 
 test("normal @keys case check", function() {
-  var parser = importModule("resource://scriptish/script/script.js").Script.header_parse;
+  var parser = importModule("resource://scriptish/utils/Scriptish_parser.js").Scriptish_parser;
   var header = (<><![CDATA[
   // ==UserScript==
   // @Key v1
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 758bf262..a34fe5de 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -9,6 +9,7 @@ lazyImport(this, "resource://scriptish/utils/Scriptish_injectScripts.js", ["Scri
 
 lazyUtil(this, "alert");
 lazyUtil(this, "cryptoHash");
+lazyUtil(this, "getScriptHeader");
 lazyUtil(this, "notification");
 lazyUtil(this, "openInTab");
 lazyUtil(this, "stringBundle");
@@ -142,7 +143,7 @@ function GM_API(options) {
   this.GM_getResourceText = function GM_getResourceText(aName) {
     if (!GM_apiLeakCheck("GM_getResourceText")) return;
 
-    if (options.content) {
+    if (options.global && options.global.sendSyncMessage) {
       return options.global.sendSyncMessage("Scriptish:GetScriptResourceText", {
         scriptID: aScript.id,
         resource: aName
@@ -153,36 +154,17 @@ function GM_API(options) {
   }
 
   this.GM_getMetadata = function(aKey, aLocalVal) {
-    let key = aKey.toLowerCase().trim();
-    if (aLocalVal) {
-      switch (key) {
-      case "id":
-      case "name":
-      case "namespace":
-      case "creator":
-      case "author":
-      case "description":
-      case "version":
-      case "jsversion":
-      case "delay":
-      case "noframes":
-        return aScript[key];
-      case "homepage":
-      case "homepageurl":
-        return aScript.homepageURL;
-      case "updateurl":
-        return aScript.updateURL;
-      case "contributor":
-      case "include":
-      case "exclude":
-      case "screenshot":
-        return aScript[key + "s"];
-      case "match":
-        return aScript[key + "es"];
-      }
+    if (!GM_apiLeakCheck("GM_getMetadata")) return;
+
+    if (options.global && options.global.sendSyncMessage) {
+      return options.global.sendSyncMessage("Scriptish:GetScriptMetadata", {
+        id: aScript.id,
+        key: aKey, 
+        localVal: aLocalVal
+      })[0];
     }
 
-    return aScript.getScriptHeader(key);
+    return Scriptish_getScriptHeader(aScript, aKey, aLocalVal);
   }
 
   this.GM_openInTab = function GM_openInTab(aURL, aLoadInBackground, aReuse) {
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index c5f2a3b8..bd1bbffb 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -22,6 +22,7 @@ lazyUtil(this, "isGreasemonkeyable");
 lazyUtil(this, "getUriFromFile");
 lazyUtil(this, "getContents");
 lazyUtil(this, "memoize");
+lazyUtil(this, "parser");
 lazyUtil(this, "stringBundle");
 
 const metaRegExp = /\/\/[ \t]*(?:==\/?UserScript==|\@\S+(?:[ \t]+(?:[^\r\f\n]+))?)/g;
@@ -203,7 +204,7 @@ Script.prototype = {
       if (4 > req.readyState || (req.status != 200 && req.status != 0)
           || !req.responseText)
         return;
-      var data = Script.header_parse(req.responseText);
+      var data = Scriptish_parser(req.responseText);
       if (!data["uso:rating"] || !data["uso:script"] || data["uso:script"][0] != scriptID
           || !data["uso:reviews"] || !data["uso:installs"])
         return;
@@ -580,12 +581,6 @@ Script.prototype = {
     return this._size;
   },
 
-  getScriptHeader: function(aKey) {
-    // TODO: cache headers and clear cache when the script is modified..
-    var headers = Script.header_parse(Scriptish_getContents(this._tempFile || this._file));
-    return aKey ? headers[aKey] : headers;
-  },
-
   get screenshots() this._screenshots,
 
   _initFileName: function(name, useExt) {
@@ -839,42 +834,12 @@ Script.prototype = {
 };
 
 Script.parseVersion = function Script_parseVersion(aSrc) {
-  var parsed = Script.header_parse(aSrc);
+  var parsed = Scriptish_parser(aSrc);
   if (parsed.version) return parsed.version.pop();
   return null;
 }
 
-// TODO: DRY this by combining it with Script.parse some way..
-Script.header_parse = function(aSource) {
-  var headers = {};
-  var foundMeta = false;
-  var line;
-
-  // do not 'optimize' by reusing this reg exp! it should not be reused!
-  var metaRegExp = /\/\/[ \t]*(?:==(\/?UserScript)==|\@(\S+)(?:[ \t]+([^\r\f\n]+))?)/g;
-
-  // read one line at a time looking for start meta delimiter or EOF
-  while (line = metaRegExp.exec(aSource)) {
-    if (line[1]) {
-      if ("userscript" == line[1].toLowerCase()) {
-        foundMeta = true; // start
-        continue;
-      } else {
-        break; // done
-      }
-    }
-    if (!foundMeta) continue;
-
-    var header = line[2].toLowerCase();
-    var value = line[3];
-
-    if (!headers[header]) headers[header] = [value];
-    else headers[header].push(value);
-  }
-
-  return headers;
-}
-
+// TODO: DRY this by combining this with Scriptish_parser some way..
 Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript) {
   var script = new Script(aConfig);
 
diff --git a/extension/modules/utils/Scriptish_getProfileFile.js b/extension/modules/utils/Scriptish_getProfileFile.js
index c1074cb4..224228df 100644
--- a/extension/modules/utils/Scriptish_getProfileFile.js
+++ b/extension/modules/utils/Scriptish_getProfileFile.js
@@ -1,3 +1,4 @@
+"use strict";
 var EXPORTED_SYMBOLS = ["Scriptish_getProfileFile"];
 Components.utils.import("resource://scriptish/constants.js");
 
diff --git a/extension/modules/utils/Scriptish_getScriptHeader.js b/extension/modules/utils/Scriptish_getScriptHeader.js
new file mode 100644
index 00000000..223dfb2f
--- /dev/null
+++ b/extension/modules/utils/Scriptish_getScriptHeader.js
@@ -0,0 +1,42 @@
+"use strict";
+var EXPORTED_SYMBOLS = ["Scriptish_getScriptHeader"];
+Components.utils.import("resource://scriptish/constants.js");
+lazyUtil(this, "getContents");
+lazyUtil(this, "parser");
+
+function Scriptish_getScriptHeader(aScript, aKey, aLocalVal) {
+  if (aLocalVal) {
+    let key = aKey ? aKey.toLowerCase().trim() : "";
+
+    switch (key) {
+    case "id":
+    case "name":
+    case "namespace":
+    case "creator":
+    case "author":
+    case "description":
+    case "version":
+    case "jsversion":
+    case "delay":
+    case "noframes":
+      return aScript[key];
+    case "homepage":
+    case "homepageurl":
+      return aScript.homepageURL;
+    case "updateurl":
+      return aScript.updateURL;
+    case "contributor":
+    case "include":
+    case "exclude":
+    case "screenshot":
+      return aScript[key + "s"];
+    case "match":
+      return aScript[key + "es"];
+    }
+  }
+
+  // TODO: cache headers and clear cache when the script is modified..
+  // TODO: should not use privates here
+  var headers = Scriptish_parser(Scriptish_getContents(aScript._tempFile || aScript._file));
+  return aKey ? headers[aKey] : headers;
+}
diff --git a/extension/modules/utils/Scriptish_parser.js b/extension/modules/utils/Scriptish_parser.js
new file mode 100644
index 00000000..34ea14f1
--- /dev/null
+++ b/extension/modules/utils/Scriptish_parser.js
@@ -0,0 +1,32 @@
+"use strict";
+var EXPORTED_SYMBOLS = ["Scriptish_parser"];
+
+function Scriptish_parser(aSource) {
+  var headers = {};
+  var foundMeta = false;
+  var line;
+
+  // do not 'optimize' by reusing this reg exp! it should not be reused!
+  var metaRegExp = /\/\/[ \t]*(?:==(\/?UserScript)==|\@(\S+)(?:[ \t]+([^\r\f\n]+))?)/g;
+
+  // read one line at a time looking for start meta delimiter or EOF
+  while (line = metaRegExp.exec(aSource)) {
+    if (line[1]) {
+      if ("userscript" == line[1].toLowerCase()) {
+        foundMeta = true; // start
+        continue;
+      } else {
+        break; // done
+      }
+    }
+    if (!foundMeta) continue;
+
+    var header = line[2].toLowerCase();
+    var value = line[3];
+
+    if (!headers[header]) headers[header] = [value];
+    else headers[header].push(value);
+  }
+
+  return headers;
+}

From 477a3f36919f1af2c013d0d5b09e9ca14a9f84d6 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 4 Sep 2011 22:21:39 -0700
Subject: [PATCH 601/829] bug fix: don't try to send a popupNotification if a
 required window does not exist yet.

---
 extension/modules/utils/Scriptish_popupNotification.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/utils/Scriptish_popupNotification.js b/extension/modules/utils/Scriptish_popupNotification.js
index a053c2c2..46a54d06 100644
--- a/extension/modules/utils/Scriptish_popupNotification.js
+++ b/extension/modules/utils/Scriptish_popupNotification.js
@@ -10,7 +10,7 @@ function Scriptish_popupNotification(details) {
     return Scriptish_log(details.message);
 
   var win = Scriptish.getMostRecentWindow();
-  if (win.PopupNotifications) {
+  if (win && win.PopupNotifications) {
     timeout(function() {
       win.PopupNotifications.show(
         win.gBrowser.selectedBrowser,

From 0b59ff5ff56e49fb20ac5ab704ef84976cbe05c3 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 4 Sep 2011 22:24:10 -0700
Subject: [PATCH 602/829] bug fix: wait until about:blank's destination url is
 known before checking if the url isGreaseable introduced in
 8177669ce1ea7674ce53fa3f40ca1f709fe9fcee

---
 extension/modules/manager.js | 59 ++++++++++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index 0e934757..4d9b6e77 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -56,9 +56,7 @@ const Scriptish_manager = {
     if (!Scriptish.enabled) return;
 
     // try to get the windows href..
-    let href = (safeWin.location.href
-        || (safeWin.frameElement && safeWin.frameElement.src))
-        || "";
+    let href = getURLForWin(safeWin);
 
     // if we don't have a href and the window is a frame, then wait until we do
     if (!href && safeWin.frameElement) {
@@ -66,6 +64,13 @@ const Scriptish_manager = {
       return;
     }
 
+    if (!href || "about:blank" == href) {
+      if ("complete" != safeWin.document.readyState) {
+        Scriptish_manager.waitForAboutBlank.call(this, safeWin, options);
+        return;
+      }
+    }
+
     if (!Scriptish_isGreasemonkeyable(href)) return;
 
     // if the url is a excluded url then stop
@@ -79,7 +84,6 @@ const Scriptish_manager = {
     if (JSON.stringify(Scriptish_getWindowIDs(options.content))
         != JSON.stringify(Scriptish_getWindowIDs(safeWin)))
       return;
-    //Scriptish_log(JSON.stringify(Scriptish_getWindowIDs(safeWin)));
 
     var uri = Services.io.newURI(href, null, null);
     if (tests._reg_userjs.test(href) && !tests.isTempScript(uri)
@@ -149,8 +153,7 @@ const Scriptish_manager = {
     let self = this;
     safeWin.addEventListener("DOMContentLoaded", function _frame_loader() {
       // not perfect, but anyway
-      let href = (safeWin.location.href
-          || (safeWin.frameElement && safeWin.frameElement.src));
+      let href = getURLForWin(safeWin);
 
       if (!href) return; // wait for it :p
       safeWin.removeEventListener("DOMContentLoaded", _frame_loader, false);
@@ -162,4 +165,48 @@ const Scriptish_manager = {
       safeWin.dispatchEvent(evt);
     }, false);
   },
+
+  // not perfect, but anyway
+  waitForAboutBlank: function(safeWin, options) {
+    let self = this;
+
+    // check if we have a url @ DOMContentLoaded
+    function _loader1() {
+      safeWin.removeEventListener("DOMContentLoaded", _loader1, false);
+    
+      let href = getURLForWin(safeWin);
+    
+      if (!href || "about:blank" == href) return; 
+      Scriptish_manager.docReady_start.call(self, safeWin, options);
+      safeWin.document.removeEventListener("readystatechange", _loader2, false);
+    
+      // fake DOMContentLoaded to get things rolling
+      var evt = safeWin.document.createEvent("Events");
+      evt.initEvent("DOMContentLoaded", true, true);
+      safeWin.dispatchEvent(evt);
+    }
+    safeWin.addEventListener("DOMContentLoaded", _loader1, false);
+
+    // check if we have a url @ readyState == "complete" 
+    safeWin.document.addEventListener("readystatechange", function _loader2() {
+      if ("complete" != safeWin.document.readyState) return;
+
+      safeWin.removeEventListener("DOMContentLoaded", _loader1, false);
+      safeWin.document.removeEventListener("readystatechange", _loader2, false);
+
+      let href = getURLForWin(safeWin);
+      Scriptish_manager.docReady_start.call(self, safeWin, options);
+
+      // fake DOMContentLoaded to get things rolling
+      var evt = safeWin.document.createEvent("Events");
+      evt.initEvent("DOMContentLoaded", true, true);
+      safeWin.dispatchEvent(evt);
+    }, false);
+  }
 };
+
+function getURLForWin(safeWin) {
+  return (safeWin.location.href
+      || (safeWin.frameElement && safeWin.frameElement.src))
+      || "";
+}

From 2a8d44ca780bfef958f1eb74015a727dbdab8e1f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 4 Sep 2011 22:25:36 -0700
Subject: [PATCH 603/829] Closes #511 GM_openInTab now ~works for Fennec (all
 args besides aURL are ignored atm)

---
 extension/content/e10s/browser.js              |  6 ++++++
 extension/modules/api.js                       | 14 ++++++++++++--
 extension/modules/utils/Scriptish_openInTab.js |  5 +++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 8cb20322..c19cefd4 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -10,6 +10,7 @@
   lazyUtil(global, "installUri");
   lazyUtil(global, "getScriptHeader");
   lazyUtil(global, "notification");
+  lazyUtil(global, "openInTab");
 
   var $ = function(id) document.getElementById(id);
 
@@ -91,6 +92,11 @@
     return Scriptish_getScriptHeader(Scriptish_config.getScriptById(json.id), json.key, json.localVal);
   });
 
+  mm.addMessageListener("Scriptish:OpenInTab", function({json}) {
+    json.push(global);
+    return Scriptish_openInTab.apply(null, json);
+  });
+
   mm.loadFrameScript(
       "chrome://scriptish/content/e10s/browser-content.js",
       true); // no delay loading frame script
diff --git a/extension/modules/api.js b/extension/modules/api.js
index a34fe5de..47606818 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -3,7 +3,7 @@ var EXPORTED_SYMBOLS = ["GM_API", "GM_apiSafeCallback"];
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 
-lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError", "Scriptish_log"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_evalInSandbox.js", ["Scriptish_evalInSandbox_filename"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_injectScripts.js", ["Scriptish_injectScripts_filename"]);
 
@@ -169,7 +169,17 @@ function GM_API(options) {
 
   this.GM_openInTab = function GM_openInTab(aURL, aLoadInBackground, aReuse) {
     if (!GM_apiLeakCheck("GM_openInTab")) return;
-    return Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin);
+
+    if (options.global && options.global.sendSyncMessage) {
+      // TODO: implement aReuse for Fennec
+      options.global.sendAsyncMessage("Scriptish:OpenInTab", [
+          aURL, aLoadInBackground, false]);
+    }
+    else {
+      Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin);
+    }
+
+    return undefined; // can't return window object b/c of e10s, don't bother
   }
 
   this.GM_xmlhttpRequest = function GM_xmlhttpRequest() {
diff --git a/extension/modules/utils/Scriptish_openInTab.js b/extension/modules/utils/Scriptish_openInTab.js
index 044c9cdb..c3603711 100644
--- a/extension/modules/utils/Scriptish_openInTab.js
+++ b/extension/modules/utils/Scriptish_openInTab.js
@@ -7,6 +7,11 @@ lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 function Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin) {
   aChromeWin = aChromeWin || Scriptish.getMostRecentWindow();
 
+  if ("Fennec" == Services.appinfo.name) {
+    aChromeWin.Browser.addTab(aURL);
+    return;
+  }
+
   // Try to reuse an existing tab
   if (aReuse) {
     let browserEnumerator = Services.wm.getEnumerator("navigator:browser");

From b471d35cd5dc05803fbb35ffff51c3e6598551f0 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 5 Sep 2011 00:32:20 -0700
Subject: [PATCH 604/829] bug fix: removing fake 'DOMContentLoaded' event
 introduced in a7c4ff555fdcdb203bc1f83767dde77481327cb6 b/c it could break
 some poorly written webpages.

---
 extension/components/scriptish.js             | 17 ++++++--
 extension/modules/manager.js                  | 40 +++++++++++--------
 .../utils/Scriptish_windowEventTracker.js     | 36 +++++++++++++++++
 3 files changed, 74 insertions(+), 19 deletions(-)
 create mode 100644 extension/modules/utils/Scriptish_windowEventTracker.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 6c45e76c..0fe146b5 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -21,6 +21,7 @@ lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "stringBundle");
 lazyUtil(this, "updateModifiedScripts");
+lazyUtil(this, "windowEventTracker");
 lazyUtil(this, "windowUnloader");
 
 const {nsIContentPolicy: CP} = Ci;
@@ -112,6 +113,7 @@ ScriptishService.prototype = {
     let unsafeWin = safeWin.wrappedJSObject;
     let self = this;
     let winClosed = false;
+    let tracker = Scriptish_windowEventTracker(safeWin);
 
     // rechecks values that can change at any moment
     function shouldNotRun() (
@@ -122,11 +124,22 @@ ScriptishService.prototype = {
 
     // find matching scripts
     Scriptish_config.initScripts(href, (safeWin === safeWin.top), function(scripts) {
+       let (windowLoaded = ("load" == tracker)) {
+         if (windowLoaded || "DOMContentLoaded" == tracker) {
+           scripts["document-start"] = scripts["document-start"].concat(scripts["document-end"], scripts["document-idle"]);
+           scripts["document-end"] = scripts["document-idle"] = [];
+         }
+
+         if (windowLoaded) {
+           scripts["document-start"] = scripts["document-start"].concat(scripts["window-load"]);
+           scripts["window-load"] = [];
+         }
+       }
+
       if (scripts["document-end"].length || scripts["document-idle"].length) {
         safeWin.addEventListener("DOMContentLoaded", function() {
           if (shouldNotRun()) return;
 
-          // inject @run-at document-idle scripts
           if (scripts["document-idle"].length)
             timeout(function() {
               if (shouldNotRun()) return;
@@ -137,7 +150,6 @@ ScriptishService.prototype = {
               });
             });
 
-          // inject @run-at document-end scripts
           Scriptish_injectScripts({
             scripts: scripts["document-end"],
             url: href,
@@ -158,7 +170,6 @@ ScriptishService.prototype = {
         }, true);
       }
 
-      // inject @run-at document-start scripts
       Scriptish_injectScripts({
         scripts: scripts["document-start"],
         url: href,
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index 4d9b6e77..05fba998 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -12,6 +12,7 @@ lazyUtil(this, "isGreasemonkeyable");
 lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "isURLExcluded");
 lazyUtil(this, "getWindowIDs");
+lazyUtil(this, "windowEventTracker");
 lazyUtil(this, "windowUnloader");
 
 const tests = {
@@ -55,6 +56,9 @@ const Scriptish_manager = {
     // TODO: disable observer that calls this when Scriptish is disabled
     if (!Scriptish.enabled) return;
 
+    // start tracking the window's progress
+    Scriptish_windowEventTracker(safeWin);
+
     // try to get the windows href..
     let href = getURLForWin(safeWin);
 
@@ -104,6 +108,19 @@ const Scriptish_manager = {
       }
     });
 
+    let tracker = Scriptish_windowEventTracker(safeWin);
+    let (windowLoaded = ("load" == tracker)) {
+      if (windowLoaded || "DOMContentLoaded" == tracker) {
+        scripts["document-start"] = scripts["document-start"].concat(scripts["document-end"], scripts["document-idle"]);
+        scripts["document-end"] = scripts["document-idle"] = [];
+      }
+
+      if (windowLoaded) {
+        scripts["document-start"] = scripts["document-start"].concat(scripts["window-load"]);
+        scripts["window-load"] = [];
+      }
+    }
+
     if (scripts["document-end"].length || scripts["document-idle"].length) {
       safeWin.addEventListener("DOMContentLoaded", function() {
         //if (shouldNotRun()) return;
@@ -158,11 +175,6 @@ const Scriptish_manager = {
       if (!href) return; // wait for it :p
       safeWin.removeEventListener("DOMContentLoaded", _frame_loader, false);
       Scriptish_manager.docReady_start.call(self, safeWin, options);
-
-      // fake DOMContentLoaded to get things rolling
-      var evt = safeWin.document.createEvent("Events");
-      evt.initEvent("DOMContentLoaded", true, true);
-      safeWin.dispatchEvent(evt);
     }, false);
   },
 
@@ -173,22 +185,17 @@ const Scriptish_manager = {
     // check if we have a url @ DOMContentLoaded
     function _loader1() {
       safeWin.removeEventListener("DOMContentLoaded", _loader1, false);
-    
+
       let href = getURLForWin(safeWin);
-    
-      if (!href || "about:blank" == href) return; 
+
+      if (!href || "about:blank" == href) return; // not done yet..
       Scriptish_manager.docReady_start.call(self, safeWin, options);
       safeWin.document.removeEventListener("readystatechange", _loader2, false);
-    
-      // fake DOMContentLoaded to get things rolling
-      var evt = safeWin.document.createEvent("Events");
-      evt.initEvent("DOMContentLoaded", true, true);
-      safeWin.dispatchEvent(evt);
     }
     safeWin.addEventListener("DOMContentLoaded", _loader1, false);
 
-    // check if we have a url @ readyState == "complete" 
-    safeWin.document.addEventListener("readystatechange", function _loader2() {
+    // check if we have a url @ readyState == "complete"
+    function _loader2() {
       if ("complete" != safeWin.document.readyState) return;
 
       safeWin.removeEventListener("DOMContentLoaded", _loader1, false);
@@ -201,7 +208,8 @@ const Scriptish_manager = {
       var evt = safeWin.document.createEvent("Events");
       evt.initEvent("DOMContentLoaded", true, true);
       safeWin.dispatchEvent(evt);
-    }, false);
+    }
+    safeWin.document.addEventListener("readystatechange", _loader2, false);
   }
 };
 
diff --git a/extension/modules/utils/Scriptish_windowEventTracker.js b/extension/modules/utils/Scriptish_windowEventTracker.js
new file mode 100644
index 00000000..3518229c
--- /dev/null
+++ b/extension/modules/utils/Scriptish_windowEventTracker.js
@@ -0,0 +1,36 @@
+"use strict";
+var EXPORTED_SYMBOLS = ["Scriptish_windowEventTracker"];
+
+Components.utils.import("resource://scriptish/constants.js");
+
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
+
+lazyUtil(this, "getWindowIDs");
+lazyUtil(this, "windowUnloader");
+
+const trackers = {};
+
+function Scriptish_windowEventTracker(aWin) {
+  var winID = Scriptish_getWindowIDs(aWin).innerID;
+  if (trackers[winID]) return trackers[winID];
+  trackers[winID] = "start";
+
+  aWin.addEventListener("DOMContentLoaded", function() {
+    trackers[winID] = "DOMContentLoaded";
+  }, false);
+  /*
+  aWin.document.addEventListener("readystatechange", function() {
+    if ("complete" != aWin.document.readyState) return;
+    trackers[winID] = "readystate@complete";
+  }, false);
+  */
+  aWin.addEventListener("load", function() {
+    trackers[winID] = "load";
+  }, false);
+
+  Scriptish_windowUnloader(function() {
+    delete trackers[winID];
+  }, winID);
+
+  return trackers[winID];
+};

From a772196da68f658f689a77b1e6e28c619c0c9b5f Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 5 Sep 2011 10:39:12 -0500
Subject: [PATCH 605/829] Closes #528 Making script+dependency download errors
 more visible and easier to understand.

---
 extension/locale/de/scriptish.properties     |  3 ++
 extension/locale/en-US/scriptish.properties  |  3 ++
 extension/locale/es-ES/scriptish.properties  |  3 ++
 extension/locale/ja-JP/scriptish.properties  |  3 ++
 extension/locale/pt-BR/scriptish.properties  |  3 ++
 extension/locale/ru-RU/scriptish.properties  |  3 ++
 extension/locale/sv-SE/scriptish.properties  |  3 ++
 extension/locale/zh-CN/scriptish.properties  |  3 ++
 extension/locale/zh-TW/scriptish.properties  |  3 ++
 extension/modules/script/scriptdownloader.js | 53 ++++++++++++++------
 10 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 9985c04a..d0592ce3 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -23,13 +23,16 @@ error.hash.algorithm=Ungültiger Hash-Algorithmus angegeben.
 error.icon.dataURL=Ungültige data:-URL für @icon
 error.icon.notImage=Fehler! @icon hat keinen Bild MIME-Typ
 error.icon.URL=Ungültige URL für @icon
+error.invalidCert=
 error.isInvalidValue=ist ein ungültiger Wert
 error.matchPattern.rules=@match Muster hält sich nicht an die Regeln für Muster
 error.matchPattern.rules.file=File-Schema @match Muster hält sich nicht an die Regeln für Muster
+error.notSecure=
 error.notSupported.Firefox=wird nicht in dieser Version von Firefox unterstützt
 error.openingFile=Konnte Datei nicht öffnen
 error.pattern.parsing=Muster konnte nicht verarbeitet werden
 error.pref.type=Nicht unterstützter Einstellungstyp. Gültige Typen sind: string, bool und 32-bit int.
+error.remoteVersionOlder=
 error.resource.dupName=ist ein doppelter Resourcenname. Jede @resource muss einen eindeutigen Namen tragen.
 error.resource.syntax=Ungültige Syntax für @resource Deklaration
 error.retrieving=Fehler beim Abrufen
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 863ba8ce..a61c8869 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -23,13 +23,16 @@ error.hash.algorithm=Invalid hash algorithm specified.
 error.icon.dataURL=Invalid data: URL for @icon
 error.icon.notImage=Error! @icon does not have an image MIME type
 error.icon.URL=Invalid URL for @icon
+error.invalidCert=Invalid SSL certificate.\nIf desired, allow all certificates by enabling the option in Scriptish Options / Advanced / Update Security.
 error.isInvalidValue=is an invalid value
 error.matchPattern.rules=@match pattern does not conform to pattern rules
 error.matchPattern.rules.file=File scheme @match pattern does not conform to pattern rules
+error.notSecure=Insecure URI.\nIf desired, allow non-HTTPS updates by enabling the option in Scriptish Options / Advanced / Update Security.
 error.notSupported.Firefox=is not supported by this version of Firefox
 error.openingFile=Could not open file
 error.pattern.parsing=Pattern could not be parsed
 error.pref.type=Unsupported preference type. Valid types are: string, bool, and 32-bit integers.
+error.remoteVersionOlder=The remote script does not have a newer version number than your current script.
 error.resource.dupName=is a duplicate resource name.  Each @resource must have a unique name.
 error.resource.syntax=Invalid syntax for @resource declaration
 error.retrieving=Failed to retrieve
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 0f6297a4..3b4c4844 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -23,13 +23,16 @@ error.hash.algorithm=Especificado algoritmo de hash no válido.
 error.icon.dataURL=URL de tipo datos para @ICON no válido
 error.icon.notImage=¡Error!: @ICON no tiene un tipo MIME de imagen
 error.icon.URL=URL para @ICON no válido
+error.invalidCert=
 error.isInvalidValue=es un valor no permitido
 error.matchPattern.rules=el filtro @match no se ajusta a las reglas para filtros
 error.matchPattern.rules.file=El filtro @match del esquema File no se ajusta a las reglas para filtros
+error.notSecure=
 error.notSupported.Firefox=no soportado por esta versión de Firefox
 error.openingFile=Error abriendo el archivo
 error.pattern.parsing=Error interpretando el filtro
 error.pref.type=Tipo de preferencia no soportado. Tipos válidos: cadena, booleano y entero de 32 bits.
+error.remoteVersionOlder=
 error.resource.dupName=es un nombre de recurso duplicado. Cada declaración @Resource debe tener un nombre único.
 error.resource.syntax=Sintaxis no válida para la declaración @Resource
 error.retrieving=Error al descargar
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 8b5271f9..55d4630b 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -23,13 +23,16 @@ error.hash.algorithm=不正なハッシュ・アルゴリズムが指定され
 error.icon.dataURL=不正なデータ： @icon 用 URL
 error.icon.notImage=エラー！ @icon が画像の MIME タイプではありません
 error.icon.URL=@icon の URL が不正です
+error.invalidCert=
 error.isInvalidValue=は不正な値です
 error.matchPattern.rules=@match のパターンが記法に適合していません
 error.matchPattern.rules.file=ファイル・スキーム（scheme）の @match パターンが記法に適合していません
+error.notSecure=
 error.notSupported.Firefox=はこのバージョンの Firefox でサポートされていません
 error.openingFile=ファイルを開くことが出来ませんでした
 error.pattern.parsing=パターンを構文解析（parse）できませんでした
 error.pref.type=サポートしてない設定の型です。正しい型は次の通り： string, bool, 32-bit integers
+error.remoteVersionOlder=
 error.resource.dupName=はリソース名として重複しています。@resource の名前は一意でなければなりません
 error.resource.syntax=@resource 宣言の構文が不正です
 error.retrieving=取得に失敗しました
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 02dcace3..a3258e13 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -23,13 +23,16 @@ error.hash.algorithm=O algoritmo de hash especificado é inválido.
 error.icon.dataURL=Dados inválidos: endereço para @icon
 error.icon.notImage=Erro! @icon não tem um tipo MIME de imagem
 error.icon.URL=Endereço inválido para @icon
+error.invalidCert=
 error.isInvalidValue=é um nome inválido
 error.matchPattern.rules=o padrão de @match não está de acordo com as regras.
 error.matchPattern.rules.file=o padrão de @match do esquema "file:" não está de acordo com as regras.
+error.notSecure=
 error.notSupported.Firefox=não é suportado por esta versão do Firefox
 error.openingFile=Não foi possível abrir o arquivo
 error.pattern.parsing=Não foi possível analisar o padrão
 error.pref.type=Tipo de preferência não suportado. Os tipos válidos são: string, bool e integers de 32 bits.
+error.remoteVersionOlder=
 error.resource.dupName=é um nome de recurso duplicado. Cada item de @resource precisa ter um nome exclusivo.
 error.resource.syntax=sintaxe inválida para a declaração @resource.
 error.retrieving=Falha ao obter
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index fe89cb2f..c6fcad26 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -23,13 +23,16 @@ error.hash.algorithm=Неверный алгоритм хеширования.
 error.icon.dataURL=Неверный URL для  @icon
 error.icon.notImage=
 error.icon.URL=Неверный URL для @icon
+error.invalidCert=
 error.isInvalidValue= - неверное значение
 error.matchPattern.rules=шаблон @match не соответствует правилам
 error.matchPattern.rules.file=Шаблон @match схемы file:// не соответствует правилам
+error.notSecure=
 error.notSupported.Firefox=не поддерживается в этой версии Огненного Лиса
 error.openingFile=Не могу открыть файл
 error.pattern.parsing=Шаблон не парсится
 error.pref.type=Неподдерживаемый тип настройки. Правильные типы: строка, булев и 32хбитное целое.
+error.remoteVersionOlder=
 error.resource.dupName= - повторяющееся имя для ресурса. Имена ресурсов должны быть уникальными.
 error.resource.syntax=Неправильный синтаксис в обьявлении @resource
 error.retrieving=Failed to retrieve
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 579e904a..32f1e569 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -23,13 +23,16 @@ error.hash.algorithm=Ogiltig hashalgoritm angavs.
 error.icon.dataURL=Ogiltig data: URL för @icon
 error.icon.notImage=Fel! @icon har ingen MIME-bildtyp
 error.icon.URL=Ogiltig URL för @icon
+error.invalidCert=
 error.isInvalidValue=är ett ogiltigt värde
 error.matchPattern.rules=@match-mönster uppfyller inte mönsterreglerna
 error.matchPattern.rules.file=@match-mönstret för filschema uppfyller inte mönsterreglerna
+error.notSecure=
 error.notSupported.Firefox=stöds inte i denna version av Firefox
 error.openingFile=Det gick inte att öppna filen
 error.pattern.parsing=Det gick inte att parsa mönstret
 error.pref.type=Inställningstypen stöds inte. Giltiga typer är: sträng, boolesk och 32-bitars heltal.
+error.remoteVersionOlder=
 error.resource.dupName=är en resursnamnsdubblett.  Varje @resource måste ha ett unikt namn.
 error.resource.syntax=Ogiltig syntax för @resource-deklaration
 error.retrieving=Det gick inte att hämta
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index a0e97a49..9854fda7 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -23,13 +23,16 @@ error.hash.algorithm=指定的散列算法无效
 error.icon.dataURL=无效的数据：@icon 的 URL
 error.icon.notImage=错误！@icon 没有图像 MIME 类型
 error.icon.URL=无效的 @icon URL
+error.invalidCert=
 error.isInvalidValue=是个无效的值
 error.matchPattern.rules=@match 模式不符合模式规则
 error.matchPattern.rules.file=文件 scheme @match 模式不符合模式规则
+error.notSecure=
 error.notSupported.Firefox=不支持这一版本的 Firefox
 error.openingFile=无法打开文件
 error.pattern.parsing=模式不能被解析
 error.pref.type=不支持的首选项类型。有效的类型有：字符串、布尔和32位整数。
+error.remoteVersionOlder=
 error.resource.dupName=是一个重复的资源名称。每一个 @resource 都必须有唯一的名称。
 error.resource.syntax=无效的 @resource 声明语法
 error.retrieving=检索失败
diff --git a/extension/locale/zh-TW/scriptish.properties b/extension/locale/zh-TW/scriptish.properties
index 1ad44e68..d241947c 100644
--- a/extension/locale/zh-TW/scriptish.properties
+++ b/extension/locale/zh-TW/scriptish.properties
@@ -23,13 +23,16 @@ error.hash.algorithm=指定的雜湊演算法無效。
 error.icon.dataURL=無效的資料: @icon 網址
 error.icon.notImage=錯誤！@icon 沒有圖像 MIME 類型
 error.icon.URL=無效的 @icon 網址
+error.invalidCert=
 error.isInvalidValue=是無效的值
 error.matchPattern.rules=@match 樣式不符合樣式規則
 error.matchPattern.rules.file=檔案協定 @match 樣式不符合樣式規則
+error.notSecure=
 error.notSupported.Firefox=不支援此版本的 Firefox
 error.openingFile=無法開啟檔案
 error.pattern.parsing=樣式無法解析
 error.pref.type=不支援的選項類型。有效的類型有：字串、真假值和32位元整數。
+error.remoteVersionOlder=
 error.resource.dupName=是一個重複的資源名稱。每一個 @resource 名稱必須唯一。
 error.resource.syntax=無效的 @resource 宣告語法
 error.retrieving=檢索失敗
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 39c06db1..18289ebe 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -63,8 +63,19 @@ ScriptDownloader.prototype.startDownload = function(bypassCache) {
   req.onload = this.handleScriptDownloadComplete.bind(this);
   req.send(null);
 }
-ScriptDownloader.prototype.handleErr = function() {
-  if (this.scriptInstaller) this.scriptInstaller.changed("DownloadFailed");
+ScriptDownloader.prototype.handleErr = function(aEvent, aMsg) {
+  let errMsg = Scriptish_stringBundle("error.script.loading") + ":\n"
+      + this.uri_.spec;
+  if (aEvent) {
+    errMsg += "\nHTTP " + aEvent.target.status;
+  } else if (aMsg) {
+    errMsg += "\n" + aMsg;
+  }
+  Scriptish_alert(errMsg);
+  Scriptish_log(errMsg);
+  if (this.scriptInstaller) {
+    this.scriptInstaller.changed("DownloadFailed");
+  }
 }
 ScriptDownloader.prototype.chkContentTypeB4DL = function() {
   if (this.req_.readyState != 2
@@ -82,30 +93,31 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
   try {
     // If loading from file, status might be zero on success
     if (req.status != 200 && req.status != 0) {
-      Scriptish_alert(Scriptish_stringBundle("error.script.loading") + ":\n" +
-      req.status + ": " + req.statusText);
+      this.handleErr(null, req.status + ": " + req.statusText);
       return;
     }
 
     if (this.secure) {
       // make sure that the final URI is a https url
       if ("https" != req.channel.URI.scheme)
-        return this.handleErr();
+        return this.handleErr(null, Scriptish_stringBundle("error.notSecure"));
 
       // make sure that the final URI's certificate is valid
       try {
         checkCert(req.channel, !Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
       }
       catch (e) {
-        return this.handleErr();
+        return this.handleErr(null, Scriptish_stringBundle("error.invalidCert"));
       }
     }
 
     if (this.scriptInstaller) {
       // make sure that the new version is greater than the old version
       var remoteVersion = Script.parseVersion(req.responseText);
-      if (!remoteVersion || Services.vc.compare(this.scriptInstaller._script.version, remoteVersion) >= 0)
-        return this.handleErr();
+      if (!remoteVersion || Services.vc.compare(this.scriptInstaller._script.version, remoteVersion) >= 0) {
+        return this.handleErr(
+            null, Scriptish_stringBundle("error.remoteVersionOlder"));
+      }
     }
 
     var source = req.responseText;
@@ -195,7 +207,8 @@ ScriptDownloader.prototype.downloadNextDependency = function() {
     if (this.secure) {
       // make sure that the dependency's URI is a https url
       if ("https" != sourceUri.scheme)
-        return this.errorInstallDependency(dep, "Insecure dependency URI");
+        return this.errorInstallDependency(
+            dep, Scriptish_stringBundle("error.notSecure"));
     }
 
     var sourceChannel = Services.io.newChannelFromURI(sourceUri);
@@ -230,15 +243,18 @@ ScriptDownloader.prototype.handleDependencyDownloadComplete =
 
   if (this.secure) {
     // make sure that the final URI is a https url
-    if ("https" != channel.URI.scheme)
-      return this.errorInstallDependency(dep, "Insecure dependency URI");
+    if ("https" != channel.URI.scheme) {
+      return this.errorInstallDependency(
+          dep, Scriptish_stringBundle("error.notSecure"));
+    }
 
     // make sure that the final URI's certificate is valid
     try {
       checkCert(channel, !Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
     }
     catch (e) {
-      return this.errorInstallDependency(dep, "Invalid dependency SSL certificate");
+      return this.errorInstallDependency(
+          dep, Scriptish_stringBundle("error.invalidCert"));
     }
   }
 
@@ -317,11 +333,16 @@ ScriptDownloader.prototype.finishInstall = function() {
   }
 }
 ScriptDownloader.prototype.errorInstallDependency = function(dep, msg) {
-  this.dependencyError = Scriptish_stringBundle("error.dependency.loading") + ": "
-      + dep.urlToDownload + "\n" + msg;
+  this.dependencyError = Scriptish_stringBundle("error.dependency.loading")
+      + ": " + dep.urlToDownload + "\n" + msg;
   Scriptish_log(this.dependencyError);
-  if (this.scriptInstaller) return this.scriptInstaller.changed("DownloadFailed");
-  if (this.installOnCompletion_) Scriptish_alert(this.dependencyError);
+  if (this.scriptInstaller) {
+    Scriptish_alert(this.dependencyError);
+    return this.scriptInstaller.changed("DownloadFailed");
+  }
+  if (this.installOnCompletion_) {
+    Scriptish_alert(this.dependencyError);
+  }
   this._callback && this._callback();
 }
 ScriptDownloader.prototype.installScript = function() {

From 33f9dd6da9f7450232f0d268b837bb33564092b8 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 5 Sep 2011 10:41:06 -0500
Subject: [PATCH 606/829] Remove the ScriptInstall from the script if the
 process fails or finishes.

---
 extension/modules/script/scriptinstaller.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension/modules/script/scriptinstaller.js b/extension/modules/script/scriptinstaller.js
index 5c48694b..52c7d8c2 100644
--- a/extension/modules/script/scriptinstaller.js
+++ b/extension/modules/script/scriptinstaller.js
@@ -27,12 +27,14 @@ ScriptInstall.prototype = {
         break;
       case "DownloadFailed":
         this.state = AddonManager.STATE_DOWNLOAD_FAILED;
+        delete this._script.updateAvailable;
         break;
       case "InstallStarted":
         this.state = AddonManager.STATE_INSTALLING;
         break;
       case "InstallEnded":
         this.state = AddonManager.STATE_INSTALLED;
+        delete this._script.updateAvailable;
         break;
       default:
         return;

From bcd6572046b67e811d2b573f21dc145d4cf2dd71 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 5 Sep 2011 13:08:20 -0700
Subject: [PATCH 607/829] bug fix: making sure a window tracker can't regress

---
 extension/modules/utils/Scriptish_windowEventTracker.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extension/modules/utils/Scriptish_windowEventTracker.js b/extension/modules/utils/Scriptish_windowEventTracker.js
index 3518229c..1ba59baa 100644
--- a/extension/modules/utils/Scriptish_windowEventTracker.js
+++ b/extension/modules/utils/Scriptish_windowEventTracker.js
@@ -8,6 +8,8 @@ lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "windowUnloader");
 
+const events = ["DOMContentLoaded", "load"];
+
 const trackers = {};
 
 function Scriptish_windowEventTracker(aWin) {
@@ -16,6 +18,9 @@ function Scriptish_windowEventTracker(aWin) {
   trackers[winID] = "start";
 
   aWin.addEventListener("DOMContentLoaded", function() {
+    // if the tracker event gte to this one has occurred then ignore
+    if (~events.indexOf(trackers[winID])) return;
+
     trackers[winID] = "DOMContentLoaded";
   }, false);
   /*

From 80497486b80d2389c89528e1833b4ae1b09b1009 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 5 Sep 2011 15:08:10 -0500
Subject: [PATCH 608/829] back to pre a772196da68f658f689a alerting in
 scriptdownloader

---
 extension/modules/script/scriptdownloader.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 18289ebe..a45af8d1 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -71,7 +71,6 @@ ScriptDownloader.prototype.handleErr = function(aEvent, aMsg) {
   } else if (aMsg) {
     errMsg += "\n" + aMsg;
   }
-  Scriptish_alert(errMsg);
   Scriptish_log(errMsg);
   if (this.scriptInstaller) {
     this.scriptInstaller.changed("DownloadFailed");
@@ -93,7 +92,8 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
   try {
     // If loading from file, status might be zero on success
     if (req.status != 200 && req.status != 0) {
-      this.handleErr(null, req.status + ": " + req.statusText);
+      Scriptish_alert(Scriptish_stringBundle("error.script.loading") + ":\n"
+          + req.status + ": " + req.statusText);
       return;
     }
 
@@ -337,7 +337,6 @@ ScriptDownloader.prototype.errorInstallDependency = function(dep, msg) {
       + ": " + dep.urlToDownload + "\n" + msg;
   Scriptish_log(this.dependencyError);
   if (this.scriptInstaller) {
-    Scriptish_alert(this.dependencyError);
     return this.scriptInstaller.changed("DownloadFailed");
   }
   if (this.installOnCompletion_) {

From 7d3a4940c91b51f8906721f1a0facf93f2961fa2 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 5 Sep 2011 13:58:15 -0700
Subject: [PATCH 609/829] Closes #508 sending messages to content processes
 when a script is modified or updated

---
 extension/content/e10s/browser-content.js | 14 +++++++++++---
 extension/content/e10s/browser.js         | 16 ++++++++++++++++
 extension/modules/addonprovider.js        |  6 ++++++
 extension/modules/script/script.js        |  1 +
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
index 231f306f..c86ed7b3 100644
--- a/extension/content/e10s/browser-content.js
+++ b/extension/content/e10s/browser-content.js
@@ -1,5 +1,4 @@
 (function(inc, tools, global){
-
 inc("resource://scriptish/constants.js", tools);
 const {lazyImport, lazyUtil} = tools;
 lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
@@ -35,8 +34,17 @@ var scripts;
 })(configJSON);
 
 addMessageListener("Scriptish:GlobalExcludesUpdate", updateExcludes);
-addMessageListener("Scriptish:ScriptInstalled", function(data) {
-  scripts.push(SimpleScript.loadFromJSON(data.json));
+addMessageListener("Scriptish:ScriptInstalled", function({json}) {
+  scripts.push(SimpleScript.loadFromJSON(json));
+});
+addMessageListener("Scriptish:ScriptChanged", function({json}) {
+  var script = SimpleScript.loadFromJSON(json);
+  for (var i = scripts.length - 1; ~i; i--) {
+    if (scripts[i].id == script.id) {
+      scripts[i] = script;
+      return;
+    }
+  }
 });
 })(Components.utils.import, {}, this);
 
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index c19cefd4..2602adaf 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -46,6 +46,22 @@
         });
       }
     }, "scriptish-script-installed", false);
+
+    // replace script nodes when there is a change to script
+    var updateObs = {
+      observe: function(aSubject, aTopic, aData) {
+        tools.timeout(function() {
+          var script = Scriptish_config.getScriptById(JSON.parse(aData).id);
+          var node = createNode(script);
+          var id = node.getAttribute("id");
+          var oldNode = $(id);
+          if (oldNode) parent.replaceChild(node, oldNode);
+          else insertScript(script); // jic
+        });
+      }
+    };
+    Services.obs.addObserver(updateObs, "scriptish-script-modified", false);
+    Services.obs.addObserver(updateObs, "scriptish-script-updated", false);
   }, false);
 
   var mm = messageManager;
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index e4aadf3e..17bbc38d 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -46,6 +46,7 @@ const Scriptish_ScriptProvider = {
         Scriptish_notification(msg, null, null, callback);
       }
 
+      // notify content processes that there is a new script
       if ("Fennec" == Services.appinfo.name) {
         Scriptish_sendAsyncE10SMessage("Scriptish:ScriptInstalled", script.toJSON());
       }
@@ -93,6 +94,11 @@ const Scriptish_ScriptProvider = {
         Scriptish_notification(msg, null, null, callback);
       }
 
+      // notify content processes that a script has changed
+      if ("Fennec" == Services.appinfo.name) {
+        Scriptish_sendAsyncE10SMessage("Scriptish:ScriptChanged", script.toJSON());
+      }
+
       break;
     case "scriptish-script-uninstalling":
       AddonManagerPrivate.callAddonListeners("onUninstalling", script, false);
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index bd1bbffb..6156f33b 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -673,6 +673,7 @@ Script.prototype = {
         this, "scriptish-script-updated", {saved: true, reloadUI: true});
   },
 
+  // Called directly when a local script is modified, and at the end of a upgrade
   updateFromNewScript: function(newScript, scriptInjector) {
     var tools = {};
     Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);

From 5de55ec9f7395fdcc4b932811768af04dbf19260 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 5 Sep 2011 17:33:09 -0500
Subject: [PATCH 610/829] minor style and comment tweaks

---
 extension/modules/utils/Scriptish_openInEditor.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index 719d4149..ad1b75ab 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -22,16 +22,22 @@ function Scriptish_openInEditor(script, parentWindow) {
       spWin.addEventListener("load", function spWinLoaded() {
         spWin.removeEventListener("load", spWinLoaded, false);
         spWin.document.title = spWin.Scratchpad.filename = file.path;
+
+        // Open the user script in Scratchpad
+        // NOTE: Resetting the "undo/redo" state on our own until Scratchpad
+        // handles it.  We want to ensure user scripts don't get screwed up.
+        // See: https://bug684546.bugzilla.mozilla.org/
         spWin.Scratchpad.importFromFile(file, false, function() {
           let spEditor = spWin.Scratchpad.editor;
+          // For the Orion editor...
           if (spEditor._undoStack && spEditor._undoStack.reset) {
-            // Reset "undo/redo" for the Orion editor
             spEditor._undoStack.reset();
-          } else if (spEditor._editor
+          }
+          // For the older textarea editor...
+          else if (spEditor._editor
               && spEditor._editor.resetModificationCount
               && spEditor._editor.transactionManager
               && spEditor._editor.transactionManager.clear) {
-            // Reset "undo/redo" for the textarea editor
             spEditor._editor.resetModificationCount();
             spEditor._editor.transactionManager.clear();
           }
@@ -41,7 +47,8 @@ function Scriptish_openInEditor(script, parentWindow) {
     else {
       Scriptish_launchApplicationWithDoc(editor, file);
     }
-  } catch (e) {
+  }
+  catch (e) {
     // Something may be wrong with the editor the user selected. Remove it.
     Scriptish_alert(Scriptish_stringBundle("editor.couldNotLaunch") + "\n" + e);
     Scriptish_prefRoot.remove("editor");

From 8114c71b804032dc2cb698653db5618c99294ef9 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 5 Sep 2011 16:07:55 -0700
Subject: [PATCH 611/829] Closes #529 inform content processes when a script is
 enabled/disabled for Fennec

---
 extension/modules/addonprovider.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index 17bbc38d..4535ebd7 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -59,6 +59,12 @@ const Scriptish_ScriptProvider = {
     case "scriptish-script-edit-enabled":
       AddonManagerPrivate.callAddonListeners(
           aData.enabling ? "onEnabled" : "onDisabled", script);
+
+      // notify content processes that a script's enabled state changed
+      if ("Fennec" == Services.appinfo.name) {
+        // TODO: use a more intelligent custom message handler
+        Scriptish_sendAsyncE10SMessage("Scriptish:ScriptChanged", script.toJSON());
+      }
       break;
     case "scriptish-script-modified":
     case "scriptish-script-updated":

From 8780b5eaf09e979bed3b114b1aa6148217393d11 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 5 Sep 2011 16:13:34 -0700
Subject: [PATCH 612/829] Closes #532 scripts are removed from content
 processes when uninstalled on Fennec now

---
 extension/content/e10s/browser-content.js | 8 ++++++++
 extension/modules/addonprovider.js        | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
index c86ed7b3..cdb55bdc 100644
--- a/extension/content/e10s/browser-content.js
+++ b/extension/content/e10s/browser-content.js
@@ -46,6 +46,14 @@ addMessageListener("Scriptish:ScriptChanged", function({json}) {
     }
   }
 });
+addMessageListener("Scriptish:ScriptUninstalled", function({json}) {
+  for (var i = scripts.length - 1; ~i; i--) {
+    if (scripts[i].id == json) {
+      scripts.splice(i, 1);
+      return;
+    }
+  }
+});
 })(Components.utils.import, {}, this);
 
 
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index 4535ebd7..fd5ca4d2 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -111,6 +111,11 @@ const Scriptish_ScriptProvider = {
       break;
     case "scriptish-script-uninstalled":
       AddonManagerPrivate.callAddonListeners("onUninstalled", script);
+
+      // notify content processes that a script is uninstalled
+      if ("Fennec" == Services.appinfo.name) {
+        Scriptish_sendAsyncE10SMessage("Scriptish:ScriptUninstalled", script.id);
+      }
       break;
     }
   },

From a5fa12d7e5a918ce42488d314523478936d71e6f Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 5 Sep 2011 18:38:49 -0500
Subject: [PATCH 613/829] Making adjustments to properly get the Scratchpad
 editor in Firefox 6.

---
 .../modules/utils/Scriptish_openInEditor.js   | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index ad1b75ab..e89c2538 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -29,17 +29,26 @@ function Scriptish_openInEditor(script, parentWindow) {
         // See: https://bug684546.bugzilla.mozilla.org/
         spWin.Scratchpad.importFromFile(file, false, function() {
           let spEditor = spWin.Scratchpad.editor;
+
           // For the Orion editor...
-          if (spEditor._undoStack && spEditor._undoStack.reset) {
+          if (spEditor && spEditor._undoStack && spEditor._undoStack.reset) {
             spEditor._undoStack.reset();
+            return;
           }
-          // For the older textarea editor...
-          else if (spEditor._editor
-              && spEditor._editor.resetModificationCount
-              && spEditor._editor.transactionManager
-              && spEditor._editor.transactionManager.clear) {
-            spEditor._editor.resetModificationCount();
-            spEditor._editor.transactionManager.clear();
+
+          // If not using Orion, pick out the proper editor
+          // Scratchpad in FF6 still uses 'textbox'
+          if (spEditor && spEditor._editor)
+            spEditor = spEditor._editor;
+          else if (spWin.Scratchpad.textbox)
+            spEditor = spWin.Scratchpad.textbox.editor;
+          if (!spEditor) return;
+
+          if (spEditor.resetModificationCount
+              && spEditor.transactionManager
+              && spEditor.transactionManager.clear) {
+            spEditor.resetModificationCount();
+            spEditor.transactionManager.clear();
           }
         });
       }, false);

From 8d14928c40bef592dc7640149f7e07a4cd6fbec6 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 5 Sep 2011 18:49:45 -0500
Subject: [PATCH 614/829] minor tweak

---
 extension/modules/utils/Scriptish_openInEditor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index e89c2538..8f42be7e 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -42,9 +42,9 @@ function Scriptish_openInEditor(script, parentWindow) {
             spEditor = spEditor._editor;
           else if (spWin.Scratchpad.textbox)
             spEditor = spWin.Scratchpad.textbox.editor;
-          if (!spEditor) return;
 
-          if (spEditor.resetModificationCount
+          if (spEditor
+              && spEditor.resetModificationCount
               && spEditor.transactionManager
               && spEditor.transactionManager.clear) {
             spEditor.resetModificationCount();

From d6c34c19566630a9555a9e7b6c6c66a7595eb96e Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 5 Sep 2011 19:15:50 -0500
Subject: [PATCH 615/829] Closes #533 Only try to set 'newscript_' values if
 they were specified.

---
 extension/content/js/newscript.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index a7618e3e..0e447e62 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -109,8 +109,10 @@ function doInstall() {
   Scriptish_openInEditor(script, window);
 
   // persist values
-  Scriptish_prefRoot.setValue("newscript_namespace", script.namespace);
-  Scriptish_prefRoot.setValue("newscript_author", script.author);
+  if (script.namespace)
+    Scriptish_prefRoot.setValue("newscript_namespace", script.namespace);
+  if (script.author)
+    Scriptish_prefRoot.setValue("newscript_author", script.author);
 
   return true;
 }

From 96bc305e47964b900c582672b1af9ffa4e5f1f72 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 5 Sep 2011 19:03:48 -0700
Subject: [PATCH 616/829] Closes #530 Implemented a basic options.xul for
 Fennec

---
 extension/chrome.manifest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 9d497dc3..ed3baeeb 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -26,6 +26,8 @@ overlay    chrome://scriptish/content/install.xul chrome://scriptish/content/clo
 overlay    chrome://scriptish/content/options.xul chrome://scriptish/content/closewindow.xul
 overlay    chrome://scriptish/content/newscript.xul chrome://scriptish/content/closewindow.xul
 
+override chrome://scriptish/content/options.xul chrome://scriptish/content/fennec-options.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
+
 locale     scriptish  en-US  locale/en-US/
 locale     scriptish  de  locale/de/
 locale     scriptish  es-ES  locale/es-ES/

From 3826c3dc63dd18cbe061785553f7ab9e2986cc49 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 5 Sep 2011 19:06:17 -0700
Subject: [PATCH 617/829] adding missing file for
 96bc305e47964b900c582672b1af9ffa4e5f1f72

---
 extension/content/fennec-options.xul | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 extension/content/fennec-options.xul

diff --git a/extension/content/fennec-options.xul b/extension/content/fennec-options.xul
new file mode 100644
index 00000000..aab02b0e
--- /dev/null
+++ b/extension/content/fennec-options.xul
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <setting pref="extensions.scriptish.enabled" type="bool" title="Scripts Enabled"/>
+  <setting pref="extensions.scriptish.cache.enabled" type="bool" title="Cache Enabled"/>
+  <setting pref="extensions.scriptish.uninstallPreferences" type="bool" title="Remove Script Preferences">
+    Remove preferences associated with a user script when the script is uninstalled.
+  </setting>
+</vbox>

From f1f37814eb40b51f34670e115ce3a14e03f8378e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 5 Sep 2011 19:37:52 -0700
Subject: [PATCH 618/829] <em:version>0.1.5</em:version>

---
 extension/install.rdf |  8 ++++----
 update.rdf            | 23 ++++++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index d1ade51f..f7c9f323 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -4,20 +4,20 @@
   <Description about="urn:mozilla:install-manifest">
     <em:type>2</em:type>
     <em:id>scriptish@erikvold.com</em:id>
-
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-
-    <em:version>0.1.5a2pre</em:version>
-    <em:creator>Erik Vold; http://erikvold.com/</em:creator>
+    <em:version>0.1.5</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
     <em:iconURL>chrome://scriptish/skin/scriptish32.png</em:iconURL>
     <em:icon64URL>chrome://scriptish/skin/scriptish64.png</em:icon64URL>
 
+    <em:creator>Erik Vold; http://erikvold.com/</em:creator>
+
     <em:developer>Greg Parris; http://phob.net/</em:developer>
     <em:developer>Nils Maier; https://tn123.org/</em:developer>
+
     <em:contributor>Aaron Boodman; http://youngpup.net/</em:contributor>
     <em:contributor>Anthony Lieuallen; http://arantius.com/</em:contributor>
     <em:contributor>Chris Feldmann; http://axlotl.net/</em:contributor>
diff --git a/update.rdf b/update.rdf
index 585eb82e..b3a58196 100644
--- a/update.rdf
+++ b/update.rdf
@@ -6,14 +6,14 @@
       <RDF:Seq>
         <RDF:li>
           <RDF:Description>
-            <em:version>0.1.4</em:version>
+            <em:version>0.1.5</em:version>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>4.0</em:minVersion>
-                <em:maxVersion>8.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.4.xpi</em:updateLink>
-                <em:updateHash>sha1:9ce9888d2d61e7179d9c2ef28bbf0c39af542f80</em:updateHash>
+                <em:maxVersion>9.*</em:maxVersion>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.5.xpi</em:updateLink>
+                <em:updateHash>sha1:04ef492b54771cc55b461de9170850338e88cf60</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
             <em:targetApplication>
@@ -21,8 +21,17 @@
                 <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
                 <em:minVersion>2.1</em:minVersion>
                 <em:maxVersion>2.3.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.4.xpi</em:updateLink>
-                <em:updateHash>sha1:9ce9888d2d61e7179d9c2ef28bbf0c39af542f80</em:updateHash>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.5.xpi</em:updateLink>
+                <em:updateHash>sha1:04ef492b54771cc55b461de9170850338e88cf60</em:updateHash>
+              </RDF:Description>
+            </em:targetApplication>
+            <em:targetApplication>
+              <RDF:Description>
+                <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
+                <em:minVersion>4.0</em:minVersion>
+                <em:maxVersion>6.*</em:maxVersion>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.5.xpi</em:updateLink>
+                <em:updateHash>sha1:04ef492b54771cc55b461de9170850338e88cf60</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
           </RDF:Description>
@@ -30,6 +39,6 @@
       </RDF:Seq>
     </em:updates>
 
-    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAHCyTQGatSyu4NSPEHRVwxspBgKiWANjfX0DeH/XdeTkLDSYMFsCC5X3GS70KechHXo9BQpT+w4kyC9NEHM3I0sXXm30RP8YvNrUVPK8gIsZV9UVe2itCyx0YVD6oCrWsmhta03dnEv0mwYtUGJ+RHgVVydGAHldXtHQZOITsuf2</em:signature>
+    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAAomoUWJ4VGDMQvxeVgqERlfYlu3M7MsPtc9+Klb9TOO2RJ/3ZQ+J9oJ64a00Iagut/SAV9U9SIOozIWK4iMXDeMrtRmfmMpdOT7Kul9WGwbUAKDG7E6W7ZJbHr8dSidENGifWXGP2Rqgzil33xtvI3AGxXSShaYarYmBIH9uxQC</em:signature>
   </RDF:Description>
 </RDF:RDF>

From c9fa67c5f2501ed9e1535659d82d4dc9898bf3e2 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 5 Sep 2011 19:40:32 -0700
Subject: [PATCH 619/829] <em:version>0.1.6a1pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index f7c9f323..ea5919ec 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.5</em:version>
+    <em:version>0.1.6a1pre</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>

From 336c6cbef59468fdc063a25354d2cf4a57175de2 Mon Sep 17 00:00:00 2001
From: Greg Parris <greg.parris@gmail.com>
Date: Mon, 12 Sep 2011 16:02:27 -0500
Subject: [PATCH 620/829] removing "en-US" from the AMO link; using HTTPS for
 some of the links since HTTP just redirects

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8a4851e5..da7888c2 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,9 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 
 * [Website](http://scriptish.org)
 * [Blog](http://scriptish.org/blog)
-* [Addons.Mozilla.Org (AMO)](https://addons.mozilla.org/en-US/firefox/addon/scriptish)
+* [Addons.Mozilla.Org (AMO)](https://addons.mozilla.org/firefox/addon/scriptish)
 * [Userscripts](http://userscripts.org)
-* [Wiki](http://github.com/scriptish/scriptish/wiki)
-* [Issues](http://github.com/scriptish/scriptish/issues)
+* [Wiki](https://github.com/scriptish/scriptish/wiki)
+* [Issues](https://github.com/scriptish/scriptish/issues)
 * [Google Group](http://groups.google.com/group/scriptish)
-* [Source Code](http://github.com/scriptish/scriptish)
+* [Source Code](https://github.com/scriptish/scriptish)

From 705c96615217ba75d27cb23fe98c85b949eb6c3b Mon Sep 17 00:00:00 2001
From: strel <strelnic@gmail.com>
Date: Wed, 14 Sep 2011 23:23:11 +0300
Subject: [PATCH 621/829] Update for this es-ES locale file, based on the en-US
 file. I also made some corrections for better understanding, and for
 messsages to sound more natural in spanish. Also I touched some of the xxx.ak
 shortcut items to use the apropriate letter in spanish if possible, avoiding
 overlapping with other current shortcuts in their respective menus.

---
 extension/locale/es-ES/scriptish.properties | 46 ++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 3b4c4844..69199d58 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -1,4 +1,4 @@
-contributions.description=El desarrollador de este script de usuario te pide que ayudes a mantener su desarrollo continuo haciendo un pequeño donativo.
+contributions.description=El desarrollador de este script de usuario le pide que ayude a mantener su continuo desarrollo haciendo un pequeño donativo.
 copyDownloadURL=Copiar URL de descarga
 copyDownloadURL.ak=C
 edit=Editar
@@ -6,9 +6,9 @@ edit.ak=E
 editor.couldNotLaunch=Error al abrir el editor.
 editor.pleasePickExecutable=Por favor, elija un programa para editar sus scripts de usuario.
 editor.prompt=Por favor, elija antes su editor de texto favorito
-editor.useScratchpad=
-editor.useScratchpad.no=
-editor.useScratchpad.yes=
+editor.useScratchpad=¿Desea usar Scratchpad como su editor?
+editor.useScratchpad.no=No (yo seleccionaré el mio)
+editor.useScratchpad.yes=Sí
 error.api.clipboard.type=no es un tipo soportado por GM_setClipboard.
 error.api.noResourceWithName=No hay recursos con ese nombre
 error.api.noSecondArgValue=Segundo argumento no especificado: Valor
@@ -17,22 +17,22 @@ error.api.reqURL.scheme=Esquema no permitido en URL
 error.api.unsafeAccess=Violación de acceso de Scriptish: unsafeWindow no puede invocar
 error.charset=El conjunto de caracteres especificado no es válido.
 error.dependency.loading=Error al cargar dependencia
-error.dependency.local=Excepción de seguridad: prohibidas las peticiones a URLs locales y chrome
+error.dependency.local=Excepción de seguridad: prohibidas las peticiones a URLs locales y a chrome
 error.dependency.serverReturned=El servidor ha devuelto ¡Error!
 error.hash.algorithm=Especificado algoritmo de hash no válido.
 error.icon.dataURL=URL de tipo datos para @ICON no válido
 error.icon.notImage=¡Error!: @ICON no tiene un tipo MIME de imagen
 error.icon.URL=URL para @ICON no válido
-error.invalidCert=
+error.invalidCert=Certificado SSL no válido.\nSi lo desea, permita todos los certificados activando la opción de Scriptish en Opciones / Avanzado / Seguridad de las actualizaciones.
 error.isInvalidValue=es un valor no permitido
-error.matchPattern.rules=el filtro @match no se ajusta a las reglas para filtros
-error.matchPattern.rules.file=El filtro @match del esquema File no se ajusta a las reglas para filtros
-error.notSecure=
+error.matchPattern.rules=El filtro @match no se ajusta a las reglas para filtros
+error.matchPattern.rules.file=El filtro @match del achivo de patrones no se ajusta a las reglas para filtros
+error.notSecure=URI insegura.\nSi quiere, permita las actualizaciones no-HTTPS activando la opción de Scriptish en Opciones / Avanzado / Seguridad de las actualizaciones.
 error.notSupported.Firefox=no soportado por esta versión de Firefox
 error.openingFile=Error abriendo el archivo
 error.pattern.parsing=Error interpretando el filtro
 error.pref.type=Tipo de preferencia no soportado. Tipos válidos: cadena, booleano y entero de 32 bits.
-error.remoteVersionOlder=
+error.remoteVersionOlder=El script remoto no tiene un número de versión más nuevo que su actual script.
 error.resource.dupName=es un nombre de recurso duplicado. Cada declaración @Resource debe tener un nombre único.
 error.resource.syntax=Sintaxis no válida para la declaración @Resource
 error.retrieving=Error al descargar
@@ -51,10 +51,10 @@ install.showScriptSource=Mostrar código fuente del script
 install.title=Instalación de script de usuario
 install.warning1=Los scripts maliciosos pueden violar su privacidad y actuar en su nombre sin su conocimiento.
 install.warning2=Sólo debería instalar scripts de fuentes en las que confíe.
-installFromFile=
-installFromFile.ak=
+installFromFile=Instalar Script de Usuario Desde Archivo...
+installFromFile.ak=S
 menu.commands=Comandos del script de usuario...
-menu.commands.ak=M
+menu.commands.ak=C
 menu.install=Instalar script de usuario...
 menu.install.ak=I
 menu.manage=Gestionar scripts de usuario...
@@ -78,7 +78,7 @@ newscript.exists=Ya hay instalado un script con ese nombre.\n¿Sobreescribir?
 newscript.id=ID
 newscript.includes=Inclusiones (una por línea)
 newscript.missing.id=Por favor, introduzca un identificador.
-newscript.missing.name=Por favor, introduzca un nombre. El nombre se mostrará en el administrador de complementos.
+newscript.missing.name=Por favor, introduzca un nombre. El nombre se mostrará en el Administrador de complementos.
 newscript.name=Nombre
 newscript.namespace=Espacio de nombres
 newscript.noID=Por favor, introduzca un identificador válido para su script.
@@ -91,7 +91,7 @@ newscript.runat.windowload=la ventana con todo su contenido esté completamente
 newscript.version=Versión
 nothing.timedOut=nada (en espera)
 openFolder=Abrir carpeta
-openFolder.ak=A
+openFolder.ak=B
 openUserScriptsManager=Abrir administrador de scripts de usuario
 openUserScriptsManager.ak=A
 options=Opciones
@@ -114,10 +114,10 @@ options.enabledSchemes.main=Protocolos
 options.enabledSchemes.securityRemark=Los protocolos adicionales podrían tener acceso completo al sistema.
 options.enabledSchemes.securityRemark2=¡Por lo tanto representan un riesgo de seguridad considerable con scripts no confiables!
 options.enabledSchemes.unmht=Protocolo unmht (Formato de Archivo Mozilla, .maf)
-options.excludes.desc=Las exclusiones globales se imponen a cualquier regla de script, o definida por el usuario
+options.excludes.desc=Las exclusiones globales prevalecen sobre cualquier regla de script, o definida por el usuario
 options.excludes.empty=No hay definidas exclusiones globales
 options.excludes.remark=(Puede definir una exclusión por linea)
-options.logChrome=Registrar en log mensajes de extensión no críticos a la consola de errores
+options.logChrome=Registrar en log mensajes de extensión no críticos en la consola de errores
 options.logging=Registro de eventos (logging)
 options.logToErrorConsole=GM_log usa la consola de errores
 options.notifications=Notificaciones
@@ -130,17 +130,17 @@ options.pane.main=Principal
 options.pane.ui=Interfaz de usuario
 options.requireBuiltInCerts=Las actualizaciones seguras requieren que el certificado esté incluído
 options.requireSecured=Requerir que los scripts de usuario se actualicen usando HTTPS
-options.title=Opciones de scriptish
+options.title=Opciones de Scriptish
 options.toolbarbutton=Botón de la Barra de Herramientas
-options.toolbarbutton.showScripts=Mostra la cuenta de scripts activos
+options.toolbarbutton.showScripts=Muestra la cuenta de scripts activos
 options.translation=Traducción
-options.translation.useEnglish=Usar Inglés siempre
+options.translation.useEnglish=Usar inglés siempre
 options.update.security=Seguridad de las actualizaciones
 options.useDownloadURL=Utilizar URL de descarga para actualizar si no hay URL de actualización
 reinstall=Reinstalar
 saving=Guardando
 scratchpad.saveAsUserScript=Guardar como script de usuario
-scratchpad.saveAsUserScript.ak=U
+scratchpad.saveAsUserScript.ak=S
 scriptOptions.disableScriptIncludes=Desactivar los filtros de inclusión de este script y utilizar sólo los definidos por el usuario.
 scriptOptions.excludes=Exclusiones definidas por el usuario:
 scriptOptions.includes=Inclusiones defenidas por el usuario:
@@ -150,7 +150,7 @@ statusbar.installed=instalado con éxito
 statusbar.modified=modificado
 statusbar.noScripts.excluded=¡Esta página está excluída!
 statusbar.noScripts.notfound=¡No hay scripts para esta página!
-statusbar.noScripts.scheme=¡Este esquema está deshabilitado!
+statusbar.noScripts.scheme=¡Este patrón está deshabilitado!
 statusbar.updated=actualizado con éxito
 tooltip.loading=Cargando...
 Uninstall=Desinstalar
@@ -160,4 +160,4 @@ userscript=Script de usuario
 userscripts=Scripts de usuario
 userscripts.get=Obtener scripts de usuario
 userscripts.noneInstalled=No tiene instalado ningún script de usuario
-warning.returnfrommain="return" desde el ámbito principal no está soportado generalmente. Debería arreglar esto en su script
+warning.returnfrommain="return" desde el ámbito principal no está soportado normalmente. Debería arreglar esto en su script

From 68e5edee595ee32529c0185d73322390ecf4e0b0 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 18 Sep 2011 22:04:46 -0700
Subject: [PATCH 622/829] changing issue tracker link on README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index da7888c2..7d8e0106 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,6 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 * [Addons.Mozilla.Org (AMO)](https://addons.mozilla.org/firefox/addon/scriptish)
 * [Userscripts](http://userscripts.org)
 * [Wiki](https://github.com/scriptish/scriptish/wiki)
-* [Issues](https://github.com/scriptish/scriptish/issues)
+* [Issues](http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/)
 * [Google Group](http://groups.google.com/group/scriptish)
 * [Source Code](https://github.com/scriptish/scriptish)

From b9bcba571be46d7aa95a1b48a57bdd0b39d2d715 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 19 Sep 2011 19:34:04 -0700
Subject: [PATCH 623/829] updating links to issue tracker in about:scriptish

---
 extension/content/aboutScriptish.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 39ecaf7d..220394b7 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -45,9 +45,9 @@ <h2>Help Out</h2>
        </header>
        <p>There are many ways you can help out with Scriptish:</p>
        <ul>
-         <li><a href="https://github.com/scriptish/scriptish/issues">Report a bug</a></li>
-         <li><a href="https://github.com/scriptish/scriptish/issues">Request a feature</a></li>
-         <li>Like coding?  <a href="https://github.com/scriptish/scriptish">Fork us!</a></li>
+         <li><a href="http://scriptish.lighthouseapp.com/projects/83146/tickets/new">Report a bug</a></li>
+         <li><a href="http://scriptish.lighthouseapp.com/projects/83146/tickets/new">Request a feature</a></li>
+         <li>Like coding?  <a href="https://github.com/scriptish/scriptish">Collaborate!</a></li>
        </ul>
      </section>
 

From 691b65821d71b7318dbd83146885168816bbcef1 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 5 Oct 2011 09:06:50 -0700
Subject: [PATCH 624/829] the default for extensions.scriptish.cache.enabled is
 now false, in order to avoid having users think there is a memory leak
 because of this feature, also it's probably a better default for mobile
 devices

---
 extension/defaults/preferences/scriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 551e0199..b59ec89f 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -3,7 +3,7 @@ pref("extensions.scriptish.blocklist.enabled", true);
 pref("extensions.scriptish.blocklist.interval", 86400);
 pref("extensions.scriptish.blocklist.lastFetch", 0);
 pref("extensions.scriptish.blocklist.url", "https://github.com/scriptish/scriptish/raw/master/blocklist.json");
-pref("extensions.scriptish.cache.enabled", true);
+pref("extensions.scriptish.cache.enabled", false);
 pref("extensions.scriptish.config.prettyPrint.enabled", false);
 pref("extensions.scriptish.enabled", true);
 pref("extensions.scriptish.enabledSchemes.about", false);

From fc4a3f1c18db3622b59f4990332f7226b7a00094 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 7 Oct 2011 16:18:18 -0700
Subject: [PATCH 625/829] maxVersion for FF is 10.* and Seamonkey is 2.4.* now

---
 extension/install.rdf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index ea5919ec..40f87e29 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -63,7 +63,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>9.*</em:maxVersion>
+        <em:maxVersion>10.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- SeaMonkey -->
@@ -71,7 +71,7 @@
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1</em:minVersion>
-        <em:maxVersion>2.3.*</em:maxVersion>
+        <em:maxVersion>2.4.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- Fennec -->

From fd4c91463298688bd1f6af611a1a179db75f73c8 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 9 Oct 2011 13:11:11 -0500
Subject: [PATCH 626/829] Adding Polish (pl) courtesy of allertec (BabelZilla).

---
 extension/chrome.manifest                  |   3 +-
 extension/install.rdf                      |   1 +
 extension/locale/pl/description.properties |  13 ++
 extension/locale/pl/scriptish.properties   | 163 +++++++++++++++++++++
 4 files changed, 179 insertions(+), 1 deletion(-)
 create mode 100644 extension/locale/pl/description.properties
 create mode 100644 extension/locale/pl/scriptish.properties

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index ed3baeeb..8f4ca4ca 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -29,9 +29,10 @@ overlay    chrome://scriptish/content/newscript.xul chrome://scriptish/content/c
 override chrome://scriptish/content/options.xul chrome://scriptish/content/fennec-options.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
 
 locale     scriptish  en-US  locale/en-US/
-locale     scriptish  de  locale/de/
+locale     scriptish  de     locale/de/
 locale     scriptish  es-ES  locale/es-ES/
 locale     scriptish  ja-JP  locale/ja-JP/
+locale     scriptish  pl     locale/pl/
 locale     scriptish  pt-BR  locale/pt-BR/
 locale     scriptish  ru-RU  locale/ru-RU/
 locale     scriptish  sv-SE  locale/sv-SE/
diff --git a/extension/install.rdf b/extension/install.rdf
index 40f87e29..4d754c8e 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -46,6 +46,7 @@
     <em:contributor>Tommi Rautava</em:contributor>
 
     <em:translator>Alfredo Fernández Díaz (es-ES)</em:translator>
+    <em:translator>allertec (pl)</em:translator>
     <em:translator>k2jp (ja-JP)</em:translator>
     <em:translator>Mauro José da Silva (pt-BR)</em:translator>
     <em:translator>Mikael Hiort af Ornäs (sv-SE)</em:translator>
diff --git a/extension/locale/pl/description.properties b/extension/locale/pl/description.properties
new file mode 100644
index 00000000..a13a3652
--- /dev/null
+++ b/extension/locale/pl/description.properties
@@ -0,0 +1,13 @@
+amo.description.line1=Scriptish jest współbieżny do Greasemonkey, oferuje:
+amo.description.line2=Wszystkie cechy Greasemonkey ( co jest bardzo przydatne )
+amo.description.line3=Aktualizacja: Skrypty Użytkownika mogą zostać zaktualizowane w Scriptish używając @updateURL
+amo.description.line4=Wiele nowych <a title="Dokumentacja do Scriptish - Scriptish Wiki" href="https://github.com/scriptish/wiki/Manual%3A-Metadata-Block">danych @keys</a>
+amo.description.line5=Wiele nowych <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API"> dodatków do GM_API</a>
+amo.description.line6=Zwiększoną Wydajność: Szybsza, przejrzystsza baza kodów, która wykorzystuje wszystko to, co mają do zaoferowania ostatnie wersje Firefox-a
+amo.description.line7=Zwiększone Bezpieczeństwo: Scriptfish dostarcza niespotykanych dotąd funkcji bezpieczeństwa
+amo.description.line8=Testowanie: Programiści przeprowadzali liczne testy, aby mieć pewność prawidłowego działania Scriptish-a oraz przyspieszyć wykrywalność licznych błędów.
+amo.developerComments.line1=Scriptish posiada wszystkie zalety Greasemonkey plus wiele innych, o których możesz poczytać na: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=Zgłoszenia dotyczące jakichkolwiek błędów oraz funkcji przesyłać na adres: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>.
+amo.developerComments.line3=Jeśli masz pytania, proszę przesłać na adres grupy dyskusyjnej: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=Największy silnik skryptowy dla użytkownika w Internecie.
+extensions.scriptish@erikvold.com.description=Script Extension Manager dla Firefox-a
diff --git a/extension/locale/pl/scriptish.properties b/extension/locale/pl/scriptish.properties
new file mode 100644
index 00000000..ec6ce38b
--- /dev/null
+++ b/extension/locale/pl/scriptish.properties
@@ -0,0 +1,163 @@
+contributions.description=Twórca tego skryptu prosi o drobne wsparcie, w celu kontynuowania procesu rozwoju.
+copyDownloadURL=Kopiuj adres pobierania
+copyDownloadURL.ak=C
+edit=Edycja
+edit.ak=E
+editor.couldNotLaunch=Nie można załadować edytora.
+editor.pleasePickExecutable=Proszę wybrać aplikację przeznaczoną do edycji skryptu użytkownika.
+editor.prompt=Najpierw proszę wybrać swój preferowany edytor tekstu
+editor.useScratchpad=Czy chcesz użyć Scratchpad-a jako edytor?
+editor.useScratchpad.no=Nie ( sam wybiorę )
+editor.useScratchpad.yes=Tak
+error.api.clipboard.type=nie jest to typ wspierany przez GM_setClipboard.
+error.api.noResourceWithName=Brak źródeł z nazwą
+error.api.noSecondArgValue=Drugi argument nie został określony: Wartość
+error.api.reqURL=Błędny URL
+error.api.reqURL.scheme=Niedozwolony schemat URL
+error.api.unsafeAccess=Naruszenie zasad dostępu Scriptish: nie można wywołać niebezpiecznego Okna
+error.charset=Określony zestaw znaków jest nieprawidłowy.
+error.dependency.loading=Błąd ładowania zależności
+error.dependency.local=Wyjątek Bezpieczeństwa: Żądanie URL lokalnych i chrome`a jest niedozwolone.
+error.dependency.serverReturned=Błąd! Serwer zwrócił
+error.hash.algorithm=Błędnie określony algorytm hash.
+error.icon.dataURL=Błąd danych: URL dla @icon
+error.icon.notImage=Błąd! @icon nie posiada obrazu typu MIME
+error.icon.URL=Błędny URL dla @icon
+error.invalidCert=
+error.isInvalidValue=jest błędną wartością
+error.matchPattern.rules=wzór @match nie odpowiada regułom wzoru
+error.matchPattern.rules.file=Schemat wzoru @match dla pliku nie odpowiada regułom wzoru
+error.notSecure=
+error.notSupported.Firefox=nie jest wspierany przez tą wersję Firefox-a
+error.openingFile=Nie można otworzyć pliku
+error.pattern.parsing=Wzór nie mógł zostać przetworzony
+error.pref.type=Niewspierany typ preferencji. Obowiązujące typy: string, bool oraz 32-bitowy integer.
+error.remoteVersionOlder=
+error.resource.dupName=jest duplikatem nazwy źródła. Każde @resource musi zawierać unikatową nazwę.
+error.resource.syntax=Błąd składni deklaracji @resource
+error.retrieving=Nie odzyskano
+error.script.installing=Błąd podczas instalowania skryptu użytkownika
+error.script.loading=Błąd podczas ładowania skryptu użytkownika
+greeting.btn.ak=I
+greeting.msg=To jest skrypt użytkownika. Wciśnij Zainstaluj do rozpoczęcia używania.
+install=Zainstaluj
+install.domains=domeny:
+install.excludes=nie działa na:
+install.includes=działa na:
+install.matches=pasuje:
+install.requires=wymaga:
+install.resources=źródła:
+install.showScriptSource=Pokaż Źródło Skryptu
+install.title=Instalacja Skryptu Użytkownika
+install.warning1=Złośliwe skrypty mogą naruszać twoją prywatność i działać w Twoim imieniu bez twojej wiedzy.
+install.warning2=Instaluj skrypty z zaufanych źródeł.
+installFromFile=Zainstaluj Skrypt Użytkownika z Pliku...
+installFromFile.ak=U
+menu.commands=Komendy Skryptu Użytkownika...
+menu.commands.ak=C
+menu.install=Zainstaluj Skrypt Użytkownika
+menu.install.ak=I
+menu.manage=Zarządzaj Skryptami Użytkownika...
+menu.manage.ak=M
+menu.new=Nowy Skrypt Użytkownika...
+menu.new.ak=N
+menu.options.ak=O
+menu.show=Przejrzyj Źródło Skryptu Użytkownika
+menu.show.ak=V
+menu.title=Scriptish
+menu.title.ak=S
+menuitem.install=Zainstaluj Ten Skrypt Użytkownika...
+menuitem.manage=Zarządzaj Skryptami Użytkownika
+menuitem.new=Nowy Skrypt Użytkownika
+moving.dependency=Przeniesienie zależności plikowych z
+moving.script=Przeniesienie pliku skryptu z
+newscript.author=Autor
+newscript.description=Opis
+newscript.excludes=Wyjątki (jeden na linię)
+newscript.exists=Skrypt o tej nazwie został już zainstalowany. Nadpisać?
+newscript.id=ID
+newscript.includes=Zawiera ( Jedną na linie )
+newscript.missing.id=Proszę wprowadzić ID.
+newscript.missing.name=Proszę wprowadzić nazwę. Nazwa będzie widoczna w nazwie Menadżera Dodatków.
+newscript.name=Nazwa
+newscript.namespace=Przestrzeń nazw
+newscript.noID=Proszę wprowadzić prawidłowe ID dla swojego skryptu.
+newscript.noName=Proszę wprowadzić nazwę dla swojego skryptu.
+newscript.runat=Rozpocznij kiedy
+newscript.runat.documentend=Koniec ładowania dokumentu
+newscript.runat.documentidle=Bezczyny dokumenty
+newscript.runat.documentstart=Dokument zaczyna się ładować
+newscript.runat.windowload=Okno wraz mediami, są w pełni załadowane
+newscript.version=Wersja
+nothing.timedOut=nic ( upłynął limit czasu )
+openFolder=Otwórz Folder
+openFolder.ak=O
+openUserScriptsManager=Otwórz Menadżera Skryptów Użytkownika
+openUserScriptsManager.ak=O
+options=Opcje
+options.addonsManager=Menadżer Dodatków
+options.alsoUninstallPrefs=Podczas deinstalacji skryptu, usuń również jego ustawienia
+options.cache=Cache
+options.cache.enabled=Cache skryptów użytkownika
+options.changeEditor=Zmień Edytor
+options.editor=Edytor
+options.editor.notset=Nie wybrano edytora
+options.enableCopyDownloadURL=Włącz kopiowanie adresów URL pobierania
+options.enabledSchemes.about=o protokole ( wewnętrznym )
+options.enabledSchemes.advanced=Dodatkowe protokoły
+options.enabledSchemes.chrome=protokół chrome ( wewnętrzny )
+options.enabledSchemes.data=protokół danych
+options.enabledSchemes.file=protokół pliku ( pliki lokalne )
+options.enabledSchemes.ftp=protokół ftp
+options.enabledSchemes.http=protokół http/https
+options.enabledSchemes.main=Protokoły
+options.enabledSchemes.securityRemark=Dodatkowe protokoły mogą posiadać pełny dostęp do systemu.
+options.enabledSchemes.securityRemark2=Dlatego też stanowią spore zagrożenie bezpieczeństwa z niezaufanymi skryptami!
+options.enabledSchemes.unmht=protokół unmht ( format archiwizacji Mozilli )
+options.excludes.desc=Wyjątki globalne nadpiszą każdy skrypt albo reguły zdefiniowane przez użytkownika
+options.excludes.empty=Nie zdefiniowano żadnych wyjątków globalnych
+options.excludes.remark=(Możesz zdefiniować jeden wyjątek na linię)
+options.logChrome=Zapisuj niekrytyczne wiadomości rozszerzenia do konsoli błędów
+options.logging=Logowanie
+options.logToErrorConsole=GM_log używa Konsoli Błędów
+options.notifications=Powiadomienia
+options.notifications.popup.enable=Włącz powiadomienia popup
+options.notifications.sliding.enable=Włącz powiadomienia przesuwane
+options.notifications.whenDisabled=Kiedy wyłączone, wszelkie powiadomienia będą wyświetlane w konsoli błędów.
+options.pane.advanced=Zaawansowane
+options.pane.excludes=Wyjątki globalne
+options.pane.main=Główne
+options.pane.ui=Interfejs Użytkownika
+options.requireBuiltInCerts=Aktualizacja bezpieczeństwa wymaga użycia wbudowanych certyfikatów
+options.requireSecured=Wymagane skrypty użytkownika do aktualizacji przez HTTPS
+options.title=Opcje Scriptish
+options.toolbarbutton=Pasek narzędzi
+options.toolbarbutton.showScripts=Pokaż liczbę aktywnych skryptów
+options.translation=Tłumaczenie
+options.translation.useEnglish=Zawsze używaj angielskiego
+options.update.security=Aktualizacja Bezpieczeństwa
+options.useDownloadURL=Używaj adresu pobierania jeśli nie ma adresu aktualizacji
+reinstall=Reinstalacja
+saving=Zapisywanie
+scratchpad.saveAsUserScript=Zapisz jako Skrypt Użytkownika
+scratchpad.saveAsUserScript.ak=u
+scriptOptions.disableScriptIncludes=Wyłącz ten skrypt zawierający wzory i używaj zdefiniowane przez użytkownika.
+scriptOptions.excludes=Wykluczone przez Użytkownika:
+scriptOptions.includes=Zawarte przez Użytkownika:
+statusbar.enabled=Włączone
+statusbar.enabled.ak=E
+statusbar.installed=poprawnie zainstalowano
+statusbar.modified=zmodyfikowano
+statusbar.noScripts.excluded=Strona została wykluczona!
+statusbar.noScripts.notfound=Brak skryptów dla strony!
+statusbar.noScripts.scheme=Schemat został wyłączony!
+statusbar.updated=poprawnie zaktualizowano
+tooltip.loading=Ładowanie...
+Uninstall=Odinstalowanie
+untitledScript=Skrypt bez nazwy
+Update=Aktualizacja
+userscript=Skrypt Użytkownika
+userscripts=Skrypty Użytkownika
+userscripts.get=Zdobądź skrypty użytkownika
+userscripts.noneInstalled=Nie posiadasz zainstalowanych skryptów użytkownika
+warning.returnfrommain="return" z głównego zakresu nie jest wspierany. Powinieneś to poprawić w swoim skrypcie użytkownika.

From da44d4c4123e88d3f63168f32e29888c78202840 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 18 Nov 2011 10:30:36 -0600
Subject: [PATCH 627/829] updating ja-JP courtesy of k2jp (BabelZilla)

---
 extension/locale/ja-JP/scriptish.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 55d4630b..223751fc 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -74,7 +74,7 @@ moving.script=スクリプトファイルを次から移動：
 newscript.author=作者
 newscript.description=スクリプトの説明
 newscript.excludes=Excludes（１行１つずつ）
-newscript.exists=同じ名前のスクリプトが既にインストールされています。\n上書きしますか？
+newscript.exists=同じ名前のスクリプトが既にインストールされています。n上書きしますか？
 newscript.id=ID（一意に識別する文字列）
 newscript.includes=Includes（１行１つずつ）
 newscript.missing.id=ID を指定してください

From 1da270c5ec6bb2e89799c22717f5fc72f16d3aa1 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 18 Nov 2011 10:32:38 -0600
Subject: [PATCH 628/829] updating pt-BR courtesy of maurojs10 (BabelZilla)

---
 extension/locale/pt-BR/description.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/locale/pt-BR/description.properties b/extension/locale/pt-BR/description.properties
index 983cb65e..f85c7f22 100644
--- a/extension/locale/pt-BR/description.properties
+++ b/extension/locale/pt-BR/description.properties
@@ -3,7 +3,7 @@ amo.description.line2=Tudo que o Greasemonkey faz (que é realmente útil)
 amo.description.line3=Atualização: os scripts podem ser atualizados usando @updateURL
 amo.description.line4=Muitos <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">metadados @keys</a> novos
 amo.description.line5=Muitos <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">acréscimos à API GM_</a>
-amo.description.line6=Desempenho superior: um código mais rápido e mais limpo, que tira proveito de tudo o que as versões recentes do Firefox tem a oferecer
+amo.description.line6=Desempenho superior: um código mais rápido e mais limpo, que tira proveito de tudo o que as versões recentes do Firefox têm a oferecer
 amo.description.line7=Segurança superior: o Scriptish fornece recursos de segurança que você não vai encontrar em outro lugar
 amo.description.line8=Testes: os desenvolvedores empregam uma série de testes para garantir o correto funcionamento do Scriptish e encontrar falhas o mais breve possível
 amo.developerComments.line1=O Scriptish tem todos os recursos que o Greasemonkey tem e muitos mais, que você pode descobrir em: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a> .

From 4c8cdaf5e157140d5afa1e04729c872cb8b2c217 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 18 Nov 2011 10:37:51 -0600
Subject: [PATCH 629/829] updating zh-CN courtesy of yfdyh000 (BabelZilla)

---
 extension/locale/zh-CN/description.properties | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/extension/locale/zh-CN/description.properties b/extension/locale/zh-CN/description.properties
index 6fe50c14..280c6457 100644
--- a/extension/locale/zh-CN/description.properties
+++ b/extension/locale/zh-CN/description.properties
@@ -1,13 +1,13 @@
 amo.description.line1=Scriptish 是 Greasemonkey 的分支，提供:
 amo.description.line2=Greasemonkey 提供的所有功能（都是非常有用的）
 amo.description.line3=更新：用户脚本在 Scriptish 上可以使用 @updateURL 更新
-amo.description.line4=许多新的 <a title="Scriptish 元数据块文档 - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">@keys 元数据支持</a>
-amo.description.line5=增加了很多新的 <a title="Scriptish 用户脚本 API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">GM_API 支持</a>
-amo.description.line6=优越的性能：利用一切 Firefox 最新版本所提供的更快、更清洁的代码
-amo.description.line7=出众的安全：Scriptish 提供独一无二的安全特性
-amo.description.line8=测试：开发者能进行大量地测试，确保您编写的代码功能正常并且更早的发现缺陷
-amo.developerComments.line1=Scriptish 拥有 Greasemonkey 的所有功能，增加的很多特性您可以到这里查看：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=请到这里提交 bug 或功能需求：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
-amo.developerComments.line3=如果您还有其他问题，请发送到邮件列表：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.description.line4=更多的 <a href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">@keys 元数据支持</a>
+amo.description.line5=更多的 <a href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">用户脚本API支持</a>
+amo.description.line6=优越的性能：利用一切 Firefox 4所提供的更快、更清洁的代码基础
+amo.description.line7=出众的安全：Scriptish 提供独一无二的安全功能
+amo.description.line8=测试：编写代码测试Scriptish 的功能和特性
+amo.developerComments.line1=Scriptish 拥有 Greasemonkey 的所有功能，增加的很多其他特性您可以到这里查看：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=请到这里提交 bug 或功能需求：<a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
+amo.developerComments.line3=如果您还有其他问题，请发送邮件到这里：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=互联网上最伟大的用户脚本引擎。
-extensions.scriptish@erikvold.com.description=Firefox 的脚本扩展管理器
+extensions.scriptish@erikvold.com.description=面向 Firefox 的一个脚本扩展管理器

From 6e2986d21f255dd8ac971de56d8a6a682ee1b055 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 18 Nov 2011 10:42:51 -0600
Subject: [PATCH 630/829] Pointing to Lighthouse, since Github's issue tracker
 is no longer available.

---
 extension/locale/de/description.properties    |  2 +-
 extension/locale/en-US/description.properties |  2 +-
 extension/locale/es-ES/description.properties | 26 +++++++++----------
 extension/locale/ja-JP/description.properties |  2 +-
 extension/locale/pl/description.properties    |  2 +-
 extension/locale/pt-BR/description.properties |  2 +-
 extension/locale/sv-SE/description.properties |  2 +-
 extension/locale/zh-TW/description.properties |  2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/extension/locale/de/description.properties b/extension/locale/de/description.properties
index 6949d914..5bd6d28c 100644
--- a/extension/locale/de/description.properties
+++ b/extension/locale/de/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Überlegene Leistung: Schnellerer, saubererer Code, der vo
 amo.description.line7=Überlegene Sicherheit: Scriptish beinhaltet Sicherheitsfunktionen, die Sie nirgendwo anders finden
 amo.description.line8=Tests: Die Entwickler benutzen viele Tests um eine korrekte Arbeitsweise sicherzustellen und Fehler schnell zu entdecken
 amo.developerComments.line1=Scriptish beinhaltet alles, was auch Greasemonkey kann, plus viele neue und verbesserte Funktionen. Erfahren Sie mehr im <a href="http://github.com/scriptish/scriptish/wiki">Scriptish Wiki</a>
-amo.developerComments.line2=Bitte schicken Sie alle Bugs oder Funktionsvorschläge zu: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
+amo.developerComments.line2=Bitte schicken Sie alle Bugs oder Funktionsvorschläge zu: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
 amo.developerComments.line3=Wenn sie weitere Fragen haben, dann senden Sie diese bitte auf Englisch an die Mailing-Liste: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=Der beste Benutzerskript Software im Internet
 extensions.scriptish@erikvold.com.description=Ein Benutzerskript-Erweiterungen-Manager für Firefox
diff --git a/extension/locale/en-US/description.properties b/extension/locale/en-US/description.properties
index 7cb0fe4f..841e8309 100644
--- a/extension/locale/en-US/description.properties
+++ b/extension/locale/en-US/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Superior Performance: A faster, cleaner code base which ta
 amo.description.line7=Superior Security: Scriptish provides security features you won't find elsewhere
 amo.description.line8=Testing: The developers make use of a lot of tests to ensure the correct functioning of Scriptish and to find any bugs sooner
 amo.developerComments.line1=Scriptish has everything Greasemonkey has, plus many features which you can read about at: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=Please submit any bugs or feature requests to: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
+amo.developerComments.line2=Please submit any bugs or feature requests to: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
 amo.developerComments.line3=If you have any other questions, please send them to the mailing list: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=The greatest user script engine on the Internet.
 extensions.scriptish@erikvold.com.description=A Script Extension Manager for Firefox
diff --git a/extension/locale/es-ES/description.properties b/extension/locale/es-ES/description.properties
index 42bad372..44c5fdd8 100644
--- a/extension/locale/es-ES/description.properties
+++ b/extension/locale/es-ES/description.properties
@@ -1,13 +1,13 @@
-amo.description.line1=Scriptish es una ramificación de Greasemonkey, que ofrece:
-amo.description.line2=Todo lo que hace Greasemonkey (que de hecho es útil)
-amo.description.line3=Actualización: Los scripts de usuario pueden ser actualizados en Scriptish usando @updateURL
-amo.description.line4=Muchas nuevas <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">metadata @keys</a>
-amo.description.line5=Muchas nuevas <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">características añadidas a la GM_ API</a>
-amo.description.line6=Rendimiento Superior: Un código base más rápido y limpio, que aprovecha todo lo que las versiones recientes de Firefox ofrecen
-amo.description.line7=Seguridad Superior: Scriptish proporciona características de seguridad que no encontrará en otro sitio
-amo.description.line8=Testeo: Los desarrolladores realizan muchos tests para asegurar el correcto funcionamiento de Scriptish y encontrar cualquier error cuanto antes
-amo.developerComments.line1=Scriptish tiene todo lo que tiene Greasemonkey, además de otras muchas características sobre las que puedes leer en: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=Por favor remite cualquier error o solicitud de característica a: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
-amo.developerComments.line3=Si tienes alguna otra pregunta, por favor envialá a la lista de correo: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
-amo.summary=El motor de scripts de usuario más avanzado en Internet.
-extensions.scriptish@erikvold.com.description=Un gestor de scripts de usuario para aplicaciones Mozilla
+amo.description.line1=Scriptish es una ramificación de Greasemonkey, que ofrece:
+amo.description.line2=Todo lo que hace Greasemonkey (que de hecho es útil)
+amo.description.line3=Actualización: Los scripts de usuario pueden ser actualizados en Scriptish usando @updateURL
+amo.description.line4=Muchas nuevas <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">metadata @keys</a>
+amo.description.line5=Muchas nuevas <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">características añadidas a la GM_ API</a>
+amo.description.line6=Rendimiento Superior: Un código base más rápido y limpio, que aprovecha todo lo que las versiones recientes de Firefox ofrecen
+amo.description.line7=Seguridad Superior: Scriptish proporciona características de seguridad que no encontrará en otro sitio
+amo.description.line8=Testeo: Los desarrolladores realizan muchos tests para asegurar el correcto funcionamiento de Scriptish y encontrar cualquier error cuanto antes
+amo.developerComments.line1=Scriptish tiene todo lo que tiene Greasemonkey, además de otras muchas características sobre las que puedes leer en: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=Por favor remite cualquier error o solicitud de característica a: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
+amo.developerComments.line3=Si tienes alguna otra pregunta, por favor envialá a la lista de correo: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=El motor de scripts de usuario más avanzado en Internet.
+extensions.scriptish@erikvold.com.description=Un gestor de scripts de usuario para aplicaciones Mozilla
diff --git a/extension/locale/ja-JP/description.properties b/extension/locale/ja-JP/description.properties
index 634c1222..7f616ba6 100644
--- a/extension/locale/ja-JP/description.properties
+++ b/extension/locale/ja-JP/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=優れたパフォーマンス：最新の Firefox を使
 amo.description.line7=優れたセキュリティ：Scriptish は他にないセキュリティ機能を提供します
 amo.description.line8=テスト：開発者は Scriptish が正しく機能していることを確認したり、より早くバグを見つけるために多くのテストを利用することができる
 amo.developerComments.line1=Scriptish は Greasemonkey と同じことができます。追加機能については…：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=バグや新機能のリクエストは…：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
+amo.developerComments.line2=バグや新機能のリクエストは…：<a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
 amo.developerComments.line3=他の質問はメーリングリストまで…：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=インターネット上で最も優れたユーザースクリプトエンジン。
 extensions.scriptish@erikvold.com.description=Firefox 用のユーザースクリプト拡張
diff --git a/extension/locale/pl/description.properties b/extension/locale/pl/description.properties
index a13a3652..80998884 100644
--- a/extension/locale/pl/description.properties
+++ b/extension/locale/pl/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Zwiększoną Wydajność: Szybsza, przejrzystsza baza kod
 amo.description.line7=Zwiększone Bezpieczeństwo: Scriptfish dostarcza niespotykanych dotąd funkcji bezpieczeństwa
 amo.description.line8=Testowanie: Programiści przeprowadzali liczne testy, aby mieć pewność prawidłowego działania Scriptish-a oraz przyspieszyć wykrywalność licznych błędów.
 amo.developerComments.line1=Scriptish posiada wszystkie zalety Greasemonkey plus wiele innych, o których możesz poczytać na: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=Zgłoszenia dotyczące jakichkolwiek błędów oraz funkcji przesyłać na adres: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>.
+amo.developerComments.line2=Zgłoszenia dotyczące jakichkolwiek błędów oraz funkcji przesyłać na adres: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>.
 amo.developerComments.line3=Jeśli masz pytania, proszę przesłać na adres grupy dyskusyjnej: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=Największy silnik skryptowy dla użytkownika w Internecie.
 extensions.scriptish@erikvold.com.description=Script Extension Manager dla Firefox-a
diff --git a/extension/locale/pt-BR/description.properties b/extension/locale/pt-BR/description.properties
index f85c7f22..603eca05 100644
--- a/extension/locale/pt-BR/description.properties
+++ b/extension/locale/pt-BR/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Desempenho superior: um código mais rápido e mais limpo,
 amo.description.line7=Segurança superior: o Scriptish fornece recursos de segurança que você não vai encontrar em outro lugar
 amo.description.line8=Testes: os desenvolvedores empregam uma série de testes para garantir o correto funcionamento do Scriptish e encontrar falhas o mais breve possível
 amo.developerComments.line1=O Scriptish tem todos os recursos que o Greasemonkey tem e muitos mais, que você pode descobrir em: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a> .
-amo.developerComments.line2=Por favor, envie informações sobre falhas ou solicitações de novos recursos em: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a> .
+amo.developerComments.line2=Por favor, envie informações sobre falhas ou solicitações de novos recursos em: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a> .
 amo.developerComments.line3=Se você tiver qualquer dúvida, envie sua pergunta para a lista de discussão: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a> .
 amo.summary=O maior mecanismo de scripts de usuário da Internet.
 extensions.scriptish@erikvold.com.description=Um gerenciador de scripts para o Firefox.
diff --git a/extension/locale/sv-SE/description.properties b/extension/locale/sv-SE/description.properties
index 2afd6cad..9099df28 100644
--- a/extension/locale/sv-SE/description.properties
+++ b/extension/locale/sv-SE/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Överlägsen prestanda: En snabbare, renare kodbas, som dr
 amo.description.line7=Överlägsen säkerhet: Scriptish tillhandahåller säkerhetsfunktioner som du inte hittar någon annanstans
 amo.description.line8=Testning: Utvecklarna använder sig av ett flertal tester för att säkerställa att Scriptish fungerar korrekt och för att hitta eventuella fel så tidigt som möjligt
 amo.developerComments.line1=Scriptish har allt som Greasemonkey har, plus flera funktioner som du kan läsa mer om på: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=Var vänlig skicka in alla buggrapporter och förslag på nya funktioner via: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
+amo.developerComments.line2=Var vänlig skicka in alla buggrapporter och förslag på nya funktioner via: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
 amo.developerComments.line3=Om du har frågor, skicka dem till e-postlistan: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=Den bästa användarskriptmotorn på Internet.
 extensions.scriptish@erikvold.com.description=En skripttilläggshanterare för Firefox
diff --git a/extension/locale/zh-TW/description.properties b/extension/locale/zh-TW/description.properties
index 7ebb124a..9d3e333e 100644
--- a/extension/locale/zh-TW/description.properties
+++ b/extension/locale/zh-TW/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=優秀的性能：憑藉新版 Firefox 的優勢，以更
 amo.description.line7=出色的安全：Scriptish 提供獨一無二的安全特性
 amo.description.line8=測試：開發者利用大量的測試保證 Scriptish 正確的執行，並更快找出程式碼中的錯誤
 amo.developerComments.line1=Scriptish 擁有 Greasemonkey 的所有功能，其他額外增加的特性您可以到這裡瀏覽：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=請到這裡提交 bug 或新功能請求：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
+amo.developerComments.line2=請到這裡提交 bug 或新功能請求：<a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
 amo.developerComments.line3=如果您還有其他問題，請寄發電子郵件到這裡：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=網際網路上最傑出的使用者腳本引擎。
 extensions.scriptish@erikvold.com.description=一個 Firefox 的腳本管理器

From 4ac728d737c22ea55ecfd152007b62102a7b7f1c Mon Sep 17 00:00:00 2001
From: strel <strelnic@gmail.com>
Date: Mon, 5 Dec 2011 03:49:32 +0100
Subject: [PATCH 631/829] Update extension/locale/es-ES/scriptish.properties

---
 extension/locale/es-ES/scriptish.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 69199d58..4b07fec2 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -1,4 +1,4 @@
-contributions.description=El desarrollador de este script de usuario le pide que ayude a mantener su continuo desarrollo haciendo un pequeño donativo.
+contributions.description=El desarrollador de este script de usuario le pide que ayude a mantener su desarrollo continuado haciendo un pequeño donativo.
 copyDownloadURL=Copiar URL de descarga
 copyDownloadURL.ak=C
 edit=Editar
@@ -114,9 +114,9 @@ options.enabledSchemes.main=Protocolos
 options.enabledSchemes.securityRemark=Los protocolos adicionales podrían tener acceso completo al sistema.
 options.enabledSchemes.securityRemark2=¡Por lo tanto representan un riesgo de seguridad considerable con scripts no confiables!
 options.enabledSchemes.unmht=Protocolo unmht (Formato de Archivo Mozilla, .maf)
-options.excludes.desc=Las exclusiones globales prevalecen sobre cualquier regla de script, o definida por el usuario
+options.excludes.desc=Prevalecen sobre cualquier regla de script, o definida por el usuario
 options.excludes.empty=No hay definidas exclusiones globales
-options.excludes.remark=(Puede definir una exclusión por linea)
+options.excludes.remark=(Una exclusión por linea)
 options.logChrome=Registrar en log mensajes de extensión no críticos en la consola de errores
 options.logging=Registro de eventos (logging)
 options.logToErrorConsole=GM_log usa la consola de errores

From 601980101179f510d15ce228b9b53068f7047be7 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 16 Dec 2011 17:11:29 -0800
Subject: [PATCH 632/829] Closes #543 GM_setValue was not working on Fennec

---
 extension/content/e10s/browser.js |  9 ++++++++-
 extension/install.rdf             |  4 ++--
 extension/modules/api.js          | 28 ++++++++++++++++++++--------
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
index 2602adaf..d0ab7ee7 100644
--- a/extension/content/e10s/browser.js
+++ b/extension/content/e10s/browser.js
@@ -5,7 +5,8 @@
   lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
   lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
   lazyImport(global, "resource://scriptish/config.js", ["Scriptish_config"]);
-  lazyImport(this, "resource://scriptish/api/GM_Resources.js", ["GM_Resources"]);
+  lazyImport(global, "resource://scriptish/api/GM_Resources.js", ["GM_Resources"]);
+  lazyImport(global, "resource://scriptish/api/GM_ScriptStorage.js", ["GM_ScriptStorage"]);
 
   lazyUtil(global, "installUri");
   lazyUtil(global, "getScriptHeader");
@@ -104,6 +105,12 @@
     Scriptish_notification.apply(null, json);
   });
 
+  mm.addMessageListener("Scriptish:ScriptSetValue", function({json}) {
+    var script = Scriptish_config.getScriptById(json.scriptID);
+    var storage = new GM_ScriptStorage(script);
+    return storage.setValue.apply(storage, json.args);
+  });
+
   mm.addMessageListener("Scriptish:GetScriptMetadata", function({json}) {
     return Scriptish_getScriptHeader(Scriptish_config.getScriptById(json.id), json.key, json.localVal);
   });
diff --git a/extension/install.rdf b/extension/install.rdf
index 4d754c8e..3b078546 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.6a1pre</em:version>
+    <em:version>0.1.6a2pre</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
@@ -80,7 +80,7 @@
       <Description>
         <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
         <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>6.*</em:maxVersion>
+        <em:maxVersion>9.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 47606818..51271274 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -98,35 +98,47 @@ function GM_API(options) {
     if (typeof aTitle != "string") aTitle = aScript.name;
     if (typeof aIcon != "string") aIcon = aScript.iconURL;
 
-
+    // e10s
     if (options.global && options.global.sendAsyncMessage) {
       options.global.sendAsyncMessage("Scriptish:ScriptNotification", [
           aMsg, aTitle, aIcon]);
     }
+    // old school
     else {
       var callback = null;
       if (typeof aCallback == "function")
         callback = function() GM_apiSafeCallback(aSafeWin, aScript, null, aCallback);
       Scriptish_notification(aMsg, aTitle, aIcon, callback);
     }
-  }
+  };
 
-  this.GM_setValue = function GM_setValue() {
+  this.GM_setValue = function GM_setValue(aName, aValue) {
     if (!GM_apiLeakCheck("GM_setValue")) return;
-    return lazyLoaders.storage.setValue.apply(lazyLoaders.storage, arguments);
-  }
+
+    // e10s
+    if (options.global && options.global.sendAsyncMessage) {
+        return options.global.sendSyncMessage("Scriptish:ScriptSetValue", {
+          scriptID: aScript.id,
+          args: [aName, aValue]
+        });
+    }
+    // old school
+    else {
+      return lazyLoaders.storage.setValue.apply(lazyLoaders.storage, arguments);
+    }
+  };
   this.GM_getValue = function GM_getValue() {
     if (!GM_apiLeakCheck("GM_getValue")) return;
     return lazyLoaders.storage.getValue.apply(lazyLoaders.storage, arguments);
-  }
+  };
   this.GM_deleteValue = function GM_deleteValue() {
     if (!GM_apiLeakCheck("GM_deleteValue")) return;
     return lazyLoaders.storage.deleteValue.apply(lazyLoaders.storage, arguments);
-  }
+  };
   this.GM_listValues = function GM_listValues() {
     if (!GM_apiLeakCheck("GM_listValues")) return;
     return lazyLoaders.storage.listValues.apply(lazyLoaders.storage, arguments);
-  }
+  };
 
   this.GM_getResourceURL = function GM_getResourceURL(aName) {
     if (!GM_apiLeakCheck("GM_getResourceURL")) return;

From 297721ae2f178008ea22449a936ea8e728ef80c4 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 16 Dec 2011 17:52:54 -0800
Subject: [PATCH 633/829] Closes #563 GM_registerMenuCommand was causing memory
 leaks when the tab was opened in the background

---
 extension/components/scriptish.js | 10 +++++-----
 extension/content/js/browser.js   |  8 ++++++--
 extension/modules/api.js          |  3 +++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 0fe146b5..99f44e9e 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -78,19 +78,19 @@ ScriptishService.prototype = {
               gBrowser.getBrowserForDocument(safeWin.document));
         }
 
+        let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
         // if the focused tab's window is the one loading, then attach menuCommander
         if (safeWin === gBrowser.selectedBrowser.contentWindow) {
           if (gmBrowserUI.currentMenuCommander)
             gmBrowserUI.currentMenuCommander.detach();
 
-          let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
           gmBrowserUI.currentMenuCommander =
               gmBrowserUI.getCommander(currentInnerWindowID).attach();
-
-          Scriptish_windowUnloader(function() {
-            gmBrowserUI.docUnload(currentInnerWindowID);
-          }, currentInnerWindowID);
         }
+
+        Scriptish_windowUnloader(function() {
+          gmBrowserUI.docUnload(currentInnerWindowID);
+        }, currentInnerWindowID);
         break;
       case "install-userscript":
         let win = Scriptish.getMostRecentWindow("navigator:browser");
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 1e01aec4..7a3ea6e2 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -157,9 +157,13 @@ Scriptish_BrowserUI.chromeLoad = function(e) {
 
 Scriptish_BrowserUI.registerMenuCommand = function(menuCommand) {
   var commander = this.getCommander(menuCommand.winID);
+
   return commander.registerMenuCommand(
-      menuCommand.name, menuCommand.doCommand, menuCommand.accelKey,
-      menuCommand.accelModifiers, menuCommand.accessKey);
+      menuCommand.name,
+      menuCommand.doCommand,
+      menuCommand.accelKey,
+      menuCommand.accelModifiers,
+      menuCommand.accessKey);
 }
 
 Scriptish_BrowserUI.unregisterMenuCommand = function(commandUUID, aWinID) {
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 51271274..251db16d 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -207,6 +207,7 @@ function GM_API(options) {
     this.GM_registerMenuCommand = function GM_registerMenuCommand(
         aCmdName, aCmdFunc, aAccelKey, aAccelModifiers, aAccessKey) {
       if (!GM_apiLeakCheck("GM_registerMenuCommand")) return;
+
       var uuid = Scriptish_BrowserUI.registerMenuCommand({
         name: aCmdName,
         accelKey: aAccelKey,
@@ -214,7 +215,9 @@ function GM_API(options) {
         accessKey: aAccessKey,
         doCommand: aCmdFunc,
         winID: windowID});
+
       menuCmdIDs.push(uuid);
+
       return uuid;
     }
 

From 49cc72b86c9d6bac7d5b5e78b5c1981642debb70 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 16 Dec 2011 18:26:13 -0800
Subject: [PATCH 634/829] updating supported versions

---
 extension/install.rdf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 3b078546..2597c752 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -64,7 +64,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>10.*</em:maxVersion>
+        <em:maxVersion>11.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- SeaMonkey -->
@@ -72,7 +72,7 @@
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1</em:minVersion>
-        <em:maxVersion>2.4.*</em:maxVersion>
+        <em:maxVersion>2.7.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- Fennec -->
@@ -80,7 +80,7 @@
       <Description>
         <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
         <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>9.*</em:maxVersion>
+        <em:maxVersion>10.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>

From 3e5154720f473745192f2cf9776a87f251c4fdef Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 16 Dec 2011 18:32:43 -0800
Subject: [PATCH 635/829] adding a userscript updater to the block list

---
 blocklist.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blocklist.json b/blocklist.json
index 0f4c7489..8b4b1803 100644
--- a/blocklist.json
+++ b/blocklist.json
@@ -1,3 +1,3 @@
 {
-  "uso": [20145, 35611, 38017, 68219]
+  "uso": [20145, 26062, 35611, 38017, 68219]
 }
\ No newline at end of file

From 2ecff511515b6b350594133459f68251219263ad Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 18 Dec 2011 16:34:11 -0800
Subject: [PATCH 636/829] Closes #536 issue getting error alert message when
 there was a dependency download error.

---
 extension/content/js/install.js              |  2 +-
 extension/modules/config/config.js           |  5 +-
 extension/modules/script/scriptdownloader.js | 58 ++++++++++++++++----
 3 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/extension/content/js/install.js b/extension/content/js/install.js
index 00534af9..c530bdaf 100644
--- a/extension/content/js/install.js
+++ b/extension/content/js/install.js
@@ -42,7 +42,7 @@ function setupIncludes(type, items) {
 }
 
 function cleanup() scriptDownloader.cleanupTempFiles();
-function delayedClose() timeout(close);
+function delayedClose() timeout(close, 1);
 
 
 on("load", function() {
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index a2053a93..938beed8 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -372,15 +372,18 @@ Config.prototype = {
   install: function(aNewScript) {
     var existingIndex = this._find(aNewScript.id);
     var exists = existingIndex > -1;
+
     if (exists) {
       this._scripts[existingIndex].replaceScriptWith(aNewScript);
-    } else {
+    }
+    else {
       aNewScript.installProcess();
       timeout(aNewScript.updateUSOData.bind(aNewScript));
       this.addScript(aNewScript);
 
       Scriptish.notify(aNewScript, "scriptish-script-installed", true);
     }
+
     this.sortScripts();
   },
 
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index a45af8d1..d15f6f40 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -139,15 +139,18 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
 
     this.script.setDownloadedFile(file);
 
+    // start async download of dependencies
     timeout(this.fetchDependencies.bind(this));
 
     switch (this.type) {
+      // show install dialog
       case "install":
         this._callback = function() {
           this.showInstallDialog();
           delete this._callback;
         }
         break;
+      // show script in tab with install banner
       case "view":
         this.showScriptView();
         break;
@@ -188,9 +191,10 @@ ScriptDownloader.prototype.fetchDependencies = function() {
   this.downloadNextDependency();
 }
 ScriptDownloader.prototype.downloadNextDependency = function() {
+  // When the last dependency has been fetched..
   if (!this.depQueue_.length) {
     this.dependenciesLoaded_ = true;
-    this._callback && this._callback();
+    this._callback && this._callback(); // show install dialog
     this.finishInstall();
     return;
   }
@@ -283,11 +287,13 @@ ScriptDownloader.prototype.handleDependencyDownloadComplete =
 
       dep.setDownloadedFile(file, channel.contentType, channel.contentCharset ? channel.contentCharset : null);
       this.downloadNextDependency();
-    } else {
+    }
+    else {
       try {
         var responseStatus = httpChannel.responseStatus + ": "
             + httpChannel.responseStatusText;
-      } catch(e) {
+      }
+      catch(e) {
         var responseStatus = Scriptish_stringBundle("nothing.timedOut");
       }
       let errMsg = Scriptish_stringBundle("error.dependency.serverReturned") + ": "
@@ -298,15 +304,18 @@ ScriptDownloader.prototype.handleDependencyDownloadComplete =
         dep.reset();
         Scriptish_logError(new Error(errMsgStart + errMsg));
         this.downloadNextDependency();
-      } else {
+      }
+      else {
         this.errorInstallDependency(dep, errMsg);
       }
     }
-  } else {
+  }
+  else {
     dep.setDownloadedFile(file);
     this.downloadNextDependency();
   }
 }
+
 ScriptDownloader.prototype.checkDependencyURL = function(url) {
   var scheme = Services.io.extractScheme(url);
 
@@ -323,38 +332,63 @@ ScriptDownloader.prototype.checkDependencyURL = function(url) {
   }
 }
 ScriptDownloader.prototype.finishInstall = function() {
+  // if this install was for a manual script update..
   if (this.updateScript) {
     // Inject the script now that we have the new dependencies
     this.script.useDelayedInjectors();
-  } else if (this.installOnCompletion_) {
+  }
+  // if the user has clicked a 'install'/'upgrade' button (not related to EM)
+  else if (this.installOnCompletion_) {
     this.installScript();
-  } else if (this.scriptInstaller) {
+  }
+  // note: this.scriptInstaller exists for EM script updates
+  else if (this.scriptInstaller) {
     this.scriptInstaller.changed("DownloadEnded");
   }
 }
 ScriptDownloader.prototype.errorInstallDependency = function(dep, msg) {
   this.dependencyError = Scriptish_stringBundle("error.dependency.loading")
       + ": " + dep.urlToDownload + "\n" + msg;
+
   Scriptish_log(this.dependencyError);
+
+  // note: scriptInstaller exists for script updates that come thru EM
   if (this.scriptInstaller) {
     return this.scriptInstaller.changed("DownloadFailed");
   }
+
+  // if the user has already clicked a nonEM 'install'/'upgrade' button
   if (this.installOnCompletion_) {
     Scriptish_alert(this.dependencyError);
   }
-  this._callback && this._callback();
+
+  this._callback && this._callback(); // show install dialog
 }
+
+// initially called when a user is ready to install or upgrade,
+// and again after dependencies are download if there are any that still need
+// to be fetched.
 ScriptDownloader.prototype.installScript = function() {
+  // Was there a dependency error? if so, then alert the stored error message.
   if (this.dependencyError) {
-    Scriptish_alert(this.dependencyError, null, 0);
+    // use timeout to avoid race condition that causes install window to fail
+    // to be closed..
+    Scriptish_alert(this.dependencyError, null, 100); 
     return false;
-  } else if (this.scriptInstaller && this.dependenciesLoaded_) {
+  }
+
+  // note: script installers exist for script updates
+  if (this.scriptInstaller && this.dependenciesLoaded_) {
     this.scriptInstaller._script.replaceScriptWith(this.script);
     this.scriptInstaller.changed("InstallEnded");
-  } else if (this.dependenciesLoaded_) {
+  }
+  // for a normal install do this..
+  else if (this.dependenciesLoaded_) {
     var script = this.script;
     Scriptish_config.install(script);
-  } else {
+  }
+  // if the dependencies are still being downloaded then wait for that.
+  else {
     this.installOnCompletion_ = true;
   }
   return true;

From ef2dc6631c6b59fcd9be8e7aef28348eb00a5c52 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 22 Dec 2011 13:03:27 -0800
Subject: [PATCH 637/829] <em:version>0.1.6</em:version>

---
 extension/install.rdf |  4 ++--
 update.rdf            | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 2597c752..d22cddc7 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.6a2pre</em:version>
+    <em:version>0.1.6</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
@@ -64,7 +64,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>11.*</em:maxVersion>
+        <em:maxVersion>12.0a1</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- SeaMonkey -->
diff --git a/update.rdf b/update.rdf
index b3a58196..93fd012f 100644
--- a/update.rdf
+++ b/update.rdf
@@ -6,32 +6,32 @@
       <RDF:Seq>
         <RDF:li>
           <RDF:Description>
-            <em:version>0.1.5</em:version>
+            <em:version>0.1.6</em:version>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>4.0</em:minVersion>
-                <em:maxVersion>9.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.5.xpi</em:updateLink>
-                <em:updateHash>sha1:04ef492b54771cc55b461de9170850338e88cf60</em:updateHash>
+                <em:maxVersion>11.*</em:maxVersion>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.6.xpi</em:updateLink>
+                <em:updateHash>sha1:c526c8377988e1d6e3e48fe2dff6d3574d037ff8</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
                 <em:minVersion>2.1</em:minVersion>
-                <em:maxVersion>2.3.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.5.xpi</em:updateLink>
-                <em:updateHash>sha1:04ef492b54771cc55b461de9170850338e88cf60</em:updateHash>
+                <em:maxVersion>2.7.*</em:maxVersion>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.6.xpi</em:updateLink>
+                <em:updateHash>sha1:c526c8377988e1d6e3e48fe2dff6d3574d037ff8</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
                 <em:minVersion>4.0</em:minVersion>
-                <em:maxVersion>6.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.5.xpi</em:updateLink>
-                <em:updateHash>sha1:04ef492b54771cc55b461de9170850338e88cf60</em:updateHash>
+                <em:maxVersion>10.*</em:maxVersion>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.6.xpi</em:updateLink>
+                <em:updateHash>sha1:c526c8377988e1d6e3e48fe2dff6d3574d037ff8</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
           </RDF:Description>
@@ -39,6 +39,6 @@
       </RDF:Seq>
     </em:updates>
 
-    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAAomoUWJ4VGDMQvxeVgqERlfYlu3M7MsPtc9+Klb9TOO2RJ/3ZQ+J9oJ64a00Iagut/SAV9U9SIOozIWK4iMXDeMrtRmfmMpdOT7Kul9WGwbUAKDG7E6W7ZJbHr8dSidENGifWXGP2Rqgzil33xtvI3AGxXSShaYarYmBIH9uxQC</em:signature>
+    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAJZhVqf5WIxVW8MTdm08ToHGPbXMegI6hGmhDyryy28fozh1ZvXYl5SN0/U9c7sVbgxwaMqEHG01Y82sbDZu0REE3kXXWjlRJSMJFIz4IXJ8nTxwI+6qnCgNzVKxMoVEs4x7uGH4ETQD/X3PgTEAT+nC3+KvdzPqntyMgAzz67CD</em:signature>
   </RDF:Description>
 </RDF:RDF>

From e26487d92efd6e8cf4bec92ba6d7f8e8dbe485dc Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 23 Dec 2011 17:20:54 -0800
Subject: [PATCH 638/829] <em:version>0.1.7a1pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index d22cddc7..dbc4795e 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.6</em:version>
+    <em:version>0.1.7a1pre</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>

From 68d94b22987034295989f5e2c70f9b0f85f80d09 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 23 Dec 2011 17:31:22 -0800
Subject: [PATCH 639/829] Closes #571 nsIScriptError and nsIScriptError2
 interfaces were merged

---
 extension/components/scriptish.js              | 2 +-
 extension/content/tests/testScriptishLogger.js | 6 ------
 extension/modules/addonprovider.js             | 2 ++
 extension/modules/constants.js                 | 3 +--
 extension/modules/logging.js                   | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 99f44e9e..70830ea7 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -6,7 +6,7 @@ const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 Cu.import("resource://scriptish/addonprovider.js");
 
-lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError", "Scriptish_log"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_log"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/manager.js", ["Scriptish_manager"]);
diff --git a/extension/content/tests/testScriptishLogger.js b/extension/content/tests/testScriptishLogger.js
index 6ba8721c..5fb9409f 100644
--- a/extension/content/tests/testScriptishLogger.js
+++ b/extension/content/tests/testScriptishLogger.js
@@ -112,7 +112,6 @@ asyncTest("null char removed", 1, function() {
 asyncTest("logScriptError: js error", 9, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
-    ok(message instanceof Ci.nsIScriptError2);
 
     equal(message.errorMessage, "[baz] Error: foo");
     equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
@@ -128,7 +127,6 @@ asyncTest("logScriptError: js error", 9, function() {
 asyncTest("logScriptError: nsIScriptError", 9, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
-    ok(message instanceof Ci.nsIScriptError2);
 
     equal(message.errorMessage, "[baz] foo");
     equal(message.sourceName, "source");
@@ -146,7 +144,6 @@ asyncTest("logScriptError: nsIScriptError", 9, function() {
 asyncTest("logScriptError: nsIScriptError; omit id", 9, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
-    ok(message instanceof Ci.nsIScriptError2);
 
     equal(message.errorMessage, "[Scriptish] foo");
     equal(message.sourceName, "source");
@@ -165,7 +162,6 @@ asyncTest("test nsIScriptError; omit optionals", function() {
   expect(9);
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
-    ok(message instanceof Ci.nsIScriptError2);
 
     equal(message.errorMessage, "[Scriptish] foo");
     equal(message.sourceName, "[user.js]");
@@ -184,7 +180,6 @@ asyncTest("test nsIException", function() {
   expect(9);
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
-    ok(message instanceof Ci.nsIScriptError2);
 
     equal(message.errorMessage, "[baz] foo");
     equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
@@ -202,7 +197,6 @@ asyncTest("test TypeError", function() {
   expect(9);
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
-    ok(message instanceof Ci.nsIScriptError2);
 
     equal(message.errorMessage, "[baz] TypeError: f is undefined");
     equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index fd5ca4d2..a11e27f0 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -136,6 +136,7 @@ AddonManagerPrivate.registerProvider({
   getAddonByID: function(aId, aCallback) {
     aCallback(Scriptish_config.getScriptById(aId));
   },
+
   getAddonsByTypes: function(aTypes, aCallback) {
     if (aTypes && aTypes.indexOf("userscript") < 0) {
       aCallback([]);
@@ -158,6 +159,7 @@ AddonManagerPrivate.registerProvider({
     }
   }
 }, types);
+
 [
   "scriptish-script-installed",
   "scriptish-script-edit-enabling",
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 7d6cf736..c887498d 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -33,8 +33,7 @@ var Instances = {
   get fp() Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker),
   get lf() Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile),
   get process() Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess),
-  get se() Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError)
-      .QueryInterface(Ci.nsIScriptError2),
+  get se() Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError),
   get ss() Cc["@mozilla.org/supports-string;1"]
       .createInstance(Ci.nsISupportsString),
   get suc() Cc["@mozilla.org/intl/scriptableunicodeconverter"]
diff --git a/extension/modules/logging.js b/extension/modules/logging.js
index f30c5c1f..5aec84f1 100644
--- a/extension/modules/logging.js
+++ b/extension/modules/logging.js
@@ -50,7 +50,7 @@ function Scriptish_logScriptError(aError, aWindow, aFileURL, aId) {
     var category = "scriptish userscript error";
 
     // get what we can
-    if ((aError instanceof Ci.nsIScriptError) || (aError instanceof Ci.nsIScriptError2)) {
+    if (aError instanceof Ci.nsIScriptError) {
       var {errorMessage, sourceName, sourceLine, lineNumber, columnNumber, flags, category} = aError;
     }
     else if (aError instanceof Ci.nsIException) {

From 99bd8f8944918840b3939056ed8abc401ad93fa5 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 8 Jan 2012 20:46:44 -0800
Subject: [PATCH 640/829] Closes #577 using sandboxName

---
 extension/modules/utils/Scriptish_injectScripts.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 7645242e..4293c2fc 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -50,7 +50,11 @@ function Scriptish_injectScripts(options) {
     // Need to keep a valid reference to |script| around so that GM_log
     // and the delay code (and probably other consumer work).
     let script = scripts[i];
-    let sandbox = new Cu.Sandbox(safeWin);
+    let sandbox = new Cu.Sandbox(safeWin, {
+      sandboxName: script.fileURL,
+      //sandboxPrototype: safeWin,
+      wantXrays: true
+    });
 
     // hack XPathResult since that is so commonly used
     sandbox.XPathResult = XPATH_RESULT;

From 8b3dd8e7c07d21fbcee5c138c267027768c872eb Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 8 Jan 2012 21:38:05 -0800
Subject: [PATCH 641/829] bug fix: Scratchpad broke at some point after the
 Orion editor was added..

---
 .../modules/utils/Scriptish_openInEditor.js   | 104 ++++++++++++------
 1 file changed, 68 insertions(+), 36 deletions(-)

diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index 8f42be7e..0dbc0afc 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var EXPORTED_SYMBOLS = ["Scriptish_openInEditor"];
 
 const Cu = Components.utils;
@@ -16,42 +18,7 @@ function Scriptish_openInEditor(script, parentWindow) {
 
   try {
     if ("Scratchpad" == editor) {
-      let spWin = (parentWindow.Scratchpad
-          || Services.wm.getMostRecentWindow("navigator:browser").Scratchpad)
-          .openScratchpad();
-      spWin.addEventListener("load", function spWinLoaded() {
-        spWin.removeEventListener("load", spWinLoaded, false);
-        spWin.document.title = spWin.Scratchpad.filename = file.path;
-
-        // Open the user script in Scratchpad
-        // NOTE: Resetting the "undo/redo" state on our own until Scratchpad
-        // handles it.  We want to ensure user scripts don't get screwed up.
-        // See: https://bug684546.bugzilla.mozilla.org/
-        spWin.Scratchpad.importFromFile(file, false, function() {
-          let spEditor = spWin.Scratchpad.editor;
-
-          // For the Orion editor...
-          if (spEditor && spEditor._undoStack && spEditor._undoStack.reset) {
-            spEditor._undoStack.reset();
-            return;
-          }
-
-          // If not using Orion, pick out the proper editor
-          // Scratchpad in FF6 still uses 'textbox'
-          if (spEditor && spEditor._editor)
-            spEditor = spEditor._editor;
-          else if (spWin.Scratchpad.textbox)
-            spEditor = spWin.Scratchpad.textbox.editor;
-
-          if (spEditor
-              && spEditor.resetModificationCount
-              && spEditor.transactionManager
-              && spEditor.transactionManager.clear) {
-            spEditor.resetModificationCount();
-            spEditor.transactionManager.clear();
-          }
-        });
-      }, false);
+      openScriptInScratchpad(script, parentWindow, file);
     }
     else {
       Scriptish_launchApplicationWithDoc(editor, file);
@@ -64,3 +31,68 @@ function Scriptish_openInEditor(script, parentWindow) {
     throw e;
   }
 }
+
+function openScriptInScratchpad(script, parentWindow, file) {
+    let spWin = (parentWindow.Scratchpad
+            || Services.wm.getMostRecentWindow("navigator:browser").Scratchpad)
+            .openScratchpad();
+
+        spWin.addEventListener("load", function spWinLoaded() {
+          spWin.removeEventListener("load", spWinLoaded, false);
+
+          let Scratchpad = spWin.Scratchpad;
+          setFilenameForScratchpadWindow(spWin, file);
+
+          if (Scratchpad.addObserver) {
+            Scratchpad.addObserver({"onReady": importFileForScratchpad.bind(null, spWin, file)});
+          }
+          else {
+            importFileForScratchpad(spWin, file);
+          }
+        }, false);
+}
+
+function setFilenameForScratchpadWindow(spWin, file) {
+    let Scratchpad = spWin.Scratchpad;
+
+    // Set the filename
+    if (Scratchpad.setFilename) {
+      Scratchpad.setFilename(file.path);
+    }
+    else {
+      spWin.document.title = Scratchpad.filename = file.path;
+    }
+}
+
+function importFileForScratchpad(spWin, file) {
+    let Scratchpad = spWin.Scratchpad;
+
+    // Open the user script in Scratchpad
+    // NOTE: Resetting the "undo/redo" state on our own until Scratchpad
+    // handles it.  We want to ensure user scripts don't get screwed up.
+    // See: https://bug684546.bugzilla.mozilla.org/
+    Scratchpad.importFromFile(file, false, function() {
+      let spEditor = Scratchpad.editor;
+
+      // For the Orion editor...
+      if (spEditor && spEditor._undoStack && spEditor._undoStack.reset) {
+        spEditor._undoStack.reset();
+        return;
+      }
+
+      // If not using Orion, pick out the proper editor
+      // Scratchpad in FF6 still uses 'textbox'
+      if (spEditor && spEditor._editor)
+        spEditor = spEditor._editor;
+      else if (Scratchpad.textbox)
+        spEditor = Scratchpad.textbox.editor;
+
+      if (spEditor
+          && spEditor.resetModificationCount
+          && spEditor.transactionManager
+          && spEditor.transactionManager.clear) {
+        spEditor.resetModificationCount();
+        spEditor.transactionManager.clear();
+      }
+    });
+}

From aa379887b80e64ba5287f98c76db72fa39c9220e Mon Sep 17 00:00:00 2001
From: Ilya Gulya <ilyagulya@gmail.com>
Date: Fri, 20 Jan 2012 18:41:39 +1100
Subject: [PATCH 642/829] Completed ru-RU Scriptish translation

---
 extension/locale/ru-RU/description.properties |  26 +-
 extension/locale/ru-RU/scriptish.properties   | 248 +++++++++---------
 2 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/extension/locale/ru-RU/description.properties b/extension/locale/ru-RU/description.properties
index 28310d27..f76f9f34 100644
--- a/extension/locale/ru-RU/description.properties
+++ b/extension/locale/ru-RU/description.properties
@@ -1,13 +1,13 @@
-amo.description.line1=
-amo.description.line2=
-amo.description.line3=
-amo.description.line4=
-amo.description.line5=
-amo.description.line6=
-amo.description.line7=
-amo.description.line8=
-amo.developerComments.line1=
-amo.developerComments.line2=
-amo.developerComments.line3=
-amo.summary=
-extensions.scriptish@erikvold.com.description=Управление пользовательских скриптов для Firefox
+amo.description.line1=Scriptish это форк Greasemonkey, предлагающий:
+amo.description.line2=Всё что предлагает Greasemonkey (что очень полезно)
+amo.description.line3=Обновление: Пользовательские скрипты могут быть обновлены с помощью @updateURL
+amo.description.line4=Множество новых <a title="Раздел документации Scriptish о метаданных - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">@ключей метаданных</a>
+amo.description.line5=Множество новых <a title="API пользовательских скриптов Scriptish - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">дополненый в GM_ API</a>
+amo.description.line6=Превосходную производительность: более быстрый и производительный базовый код, который использует все последние возможности Firefox.
+amo.description.line7=Превосходную безопасность: Scriptish предлагает возможности безопасности, которые вы не найдёте больше нигде.
+amo.description.line8=Тестирование: Разработчики могут использовать большое количество тестов, позволяющих выявить баги и убедиться в правильности работы Scriptish.
+amo.developerComments.line1=В Scriptish есть всё, что есть в Greasemonkey, плюс много новых функций, о которых можно прочитать здесь: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=Пожалуйста, отправляйте сообщения о багах и запросы на новую функциональность сюда: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
+amo.developerComments.line3=Если у вас есть другие вопросы, пишите сюда: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=Лучший движок для пользовательских скриптов в интернете.
+extensions.scriptish@erikvold.com.description=Менеджер пользовательских скриптов для Firefox.
\ No newline at end of file
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index c6fcad26..87f5324d 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -1,163 +1,163 @@
-contributions.description=
-copyDownloadURL=
-copyDownloadURL.ak=
+contributions.description=Разработчик этого пользовательского скрипта просит вас помочь поддержать его дальнейшее развитие, сделав небольшой взнос.
+copyDownloadURL=Скопировать ссылку на загрузку
+copyDownloadURL.ak=C
 edit=Редактировать
-edit.ak=
-editor.couldNotLaunch=Не могу запустить редактор.
-editor.pleasePickExecutable=Пожалуйста, выберите приложение для редактирования скриптов
+edit.ak=E
+editor.couldNotLaunch=Не удалось запустить редактор.
+editor.pleasePickExecutable=Пожалуйста, выберите приложение для редактирования скриптов.
 editor.prompt=Пожалуйста сначала выберите ваш редактор скриптов
-editor.useScratchpad=
-editor.useScratchpad.no=
-editor.useScratchpad.yes=
-error.api.clipboard.type=Тип данных не подходит для GM_setClipboard.
+editor.useScratchpad=Вы хотите использовать Scratchpad как редактор по умолчанию?
+editor.useScratchpad.no=Нет (Я укажу свой)
+editor.useScratchpad.yes=Да
+error.api.clipboard.type=- тип данных, не поддерживаемый GM_setClipboard.
 error.api.noResourceWithName=Нет ресурса с таким именем
-error.api.noSecondArgValue=Второй аргумент - значение - не задан
+error.api.noSecondArgValue=Следующий аргумент не указан: Значение
 error.api.reqURL=Неверный URL
-error.api.reqURL.scheme=Схема  URL запрещена
+error.api.reqURL.scheme=Схема URL запрещена
 error.api.unsafeAccess=Нарушение доступа Scriptish: из unsafeWindow не позволено работать с
 error.charset=Неверная кодировка.
-error.dependency.loading=Не могу загрузить зависимость
-error.dependency.local=Исключение безопасности: запрещено вызывать локальные пути
+error.dependency.loading=Не удалось загрузить зависимость
+error.dependency.local=Исключение безопасности: Вызов локальных путей запрещён
 error.dependency.serverReturned=Ошибка! Сервер вернул
 error.hash.algorithm=Неверный алгоритм хеширования.
-error.icon.dataURL=Неверный URL для  @icon
-error.icon.notImage=
+error.icon.dataURL=Неверный data: URL для @icon
+error.icon.notImage=Ошибка! В @icon отсутствует MIME тип изображения
 error.icon.URL=Неверный URL для @icon
-error.invalidCert=
+error.invalidCert=Неверный SSL сертификат.\nЕсли необходимо, разрешите все сертификаты здесь: Настройки Scriptish / Дополнительно / Безопасность обновлений.
 error.isInvalidValue= - неверное значение
 error.matchPattern.rules=шаблон @match не соответствует правилам
 error.matchPattern.rules.file=Шаблон @match схемы file:// не соответствует правилам
-error.notSecure=
-error.notSupported.Firefox=не поддерживается в этой версии Огненного Лиса
-error.openingFile=Не могу открыть файл
-error.pattern.parsing=Шаблон не парсится
-error.pref.type=Неподдерживаемый тип настройки. Правильные типы: строка, булев и 32хбитное целое.
-error.remoteVersionOlder=
-error.resource.dupName= - повторяющееся имя для ресурса. Имена ресурсов должны быть уникальными.
+error.notSecure=Небезопасная URI.\nЕсли необходимо, разрешите не-HTTPS обновления здесь: Настройки Scriptish / Дополнительно / Безопасность обновлений.
+error.notSupported.Firefox=не поддерживается в этой версии Firefox
+error.openingFile=Не удалось открыть файл
+error.pattern.parsing=Не удалось пропарсить шаблон
+error.pref.type=Неподдерживаемый тип настройки. Правильные типы: string, bool и 32-битное целое.
+error.remoteVersionOlder=Удалённый скрипт не новее вашей текущей версии.
+error.resource.dupName= - повторяющееся имя ресурса. Имена @resource должны быть уникальными.
 error.resource.syntax=Неправильный синтаксис в обьявлении @resource
-error.retrieving=Failed to retrieve
-error.script.installing=Ошибка при установке юзерскрипта
-error.script.loading=Ошибка при загрузке юзерскрипта
-greeting.btn.ak=
-greeting.msg=Это юзерскрипт. Нажмите "Установить" чтобы начать использовать его.
+error.retrieving=Не удалось получить
+error.script.installing=Ошибка при установке пользовательского скрипта
+error.script.loading=Ошибка при загрузке пользовательского скрипта
+greeting.btn.ak=I
+greeting.msg=Это пользовательского скрипта. Нажмите "Установить" чтобы начать использовать его.
 install=Установить
-install.domains=
-install.excludes=не запускать на:
-install.includes=запуск на:
-install.matches=совпадений:
-install.requires=
-install.resources=
+install.domains=домены:
+install.excludes=не запускается на:
+install.includes=запускается на:
+install.matches=соответствует:
+install.requires=зависит от:
+install.resources=ресурсы:
 install.showScriptSource=Показать исходный код скрипта
-install.title=Установщик скриптов
-install.warning1=Вредоносные скрипты могут нарушить Вашу конфиденциальность и действовать от Вашего имени без Вашего согласия.
-install.warning2=Вы должны устанавливать скрипты только из доверенных источников.
-installFromFile=
-installFromFile.ak=
-menu.commands=Команды скрипта...
-menu.commands.ak=
-menu.install=Установить скрипт...
-menu.install.ak=
+install.title=Установка пользовательского скрипта
+install.warning1=Вредоносные скрипты могут угрожать вашей конфиденциальности и работать от вашего имени без вашего ведома.
+install.warning2=Устанавливайте скрипты только из доверенных источников.
+installFromFile=Установить пользовательский скрипт из файла...
+installFromFile.ak=U
+menu.commands=Команды пользовательских скриптов...
+menu.commands.ak=C
+menu.install=Установить пользовательский скрипт...
+menu.install.ak=I
 menu.manage=Управление пользовательскими скриптами...
-menu.manage.ak=
-menu.new=Создать скрипт...
-menu.new.ak=
-menu.options.ak=
-menu.show=Посмотреть исходный код скрипта
-menu.show.ak=
+menu.manage.ak=M
+menu.new=Новый пользовательский скрипт...
+menu.new.ak=N
+menu.options.ak=O
+menu.show=Просмотреть исходный код пользовательского скрипта
+menu.show.ak=V
 menu.title=Scriptish
-menu.title.ak=
-menuitem.install=Установить этот скрипт...
-menuitem.manage=Управление скриптами
-menuitem.new=Новый скрипт
-moving.dependency=
-moving.script=
-newscript.author=
+menu.title.ak=S
+menuitem.install=Установить этот пользовательский скрипт...
+menuitem.manage=Управление пользовательскими скриптами
+menuitem.new=Новый пользовательский скрипт
+moving.dependency=Переносится файл зависимости из
+moving.script=Переносится файл скрипта из
+newscript.author=Автор
 newscript.description=Описание
 newscript.excludes=Исключать страницы (Одно правило на строчку)
 newscript.exists=Скрипт с таким именем уже установлен.\nПерезаписать?
-newscript.id=
+newscript.id=ID
 newscript.includes=Включать страницы (Одно правило на строчку)
-newscript.missing.id=
-newscript.missing.name=
-newscript.name=Имя
-newscript.namespace=
-newscript.noID=Пожалуйста, введите идентификатор скрипта
-newscript.noName=Пожалуйста, задайте имя скрипта.
-newscript.runat=
-newscript.runat.documentend=
-newscript.runat.documentidle=
-newscript.runat.documentstart=
-newscript.runat.windowload=
-newscript.version=
-nothing.timedOut=
+newscript.missing.id=Пожалуйста, укажите идентификатор скрипта.
+newscript.missing.name=Пожалуйста, укажите название. Оно будет показано на странице Менеджера Дополнений.
+newscript.name=Название
+newscript.namespace=Пространство имён
+newscript.noID=Пожалуйста, укажите идентификатор скрипта
+newscript.noName=Пожалуйста, укажите имя скрипта.
+newscript.runat=Запускать когда
+newscript.runat.documentend=Документ завершает загрузку
+newscript.runat.documentidle=Документ первый простаивает
+newscript.runat.documentstart=Документ начинает загрузку
+newscript.runat.windowload=Весь контент загружен
+newscript.version=Версия
+nothing.timedOut=ничего (превышен интервал ожидания)
 openFolder=Открыть папку скрипта.
-openFolder.ak=
-openUserScriptsManager=
-openUserScriptsManager.ak=
+openFolder.ak=O
+openUserScriptsManager=Открыть менеджер пользовательских скриптов
+openUserScriptsManager.ak=O
 options=Настройки
 options.addonsManager=Менеджер Дополнений
-options.alsoUninstallPrefs=Удалять также ассоциированные настройки
-options.cache=
-options.cache.enabled=
+options.alsoUninstallPrefs=Удалять также настройки скрипта
+options.cache=Кеш
+options.cache.enabled=Кешировать пользовательские скрипты
 options.changeEditor=Изменить редактор
 options.editor=Редактор
-options.editor.notset=
+options.editor.notset=Не выбран редактор
 options.enableCopyDownloadURL=Включить копирование URL для загрузки
-options.enabledSchemes.about=
-options.enabledSchemes.advanced=
-options.enabledSchemes.chrome=
-options.enabledSchemes.data=
-options.enabledSchemes.file=
-options.enabledSchemes.ftp=
-options.enabledSchemes.http=
-options.enabledSchemes.main=
-options.enabledSchemes.securityRemark=
-options.enabledSchemes.securityRemark2=
-options.enabledSchemes.unmht=
-options.excludes.desc=
-options.excludes.empty=
-options.excludes.remark=
-options.logChrome=
-options.logging=
-options.logToErrorConsole=
-options.notifications=
-options.notifications.popup.enable=
-options.notifications.sliding.enable=
-options.notifications.whenDisabled=
-options.pane.advanced=
+options.enabledSchemes.about=Протокол about (внутренний)
+options.enabledSchemes.advanced=Дополнительные протоколы
+options.enabledSchemes.chrome=Протокол chrome (внутренний)
+options.enabledSchemes.data=Протокол data
+options.enabledSchemes.file=Протокол file (локальные файлы)
+options.enabledSchemes.ftp=Протокол ftp
+options.enabledSchemes.http=Протокол http/https
+options.enabledSchemes.main=Протоколы
+options.enabledSchemes.securityRemark=Дополнительные протоколы могут иметь полный доступ к файловой системе.
+options.enabledSchemes.securityRemark2=Следовательно, они представляют значительный риск безопасности, если вы используете не доверенные скрипты!
+options.enabledSchemes.unmht=Протокол unmht (Формат Mozilla Archive)
+options.excludes.desc=Глобальные исключения перекроют любые авторские или пользовательские правила
+options.excludes.empty=Не указаны глобальные исключения
+options.excludes.remark=(Вы можете указывать по одному исключению на строку)
+options.logChrome=Записывать некритические сообщения в Консоль Ошибок to the Error Console
+options.logging=Логи
+options.logToErrorConsole=GM_log использует Консоль Ошибок
+options.notifications=Уведомления
+options.notifications.popup.enable=Включить всплывающие уведомления
+options.notifications.sliding.enable=Включить анимированные уведомления
+options.notifications.whenDisabled=Когда выключено, любое уведомление будет записано в Консоль Ошибок.
+options.pane.advanced=Дополнительно
 options.pane.excludes=Глобальные исключения
-options.pane.main=
-options.pane.ui=
-options.requireBuiltInCerts=
+options.pane.main=Основные
+options.pane.ui=Интерфейс
+options.requireBuiltInCerts=Безопасное обновление требует использование встроенных сертификатов
 options.requireSecured=Разрешить обновления скриптов только по протоколу HTTPS
-options.title=
-options.toolbarbutton=
-options.toolbarbutton.showScripts=
-options.translation=
-options.translation.useEnglish=
-options.update.security=
-options.useDownloadURL=Используйте URL для загрузки в качестве запасного URL для обновления (если он не определен)?
-reinstall=
-saving=
-scratchpad.saveAsUserScript=
-scratchpad.saveAsUserScript.ak=
-scriptOptions.disableScriptIncludes=Отключить прописанные в скрипте включения, использовать только эти.
-scriptOptions.excludes=Пользовательские исключения:
-scriptOptions.includes=Пользовательские включения:
+options.title=Настройки Scriptish
+options.toolbarbutton=Кнопка на тулбаре
+options.toolbarbutton.showScripts=Показывать количество активных скриптов
+options.translation=Перевод
+options.translation.useEnglish=Всегда использовать Английский
+options.update.security=Безопасность обновлений
+options.useDownloadURL=Использовать URL загрузки для обновления, если не указана URL обновления.
+reinstall=Переустановить
+saving=Сохранение
+scratchpad.saveAsUserScript=Сохранить как пользовательский скрипт
+scratchpad.saveAsUserScript.ak=u
+scriptOptions.disableScriptIncludes=Отключить указанные в скрипте @include шаблоны и использовать указанные здесь.
+scriptOptions.excludes=Пользовательские @exclude:
+scriptOptions.includes=Пользовательские @include:
 statusbar.enabled=Включено
-statusbar.enabled.ak=
+statusbar.enabled.ak=E
 statusbar.installed=успешно установлен
 statusbar.modified=изменен
 statusbar.noScripts.excluded=
 statusbar.noScripts.notfound=Нет скриптов для страницы!
 statusbar.noScripts.scheme=
 statusbar.updated=успешно обновлен(ы)
-tooltip.loading=Грузим ...
+tooltip.loading=Загрузка...
 Uninstall=Удалить
-untitledScript=
+untitledScript=Скрипт без имени
 Update=Обновить
-userscript=
+userscript=Пользовательский скрипт
 userscripts=Пользовательские скрипты
-userscripts.get=
-userscripts.noneInstalled=
-warning.returnfrommain=
+userscripts.get=Получить пользовательские скрипты
+userscripts.noneInstalled=У вас нет установленных скриптов
+warning.returnfrommain="return" from the main scope is not generally supported. You should fix that in your user script

From 6f67a880be3c27b5dbe84bc1611a75cc45768f45 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 29 Jan 2012 19:04:33 -0800
Subject: [PATCH 643/829] Closes #578 AddonScreenshot constructor signature
 changed..

---
 extension/modules/script/script.js | 33 +++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index fb6920ea..7078187f 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -851,6 +851,19 @@ Script.prototype = {
   }
 };
 
+Script.prototype.addScreenShot = function(aURL, aThumbURL) {
+  if (!AddonManagerPrivate.AddonScreenshot) return;
+
+  var ss = new AddonManagerPrivate.AddonScreenshot(aURL);
+
+  if (aThumbURL) {
+    ss.thumbnailURL = aThumbURL;
+  }
+
+  this._screenshots.push(ss);
+  return;
+}
+
 Script.parseVersion = function Script_parseVersion(aSrc) {
   var parsed = Scriptish_parser(aSrc);
   if (parsed.version) return parsed.version.pop();
@@ -1005,14 +1018,15 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript) {
           script._matches.push(new MatchPattern(value));
           continue;
         case 'screenshot':
-          if (!AddonManagerPrivate.AddonScreenshot) continue;
           var splitValue = value.match(valueSplitter);
+
+          // if there is a thumb url provided
           if (splitValue) {
-            script._screenshots.push(new AddonManagerPrivate.AddonScreenshot(
-                splitValue[1], splitValue[2]));
-          } else {
-            script._screenshots.push(new AddonManagerPrivate.AddonScreenshot(
-                value));
+            script.addScreenShot(splitValue[1], splitValue[2]);
+          }
+          // no thumb url is provided
+          else {
+            script.addScreenShot(value);
           }
           continue;
         case "defaulticon":
@@ -1168,8 +1182,7 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
     script._resources.push(scriptResource);
   });
   aSkeleton.screenshots.forEach(function(i) {
-    script._screenshots.push(new AddonManagerPrivate.AddonScreenshot(
-        i.url, i.thumbnailURL));
+    script.addScreenShot(i.url, i.thumbnailURL);
   });
 
   script.id = aSkeleton.id;
@@ -1283,8 +1296,8 @@ Script.loadFromXML = function(aConfig, aNode) {
         var thumb = "";
         if (childNode.hasAttribute("thumb"))
           thumb = childNode.getAttribute("thumb");
-        script._screenshots.push(new AddonManagerPrivate.AddonScreenshot(
-            childNode.firstChild.nodeValue.trim(), thumb));
+
+        script.addScreenShot(childNode.firstChild.nodeValue.trim(), thumb);
         break;
       case "Noframes":
         script["_" + childNode.nodeName.toLowerCase()] = true;

From dbb7d2bf32ac178939de9a3e9239889a7ec901e3 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 29 Jan 2012 19:23:20 -0800
Subject: [PATCH 644/829] <em:version>0.1.7</em:version>

---
 extension/install.rdf |  4 ++--
 update.rdf            | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index dbc4795e..0cc393cd 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.7a1pre</em:version>
+    <em:version>0.1.7</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
@@ -72,7 +72,7 @@
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1</em:minVersion>
-        <em:maxVersion>2.7.*</em:maxVersion>
+        <em:maxVersion>2.8.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- Fennec -->
diff --git a/update.rdf b/update.rdf
index 93fd012f..35ad2945 100644
--- a/update.rdf
+++ b/update.rdf
@@ -6,23 +6,23 @@
       <RDF:Seq>
         <RDF:li>
           <RDF:Description>
-            <em:version>0.1.6</em:version>
+            <em:version>0.1.7</em:version>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>4.0</em:minVersion>
-                <em:maxVersion>11.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.6.xpi</em:updateLink>
-                <em:updateHash>sha1:c526c8377988e1d6e3e48fe2dff6d3574d037ff8</em:updateHash>
+                <em:maxVersion>12.0a1</em:maxVersion>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.7.xpi</em:updateLink>
+                <em:updateHash>sha1:1f098ee6a55778e00f057826d39b6fabecd0b8d4</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
                 <em:minVersion>2.1</em:minVersion>
-                <em:maxVersion>2.7.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.6.xpi</em:updateLink>
-                <em:updateHash>sha1:c526c8377988e1d6e3e48fe2dff6d3574d037ff8</em:updateHash>
+                <em:maxVersion>2.8.*</em:maxVersion>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.7.xpi</em:updateLink>
+                <em:updateHash>sha1:1f098ee6a55778e00f057826d39b6fabecd0b8d4</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
             <em:targetApplication>
@@ -30,8 +30,8 @@
                 <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
                 <em:minVersion>4.0</em:minVersion>
                 <em:maxVersion>10.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.6.xpi</em:updateLink>
-                <em:updateHash>sha1:c526c8377988e1d6e3e48fe2dff6d3574d037ff8</em:updateHash>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.7.xpi</em:updateLink>
+                <em:updateHash>sha1:1f098ee6a55778e00f057826d39b6fabecd0b8d4</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
           </RDF:Description>
@@ -39,6 +39,6 @@
       </RDF:Seq>
     </em:updates>
 
-    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAJZhVqf5WIxVW8MTdm08ToHGPbXMegI6hGmhDyryy28fozh1ZvXYl5SN0/U9c7sVbgxwaMqEHG01Y82sbDZu0REE3kXXWjlRJSMJFIz4IXJ8nTxwI+6qnCgNzVKxMoVEs4x7uGH4ETQD/X3PgTEAT+nC3+KvdzPqntyMgAzz67CD</em:signature>
+    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAFxIbXsnLRKFaXW4ebxmIM7rl1dVY1LLIYiygy1LAk50d71NRTh0Sk02zsykZ+/sPIxwaK4giAO/kOQxgkUGlFGk4itCGyhaHr0lAwCVoAL8O+BewwFB48hxFZvu+QRq1QTlPcxHT7RU+bZWYtxGOJhlET5bz68jczYMcDCeDj9w</em:signature>
   </RDF:Description>
 </RDF:RDF>

From e32b6f4e989cd7f56b068f5c6c1d3755b93647cd Mon Sep 17 00:00:00 2001
From: dindog <dindog@163.com>
Date: Tue, 6 Mar 2012 16:33:42 +0800
Subject: [PATCH 645/829] add nsIConverterOutputStream for support non-ASCII
 characters new script

---
 extension/content/js/newscript.js | 6 ++++--
 extension/modules/constants.js    | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 0e447e62..5e67854c 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -87,8 +87,10 @@ function doInstall() {
   // put this created script into a file -- only way to install it
   var tempFile = Scriptish_getTempFile();
   var foStream = Scriptish_getWriteStream(tempFile);
-  foStream.write(script, script.length);
-  foStream.close();
+  var converter = Instances.cos;
+	converter.init(foStream, "UTF-8", 0, 0);  
+	converter.writeString(script);  
+	converter.close(); // this closes foStream  
 
   // create a script object with parsed metadata,
   script = Scriptish_config.parse(script);
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index c887498d..39ef23f4 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -38,6 +38,8 @@ var Instances = {
       .createInstance(Ci.nsISupportsString),
   get suc() Cc["@mozilla.org/intl/scriptableunicodeconverter"]
       .createInstance(Ci.nsIScriptableUnicodeConverter),
+  get cos() Cc["@mozilla.org/intl/converter-output-stream;1"]  
+       .createInstance(Ci.nsIConverterOutputStream),
   get timer() Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer),
   get wbp() Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
       .createInstance(Ci.nsIWebBrowserPersist),

From 8f05e02546c661375188fe363d43b2299e433659 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 17 May 2012 13:23:38 -0700
Subject: [PATCH 646/829] adding minor comment

---
 extension/modules/script/scriptdownloader.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index d15f6f40..49ed0d45 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -129,6 +129,7 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
     file.createUnique(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0640);
     this.tempFiles_.push(file);
 
+    // sync save file
     var converter = Instances.suc;
     converter.charset = "UTF-8";
     source = converter.ConvertFromUnicode(source);

From fb752bfc20d72911bde0f24d3e8bb397a5a7dfbd Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 17 May 2012 20:49:18 -0700
Subject: [PATCH 647/829] Blocking http://userscripts.org/scripts/review/114457
 for using a third party updater

---
 blocklist.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blocklist.json b/blocklist.json
index 8b4b1803..22e42984 100644
--- a/blocklist.json
+++ b/blocklist.json
@@ -1,3 +1,3 @@
 {
-  "uso": [20145, 26062, 35611, 38017, 68219]
+  "uso": [20145, 26062, 35611, 38017, 68219, 114457]
 }
\ No newline at end of file

From ef08c98c89f371cde8545a330cd605dd47b2e658 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 17 May 2012 20:50:43 -0700
Subject: [PATCH 648/829] Blocking http://userscripts.org/scripts/show/92054
 for using a 3rd party updater

---
 blocklist.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blocklist.json b/blocklist.json
index 22e42984..aaed26d0 100644
--- a/blocklist.json
+++ b/blocklist.json
@@ -1,3 +1,3 @@
 {
-  "uso": [20145, 26062, 35611, 38017, 68219, 114457]
+  "uso": [20145, 26062, 35611, 38017, 68219, 92054, 114457]
 }
\ No newline at end of file

From cf4462ecb8144426e21d5abedd243aec51932272 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 17 May 2012 20:52:50 -0700
Subject: [PATCH 649/829] Blocking http://userscripts.org/scripts/review/130770

---
 blocklist.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blocklist.json b/blocklist.json
index aaed26d0..0fe1cfcb 100644
--- a/blocklist.json
+++ b/blocklist.json
@@ -1,3 +1,3 @@
 {
-  "uso": [20145, 26062, 35611, 38017, 68219, 92054, 114457]
+  "uso": [20145, 26062, 35611, 38017, 68219, 92054, 114457, 130770]
 }
\ No newline at end of file

From 2530c06821a3032623c630ddc8c3772225801298 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Thu, 17 May 2012 20:54:18 -0700
Subject: [PATCH 650/829] Blocking http://userscripts.org/scripts/review/128437

---
 blocklist.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blocklist.json b/blocklist.json
index 0fe1cfcb..3d3a746a 100644
--- a/blocklist.json
+++ b/blocklist.json
@@ -1,3 +1,3 @@
 {
-  "uso": [20145, 26062, 35611, 38017, 68219, 92054, 114457, 130770]
+  "uso": [20145, 26062, 35611, 38017, 68219, 92054, 114457, 128437, 130770]
 }
\ No newline at end of file

From a83b39205d740f07461aaf698a75673549fe6658 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 18 May 2012 11:59:58 -0700
Subject: [PATCH 651/829] Blocking USO #59744

---
 blocklist.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blocklist.json b/blocklist.json
index 3d3a746a..880ca2ec 100644
--- a/blocklist.json
+++ b/blocklist.json
@@ -1,3 +1,3 @@
 {
-  "uso": [20145, 26062, 35611, 38017, 68219, 92054, 114457, 128437, 130770]
+  "uso": [20145, 26062, 35611, 38017, 59744, 68219, 92054, 114457, 128437, 130770]
 }
\ No newline at end of file

From ff19024c90b93a1c92aa59f329cd082b64be76c5 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 24 Aug 2012 21:48:28 -0500
Subject: [PATCH 652/829] Mark __exposedProps__ for the response object passed
 from GM_xmlhttpRequest events.  See
 https://developer.mozilla.org/en-US/docs/XPConnect_wrappers#__exposedProps__
 .  Closes #624

---
 extension/modules/api/GM_xmlhttpRequester.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 1d27ea94..15538801 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -199,6 +199,14 @@ GM_xmlhttpRequester.prototype.setupRequestEvent =
       var responseState = {
         // can't support responseXML because security won't
         // let the browser call properties on it
+        __exposedProps__: {
+          responseText: "r",
+          readyState: "r",
+          responseHeaders: "r",
+          status: "r",
+          statusText: "r",
+          finalUrl: "r"
+        },
         responseText: req.responseText,
         readyState: req.readyState,
         responseHeaders: null,

From 7a4312f681a26490141cba9fe65b43bd8d365695 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 24 Aug 2012 23:04:12 -0500
Subject: [PATCH 653/829] Add 'onprogress' support for GM_xmlhttpRequest.

---
 extension/modules/api/GM_xmlhttpRequester.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 15538801..968b1465 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -132,8 +132,8 @@ GM_xmlhttpRequester.prototype.chromeStartRequest =
     function(safeUrl, details, req) {
   this.setupRequestEvent(this.unsafeContentWin, req, "onload", details);
   this.setupRequestEvent(this.unsafeContentWin, req, "onerror", details);
-  this.setupRequestEvent(
-      this.unsafeContentWin, req, "onreadystatechange", details);
+  this.setupRequestEvent(this.unsafeContentWin, req, "onprogress", details);
+  this.setupRequestEvent(this.unsafeContentWin, req, "onreadystatechange", details);
 
   if (details.mozBackgroundRequest) req.mozBackgroundRequest = true;
 
@@ -195,7 +195,7 @@ GM_xmlhttpRequester.prototype.setupRequestEvent =
   var script = this.script;
 
   if (details[event]) {
-    req[event] = function() {
+    req[event] = function(ev) {
       var responseState = {
         // can't support responseXML because security won't
         // let the browser call properties on it
@@ -214,7 +214,15 @@ GM_xmlhttpRequester.prototype.setupRequestEvent =
         statusText: null,
         finalUrl: null
       };
-      if (4 == req.readyState && 'onerror' != event) {
+      if ("onprogress" == event) {
+        responseState.__exposedProps__.lengthComputable = "r";
+        responseState.__exposedProps__.loaded = "r";
+        responseState.__exposedProps__.total = "r";
+        responseState.lengthComputable = ev.lengthComputable;
+        responseState.loaded = ev.loaded;
+        responseState.total = ev.total;
+      }
+      else if (4 == req.readyState && "onerror" != event) {
         responseState.responseHeaders = req.getAllResponseHeaders();
         responseState.status = req.status;
         responseState.statusText = req.statusText;

From b7abe2a89a89658c4fd66804f4cc48da07df504c Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Aug 2012 19:31:16 +0200
Subject: [PATCH 654/829] Add __exposedProps__ to console wrapper

See:
* ff19024c90b93a1c92aa59f329cd082b64be76c5
* https://developer.mozilla.org/en-US/docs/XPConnect_wrappers#__exposedProps__
---
 extension/modules/api/GM_console.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index c51811e5..e4bf95ab 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -34,13 +34,14 @@ function getConsoleFor(contentWindow, chromeWindow) {
 
 function GM_console(script, contentWindow, chromeWindow) {
   const _console = getConsoleFor(contentWindow, chromeWindow);
-  const console = {};
+  const console = { __exposedProps__: {__noSuchMethod__: "r"} };
   const prefix = "[" + (script.id || "Scriptish") + "]";
 
   // Wrap log functions
   // Redirect any missing log function to .log
   for (let i = 0, e = log_functions.length; i < e; ++i) {
     let fn = log_functions[i];
+    console.__exposedProps__[fn] = "r";
     if (fn in _console) {
       console[fn] = _console[fn].bind(_console, prefix);
     }
@@ -70,6 +71,7 @@ function GM_console(script, contentWindow, chromeWindow) {
     let fn = aux_functions[i];
     if (fn in console) {
       console[fn] = _console[fn].bind(_console);
+      console.__exposedProps__[fn] = "r";
     }
   }
   Object.defineProperty(console, "__noSuchMethod__", {

From 216a406483fa944ac0dba8287d1a6e175c436be3 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Aug 2012 20:12:50 +0200
Subject: [PATCH 655/829] Add lazy* shortcuts

---
 extension/modules/api.js                      |  6 +-
 extension/modules/constants.js                | 56 +++++++++----------
 .../modules/utils/Scriptish_injectScripts.js  |  4 +-
 .../modules/utils/Scriptish_stringBundle.js   |  2 +-
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 251db16d..98b05eaf 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -73,13 +73,13 @@ function GM_API(options) {
   var windowID = aWinID;
 
   var lazyLoaders = {};
-  XPCOMUtils.defineLazyGetter(lazyLoaders, "xhr", function() {
+  lazy(lazyLoaders, "xhr", function() {
     return new GM_xmlhttpRequester(aUnsafeContentWin, aURL, aScript);
   });
-  XPCOMUtils.defineLazyGetter(lazyLoaders, "storage", function() {
+  lazy(lazyLoaders, "storage", function() {
     return new GM_ScriptStorage(aScript);
   });
-  XPCOMUtils.defineLazyGetter(lazyLoaders, "resources", function() {
+  lazy(lazyLoaders, "resources", function() {
     return new GM_Resources(aScript);
   });
 
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 39ef23f4..47f82215 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = [
     "Cc", "Ci", "Cr", "NetUtil", "XPCOMUtils", "extend",
-    "Services", "Instances", "lazyImport", "lazyUtil", "timeout", "e10s"];
+    "Services", "Instances", "lazy", "lazyImport", "lazyUtil", "timeout", "e10s"];
 
 const {classes: Cc, interfaces: Ci, results: Cr} = Components;
 const e10s = !!Cc["@mozilla.org/globalmessagemanager;1"];
@@ -49,29 +49,32 @@ var Instances = {
       .createInstance(Ci.nsIXMLHttpRequest)
 };
 
-XPCOMUtils.defineLazyServiceGetter(
+const lazy = XPCOMUtils.defineLazyGetter.bind(XPCOMUtils);
+const lazyService = XPCOMUtils.defineLazyServiceGetter.bind(XPCOMUtils);
+
+lazyService(
      Services, "as", "@mozilla.org/alerts-service;1", "nsIAlertsService");
 
-XPCOMUtils.defineLazyServiceGetter(
+lazyService(
     Services, "ass", "@mozilla.org/appshell/appShellService;1",
     "nsIAppShellService");
 
-XPCOMUtils.defineLazyServiceGetter(
+lazyService(
     Services, "cb", "@mozilla.org/widget/clipboardhelper;1",
     "nsIClipboardHelper");
 
-XPCOMUtils.defineLazyServiceGetter(
+lazyService(
     Services, "cbs", "@mozilla.org/widget/clipboard;1", "nsIClipboard");
 
-XPCOMUtils.defineLazyServiceGetter(
+lazyService(
     Services, "cs", "@mozilla.org/consoleservice;1", "nsIConsoleService");
 
-XPCOMUtils.defineLazyServiceGetter(
+lazyService(
     Services, "eps", "@mozilla.org/uriloader/external-protocol-service;1",
     "nsIExternalProtocolService");
 
 if (Cc["@mozilla.org/privatebrowsing;1"]) {
-  XPCOMUtils.defineLazyServiceGetter(
+  lazyService(
       Services, "pbs", "@mozilla.org/privatebrowsing;1",
       "nsIPrivateBrowsingService");
 } else {
@@ -79,48 +82,45 @@ if (Cc["@mozilla.org/privatebrowsing;1"]) {
 }
 
 if (e10s) {
-  XPCOMUtils.defineLazyServiceGetter(
+  lazyService(
       Services, "mm", "@mozilla.org/globalmessagemanager;1",
       "nsIChromeFrameMessageManager");
 }
 
-XPCOMUtils.defineLazyServiceGetter(
+lazyService(
     Services, "sis", "@mozilla.org/scriptableinputstream;1",
     "nsIScriptableInputStream");
 
-XPCOMUtils.defineLazyServiceGetter(
+lazyService(
     Services, "suhtml", "@mozilla.org/feed-unescapehtml;1",
     "nsIScriptableUnescapeHTML");
 
-XPCOMUtils.defineLazyServiceGetter(
+lazyService(
     Services, "tld", "@mozilla.org/network/effective-tld-service;1",
     "nsIEffectiveTLDService");
 
-XPCOMUtils.defineLazyServiceGetter(
+lazyService(
     Services, "uuid", "@mozilla.org/uuid-generator;1",
     "nsIUUIDGenerator");
 
 const _lazyModules = {};
 function lazyImport(obj, resource, symbols) {
   if (!(resource in _lazyModules)) {
-    XPCOMUtils.defineLazyGetter(
-      _lazyModules,
-      resource,
-      function() {
-        let _m = {};
-        try {
-          Components.utils.import(resource, _m);
-        }
-        catch (ex) {
-          Components.utils.reportError("Failed to import resource: " + resource);
-          throw ex;
-        }
-        return _m;
-      });
+    lazy(_lazyModules, resource, function() {
+      let _m = {};
+      try {
+        Components.utils.import(resource, _m);
+      }
+      catch (ex) {
+        Components.utils.reportError("Failed to import resource: " + resource);
+        throw ex;
+      }
+      return _m;
+    });
   }
   for (let i = symbols.length; ~--i;) {
     let s = symbols[i];
-    XPCOMUtils.defineLazyGetter(obj, s, function() _lazyModules[resource][s]);
+    lazy(obj, s, function() _lazyModules[resource][s]);
   }
 }
 function lazyUtil(obj, name) lazyImport(obj,
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 4293c2fc..a79141e7 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -74,12 +74,12 @@ function Scriptish_injectScripts(options) {
         sandbox[funcName] = GM_api[funcName];
       }
     }
-    XPCOMUtils.defineLazyGetter(sandbox, "console", function() {
+    lazy(sandbox, "console", function() {
       return GM_console(script, safeWin, chromeWin);
     });
 
 
-    XPCOMUtils.defineLazyGetter(sandbox, "GM_log", function() {
+    lazy(sandbox, "GM_log", function() {
       if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
         var logger = new GM_ScriptLogger(script);
         return function() {
diff --git a/extension/modules/utils/Scriptish_stringBundle.js b/extension/modules/utils/Scriptish_stringBundle.js
index 2f4c0f1f..d6e371b3 100644
--- a/extension/modules/utils/Scriptish_stringBundle.js
+++ b/extension/modules/utils/Scriptish_stringBundle.js
@@ -12,7 +12,7 @@ const engBundle = Services.strings.createBundle((function(){
   return tmp.join("/")
 })());
 
-XPCOMUtils.defineLazyGetter(this, "Scriptish_getPref", function() {
+lazy(this, "Scriptish_getPref", function() {
   let tools = {};
   Components.utils.import("resource://scriptish/prefmanager.js", tools);
   return function(aVal) tools.Scriptish_prefRoot.getValue(aVal);

From 7603415d4ef8208c34e5820fc09a0d004aecdedd Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Aug 2012 20:13:12 +0200
Subject: [PATCH 656/829] console.__noSuchMethod__ should not throw

The built-in console does not throw, neither should we. However, instead
of silently failing, at least log the undefined method
---
 extension/modules/api/GM_console.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index e4bf95ab..67b64d84 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -80,7 +80,7 @@ function GM_console(script, contentWindow, chromeWindow) {
         let fn = _console[id] || (function() {});
         return fn.apply(_console, args);
       }
-      throw new Error("No such method");
+      console.log("No such method in console", id);
     }
   });
 

From 6e5f12c22f6f1464e9ee23c7d88342ea7c2fa88c Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 27 Aug 2012 20:16:52 +0200
Subject: [PATCH 657/829] Fix GM_log console logging

---
 extension/modules/utils/Scriptish_injectScripts.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index a79141e7..95fe8e59 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -83,8 +83,9 @@ function Scriptish_injectScripts(options) {
       if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
         var logger = new GM_ScriptLogger(script);
         return function() {
-          logger.log(Array.slice(arguments).join(" "));
-          sandbox.console.log.apply(sandbox.console, arguments);
+          const args = Array.slice(arguments);
+          logger.log(args.join(" "));
+          sandbox.console.log.apply(sandbox.console, args);
         }
       }
       return sandbox.console.log.bind(sandbox.console);

From ace8c387928e5e13287c47fa798043b1e69578f8 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 30 Aug 2012 16:59:36 -0500
Subject: [PATCH 658/829] Add __exposedProps__ for GM_xmlhttpRequest's returned
 object w/ abort()

---
 extension/modules/api/GM_xmlhttpRequester.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 968b1465..cf265cb2 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -120,6 +120,9 @@ GM_xmlhttpRequester.prototype.contentStartRequest = function(details) {
   }
 
   return {
+    __exposedProps__: {
+      abort: "r"
+    },
     abort: function() {
       req.abort();
     }

From daee3e987b65585165dd480ee30f53209e965906 Mon Sep 17 00:00:00 2001
From: strel <strelnic@gmail.com>
Date: Sun, 2 Sep 2012 18:36:47 +0300
Subject: [PATCH 659/829] Update extension/locale/es-ES/scriptish.properties

Correction of some typo errors
---
 extension/locale/es-ES/scriptish.properties | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 4b07fec2..2d5cd834 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -7,7 +7,7 @@ editor.couldNotLaunch=Error al abrir el editor.
 editor.pleasePickExecutable=Por favor, elija un programa para editar sus scripts de usuario.
 editor.prompt=Por favor, elija antes su editor de texto favorito
 editor.useScratchpad=¿Desea usar Scratchpad como su editor?
-editor.useScratchpad.no=No (yo seleccionaré el mio)
+editor.useScratchpad.no=No (yo seleccionaré el mío)
 editor.useScratchpad.yes=Sí
 error.api.clipboard.type=no es un tipo soportado por GM_setClipboard.
 error.api.noResourceWithName=No hay recursos con ese nombre
@@ -39,7 +39,7 @@ error.retrieving=Error al descargar
 error.script.installing=Error al instalar script de usuario
 error.script.loading=Error al cargar script de usuario
 greeting.btn.ak=I
-greeting.msg=Este es un script de usuario. Pulse instalar para empezar a usarlo.
+greeting.msg=Este es un script de usuario. Pulse Instalar para empezar a usarlo.
 install=Instalar
 install.domains=dominios:
 install.excludes=no se ejecuta sobre:
@@ -51,7 +51,7 @@ install.showScriptSource=Mostrar código fuente del script
 install.title=Instalación de script de usuario
 install.warning1=Los scripts maliciosos pueden violar su privacidad y actuar en su nombre sin su conocimiento.
 install.warning2=Sólo debería instalar scripts de fuentes en las que confíe.
-installFromFile=Instalar Script de Usuario Desde Archivo...
+installFromFile=Instalar script de usuario desde archivo...
 installFromFile.ak=S
 menu.commands=Comandos del script de usuario...
 menu.commands.ak=C
@@ -73,10 +73,10 @@ moving.dependency=Moviendo el archivo de dependencias desde
 moving.script=Moviendo el archivo de script desde
 newscript.author=Autor
 newscript.description=Descripción
-newscript.excludes=Exclusiones (una por línea)
+newscript.excludes=Exclusiones (una por linea)
 newscript.exists=Ya hay instalado un script con ese nombre.\n¿Sobreescribir?
 newscript.id=ID
-newscript.includes=Inclusiones (una por línea)
+newscript.includes=Inclusiones (una por linea)
 newscript.missing.id=Por favor, introduzca un identificador.
 newscript.missing.name=Por favor, introduzca un nombre. El nombre se mostrará en el Administrador de complementos.
 newscript.name=Nombre
@@ -92,7 +92,7 @@ newscript.version=Versión
 nothing.timedOut=nada (en espera)
 openFolder=Abrir carpeta
 openFolder.ak=B
-openUserScriptsManager=Abrir administrador de scripts de usuario
+openUserScriptsManager=Abrir Administrador de scripts de usuario
 openUserScriptsManager.ak=A
 options=Opciones
 options.addonsManager=Administrador de complementos
@@ -102,7 +102,7 @@ options.cache.enabled=Cargar los scripts de usuario en cache
 options.changeEditor=Cambiar editor
 options.editor=Editor
 options.editor.notset=No se ha seleccionado editor
-options.enableCopyDownloadURL=Activar opción Copiar URL de Descarga
+options.enableCopyDownloadURL=Activar opción Copiar URL de descarga
 options.enabledSchemes.about=Protocolo about (interno)
 options.enabledSchemes.advanced=Protocolos adicionales
 options.enabledSchemes.chrome=Protocolo chrome (interno)
@@ -117,13 +117,13 @@ options.enabledSchemes.unmht=Protocolo unmht (Formato de Archivo Mozilla, .maf)
 options.excludes.desc=Prevalecen sobre cualquier regla de script, o definida por el usuario
 options.excludes.empty=No hay definidas exclusiones globales
 options.excludes.remark=(Una exclusión por linea)
-options.logChrome=Registrar en log mensajes de extensión no críticos en la consola de errores
+options.logChrome=Registrar en log mensajes de extensión no críticos en la Consola de errores
 options.logging=Registro de eventos (logging)
-options.logToErrorConsole=GM_log usa la consola de errores
+options.logToErrorConsole=GM_log usa la Consola de errores
 options.notifications=Notificaciones
 options.notifications.popup.enable=Activar notificaciones emergentes
 options.notifications.sliding.enable=Activar notificaciones deslizantes
-options.notifications.whenDisabled=Cuando está deshabilitado, cualquier notificación aparecerá en la Consola de Errores.
+options.notifications.whenDisabled=Cuando está deshabilitado, cualquier notificación aparecerá en la Consola de errores.
 options.pane.advanced=Avanzado
 options.pane.excludes=Exclusiones globales
 options.pane.main=Principal
@@ -143,7 +143,7 @@ scratchpad.saveAsUserScript=Guardar como script de usuario
 scratchpad.saveAsUserScript.ak=S
 scriptOptions.disableScriptIncludes=Desactivar los filtros de inclusión de este script y utilizar sólo los definidos por el usuario.
 scriptOptions.excludes=Exclusiones definidas por el usuario:
-scriptOptions.includes=Inclusiones defenidas por el usuario:
+scriptOptions.includes=Inclusiones definidas por el usuario:
 statusbar.enabled=Activado
 statusbar.enabled.ak=A
 statusbar.installed=instalado con éxito

From 0c1e15afa14b391a7b8a9177d75fc34c696f8b2a Mon Sep 17 00:00:00 2001
From: strel <strelnic@gmail.com>
Date: Sun, 2 Sep 2012 18:45:46 +0300
Subject: [PATCH 660/829] Update extension/locale/es-ES/description.properties

Correction of some expressions
---
 extension/locale/es-ES/description.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/locale/es-ES/description.properties b/extension/locale/es-ES/description.properties
index 44c5fdd8..f3270a1b 100644
--- a/extension/locale/es-ES/description.properties
+++ b/extension/locale/es-ES/description.properties
@@ -1,4 +1,4 @@
-amo.description.line1=Scriptish es una ramificación de Greasemonkey, que ofrece:
+amo.description.line1=Scriptish es un derivado de Greasemonkey, que ofrece:
 amo.description.line2=Todo lo que hace Greasemonkey (que de hecho es útil)
 amo.description.line3=Actualización: Los scripts de usuario pueden ser actualizados en Scriptish usando @updateURL
 amo.description.line4=Muchas nuevas <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">metadata @keys</a>
@@ -6,8 +6,8 @@ amo.description.line5=Muchas nuevas <a title="Scriptish User Script API - Script
 amo.description.line6=Rendimiento Superior: Un código base más rápido y limpio, que aprovecha todo lo que las versiones recientes de Firefox ofrecen
 amo.description.line7=Seguridad Superior: Scriptish proporciona características de seguridad que no encontrará en otro sitio
 amo.description.line8=Testeo: Los desarrolladores realizan muchos tests para asegurar el correcto funcionamiento de Scriptish y encontrar cualquier error cuanto antes
-amo.developerComments.line1=Scriptish tiene todo lo que tiene Greasemonkey, además de otras muchas características sobre las que puedes leer en: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line1=Scriptish tiene todo lo que tiene Greasemonkey, además de otras muchas características sobre las que puede leer en: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
 amo.developerComments.line2=Por favor remite cualquier error o solicitud de característica a: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
-amo.developerComments.line3=Si tienes alguna otra pregunta, por favor envialá a la lista de correo: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.developerComments.line3=Si tiene alguna otra pregunta, por favor envíela a la lista de correo: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=El motor de scripts de usuario más avanzado en Internet.
 extensions.scriptish@erikvold.com.description=Un gestor de scripts de usuario para aplicaciones Mozilla

From d4da9ada05633517c97d4515ea1453e69531fa3e Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 7 Sep 2012 09:10:04 -0700
Subject: [PATCH 661/829] Fix bug 743215 cleanup menu commander when a window
 closes

---
 extension/content/js/browser.js    |  3 +++
 extension/modules/menucommander.js | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 7a3ea6e2..2600a995 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -254,6 +254,9 @@ Scriptish_BrowserUI.reattachMenuCmds = function() {
  */
 Scriptish_BrowserUI.chromeUnload = function() {
   gBrowser.removeProgressListener(this);
+  // kill reference to this document
+  this.menuCommanders.forEach(function({commander}) commander.destroy());
+  // kill reference to menuCommanders
   delete this.menuCommanders;
 }
 
diff --git a/extension/modules/menucommander.js b/extension/modules/menucommander.js
index bf4483f7..3b998871 100644
--- a/extension/modules/menucommander.js
+++ b/extension/modules/menucommander.js
@@ -233,3 +233,15 @@ Scriptish_MenuCommander.prototype.setDisabled = function(aStatus) {
   setStatus(this.$("scriptish-tb-cmds"), aStatus);
   setStatus(this.toolsMenu, aStatus);
 }
+
+Scriptish_MenuCommander.prototype.destroy = function() {
+  this.doc = null;
+  this.$ = null;
+  this.keyset = null;
+  this.keys = [];
+  this.attached = null;
+  this.tbMenuItems = [];
+  this.toolsMenu = null;
+  this.toolsMenuPopup = null;
+  this.toolsMenuItems = [];
+};

From 46d342a41a31b1c84ac808de48a21478680b932b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 7 Sep 2012 10:19:11 -0700
Subject: [PATCH 662/829] __exposedProps__ for GM_xhr's responseJSON

---
 extension/modules/api/GM_xmlhttpRequester.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 968b1465..716101b5 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -201,6 +201,7 @@ GM_xmlhttpRequester.prototype.setupRequestEvent =
         // let the browser call properties on it
         __exposedProps__: {
           responseText: "r",
+          responseJSON: "r",
           readyState: "r",
           responseHeaders: "r",
           status: "r",

From d534b19f8b104c359622bfd0d9d67947a2f46505 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 7 Sep 2012 10:30:56 -0700
Subject: [PATCH 663/829] no longer officially supporting Fennec

---
 README.md             | 1 -
 extension/install.rdf | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/README.md b/README.md
index 7d8e0106..e68913ca 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,6 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 # Browsers Supported
 
 * Firefox 4+
-* Fennec 4+
 * Seamonkey 2.1+
 
 
diff --git a/extension/install.rdf b/extension/install.rdf
index 0cc393cd..1bd44ba9 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -75,13 +75,5 @@
         <em:maxVersion>2.8.*</em:maxVersion>
       </Description>
     </em:targetApplication>
-    <!-- Fennec -->
-    <em:targetApplication>
-      <Description>
-        <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
-        <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>10.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
   </Description>
 </RDF>

From 980d1de7398efcd8fa67eaab90a2781a8d2d64e3 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 7 Sep 2012 10:31:33 -0700
Subject: [PATCH 664/829] <em:version>0.1.8pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 1bd44ba9..320adb1a 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.7</em:version>
+    <em:version>0.1.8pre</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>

From 615b104e71682bd4305c49c4d40ab857c765aa1f Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 7 Sep 2012 10:33:08 -0700
Subject: [PATCH 665/829] changing the issue link in the README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e68913ca..ecd9995c 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,6 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 * [Addons.Mozilla.Org (AMO)](https://addons.mozilla.org/firefox/addon/scriptish)
 * [Userscripts](http://userscripts.org)
 * [Wiki](https://github.com/scriptish/scriptish/wiki)
-* [Issues](http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/)
+* [Issues](https://github.com/scriptish/scriptish/issues)
 * [Google Group](http://groups.google.com/group/scriptish)
 * [Source Code](https://github.com/scriptish/scriptish)

From c06993ffd89ca236b91f3b3bc1241f13d138bfa6 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 7 Sep 2012 11:05:55 -0700
Subject: [PATCH 666/829] fix bug when using a url ending with ?x.user.js or
 #y.user.js

---
 extension/components/scriptish.js     | 3 ++-
 extension/modules/api/GM_Resources.js | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 70830ea7..9321bd32 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -1,3 +1,4 @@
+"use strict";
 const DESCRIPTION = "ScriptishService";
 const CONTRACTID = "@scriptish.erikvold.com/scriptish-service;1";
 const CLASSID = Components.ID("{ca39e060-88ab-11df-a4ee-0800200c9a66}");
@@ -190,7 +191,7 @@ ScriptishService.prototype = {
     "chrome": true,
     "resource": true
   },
-  _reg_userjs: /\.user\.js$/,
+  _reg_userjs: /^[^#\?=]+\.user\.js$/,
   shouldLoad: function(ct, cl, org, ctx, mt, ext) {
     // block content detection of scriptish by denying it chrome: & resource:
     // content, unless loaded from chrome: or about:
diff --git a/extension/modules/api/GM_Resources.js b/extension/modules/api/GM_Resources.js
index 467a77a0..bb448084 100644
--- a/extension/modules/api/GM_Resources.js
+++ b/extension/modules/api/GM_Resources.js
@@ -1,3 +1,4 @@
+"use strict";
 var EXPORTED_SYMBOLS = ["GM_Resources"];
 
 const Cu = Components.utils;

From 88ffefe74e106f23456e803bb71f702d9df34da8 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 8 Sep 2012 10:46:22 -0500
Subject: [PATCH 667/829] Updating sv-SE courtesy of Lakrits (BabelZilla)

---
 extension/locale/sv-SE/description.properties |  2 +-
 extension/locale/sv-SE/scriptish.properties   | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/extension/locale/sv-SE/description.properties b/extension/locale/sv-SE/description.properties
index 9099df28..2afd6cad 100644
--- a/extension/locale/sv-SE/description.properties
+++ b/extension/locale/sv-SE/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Överlägsen prestanda: En snabbare, renare kodbas, som dr
 amo.description.line7=Överlägsen säkerhet: Scriptish tillhandahåller säkerhetsfunktioner som du inte hittar någon annanstans
 amo.description.line8=Testning: Utvecklarna använder sig av ett flertal tester för att säkerställa att Scriptish fungerar korrekt och för att hitta eventuella fel så tidigt som möjligt
 amo.developerComments.line1=Scriptish har allt som Greasemonkey har, plus flera funktioner som du kan läsa mer om på: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=Var vänlig skicka in alla buggrapporter och förslag på nya funktioner via: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
+amo.developerComments.line2=Var vänlig skicka in alla buggrapporter och förslag på nya funktioner via: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=Om du har frågor, skicka dem till e-postlistan: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=Den bästa användarskriptmotorn på Internet.
 extensions.scriptish@erikvold.com.description=En skripttilläggshanterare för Firefox
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 32f1e569..02a242e9 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -6,9 +6,9 @@ edit.ak=e
 editor.couldNotLaunch=Det gick inte att starta redigeringsprogrammet.
 editor.pleasePickExecutable=Var vänlig välj ett körbart program att använda för redigering av användarskript.
 editor.prompt=Var vänlig välj först det textredigeringsprogram du föredrar
-editor.useScratchpad=
-editor.useScratchpad.no=
-editor.useScratchpad.yes=
+editor.useScratchpad=Vill du använda Scratchpad som din textredigerare?
+editor.useScratchpad.no=Nej, jag väljer min egen
+editor.useScratchpad.yes=Ja
 error.api.clipboard.type=är inte en typ som stöds av GM_setClipboard.
 error.api.noResourceWithName=Det finns ingen resurs med namnet
 error.api.noSecondArgValue=Det andra argumentet har inte angivits: Värde
@@ -39,7 +39,7 @@ error.retrieving=Det gick inte att hämta
 error.script.installing=Fel vid installation av användarskript
 error.script.loading=Fel vid inläsning av användarskript
 greeting.btn.ak=I
-greeting.msg=Detta är ett användarskript. Klicka på "Installera" för att börja använda det.
+greeting.msg=Detta är ett användarskript. Klicka på \"Installera\" för att börja använda det.
 install=Installera
 install.domains=domäner:
 install.excludes=kan inte köras på:
@@ -51,8 +51,8 @@ install.showScriptSource=Visa skriptets källa
 install.title=Installation av användarskript
 install.warning1=Skadliga skript kan kränka din integritet och agera för din räkning utan din vetskap.
 install.warning2=Du bör endast installera skript från källor som du litar på.
-installFromFile=
-installFromFile.ak=
+installFromFile=Installera användarskript från fil…
+installFromFile.ak=f
 menu.commands=Användarskriptkommandon…
 menu.commands.ak=A
 menu.install=Installera användarskript…
@@ -121,9 +121,9 @@ options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felkonsolen
 options.logging=Loggning
 options.logToErrorConsole=GM_log använder Felkonsolen
 options.notifications=Aviseringar
-options.notifications.popup.enable=
-options.notifications.sliding.enable=
-options.notifications.whenDisabled=
+options.notifications.popup.enable=Aktivera popup-aviseringar
+options.notifications.sliding.enable=Aktivera glidande aviseringar
+options.notifications.whenDisabled=Om inaktiverat, kommer alla aviseringar att visas i Felkonsolen.
 options.pane.advanced=Avancerat
 options.pane.excludes=Globala undantag
 options.pane.main=Allmänt
@@ -131,8 +131,8 @@ options.pane.ui=Användargränssnitt
 options.requireBuiltInCerts=Säker uppdatering kräver användning av inbyggda certifikat
 options.requireSecured=Kräv att användarskript uppdateras via HTTPS
 options.title=Inställningar för Scriptish
-options.toolbarbutton=
-options.toolbarbutton.showScripts=
+options.toolbarbutton=Verktygsfältsknapp
+options.toolbarbutton.showScripts=Visa antalet aktiva skript
 options.translation=Översättning
 options.translation.useEnglish=Använd alltid engelska
 options.update.security=Uppdateringssäkerhet
@@ -156,8 +156,8 @@ tooltip.loading=Läser in…
 Uninstall=Avinstallera
 untitledScript=(Namnlöst skript)
 Update=Uppdatera
-userscript=
+userscript=Användarskript
 userscripts=Användarskript
 userscripts.get=Hämta användarskript
 userscripts.noneInstalled=Du har inga användarskript installerade
-warning.returnfrommain=Att "gå tillbaka" från huvudområdet stöds som regel inte. Du bör åtgärda det i ditt användarskript.
+warning.returnfrommain=Att \"gå tillbaka\" från huvudområdet stöds som regel inte. Du bör åtgärda det i ditt användarskript.

From ffce4d39aa56b0786e3b61f6c53f01d023ffbc8a Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 8 Sep 2012 10:47:28 -0500
Subject: [PATCH 668/829] Updating ja-JP courtesy of hosiguma (BabelZilla)

---
 extension/locale/ja-JP/description.properties | 2 +-
 extension/locale/ja-JP/scriptish.properties   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/locale/ja-JP/description.properties b/extension/locale/ja-JP/description.properties
index 7f616ba6..634c1222 100644
--- a/extension/locale/ja-JP/description.properties
+++ b/extension/locale/ja-JP/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=優れたパフォーマンス：最新の Firefox を使
 amo.description.line7=優れたセキュリティ：Scriptish は他にないセキュリティ機能を提供します
 amo.description.line8=テスト：開発者は Scriptish が正しく機能していることを確認したり、より早くバグを見つけるために多くのテストを利用することができる
 amo.developerComments.line1=Scriptish は Greasemonkey と同じことができます。追加機能については…：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=バグや新機能のリクエストは…：<a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
+amo.developerComments.line2=バグや新機能のリクエストは…：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=他の質問はメーリングリストまで…：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=インターネット上で最も優れたユーザースクリプトエンジン。
 extensions.scriptish@erikvold.com.description=Firefox 用のユーザースクリプト拡張
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 223751fc..8755496b 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -51,7 +51,7 @@ install.showScriptSource=スクリプトのソースを表示
 install.title=ユーザースクリプトのインストール
 install.warning1=悪意のあるスクリプトはあなたの知らぬ間にプライバシーを侵害することがあります
 install.warning2=信頼できる場所からのみスクリプトをインストールすべきです
-installFromFile=ファイルからのユーザースクリプトをインストールする…
+installFromFile=ファイルからユーザースクリプトをインストールする…
 installFromFile.ak=U
 menu.commands=ユーザースクリプトのコマンド…
 menu.commands.ak=C
@@ -74,7 +74,7 @@ moving.script=スクリプトファイルを次から移動：
 newscript.author=作者
 newscript.description=スクリプトの説明
 newscript.excludes=Excludes（１行１つずつ）
-newscript.exists=同じ名前のスクリプトが既にインストールされています。n上書きしますか？
+newscript.exists=同じ名前のスクリプトが既にインストールされています。\n上書きしますか？
 newscript.id=ID（一意に識別する文字列）
 newscript.includes=Includes（１行１つずつ）
 newscript.missing.id=ID を指定してください

From 482686972429a8b223b07d673eac24e298d52403 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 8 Sep 2012 10:53:53 -0500
Subject: [PATCH 669/829] Adding the Hebrew (he) locale courtesy of barryoni
 (BabelZilla).

---
 extension/install.rdf                      |   2 +
 extension/locale/he/description.properties |  13 ++
 extension/locale/he/scriptish.properties   | 163 +++++++++++++++++++++
 3 files changed, 178 insertions(+)
 create mode 100644 extension/locale/he/description.properties
 create mode 100644 extension/locale/he/scriptish.properties

diff --git a/extension/install.rdf b/extension/install.rdf
index 320adb1a..ca153255 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -47,9 +47,11 @@
 
     <em:translator>Alfredo Fernández Díaz (es-ES)</em:translator>
     <em:translator>allertec (pl)</em:translator>
+    <em:translator>barryoni (he)</em:translator>
     <em:translator>k2jp (ja-JP)</em:translator>
     <em:translator>Mauro José da Silva (pt-BR)</em:translator>
     <em:translator>Mikael Hiort af Ornäs (sv-SE)</em:translator>
+    <em:translator>Noumi Ryoko (ja-JP); http://wiijpn.blog69.fc2.com</em:translator>
     <em:translator>Nils Maier (de)</em:translator>
     <em:translator>nishikawasasaki (kohsei yamamoto) (ja-JP)</em:translator>
     <em:translator>shyangs (林郁翔) (zh-TW)</em:translator>
diff --git a/extension/locale/he/description.properties b/extension/locale/he/description.properties
new file mode 100644
index 00000000..07eecd37
--- /dev/null
+++ b/extension/locale/he/description.properties
@@ -0,0 +1,13 @@
+amo.description.line1=Scriptish הוא המשך פיתוח ל־Greasemonkey, המציע:
+amo.description.line2=כל מה ש־Greasemonkey עושה (שהוא למעשה שימושי)
+amo.description.line3=מעדכן: קבצי script של משתמש ניתנים לעדכון ב־Scriptish באמצעות @updateURL
+amo.description.line4=הרבה <a title="Scriptish metadata block documentation-Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block"> חדשים הם מטה־נתונים של @מפתחות</a>
+amo.description.line5=הרבה <a title="Scriptish User Script API-Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API"> חדשים הם תוספות לממשק היישום של GM_</a>
+amo.description.line6=ביצועים מעולים: מהיר יותר, קוד בסיס נקי יותר שמנצל את היתרונות בכל הגירסאות האחרונות של Firefox בצורה מירבית
+amo.description.line7=אבטחה מעולה : Scriptish מספק תכונות אבטחה שלא תמצא במקום אחר
+amo.description.line8=בדיקות: המפתחים עושים הרבה בדיקות, כדי להבטיח תפקוד נכון של Scriptish ולאתר את כל הבאגים מוקדם יותר
+amo.developerComments.line1=ל־Scriptish יש כל מה שיש ל־Greasemonkey, ועוד תכונות רבות שניתן לקרוא אודותם ב: <a href="http://github.com/scriptish/scriptish/wiki"> http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=אנא שלח דיווח על כל באג או בקשת תוספת לכתובת הבאה: <a href="https://github.com/scriptish/scriptish/issues"> https://github.com/scriptish/scriptish/issues</a>
+amo.developerComments.line3=אם יש לך שאלות נוספות, נא לשלוח אותם לרשימת התפוצה: <a href="http://groups.google.com/group/scriptish"> http://groups.google.com/group/scriptish</a>
+amo.summary=מנוע script של משתמש הגדול ביותר ברשת.
+extensions.scriptish@erikvold.com.description=מנהל הרחבה של קבצי Script עבור Firefox
diff --git a/extension/locale/he/scriptish.properties b/extension/locale/he/scriptish.properties
new file mode 100644
index 00000000..6e23467f
--- /dev/null
+++ b/extension/locale/he/scriptish.properties
@@ -0,0 +1,163 @@
+contributions.description=המפתח של Scriptish מבקש סיוע בהמשך פיתוח ההרחבה באמצעות מתן תרומה קטנה.
+copyDownloadURL=העתק כתובת URL של הורדה
+copyDownloadURL.ak=ע
+edit=ערוך
+edit.ak=ע
+editor.couldNotLaunch=לא ניתן להפעיל את עורך הטקסט
+editor.pleasePickExecutable=אנא בחר יישום הפעלה (כגון: notepad.exe) עבור עריכת קבצי script של משתמש.
+editor.prompt=אנא בחר תחילה את עורך הטקסט המועדף עליך
+editor.useScratchpad=האם ברצונך להשתמש ב־Scratchpad כעורך הטקסט שלך?
+editor.useScratchpad.no=לא (אני אבחר בעצמי)
+editor.useScratchpad.yes=כן
+error.api.clipboard.type=אינו מסוג שנתמך ע"י GM_setClipboard.
+error.api.noResourceWithName=לא קיים משאב בעל שם
+error.api.noSecondArgValue=לא צוין ערך שני: ערך
+error.api.reqURL=כתובת URL לא חוקית
+error.api.reqURL.scheme=ערכה לא מורשת בכתובת URL
+error.api.unsafeAccess=הפרת גישה של Scriptish: אין אפשרות לקרוא unsafeWindow
+error.charset=צוין קידוד לא חוקי.
+error.dependency.loading=שגיאה בטעינת תלות
+error.dependency.local=SecurityException: בקשות אל כתובות מקומיות ו־chrome הינן אסורות
+error.dependency.serverReturned=שגיאה! השרת החזיר שגיאה
+error.hash.algorithm=צוין אלגוריתם hash לא חוקי.
+error.icon.dataURL=נתונים לא חוקיים: כתובת URL של @סמל
+error.icon.notImage=שגיאה! ל־@סמל אין תמונה מסוג MIME
+error.icon.URL=כתובת URL לא חוקית של @סמל
+error.invalidCert=
+error.isInvalidValue=הוא ערך לא חוקי
+error.matchPattern.rules=@התאמת התבנית אינה תואמת את כללי התבנית
+error.matchPattern.rules.file=קובץ ערכת @התאמת תבנית אינו תואם את כללי התבנית
+error.notSecure=
+error.notSupported.Firefox=אינו נתמך ע"י גירסה זו של Firefox
+error.openingFile=אין אפשרות לפתוח קובץ
+error.pattern.parsing=אין אפשרות לעבד את התבנית
+error.pref.type=סוג מאפיין שאינו נתמך. הסוגים החוקיים הם: מחרוזת, פעולה בוליאנית ומספרים שלמים של 32 סיביות.
+error.remoteVersionOlder=
+error.resource.dupName=הוא שם משאב כפול. כל @משאב חייב להיות בעל שם ייחודי.
+error.resource.syntax=תחביר לא חוקי עבור הצהרת @משאב
+error.retrieving=אחזור נכשל
+error.script.installing=שגיאה בהתקנת קובץ script של משתמש
+error.script.loading=שגיאה בטעינת קובץ script של משתמש
+greeting.btn.ak=ט
+greeting.msg=זהו קובץ script של משתמש. לחץ על התקן כדי להתחיל להשתמש בו.
+install=התקן
+install.domains=תחומים:
+install.excludes=אינו פועל ב:
+install.includes=פועל ב:
+install.matches=מתאים:
+install.requires=דורש:
+install.resources=משאבים:
+install.showScriptSource=הצג את מקור ה־Script
+install.title=התקנת קובץ Script של משתמש
+install.warning1=קבצי script זדוניים יכולים להפר את הפרטיות שלך ולפעול בשמך ללא ידיעתך.
+install.warning2=עליך להתקין קבצי script רק ממקורות מהימנים.
+installFromFile=התקנת Script של משתמש מקובץ...
+installFromFile.ak=מ
+menu.commands=פקודות Script של משתמש...
+menu.commands.ak=פ
+menu.install=התקנת Script של משתמש...
+menu.install.ak=ה
+menu.manage=ניהול קבצי Script של משתמש...
+menu.manage.ak=נ
+menu.new=Script של משתמש חדש...
+menu.new.ak=ח
+menu.options.ak=א
+menu.show=הצג את מקור הקובץ של Script המשתמש
+menu.show.ak=צ
+menu.title=Scriptish
+menu.title.ak=S
+menuitem.install=התקן קובץ Script של משתמש זה...
+menuitem.manage=ניהול קבצי Script של משתמש
+menuitem.new=Script של משתמש חדש
+moving.dependency=מעביר קובץ תלות מ...
+moving.script=מעביר תלות קובץ מ...
+newscript.author=מחבר
+newscript.description=תיאור
+newscript.excludes=לא כולל (אחד בכל שורה)
+newscript.exists=Script בשם זה כבר מותקן. \nהאם ברצונך להחליפו?
+newscript.id=מזהה
+newscript.includes=כולל (אחד בכל שורה)
+newscript.missing.id=אנא ספק מזהה.
+newscript.missing.name=אנא ספק שם. השם יוצג בתוך מנהל התוספות.
+newscript.name=שם
+newscript.namespace=שם מרחב
+newscript.noID=אנא ציין מזהה חוקי עבור ה־script שלך.
+newscript.noName=אנא ספק שם עבור ה־script שלך.
+newscript.runat=הפעל כאשר
+newscript.runat.documentend=המסמך סיים להיטען
+newscript.runat.documentidle=המסמך הראשון אינו פעיל
+newscript.runat.documentstart=המסמך התחיל להיטען
+newscript.runat.windowload=החלון כולל כל המדיה נטענו במלואם
+newscript.version=גירסה
+nothing.timedOut=שום דבר (בזמן שהוקצב)
+openFolder=פתח תיקיה
+openFolder.ak=פ
+openUserScriptsManager=פתח את מנהל קבצי ה־Scripts של משתמש
+openUserScriptsManager.ak=פ
+options=אפשרויות
+options.addonsManager=מנהל התוספות
+options.alsoUninstallPrefs=בעת הסרת ההתקנה של קובץ script, הסר גם את ההעדפות שלו
+options.cache=מטמון
+options.cache.enabled=קבצי script של משתמש במטמון
+options.changeEditor=שנה עורך טקסט
+options.editor=עורך טקסט
+options.editor.notset=לא נבחר עורך טקסט
+options.enableCopyDownloadURL=אפשר העתקת כתובת URL של הורדה
+options.enabledSchemes.about=אודות תקן העברת נתונים (פנימי)
+options.enabledSchemes.advanced=תקני העברת נתונים נוספים
+options.enabledSchemes.chrome=תקן העברת נתונים של chrome (פנימי)
+options.enabledSchemes.data=תקן העברת נתונים של נתונים
+options.enabledSchemes.file=תקן העברת נתונים של קבצים (קבצים מקומיים)
+options.enabledSchemes.ftp=תקן העברת נתונים של FTP
+options.enabledSchemes.http=תקן העברת נתונים של http/https
+options.enabledSchemes.main=תקני העברת נתונים
+options.enabledSchemes.securityRemark=תקני העברת נתונים נוספים שעלולים לקבל גישה מלאה למערכת.
+options.enabledSchemes.securityRemark2=לפיכך הם מהווים סיכון אבטחה גדול למדי עם קבצי script שאינו מהימנים!
+options.enabledSchemes.unmht=תקן העברת נתונים של unmht (תבנית ארכיון מוזילה)
+options.excludes.desc=אי הכללה כללית תשבית כל script או כללים מסויימים של משתמש
+options.excludes.empty=לא צוינה אי הכללה כללית
+options.excludes.remark=(באפשרותך לציין הכללה אחת בכל שורה)
+options.logChrome=לרשום הודעות שאינם קריטיים הרחבה למסוף שגיאה
+options.logging=רישום
+options.logToErrorConsole=GM_log משתמש במסוף שגיאה
+options.notifications=הודעות
+options.notifications.popup.enable=הפעל הודעות מוקפצות
+options.notifications.sliding.enable=הפעל הודעות גולשות
+options.notifications.whenDisabled=כאשר לא זמין, כל הודעה תופיע במסוף השגיאה.
+options.pane.advanced=מתקדם
+options.pane.excludes=שלילה
+options.pane.main=ראשי
+options.pane.ui=ממשק
+options.requireBuiltInCerts=עדכון מאובטח מחייב שימוש באישורים מובנים
+options.requireSecured=דרוש מקבצי script של משתמש להתעדכן ע"י שימוש ב־HTTPS
+options.title=אפשרויות של Scriptish
+options.toolbarbutton=לחצן סרגל כלים
+options.toolbarbutton.showScripts=הצג את מספר ה־scripts הפעילים
+options.translation=תרגום
+options.translation.useEnglish=תמיד השתמש באנגלית
+options.update.security=עדכון אבטחה
+options.useDownloadURL=השתמש בכתובת URL להורדת עדכונים אם קיימת כתובת URL ללא עדכון
+reinstall=התקן מחדש
+saving=שומר
+scratchpad.saveAsUserScript=שמור כקובץ Script של משתמש
+scratchpad.saveAsUserScript.ak=מ
+scriptOptions.disableScriptIncludes=מנע קובץ script והשתמש רק באלה המוגדרים ע"י המשתמש.
+scriptOptions.excludes=לא כלול (ע"י המשתמש):
+scriptOptions.includes=כלול (ע"י המשתמש):
+statusbar.enabled=זמין
+statusbar.enabled.ak=ז
+statusbar.installed=הותקן בהצלחה
+statusbar.modified=שונה לאחרונה
+statusbar.noScripts.excluded=הדף אינו נכלל!
+statusbar.noScripts.notfound=אין קבצי script לדף!
+statusbar.noScripts.scheme=ערכה אינה זמינה!
+statusbar.updated=עודכן בהצלחה
+tooltip.loading=טוען...
+Uninstall=הסר
+untitledScript=קובץ Script ללא שם
+Update=עדכן
+userscript=Script של משתמש
+userscripts=Script של משתמש
+userscripts.get=קבל קבצי script של משתמש
+userscripts.noneInstalled=אין ברשותך קבצי scripts של משתמש מותקנים
+warning.returnfrommain=מצב "חוזר" מתחום ראשי בדרך כלל אינה נתמך. עליך לתקן זאת בקובץ ה־script של המשתמש.

From 34c469f99f496bafcdbf9c5e5793447eeb9944b6 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 8 Sep 2012 10:59:56 -0500
Subject: [PATCH 670/829] Adding the Hungarian (hu) locale courtesy of Kozak
 (WonderCsabo) Csaba (BabelZilla)

---
 extension/install.rdf                      |   1 +
 extension/locale/hu/description.properties |  13 ++
 extension/locale/hu/scriptish.properties   | 163 +++++++++++++++++++++
 3 files changed, 177 insertions(+)
 create mode 100644 extension/locale/hu/description.properties
 create mode 100644 extension/locale/hu/scriptish.properties

diff --git a/extension/install.rdf b/extension/install.rdf
index ca153255..f3c0f177 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -49,6 +49,7 @@
     <em:translator>allertec (pl)</em:translator>
     <em:translator>barryoni (he)</em:translator>
     <em:translator>k2jp (ja-JP)</em:translator>
+    <em:translator>Kozák (WonderCsabo) Csaba (hu)</em:translator>
     <em:translator>Mauro José da Silva (pt-BR)</em:translator>
     <em:translator>Mikael Hiort af Ornäs (sv-SE)</em:translator>
     <em:translator>Noumi Ryoko (ja-JP); http://wiijpn.blog69.fc2.com</em:translator>
diff --git a/extension/locale/hu/description.properties b/extension/locale/hu/description.properties
new file mode 100644
index 00000000..9a2ff3b4
--- /dev/null
+++ b/extension/locale/hu/description.properties
@@ -0,0 +1,13 @@
+amo.description.line1=A Scriptish a Greasemonkey továbbfejlesztése, és a következőt kínálja:
+amo.description.line2=Mindent, amit a Greasemonkey tud (ami éppenséggel elég hasznos)
+amo.description.line3=Frissítés: a parancsfájlok frissíthetőek a Scriptish-ben a @updateURL használatával
+amo.description.line4=Sok új <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">metadata @kulcs</a>
+amo.description.line5=Sok új <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">kiegészítés a GM_ API-hoz</a>
+amo.description.line6=Nagyobb teljesítmény: Gyorsabb, tisztább kódbázis, mely kihasználja a legújabb Firefox verziók adta lehetőségeket
+amo.description.line7=Nagyobb biztonság: A Scriptish olyan biztonsági funkciókat szolgáltat, melyeket máshol nem talál meg
+amo.description.line8=Tesztelés: A fejlesztők rengeteg tesztet végeznek a helyes működés biztosítása és a hibák gyorsabb felderítése érdekében
+amo.developerComments.line1=A Scriptish tartalmazza mindazt, amit a Greasemonkey, továbbá sok új funkciót, melyekről itt olvashat: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=Kérjük a hibákat és a javaslatokat itt jelezze: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
+amo.developerComments.line3=Ha bármely kérdése van, kérjük küldje el azokat a levelezési listára: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=A legnagyszerűbb parancsfájl-kezelő az Interneten.
+extensions.scriptish@erikvold.com.description=Parancsfájl-kezelő a Firefoxhoz
diff --git a/extension/locale/hu/scriptish.properties b/extension/locale/hu/scriptish.properties
new file mode 100644
index 00000000..c299c5ff
--- /dev/null
+++ b/extension/locale/hu/scriptish.properties
@@ -0,0 +1,163 @@
+contributions.description=A parancsfájl készítője támogatást kér a parancsfájl fejlesztésének folytatásához.
+copyDownloadURL=Letöltési link másolása
+copyDownloadURL.ak=m
+edit=Szerkesztés
+edit.ak=S
+editor.couldNotLaunch=Szerkesztő indítása sikertelen.
+editor.pleasePickExecutable=Kérem válasszon egy futtatható alkalmazást a parancsfájlok szerkesztéséhez.
+editor.prompt=Kérem először válassza ki az Ön által preferált szerkesztőt
+editor.useScratchpad=A Scratchpad-et szeretné használni szerkesztőként?
+editor.useScratchpad.no=Nem (kiválasztok egy sajátot)
+editor.useScratchpad.yes=Igen
+error.api.clipboard.type=a GM_setClipboard által nem támogatott típus.
+error.api.noResourceWithName=Nincs erőforrás ezen a néven:
+error.api.noSecondArgValue=Második argumentum nincs meghatározva: Érték
+error.api.reqURL=Érvénytelen URL
+error.api.reqURL.scheme=Az URL formátuma érvénytelen
+error.api.unsafeAccess=Scriptish hozzáférési hiba: unsafeWindow nem képes hívni
+error.charset=Érvénytelen karakterosztály.
+error.dependency.loading=Hiba a függőség betöltése során
+error.dependency.local=SecurityException: lokális és chrome URL-ek lekérése nem engedélyezett
+error.dependency.serverReturned=Hiba! A szerver válasza:
+error.hash.algorithm=Érvénytelen hash-elő algoritmus.
+error.icon.dataURL=Érvénytelen adat: @icon URL-ja
+error.icon.notImage=Hiba! @icon nem rendelkezik kép MIME típussal
+error.icon.URL=Érvénytelen URL az @icon-hoz
+error.invalidCert=
+error.isInvalidValue=érvénytelen érték
+error.matchPattern.rules=@match minta nem felel meg a szabályoknak
+error.matchPattern.rules.file=Fájl séma @match minta nem fele meg a szabályoknak
+error.notSecure=
+error.notSupported.Firefox=nem támogatott a Firefox ezen verziója által.
+error.openingFile=Fájl megnyitása sikertelen
+error.pattern.parsing=Minta feldolgozása sikertelen
+error.pref.type=Nem támogatott típus. Érvényes típusok: karakterlánc, logikai és 32 bites egész.
+error.remoteVersionOlder=
+error.resource.dupName=egy duplikált erőforrás név. Minden @resource-nek egyedi névvel kell rendelkeznie.
+error.resource.syntax=Érvénytelen szintaktis @resource deklarációhoz
+error.retrieving=Beszerzése sikertelen:
+error.script.installing=Hiba a parancsfájl telepítése során
+error.script.loading=Hiba a parancsfájl betöltése során
+greeting.btn.ak=T
+greeting.msg=Ez egy parancsfájl. Kattintson a telepítésre a parancsfájl használatának megkezdéséhez.
+install=Telepítés
+install.domains=dömének:
+install.excludes=nem fut a következőn:
+install.includes=fut a következőn:
+install.matches=illeszkedik:
+install.requires=elvárások:
+install.resources=erőforrások:
+install.showScriptSource=Parancsfájl forrásának megjelenítése
+install.title=Parancsfájl telepítése
+install.warning1=Kártékony parancsfájlok hozzáférhetnek az Ön személyes adataihoz és működhetnek az Ön tudta nélkül.
+install.warning2=Csak megbízható forrásból telepítsen parancsfájlt!
+installFromFile=Parancsfájl telepítése fájlból…
+installFromFile.ak=f
+menu.commands=Parancsfájl műveletei…
+menu.commands.ak=P
+menu.install=Parancsfájl telepítése…
+menu.install.ak=t
+menu.manage=Parancsfájlok kezelése…
+menu.manage.ak=k
+menu.new=Új parancsfájl…
+menu.new.ak=j
+menu.options.ak=B
+menu.show=Parancsfájl forrásának megtekintése
+menu.show.ak=f
+menu.title=Scriptish
+menu.title.ak=S
+menuitem.install=Parancsfájl telepítése…
+menuitem.manage=Parancsfájlok kezelése…
+menuitem.new=Új parancsfájl
+moving.dependency=Függőségi fájl áthelyezése
+moving.script=Parancsfájl átnevezése
+newscript.author=Készítő
+newscript.description=Leírás
+newscript.excludes=Kizárt oldalak (soronként egy)
+newscript.exists=Már telepítve van parancsfájl ilyen néven.\nFelülírja?
+newscript.id=ID
+newscript.includes=Tartalmazott oldalak (soronként egy)
+newscript.missing.id=Kérem adjon meg egy ID-t.
+newscript.missing.name=Kérem adjon meg egy nevet. Ez a név fog megjelenni a Kiegészítőkezelőben.
+newscript.name=Név
+newscript.namespace=Névtér
+newscript.noID=Kérem adjon meg egy érvényes ID-t a szkripthez.
+newscript.noName=Kérem adjon meg egy nevet a szkripthez.
+newscript.runat=Mikor fusson
+newscript.runat.documentend=Az oldal betöltésének befejeztekor
+newscript.runat.documentidle=Amikor az oldal először van üresjáratban
+newscript.runat.documentstart=Az oldal betöltésének kezdetekor
+newscript.runat.windowload=Amikor az ablak az összes média elemmel együtt betöltésre kerül
+newscript.version=Verzió
+nothing.timedOut=semmi (időtúllépés)
+openFolder=Könyvtár megnyitása
+openFolder.ak=K
+openUserScriptsManager=Parancsfájl kezelő megnyitása
+openUserScriptsManager.ak=m
+options=Beállítások
+options.addonsManager=Kiegészítőkezelő
+options.alsoUninstallPrefs=A parancsfájl eltávolításakor a hozzá tartozó beállításokat is törölje
+options.cache=Gyorsítótár
+options.cache.enabled=Parancsfájlok gyorsítótárazása
+options.changeEditor=Szerkesztő megváltoztatása
+options.editor=Szerkesztő
+options.editor.notset=Nincs szerkesztő kiválasztva
+options.enableCopyDownloadURL=Letöltési URL másolásának engedélyezése
+options.enabledSchemes.about=about protokoll (belső)
+options.enabledSchemes.advanced=További protokollok
+options.enabledSchemes.chrome=chrome protokoll (belső)
+options.enabledSchemes.data=data protokoll
+options.enabledSchemes.file=file protokoll (lokális fájlok)
+options.enabledSchemes.ftp=ftp protokoll
+options.enabledSchemes.http=http/https protokoll
+options.enabledSchemes.main=Protokollok
+options.enabledSchemes.securityRemark=A további protokollok teljes rendszer jogosultságokkal rendelkezhetnek.
+options.enabledSchemes.securityRemark2=Így nem megbízható parancsfájlokkal használva komoly biztonsági kockázatot jelentenek!
+options.enabledSchemes.unmht=unmht protokoll (Mozilla archívum formátum)
+options.excludes.desc=A globális kivételek minden parancsfájl vagy felhasználó által meghatározott szabályt felülírnak
+options.excludes.empty=Nincsenek globális kivételek meghatározva
+options.excludes.remark=(Soronként egyet adhat meg)
+options.logChrome=Nem kritikus kiterjesztés üzenetek naplózása a Hibakonzolban
+options.logging=Naplózás
+options.logToErrorConsole=A GM_log használja a Hibakonzolt
+options.notifications=Értesítések
+options.notifications.popup.enable=Felugró értesítések engedélyezése
+options.notifications.sliding.enable=Beúszó értesítések engedélyezése
+options.notifications.whenDisabled=Ha ez nincs engedélyezve, minden értesítés a Hibakonzolban jelenik meg.
+options.pane.advanced=Haladó
+options.pane.excludes=Globális kivételek
+options.pane.main=Általános
+options.pane.ui=Felhasználói felület
+options.requireBuiltInCerts=A biztonsági frissítésekhez beépített tanúsítványok szükségesek
+options.requireSecured=A parancsfájlok frissítése a HTTPS protokollon keresztül történjen
+options.title=Scriptish beállítások
+options.toolbarbutton=Eszköztár gomb
+options.toolbarbutton.showScripts=Aktív parancsfájlok számának megjelenése
+options.translation=Honosítás
+options.translation.useEnglish=Mindig az angol szöveget használja
+options.update.security=Frissítések biztonsága
+options.useDownloadURL=Letöltési URL használata a frissítéshez, ha frissítési URL nincs meghatározva
+reinstall=Újratelepítés
+saving=Mentés
+scratchpad.saveAsUserScript=Mentés parancsfájlként
+scratchpad.saveAsUserScript.ak=p
+scriptOptions.disableScriptIncludes=Parancsfájl tartalmazási mintáinak letiltása és csak a felhasználó által megadottakat használja.
+scriptOptions.excludes=Felhasználói kizárások:
+scriptOptions.includes=Felhasználói tartalmazások:
+statusbar.enabled=Engedélyezve
+statusbar.enabled.ak=E
+statusbar.installed=telepítése sikeres
+statusbar.modified=módosítva
+statusbar.noScripts.excluded=Oldal kizárva!
+statusbar.noScripts.notfound=Nincsenek parancsfájlok az oldalhoz!
+statusbar.noScripts.scheme=Séma kikapcsolva!
+statusbar.updated=frissítése sikeres
+tooltip.loading=Betöltés…
+Uninstall=Eltávolítás
+untitledScript=Névtelen parancsfájl
+Update=Frissítés
+userscript=Parancsfájl
+userscripts=Parancsfájlok
+userscripts.get=Töltsön le parancsfájlokat
+userscripts.noneInstalled=Nincsen telepített parancsfájl
+warning.returnfrommain="return" utasítás használata a fő scope-ban nem támogatott. Ezt ki kell javítania a parancsfájlban.

From 17cb95a76863b8feef045cf1cf467cffc818908c Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 8 Sep 2012 11:09:36 -0500
Subject: [PATCH 671/829] Switching back to the Github Issues tracker in
 locales and about:scriptish

---
 extension/content/aboutScriptish.html         | 4 ++--
 extension/locale/de/description.properties    | 2 +-
 extension/locale/en-US/description.properties | 2 +-
 extension/locale/es-ES/description.properties | 2 +-
 extension/locale/pl/description.properties    | 2 +-
 extension/locale/pt-BR/description.properties | 2 +-
 extension/locale/ru-RU/description.properties | 2 +-
 extension/locale/zh-CN/description.properties | 2 +-
 extension/locale/zh-TW/description.properties | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 220394b7..88e13dcb 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -45,8 +45,8 @@ <h2>Help Out</h2>
        </header>
        <p>There are many ways you can help out with Scriptish:</p>
        <ul>
-         <li><a href="http://scriptish.lighthouseapp.com/projects/83146/tickets/new">Report a bug</a></li>
-         <li><a href="http://scriptish.lighthouseapp.com/projects/83146/tickets/new">Request a feature</a></li>
+         <li><a href="https://github.com/scriptish/scriptish/issues/new">Report a bug</a></li>
+         <li><a href="https://github.com/scriptish/scriptish/issues/new">Request a feature</a></li>
          <li>Like coding?  <a href="https://github.com/scriptish/scriptish">Collaborate!</a></li>
        </ul>
      </section>
diff --git a/extension/locale/de/description.properties b/extension/locale/de/description.properties
index 5bd6d28c..6949d914 100644
--- a/extension/locale/de/description.properties
+++ b/extension/locale/de/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Überlegene Leistung: Schnellerer, saubererer Code, der vo
 amo.description.line7=Überlegene Sicherheit: Scriptish beinhaltet Sicherheitsfunktionen, die Sie nirgendwo anders finden
 amo.description.line8=Tests: Die Entwickler benutzen viele Tests um eine korrekte Arbeitsweise sicherzustellen und Fehler schnell zu entdecken
 amo.developerComments.line1=Scriptish beinhaltet alles, was auch Greasemonkey kann, plus viele neue und verbesserte Funktionen. Erfahren Sie mehr im <a href="http://github.com/scriptish/scriptish/wiki">Scriptish Wiki</a>
-amo.developerComments.line2=Bitte schicken Sie alle Bugs oder Funktionsvorschläge zu: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
+amo.developerComments.line2=Bitte schicken Sie alle Bugs oder Funktionsvorschläge zu: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=Wenn sie weitere Fragen haben, dann senden Sie diese bitte auf Englisch an die Mailing-Liste: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=Der beste Benutzerskript Software im Internet
 extensions.scriptish@erikvold.com.description=Ein Benutzerskript-Erweiterungen-Manager für Firefox
diff --git a/extension/locale/en-US/description.properties b/extension/locale/en-US/description.properties
index 841e8309..7cb0fe4f 100644
--- a/extension/locale/en-US/description.properties
+++ b/extension/locale/en-US/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Superior Performance: A faster, cleaner code base which ta
 amo.description.line7=Superior Security: Scriptish provides security features you won't find elsewhere
 amo.description.line8=Testing: The developers make use of a lot of tests to ensure the correct functioning of Scriptish and to find any bugs sooner
 amo.developerComments.line1=Scriptish has everything Greasemonkey has, plus many features which you can read about at: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=Please submit any bugs or feature requests to: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
+amo.developerComments.line2=Please submit any bugs or feature requests to: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=If you have any other questions, please send them to the mailing list: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=The greatest user script engine on the Internet.
 extensions.scriptish@erikvold.com.description=A Script Extension Manager for Firefox
diff --git a/extension/locale/es-ES/description.properties b/extension/locale/es-ES/description.properties
index f3270a1b..a5dd8a01 100644
--- a/extension/locale/es-ES/description.properties
+++ b/extension/locale/es-ES/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Rendimiento Superior: Un código base más rápido y limpi
 amo.description.line7=Seguridad Superior: Scriptish proporciona características de seguridad que no encontrará en otro sitio
 amo.description.line8=Testeo: Los desarrolladores realizan muchos tests para asegurar el correcto funcionamiento de Scriptish y encontrar cualquier error cuanto antes
 amo.developerComments.line1=Scriptish tiene todo lo que tiene Greasemonkey, además de otras muchas características sobre las que puede leer en: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=Por favor remite cualquier error o solicitud de característica a: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
+amo.developerComments.line2=Por favor remite cualquier error o solicitud de característica a: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=Si tiene alguna otra pregunta, por favor envíela a la lista de correo: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=El motor de scripts de usuario más avanzado en Internet.
 extensions.scriptish@erikvold.com.description=Un gestor de scripts de usuario para aplicaciones Mozilla
diff --git a/extension/locale/pl/description.properties b/extension/locale/pl/description.properties
index 80998884..a13a3652 100644
--- a/extension/locale/pl/description.properties
+++ b/extension/locale/pl/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Zwiększoną Wydajność: Szybsza, przejrzystsza baza kod
 amo.description.line7=Zwiększone Bezpieczeństwo: Scriptfish dostarcza niespotykanych dotąd funkcji bezpieczeństwa
 amo.description.line8=Testowanie: Programiści przeprowadzali liczne testy, aby mieć pewność prawidłowego działania Scriptish-a oraz przyspieszyć wykrywalność licznych błędów.
 amo.developerComments.line1=Scriptish posiada wszystkie zalety Greasemonkey plus wiele innych, o których możesz poczytać na: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=Zgłoszenia dotyczące jakichkolwiek błędów oraz funkcji przesyłać na adres: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>.
+amo.developerComments.line2=Zgłoszenia dotyczące jakichkolwiek błędów oraz funkcji przesyłać na adres: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>.
 amo.developerComments.line3=Jeśli masz pytania, proszę przesłać na adres grupy dyskusyjnej: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=Największy silnik skryptowy dla użytkownika w Internecie.
 extensions.scriptish@erikvold.com.description=Script Extension Manager dla Firefox-a
diff --git a/extension/locale/pt-BR/description.properties b/extension/locale/pt-BR/description.properties
index 603eca05..f85c7f22 100644
--- a/extension/locale/pt-BR/description.properties
+++ b/extension/locale/pt-BR/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Desempenho superior: um código mais rápido e mais limpo,
 amo.description.line7=Segurança superior: o Scriptish fornece recursos de segurança que você não vai encontrar em outro lugar
 amo.description.line8=Testes: os desenvolvedores empregam uma série de testes para garantir o correto funcionamento do Scriptish e encontrar falhas o mais breve possível
 amo.developerComments.line1=O Scriptish tem todos os recursos que o Greasemonkey tem e muitos mais, que você pode descobrir em: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a> .
-amo.developerComments.line2=Por favor, envie informações sobre falhas ou solicitações de novos recursos em: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a> .
+amo.developerComments.line2=Por favor, envie informações sobre falhas ou solicitações de novos recursos em: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a> .
 amo.developerComments.line3=Se você tiver qualquer dúvida, envie sua pergunta para a lista de discussão: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a> .
 amo.summary=O maior mecanismo de scripts de usuário da Internet.
 extensions.scriptish@erikvold.com.description=Um gerenciador de scripts para o Firefox.
diff --git a/extension/locale/ru-RU/description.properties b/extension/locale/ru-RU/description.properties
index f76f9f34..d5a3d842 100644
--- a/extension/locale/ru-RU/description.properties
+++ b/extension/locale/ru-RU/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=Превосходную производительнос
 amo.description.line7=Превосходную безопасность: Scriptish предлагает возможности безопасности, которые вы не найдёте больше нигде.
 amo.description.line8=Тестирование: Разработчики могут использовать большое количество тестов, позволяющих выявить баги и убедиться в правильности работы Scriptish.
 amo.developerComments.line1=В Scriptish есть всё, что есть в Greasemonkey, плюс много новых функций, о которых можно прочитать здесь: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=Пожалуйста, отправляйте сообщения о багах и запросы на новую функциональность сюда: <a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
+amo.developerComments.line2=Пожалуйста, отправляйте сообщения о багах и запросы на новую функциональность сюда: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=Если у вас есть другие вопросы, пишите сюда: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=Лучший движок для пользовательских скриптов в интернете.
 extensions.scriptish@erikvold.com.description=Менеджер пользовательских скриптов для Firefox.
\ No newline at end of file
diff --git a/extension/locale/zh-CN/description.properties b/extension/locale/zh-CN/description.properties
index 280c6457..b32375aa 100644
--- a/extension/locale/zh-CN/description.properties
+++ b/extension/locale/zh-CN/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=优越的性能：利用一切 Firefox 4所提供的更快
 amo.description.line7=出众的安全：Scriptish 提供独一无二的安全功能
 amo.description.line8=测试：编写代码测试Scriptish 的功能和特性
 amo.developerComments.line1=Scriptish 拥有 Greasemonkey 的所有功能，增加的很多其他特性您可以到这里查看：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=请到这里提交 bug 或功能需求：<a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
+amo.developerComments.line2=请到这里提交 bug 或功能需求：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=如果您还有其他问题，请发送邮件到这里：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=互联网上最伟大的用户脚本引擎。
 extensions.scriptish@erikvold.com.description=面向 Firefox 的一个脚本扩展管理器
diff --git a/extension/locale/zh-TW/description.properties b/extension/locale/zh-TW/description.properties
index 9d3e333e..7ebb124a 100644
--- a/extension/locale/zh-TW/description.properties
+++ b/extension/locale/zh-TW/description.properties
@@ -7,7 +7,7 @@ amo.description.line6=優秀的性能：憑藉新版 Firefox 的優勢，以更
 amo.description.line7=出色的安全：Scriptish 提供獨一無二的安全特性
 amo.description.line8=測試：開發者利用大量的測試保證 Scriptish 正確的執行，並更快找出程式碼中的錯誤
 amo.developerComments.line1=Scriptish 擁有 Greasemonkey 的所有功能，其他額外增加的特性您可以到這裡瀏覽：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=請到這裡提交 bug 或新功能請求：<a href="http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/">http://scriptish.lighthouseapp.com/projects/83146-firefox-extension/</a>
+amo.developerComments.line2=請到這裡提交 bug 或新功能請求：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=如果您還有其他問題，請寄發電子郵件到這裡：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=網際網路上最傑出的使用者腳本引擎。
 extensions.scriptish@erikvold.com.description=一個 Firefox 的腳本管理器

From b956baea523e21cde8fcde9165ad446e7fe51160 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 16 Sep 2012 18:09:38 -0500
Subject: [PATCH 672/829] Add the 'aBaseURL' argument to GM_safeHTMLParser,
 which allows script authors to specify a base URL to be used when resolving
 partials. Closes #17 (cherry picked from commit
 ee9ff4801c50abedfd1ad61a6a6243884261e363)

---
 extension/locale/de/scriptish.properties    |  1 +
 extension/locale/en-US/scriptish.properties |  1 +
 extension/locale/es-ES/scriptish.properties |  1 +
 extension/locale/he/scriptish.properties    |  1 +
 extension/locale/hu/scriptish.properties    |  1 +
 extension/locale/ja-JP/scriptish.properties |  1 +
 extension/locale/pl/scriptish.properties    |  1 +
 extension/locale/pt-BR/scriptish.properties |  1 +
 extension/locale/ru-RU/scriptish.properties |  1 +
 extension/locale/sv-SE/scriptish.properties |  1 +
 extension/locale/zh-CN/scriptish.properties |  1 +
 extension/locale/zh-TW/scriptish.properties |  1 +
 extension/modules/api.js                    | 30 +++++++++++++++++++--
 extension/modules/constants.js              |  5 ++++
 14 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index d0592ce3..2fecc4ad 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=Keine Resource mit dem Namen
 error.api.noSecondArgValue=Zweites Argument nicht spezifiziert: Value
 error.api.reqURL=Ungültige URL
 error.api.reqURL.scheme=Verbotenes Schema (Protokoll) in URL
+error.api.safeHTMLParser.url=
 error.api.unsafeAccess=Scriptish Zugriffsverletzung: unsafeWindow darf nicht aufrufen werden
 error.charset=Ungültige Zeichenkodierung angegeben.
 error.dependency.loading=Fehler beim Laden von Anhängigkeit
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index a61c8869..a17c8a44 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=No resource with name
 error.api.noSecondArgValue=Second argument not specified: Value
 error.api.reqURL=Invalid URL
 error.api.reqURL.scheme=Disallowed scheme in URL
+error.api.safeHTMLParser.url=The "URL" argument to GM_safeHTMLParser could not be parsed
 error.api.unsafeAccess=Scriptish access violation: unsafeWindow cannot call
 error.charset=Invalid charset specified.
 error.dependency.loading=Error loading dependency
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 2d5cd834..7280b030 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=No hay recursos con ese nombre
 error.api.noSecondArgValue=Segundo argumento no especificado: Valor
 error.api.reqURL=URL no válido
 error.api.reqURL.scheme=Esquema no permitido en URL
+error.api.safeHTMLParser.url=
 error.api.unsafeAccess=Violación de acceso de Scriptish: unsafeWindow no puede invocar
 error.charset=El conjunto de caracteres especificado no es válido.
 error.dependency.loading=Error al cargar dependencia
diff --git a/extension/locale/he/scriptish.properties b/extension/locale/he/scriptish.properties
index 6e23467f..4fd0c176 100644
--- a/extension/locale/he/scriptish.properties
+++ b/extension/locale/he/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=לא קיים משאב בעל שם
 error.api.noSecondArgValue=לא צוין ערך שני: ערך
 error.api.reqURL=כתובת URL לא חוקית
 error.api.reqURL.scheme=ערכה לא מורשת בכתובת URL
+error.api.safeHTMLParser.url=
 error.api.unsafeAccess=הפרת גישה של Scriptish: אין אפשרות לקרוא unsafeWindow
 error.charset=צוין קידוד לא חוקי.
 error.dependency.loading=שגיאה בטעינת תלות
diff --git a/extension/locale/hu/scriptish.properties b/extension/locale/hu/scriptish.properties
index c299c5ff..c233a794 100644
--- a/extension/locale/hu/scriptish.properties
+++ b/extension/locale/hu/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=Nincs erőforrás ezen a néven:
 error.api.noSecondArgValue=Második argumentum nincs meghatározva: Érték
 error.api.reqURL=Érvénytelen URL
 error.api.reqURL.scheme=Az URL formátuma érvénytelen
+error.api.safeHTMLParser.url=
 error.api.unsafeAccess=Scriptish hozzáférési hiba: unsafeWindow nem képes hívni
 error.charset=Érvénytelen karakterosztály.
 error.dependency.loading=Hiba a függőség betöltése során
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 8755496b..a41c7fe3 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=名前付きリソースが見つかりません
 error.api.noSecondArgValue=２番目の引数が指定されていません：Value
 error.api.reqURL=不正な URL です
 error.api.reqURL.scheme=URL 内で許されないスキーム（scheme）です
+error.api.safeHTMLParser.url=
 error.api.unsafeAccess=Scriptish アクセス違反： unsafeWindow は以下を呼び出すことが出来ません
 error.charset=不正な文字セットが指定されました
 error.dependency.loading=依存関係の読み込みでエラーが発生しました
diff --git a/extension/locale/pl/scriptish.properties b/extension/locale/pl/scriptish.properties
index ec6ce38b..a68048a9 100644
--- a/extension/locale/pl/scriptish.properties
+++ b/extension/locale/pl/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=Brak źródeł z nazwą
 error.api.noSecondArgValue=Drugi argument nie został określony: Wartość
 error.api.reqURL=Błędny URL
 error.api.reqURL.scheme=Niedozwolony schemat URL
+error.api.safeHTMLParser.url=
 error.api.unsafeAccess=Naruszenie zasad dostępu Scriptish: nie można wywołać niebezpiecznego Okna
 error.charset=Określony zestaw znaków jest nieprawidłowy.
 error.dependency.loading=Błąd ładowania zależności
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index a3258e13..8b90746f 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=Nenhum recurso com o nome
 error.api.noSecondArgValue=Segundo argumento não especificado: Valor
 error.api.reqURL=Endereço inválido
 error.api.reqURL.scheme=Esquema não permitido em URL
+error.api.safeHTMLParser.url=
 error.api.unsafeAccess=Violação de acesso do Scriptish: unsafeWindow não pode chamar
 error.charset=O conjunto de caracteres especificado é inválido.
 error.dependency.loading=Erro carregando dependência
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 87f5324d..184b5754 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=Нет ресурса с таким именем
 error.api.noSecondArgValue=Следующий аргумент не указан: Значение
 error.api.reqURL=Неверный URL
 error.api.reqURL.scheme=Схема URL запрещена
+error.api.safeHTMLParser.url=
 error.api.unsafeAccess=Нарушение доступа Scriptish: из unsafeWindow не позволено работать с
 error.charset=Неверная кодировка.
 error.dependency.loading=Не удалось загрузить зависимость
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 02a242e9..2a4c3648 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=Det finns ingen resurs med namnet
 error.api.noSecondArgValue=Det andra argumentet har inte angivits: Värde
 error.api.reqURL=Ogiltig URL
 error.api.reqURL.scheme=Otillåtet schema i URL
+error.api.safeHTMLParser.url=
 error.api.unsafeAccess=Åtkomstfel i Scriptish: unsafeWindow kan inte anropa
 error.charset=Ogiltig teckenuppsättning angavs.
 error.dependency.loading=Fel vid inläsning av beroende
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index 9854fda7..9bbbc82f 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=没有该名称的资源
 error.api.noSecondArgValue=第二个参数未指定：值
 error.api.reqURL=无效的 URL
 error.api.reqURL.scheme=不允许在 URL 中出现 scheme
+error.api.safeHTMLParser.url=
 error.api.unsafeAccess=Scriptish 访问冲突：unsafeWindow 无法调用
 error.charset=指定的字符集无效。
 error.dependency.loading=加载依赖文件时发生错误
diff --git a/extension/locale/zh-TW/scriptish.properties b/extension/locale/zh-TW/scriptish.properties
index d241947c..12cc1d66 100644
--- a/extension/locale/zh-TW/scriptish.properties
+++ b/extension/locale/zh-TW/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=沒有該名稱的資源
 error.api.noSecondArgValue=第二個參數未指定：值
 error.api.reqURL=無效的網址
 error.api.reqURL.scheme=網址中有不支援的協定
+error.api.safeHTMLParser.url=
 error.api.unsafeAccess=Scriptish 存取失敗: unsafeWindow 無法呼叫
 error.charset=指定的字元編碼無效。
 error.dependency.loading=載入附屬檔案時發生錯誤
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 98b05eaf..ef3a0943 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -83,12 +83,38 @@ function GM_API(options) {
     return new GM_Resources(aScript);
   });
 
-  this.GM_safeHTMLParser = function GM_safeHTMLParser(aHTMLStr) {
+  this.GM_safeHTMLParser = function GM_safeHTMLParser(aHTMLStr, aBaseURL) {
     if (!GM_apiLeakCheck("GM_safeHTMLParser")) return;
+
     let doc = document.implementation.createDocument(NS_XHTML, "html", null);
     let body = document.createElementNS(NS_XHTML, "body");
+    let baseURI;
+    let frag;
+
     doc.documentElement.appendChild(body);
-    body.appendChild(Services.suhtml.parseFragment(aHTMLStr, false, null, body));
+
+    if ("undefined" !== typeof aBaseURL) {
+      try {
+        baseURI = NetUtil.newURI(aBaseURL);
+      }
+      catch(e) {
+        throw new Error(Scriptish_stringBundle("error.api.safeHTMLParser.url"));
+      }
+    }
+    else {
+      baseURI = null;
+    }
+
+    // Try to use the newer nsIParserUtils (Gecko >= 14)
+    if ("pu" in Services) {
+      frag = Services.pu.parseFragment(aHTMLStr, 0, false, baseURI, body);
+    }
+    // Otherwise fall back to deprecated nsIScriptableUnescapeHTML
+    else {
+      frag = Services.suhtml.parseFragment(aHTMLStr, false, baseURI, body);
+    }
+
+    body.appendChild(frag);
     return doc;
   }
 
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 47f82215..9682950a 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -87,6 +87,11 @@ if (e10s) {
       "nsIChromeFrameMessageManager");
 }
 
+if (Cc["@mozilla.org/parserutils;1"]) {
+  lazyService(
+      Services, "pu", "@mozilla.org/parserutils;1", "nsIParserUtils");
+}
+
 lazyService(
     Services, "sis", "@mozilla.org/scriptableinputstream;1",
     "nsIScriptableInputStream");

From 2509bdaf415a306f5719dc1dbfd5a11da6afdc3c Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 16 Sep 2012 18:17:32 -0500
Subject: [PATCH 673/829] Minor tweak to an error message.

---
 extension/locale/en-US/scriptish.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index a17c8a44..cd11161f 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -14,7 +14,7 @@ error.api.noResourceWithName=No resource with name
 error.api.noSecondArgValue=Second argument not specified: Value
 error.api.reqURL=Invalid URL
 error.api.reqURL.scheme=Disallowed scheme in URL
-error.api.safeHTMLParser.url=The "URL" argument to GM_safeHTMLParser could not be parsed
+error.api.safeHTMLParser.url=The "URL" argument of GM_safeHTMLParser could not be parsed
 error.api.unsafeAccess=Scriptish access violation: unsafeWindow cannot call
 error.charset=Invalid charset specified.
 error.dependency.loading=Error loading dependency

From e636052a3efb2da2a6389a29c17ecd2162194a6d Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 20 Sep 2012 20:46:57 +0200
Subject: [PATCH 674/829] Fix regexpmerger escape character bug

Closes GH-19
---
 .../content/tests/testPatternCollection.js    | 28 ++++++
 extension/modules/third-party/regexpmerger.js | 85 +++++++++----------
 2 files changed, 69 insertions(+), 44 deletions(-)

diff --git a/extension/content/tests/testPatternCollection.js b/extension/content/tests/testPatternCollection.js
index 051a6ba9..6f2150ed 100644
--- a/extension/content/tests/testPatternCollection.js
+++ b/extension/content/tests/testPatternCollection.js
@@ -451,4 +451,32 @@ test("tainted \\u escape", function() {
   equal(pc.test("foobaz\u0025"), true, "test");
 });
 
+test("https://github.com/scriptish/scriptish/issues/19", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("http://tieba.baidu.com/*");
+  pc.addPattern("http://tieba.baidu.com.cn/*");
+  if (optimized) {
+    equal(pc.merged.source, "^http:\\/\\/tieba\\.baidu\\.com(?:\\.cn\\/.*$|\\/.*$)", "issue/19");
+  }
+  else {
+    equal(pc.merged.source, "(?:^http:\\/\\/tieba\\.baidu\\.com\\/.*$)|(?:^http:\\/\\/tieba\\.baidu\\.com\\.cn\\/.*$)", "issue/19");
+  }
+});
+
+test("https://github.com/scriptish/scriptish/issues/19 2", function() {
+  var PatternCollection = importModule("resource://scriptish/utils/PatternCollection.js").PatternCollection;
+
+  var pc = new PatternCollection();
+  pc.addPattern("abc\\de");
+  pc.addPattern("abc\\ef");
+  if (optimized) {
+    equal(pc.merged.source, "^abc\\\\(?:de$|ef$)", "issue/19 2");
+  }
+  else {
+    equal(pc.merged.source, "(?:^abc\\\\de$)|(?:^abc\\\\ef$)", "issue/19 2");
+  }
+});
+
 })();
diff --git a/extension/modules/third-party/regexpmerger.js b/extension/modules/third-party/regexpmerger.js
index 5918eea0..0c3def0e 100644
--- a/extension/modules/third-party/regexpmerger.js
+++ b/extension/modules/third-party/regexpmerger.js
@@ -1,47 +1,18 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is DownThemAll! RegExp optimizing merger
- *
- * The Initial Developer of the Original Code is Nils Maier
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Nils Maier <MaierMan@web.de>
- *   Erik Vold <erikvvold@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/ */
 "use strict";
 
-const EXPORTED_SYMBOLS = ['merge'];
-
 const REG_TAINTED = /\\[ux]?\d/;
 const REG_TAINTED_ESCAPES = /\\\\/g;
 
+/**
+ * Filter function - Split a group of patterns into processable and
+ * tainted ones. The |this| context must be set up to refer to an
+ * array that will receive the tainted patterns.
+ * @param {String} r A pattern
+ * @returns {Boolean} Filter pattern
+ */
 function tainted_filter(r) {
   // No negative lookbehind in js :p
   if (REG_TAINTED.test(r.replace(REG_TAINTED_ESCAPES, ""))) {
@@ -52,14 +23,13 @@ function tainted_filter(r) {
 }
 
 /**
- * Array filter function to create an unique array
+ * Filter function - Create an unique array
  * @usage arr.filter(unique_filter, Object.create(null));
  */
 function unique_filter(e) !((e in this) || (this[e] = null));
 
 /**
  * Return a good prefix, with no bracket mismatches
- *
  * @param {String} Calculate the prefix from
  * @return {String} Calculated safe prefix without bracket mismatches
  */
@@ -215,6 +185,26 @@ function splitAlternates(pattern, rv) {
   rv.push(cur);
 }
 
+/**
+ * Sanitizes (truncates) a prefix, so that it does not end with an escape
+ * character
+ * @param {String} prefix Prefix to sanitize
+ * @returns {String} Sanitized Prefix
+ */
+function sanitizePrefixTail(prefix) {
+  const pl = prefix.length;
+  if (!pl) {
+    return "";
+  }
+  if (pl > 1 && prefix[pl-1] == "\\" && prefix[pl-2] != "\\" ) {
+    return prefix.substr(0, pl-1);
+  }
+  else if (pl == 1 && prefix == "\\") {
+    return "";
+  }
+  return prefix;
+}
+
 /**
  * Recursively determine the the largest group with a common prefix
  * The group is guaranteed to contain at least 3 items
@@ -303,7 +293,7 @@ function largestPrefixGroup(patterns, low, high, level) {
  *                  specified by the low & high params are merged.
  */
 function mergePatterns(patterns, low, high, prefix) {
-  let pl = prefix.length;
+  const pl = prefix.length;
 
   // splice the patterns to be merged, chop off their common prefix and join
   let tails = patterns.splice(low, high - low).map(function(p) p.substring(pl));
@@ -358,7 +348,6 @@ function merge(patterns) {
   let tainted = [];
   patterns = patterns.filter(tainted_filter, tainted);
 
-
   // split patterns into pieces by top-level alternates
   let newpatterns = [];
   for (let [,p] in Iterator(patterns)) {
@@ -378,7 +367,8 @@ function merge(patterns) {
       // no common prefix found in (remaining) patterns
       break;
     }
-    patterns = mergePatterns(patterns, i, e, prefix);
+    const sprefix = sanitizePrefixTail(prefix);
+    patterns = mergePatterns(patterns, i, e, sprefix);
   }
 
   let len = patterns.length;
@@ -391,3 +381,10 @@ function merge(patterns) {
   // merge without a prefix to get single pattern
   return merge_finish(mergePatterns(patterns, 0, len, ""), tainted);
 }
+
+if ("exports" in this) {
+  exports.merge = merge;
+}
+else {
+  this.EXPORTED_SYMBOLS = ["merge"];
+}

From 497bd225f1b9486e436bff245fa46c7f2f0cd636 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 20 Sep 2012 20:53:10 +0200
Subject: [PATCH 675/829] Fix ScriptishLogger tests

---
 extension/content/tests/testScriptishLogger.js | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/extension/content/tests/testScriptishLogger.js b/extension/content/tests/testScriptishLogger.js
index 5fb9409f..9b11788e 100644
--- a/extension/content/tests/testScriptishLogger.js
+++ b/extension/content/tests/testScriptishLogger.js
@@ -109,7 +109,7 @@ asyncTest("null char removed", 1, function() {
 
 // logScriptError
 
-asyncTest("logScriptError: js error", 9, function() {
+asyncTest("logScriptError: js error", 7, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
@@ -117,14 +117,13 @@ asyncTest("logScriptError: js error", 9, function() {
     equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
     equal(message.sourceLine, "");
     ok(message.lineNumber > 10);
-    equal(message.columnNumber, 0);
     equal(message.category, "scriptish userscript error");
     equal(message.flags, message.errorFlag);
   });
   Scriptish_logScriptError(new Error("foo"), window, "bar.js", "baz");
 });
 
-asyncTest("logScriptError: nsIScriptError", 9, function() {
+asyncTest("logScriptError: nsIScriptError", 8, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
@@ -141,7 +140,7 @@ asyncTest("logScriptError: nsIScriptError", 9, function() {
   Scriptish_logScriptError(se, window, "bar.js", "baz");
 });
 
-asyncTest("logScriptError: nsIScriptError; omit id", 9, function() {
+asyncTest("logScriptError: nsIScriptError; omit id", 8, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
@@ -158,8 +157,7 @@ asyncTest("logScriptError: nsIScriptError; omit id", 9, function() {
   Scriptish_logScriptError(se, window);
 });
 
-asyncTest("test nsIScriptError; omit optionals", function() {
-  expect(9);
+asyncTest("test nsIScriptError; omit optionals", 8, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
@@ -176,8 +174,7 @@ asyncTest("test nsIScriptError; omit optionals", function() {
   Scriptish_logScriptError(se, window);
 });
 
-asyncTest("test nsIException", function() {
-  expect(9);
+asyncTest("test nsIException", 7, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
@@ -185,7 +182,6 @@ asyncTest("test nsIException", function() {
     equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
     equal(message.sourceLine, "");
     ok(message.lineNumber > 10);
-    equal(message.columnNumber, 0);
     equal(message.category, "scriptish userscript error");
     equal(message.flags, message.errorFlag);
   });
@@ -193,8 +189,7 @@ asyncTest("test nsIException", function() {
   Scriptish_logScriptError(ex, window, "bar.js", "baz");
 });
 
-asyncTest("test TypeError", function() {
-  expect(9);
+asyncTest("test TypeError", 7, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
@@ -202,7 +197,6 @@ asyncTest("test TypeError", function() {
     equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
     equal(message.sourceLine, "");
     ok(message.lineNumber > 10);
-    equal(message.columnNumber, 0);
     equal(message.category, "scriptish userscript error");
     equal(message.flags, message.errorFlag);
   });

From ef3c9d872fedd7e220eb3e03a3744042b74aacd5 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 20 Sep 2012 21:51:46 +0200
Subject: [PATCH 676/829] Fix WebConsole integration

which uses innerWindowID by now
---
 extension/modules/logging.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/logging.js b/extension/modules/logging.js
index 5aec84f1..077b27f1 100644
--- a/extension/modules/logging.js
+++ b/extension/modules/logging.js
@@ -34,7 +34,7 @@ function Scriptish_logScriptError(aError, aWindow, aFileURL, aId) {
     try {
       windowId = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
         .getInterface(Ci.nsIDOMWindowUtils)
-        .outerWindowID;
+        .currentInnerWindowID;
     }
     catch (ex) {
       throw new Error("failed to get window id");

From a8e4f4b8a88dfd3884e9148e9147f46104f5c666 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 20 Sep 2012 22:04:19 +0200
Subject: [PATCH 677/829] GM_safeHTMLParser: actually create an HTML document

---
 extension/modules/api.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index ef3a0943..95f374ac 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -86,13 +86,14 @@ function GM_API(options) {
   this.GM_safeHTMLParser = function GM_safeHTMLParser(aHTMLStr, aBaseURL) {
     if (!GM_apiLeakCheck("GM_safeHTMLParser")) return;
 
-    let doc = document.implementation.createDocument(NS_XHTML, "html", null);
-    let body = document.createElementNS(NS_XHTML, "body");
+    let doc = document.implementation.createDocument("", "",
+        document.implementation.createDocumentType("html", "", ""));
+    doc.appendChild(doc.createElement("html"));
+    doc.documentElement.appendChild(doc.createElement("body"));
+
     let baseURI;
     let frag;
 
-    doc.documentElement.appendChild(body);
-
     if ("undefined" !== typeof aBaseURL) {
       try {
         baseURI = NetUtil.newURI(aBaseURL);
@@ -107,14 +108,14 @@ function GM_API(options) {
 
     // Try to use the newer nsIParserUtils (Gecko >= 14)
     if ("pu" in Services) {
-      frag = Services.pu.parseFragment(aHTMLStr, 0, false, baseURI, body);
+      frag = Services.pu.parseFragment(aHTMLStr, 0, false, baseURI, doc.body);
     }
     // Otherwise fall back to deprecated nsIScriptableUnescapeHTML
     else {
-      frag = Services.suhtml.parseFragment(aHTMLStr, false, baseURI, body);
+      frag = Services.suhtml.parseFragment(aHTMLStr, false, baseURI, doc.body);
     }
-
-    body.appendChild(frag);
+    doc.adoptNode(frag);
+    doc.body.appendChild(frag);
     return doc;
   }
 

From 98cecd57fdfc05679fb1082477e9c3f2ed7a4159 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 22 Sep 2012 10:58:29 -0700
Subject: [PATCH 678/829] Closes #21 nuke sandboxes for destroyed inner windows
 on FF 17+

---
 extension/modules/manager.js                  |  2 +-
 .../modules/utils/Scriptish_injectScripts.js  | 29 ++++++++++++-------
 .../modules/utils/Scriptish_windowUnloader.js | 21 +++++++-------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index 05fba998..5a0519a3 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -31,7 +31,7 @@ const tests = {
     var file = uri.file;
     return file.parent.equals(this._tmpDir) && file.leafName != "newscript.user.js";
   }
-}
+};
 
 const Scriptish_manager = {
   setup: function(options) {
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 95fe8e59..197d7456 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -6,7 +6,7 @@ var EXPORTED_SYMBOLS = [
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 
-lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish_logError"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
 lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_sandboxScripts"]);
@@ -25,23 +25,21 @@ const {nsIDOMXPathResult: XPATH_RESULT} = Ci;
 
 function Scriptish_injectScripts(options) {
   var {scripts, url, safeWin} = options;
-
-  try {
-  if ("Fennec" != Services.appinfo.name) {
-    var chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
-    if (!chromeWin || !chromeWin.Scriptish_BrowserUI) return;
-  }
-  }
-  catch (e) {}
+  var chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
+  if (!chromeWin || !chromeWin.Scriptish_BrowserUI) return;
 
   if (0 >= scripts.length) return;
 
   let unsafeContentWin = safeWin.wrappedJSObject;
-  let delays = [];
   let winID = Scriptish_getWindowIDs(safeWin).innerID;
 
+  let delays = [];
+
+  // window destroyed handler
   Scriptish_windowUnloader(function() {
+    // destroy a possible inject @delay
     for (let [, id] in Iterator(delays)) gTimer.clearTimeout(id);
+    delays.length = 0;
   }, winID);
 
   for (var i = 0, e = scripts.length; i < e; ++i) {
@@ -100,8 +98,17 @@ function Scriptish_injectScripts(options) {
       delays.push(gTimer.setTimeout(function() {
         Scriptish_evalInSandbox(script, sandbox, safeWin, options);
       }, delay));
-    } else {
+    }
+    else {
       Scriptish_evalInSandbox(script, sandbox, safeWin, options);
     }
+
+    // window destroyed handler
+    if ("nukeSandbox" in Cu) {
+      Scriptish_windowUnloader(function() {
+        // try to nuke the sandbox (FF 17+ see bug 769273)
+        Cu.nukeSandbox(sandbox);
+      }, winID);
+    }
   }
 }
diff --git a/extension/modules/utils/Scriptish_windowUnloader.js b/extension/modules/utils/Scriptish_windowUnloader.js
index cb821a85..154516f4 100644
--- a/extension/modules/utils/Scriptish_windowUnloader.js
+++ b/extension/modules/utils/Scriptish_windowUnloader.js
@@ -1,26 +1,25 @@
 var EXPORTED_SYMBOLS = ["Scriptish_windowUnloader"];
 Components.utils.import("resource://scriptish/constants.js");
-lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish_logError"]);
 
 const winUnloaders = {};
 
-function Unloader(aFunc, aInnerID) {
-  this.unload = aFunc;
-  this.innerID = aInnerID;
-}
-
 const observer = {
   observe: function(aSubject, aTopic, aData) {
     var innerID = aSubject.QueryInterface(Ci.nsISupportsPRUint64).data;
     var unloaders = winUnloaders[innerID];
-
     if (!unloaders) return;
 
-    for (var i = 0, e = unloaders.length - 1; ~i; i--) {
-      unloaders[i].unload();
+    for (var i = unloaders.length - 1; ~i; i--) {
+      try {
+        unloaders[i]();
+      }
+      catch(e) {
+        Scriptish_logError(e);
+      }
     }
 
-    delete winUnloaders[innerID];
+    winUnloaders[innerID] = null;
   }
 };
 Services.obs.addObserver(observer, "inner-window-destroyed", false);
@@ -29,5 +28,5 @@ const Scriptish_windowUnloader = function(aUnloader, aInnerID) {
   if (!winUnloaders[aInnerID])
     winUnloaders[aInnerID] = [];
 
-  winUnloaders[aInnerID].push(new Unloader(aUnloader, aInnerID));
+  winUnloaders[aInnerID].push(aUnloader);
 };

From eee6e67d7459ed8a14c35a0d54a3ac5fb9249d99 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 22 Sep 2012 11:22:23 -0700
Subject: [PATCH 679/829] Closes #20 adding a CONTRIBUTING file

---
 CONTRIBUTING.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..0e3ee561
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,25 @@
+# Contributing
+
+## Overview
+
+* Code contributions should follow the [style guide](https://github.com/scriptish/scriptish/wiki/JavaScript-Style-Guide)
+* Tests may be requested, and eventually will be required.
+* All code must be reviewed by a reviewer.
+** Sometimes code will need additional reviews.
+
+## Contributing Code
+
+* Check that your [issue](https://github.com/scriptish/scriptish/issues) does not
+already exist.
+* If it does not yet exist [please create one](https://github.com/scriptish/scriptish/issues/new).
+* Make your changes, preferably in a branch named `bug_number`.
+* Make sure there is a test in the branch (reverse the order of this for TDD).
+* Mention your `branch_name`, with a link to it, in the issue thread.
+* Ask for a review from one our reviewers
+* 
+
+## Reviewers
+
+* [@erikvold](https://github.com/erikvold)
+* [@supahgreg](https://github.com/supahgreg)
+* [@nmaier](https://github.com/nmaier)

From f35c6765fb0f9a37237fa1517a9782773b690fef Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sat, 22 Sep 2012 12:01:31 -0700
Subject: [PATCH 680/829] fixing possible error from
 esource://scriptish/api.js:37 reported at
 https://scriptish.lighthouseapp.com/projects/83146/tickets/613-possible-scriptish-problem

---
 extension/modules/api.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 95f374ac..ca9ff64e 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -28,9 +28,10 @@ function GM_apiLeakCheck(apiName) {
   let stack = Components.stack;
 
   do {
+    // TODO: do better protocol check below
     // Valid stack frames for GM api calls are: native and js when coming from
     // chrome:// URLs and any file name listed in _apiAcceptedFiles.
-    if (2 == stack.language &&
+    if (2 == stack.language && stack.filename &&
         stack.filename != moduleFilename &&
         stack.filename != Scriptish_evalInSandbox_filename &&
         stack.filename != Scriptish_injectScripts_filename &&

From 8507967e7b5b059ea1b4c5b201e0d648173046bf Mon Sep 17 00:00:00 2001
From: Greg Parris <greg.parris@gmail.com>
Date: Sat, 22 Sep 2012 14:24:38 -0500
Subject: [PATCH 681/829] Trivial tweaks to CONTRIBUTING.md

---
 CONTRIBUTING.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0e3ee561..da2c7c75 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 ## Overview
 
-* Code contributions should follow the [style guide](https://github.com/scriptish/scriptish/wiki/JavaScript-Style-Guide)
+* Code contributions should follow the [style guide](https://github.com/scriptish/scriptish/wiki/JavaScript-Style-Guide).
 * Tests may be requested, and eventually will be required.
 * All code must be reviewed by a reviewer.
 ** Sometimes code will need additional reviews.
@@ -15,8 +15,7 @@ already exist.
 * Make your changes, preferably in a branch named `bug_number`.
 * Make sure there is a test in the branch (reverse the order of this for TDD).
 * Mention your `branch_name`, with a link to it, in the issue thread.
-* Ask for a review from one our reviewers
-* 
+* Ask for a review from one our reviewers.
 
 ## Reviewers
 

From b35a65374451029b23ce29b7130c450a0e55d806 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 22 Sep 2012 17:45:44 -0500
Subject: [PATCH 682/829] Allow syncing of certain Scriptish options using the
 Firefox Sync service.  Closes #14 (cherry picked from commit
 70523133db41ab0617fee76fb2f1c7e889be1d9c)

---
 extension/content/js/options.js             | 71 +++++++++++++++++++++
 extension/content/options.xul               | 15 +++++
 extension/defaults/preferences/scriptish.js |  2 +
 extension/locale/de/scriptish.properties    |  5 ++
 extension/locale/en-US/scriptish.properties |  5 ++
 extension/locale/es-ES/scriptish.properties |  5 ++
 extension/locale/he/scriptish.properties    |  5 ++
 extension/locale/hu/scriptish.properties    |  5 ++
 extension/locale/ja-JP/scriptish.properties |  5 ++
 extension/locale/pl/scriptish.properties    |  5 ++
 extension/locale/pt-BR/scriptish.properties |  5 ++
 extension/locale/ru-RU/scriptish.properties |  5 ++
 extension/locale/sv-SE/scriptish.properties |  5 ++
 extension/locale/zh-CN/scriptish.properties |  5 ++
 extension/locale/zh-TW/scriptish.properties |  5 ++
 extension/modules/prefmanager.js            | 21 +++++-
 extension/skin/options.css                  |  3 +
 17 files changed, 170 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index b21f9f8f..d11affd4 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -4,6 +4,7 @@ Components.utils.import("resource://scriptish/constants.js");
 
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot", "Scriptish_PrefManager"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Scriptish_localizeOnLoad"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
   "Scriptish_isURLExcluded",
@@ -16,6 +17,8 @@ lazyUtil(this, "getEditor");
 lazyUtil(this, "sendAsyncE10SMessage");
 lazyUtil(this, "stringBundle");
 
+const RE_scriptishPrefix = /^extensions\.scriptish\./;
+
 function $(aID) document.getElementById(aID);
 
 function changeEditor() Scriptish_getEditor(window, true);
@@ -27,6 +30,65 @@ function saveExcludes() {
   Scriptish.notify(null, "scriptish-preferences-change", true);
 }
 
+function checkSync() {
+  let Scriptish_SyncManager = new Scriptish_PrefManager(null, true);
+  let prefSyncEnabled;
+
+  try {
+    prefSyncEnabled = Services.prefs.getBoolPref("services.sync.engine.prefs");
+  }
+  catch(e) {
+    prefSyncEnabled = false;
+  }
+
+  // Do nothing if pref syncing isn't enabled
+  if (!prefSyncEnabled) {
+    return;
+  }
+
+  // Sync "common" preferences?
+  let syncCommonPrefName = "sync.ScriptishPrefs.common";
+  let syncCommon = Scriptish_prefRoot.getValue(syncCommonPrefName, false);
+
+  // Sync the editor preference?
+  let syncEditorPrefName = "sync.ScriptishPrefs.editor";
+  let syncEditor = Scriptish_prefRoot.getValue(syncEditorPrefName, false);
+
+  // Collect preferences used in Options... considering these "common" prefs.
+  // Others can be added to the prefNames array as needed.
+  let prefNodes = document.getElementsByTagName("preference");
+  let prefNames = [];
+  for (let i = 0, e = prefNodes.length; i < e; ++i) {
+    prefNames.push(prefNodes[i].name.replace(RE_scriptishPrefix, ""));
+  }
+
+  // Exclude the sync-controlling preferences
+  let syncCommonIndex = prefNames.indexOf(syncCommonPrefName);
+  if (syncCommonIndex > -1) prefNames.splice(syncCommonIndex, 1);
+
+  let syncEditorIndex = prefNames.indexOf(syncEditorPrefName);
+  if (syncEditorIndex > -1) prefNames.splice(syncEditorIndex, 1);
+
+  // Exclude the editor pref from the general list.  The editor is handled
+  // separately since the path might vary between systems.
+  let editorIndex = prefNames.indexOf("editor");
+  if (editorIndex > -1) prefNames.splice(editorIndex, 1);
+
+  // Either sync or unsync all eligible preferences
+  let syncOp =
+      (syncCommon ? Scriptish_SyncManager.sync : Scriptish_SyncManager.unsync)
+      .bind(Scriptish_SyncManager);
+  for (let i = 0, e = prefNames.length; i < e; ++i) {
+    syncOp(prefNames[i]);
+  }
+
+  // Either sync or unsync the editor preference
+  syncOp =
+      (syncEditor ? Scriptish_SyncManager.sync : Scriptish_SyncManager.unsync)
+      .bind(Scriptish_SyncManager);
+  syncOp("editor");
+}
+
 Scriptish_localizeOnLoad(this);
 
 addEventListener("load", function init() {
@@ -43,4 +105,13 @@ addEventListener("load", function init() {
   else {
     addEventListener("dialogaccept", saveExcludes, true);
   }
+
+  // Check sync options to determine whether to add or remove sync service vals.
+  // NOTE: Delaying to allow the sync-controlling prefs to update.
+  if (instantApply) {
+    addEventListener("unload", function() { timeout(checkSync) }, false);
+  }
+  else {
+    addEventListener("dialogaccept", function() { timeout(checkSync) }, true);
+  }
 }, false);
diff --git a/extension/content/options.xul b/extension/content/options.xul
index 31dff92e..1877977b 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -81,6 +81,21 @@
     </hbox>
   </prefpane>
 
+  <prefpane id="pane-sync" label="sync" localize="label">
+    <preferences>
+      <preference id="pref-syncScriptishPrefsCommon" name="extensions.scriptish.sync.ScriptishPrefs.common" type="bool"/>
+      <preference id="pref-syncScriptishPrefsEditor" name="extensions.scriptish.sync.ScriptishPrefs.editor" type="bool"/>
+    </preferences>
+
+    <description value="options.sync.desc" localize="value"/>
+
+    <groupbox>
+      <caption label="options.sync.ScriptishPrefs" localize="label"/>
+      <checkbox id="sync-common" preference="pref-syncScriptishPrefsCommon" label="options.sync.ScriptishPrefs.common" localize="label"/>
+      <checkbox preference="pref-syncScriptishPrefsEditor" label="options.sync.ScriptishPrefs.editor" localize="label"/>
+    </groupbox>
+  </prefpane>
+
   <prefpane id="pane-advanced" label="options.pane.advanced" localize="label">
     <preferences>
       <preference id="pref-cache-enabled" name="extensions.scriptish.cache.enabled" type="bool"/>
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index b59ec89f..4a0ce9ae 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -20,6 +20,8 @@ pref("extensions.scriptish.enableScriptRefreshing", true);
 pref("extensions.scriptish.logChrome", false);
 pref("extensions.scriptish.logToErrorConsole", true);
 pref("extensions.scriptish.optimizingRegexpMerge", false);
+pref("extensions.scriptish.sync.ScriptishPrefs.common", false);
+pref("extensions.scriptish.sync.ScriptishPrefs.editor", false);
 pref("extensions.scriptish.toolbarbutton.showScripts", true);
 pref("extensions.scriptish.uninstallPreferences", true);
 pref("extensions.scriptish.update.requireBuiltInCerts", true);
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 2fecc4ad..b7e48c5a 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=Allgemein
 options.pane.ui=Benutzeroberfläche
 options.requireBuiltInCerts=Sichere Aktualisierungen müssen eingebaute Zertifikate nutzen
 options.requireSecured=Benutzerskripte müssen über eine sichere Verbindung (https) aktualisiert werden
+options.sync.desc=
+options.sync.ScriptishPrefs=
+options.sync.ScriptishPrefs.common=
+options.sync.ScriptishPrefs.editor=
 options.title=Scriptish Einstellungen
 options.toolbarbutton=Toolbar Button
 options.toolbarbutton.showScripts=Anzahl aktiver Skripte zeigen
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=Seite ist ausgenommen!
 statusbar.noScripts.notfound=Keine Benutzerskripte für diese Seite!
 statusbar.noScripts.scheme=Protokoll ist deaktiviert!
 statusbar.updated=erfolgreich aktualisiert
+sync=
 tooltip.loading=Lade...
 Uninstall=Entfernen
 untitledScript=Unbenanntes Script
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index cd11161f..758b2b38 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=Main
 options.pane.ui=User Interface
 options.requireBuiltInCerts=Secure update requires using built-in certificates
 options.requireSecured=Require user scripts to update using HTTPS
+options.sync.desc=The Firefox Sync service and its "Preferences" option must be enabled!
+options.sync.ScriptishPrefs=Scriptish Preferences
+options.sync.ScriptishPrefs.common=Synchronize common Scriptish extension preferences
+options.sync.ScriptishPrefs.editor=Synchronize the Editor preference
 options.title=Scriptish Options
 options.toolbarbutton=Toolbar button
 options.toolbarbutton.showScripts=Show active script count
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=Page is excluded!
 statusbar.noScripts.notfound=No scripts for page!
 statusbar.noScripts.scheme=Scheme is disabled!
 statusbar.updated=updated successfully
+sync=Sync
 tooltip.loading=Loading...
 Uninstall=Uninstall
 untitledScript=Untitled Script
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 7280b030..b768bb31 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=Principal
 options.pane.ui=Interfaz de usuario
 options.requireBuiltInCerts=Las actualizaciones seguras requieren que el certificado esté incluído
 options.requireSecured=Requerir que los scripts de usuario se actualicen usando HTTPS
+options.sync.desc=
+options.sync.ScriptishPrefs=
+options.sync.ScriptishPrefs.common=
+options.sync.ScriptishPrefs.editor=
 options.title=Opciones de Scriptish
 options.toolbarbutton=Botón de la Barra de Herramientas
 options.toolbarbutton.showScripts=Muestra la cuenta de scripts activos
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=¡Esta página está excluída!
 statusbar.noScripts.notfound=¡No hay scripts para esta página!
 statusbar.noScripts.scheme=¡Este patrón está deshabilitado!
 statusbar.updated=actualizado con éxito
+sync=
 tooltip.loading=Cargando...
 Uninstall=Desinstalar
 untitledScript=Script sin título
diff --git a/extension/locale/he/scriptish.properties b/extension/locale/he/scriptish.properties
index 4fd0c176..be93bfc5 100644
--- a/extension/locale/he/scriptish.properties
+++ b/extension/locale/he/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=ראשי
 options.pane.ui=ממשק
 options.requireBuiltInCerts=עדכון מאובטח מחייב שימוש באישורים מובנים
 options.requireSecured=דרוש מקבצי script של משתמש להתעדכן ע"י שימוש ב־HTTPS
+options.sync.desc=
+options.sync.ScriptishPrefs=
+options.sync.ScriptishPrefs.common=
+options.sync.ScriptishPrefs.editor=
 options.title=אפשרויות של Scriptish
 options.toolbarbutton=לחצן סרגל כלים
 options.toolbarbutton.showScripts=הצג את מספר ה־scripts הפעילים
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=הדף אינו נכלל!
 statusbar.noScripts.notfound=אין קבצי script לדף!
 statusbar.noScripts.scheme=ערכה אינה זמינה!
 statusbar.updated=עודכן בהצלחה
+sync=
 tooltip.loading=טוען...
 Uninstall=הסר
 untitledScript=קובץ Script ללא שם
diff --git a/extension/locale/hu/scriptish.properties b/extension/locale/hu/scriptish.properties
index c233a794..bdf6a48e 100644
--- a/extension/locale/hu/scriptish.properties
+++ b/extension/locale/hu/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=Általános
 options.pane.ui=Felhasználói felület
 options.requireBuiltInCerts=A biztonsági frissítésekhez beépített tanúsítványok szükségesek
 options.requireSecured=A parancsfájlok frissítése a HTTPS protokollon keresztül történjen
+options.sync.desc=
+options.sync.ScriptishPrefs=
+options.sync.ScriptishPrefs.common=
+options.sync.ScriptishPrefs.editor=
 options.title=Scriptish beállítások
 options.toolbarbutton=Eszköztár gomb
 options.toolbarbutton.showScripts=Aktív parancsfájlok számának megjelenése
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=Oldal kizárva!
 statusbar.noScripts.notfound=Nincsenek parancsfájlok az oldalhoz!
 statusbar.noScripts.scheme=Séma kikapcsolva!
 statusbar.updated=frissítése sikeres
+sync=
 tooltip.loading=Betöltés…
 Uninstall=Eltávolítás
 untitledScript=Névtelen parancsfájl
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index a41c7fe3..374134be 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=メイン
 options.pane.ui=ユーザーインタフェース
 options.requireBuiltInCerts=安全な更新に built-in 証明書を利用
 options.requireSecured=HTTPS でユーザースクリプトを更新
+options.sync.desc=
+options.sync.ScriptishPrefs=
+options.sync.ScriptishPrefs.common=
+options.sync.ScriptishPrefs.editor=
 options.title=Scriptish オプション
 options.toolbarbutton=ツールバーのボタン
 options.toolbarbutton.showScripts=アクティブなスクリプト数を表示
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=ページが除外（exclude）されました！
 statusbar.noScripts.notfound=このページ用のスクリプトはありません！
 statusbar.noScripts.scheme=スキーム（Scheme）が無効になっています！
 statusbar.updated=は正常に更新されました
+sync=
 tooltip.loading=読み込み中…
 Uninstall=アンインストール
 untitledScript=名称未定スクリプト
diff --git a/extension/locale/pl/scriptish.properties b/extension/locale/pl/scriptish.properties
index a68048a9..66c29c3c 100644
--- a/extension/locale/pl/scriptish.properties
+++ b/extension/locale/pl/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=Główne
 options.pane.ui=Interfejs Użytkownika
 options.requireBuiltInCerts=Aktualizacja bezpieczeństwa wymaga użycia wbudowanych certyfikatów
 options.requireSecured=Wymagane skrypty użytkownika do aktualizacji przez HTTPS
+options.sync.desc=
+options.sync.ScriptishPrefs=
+options.sync.ScriptishPrefs.common=
+options.sync.ScriptishPrefs.editor=
 options.title=Opcje Scriptish
 options.toolbarbutton=Pasek narzędzi
 options.toolbarbutton.showScripts=Pokaż liczbę aktywnych skryptów
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=Strona została wykluczona!
 statusbar.noScripts.notfound=Brak skryptów dla strony!
 statusbar.noScripts.scheme=Schemat został wyłączony!
 statusbar.updated=poprawnie zaktualizowano
+sync=
 tooltip.loading=Ładowanie...
 Uninstall=Odinstalowanie
 untitledScript=Skrypt bez nazwy
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 8b90746f..e9ecb6fc 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=Principal
 options.pane.ui=Interface
 options.requireBuiltInCerts=Exigir que as atualizações seguras usem os certificados internos
 options.requireSecured=Exigir que os scripts atualizem usando HTTPS
+options.sync.desc=
+options.sync.ScriptishPrefs=
+options.sync.ScriptishPrefs.common=
+options.sync.ScriptishPrefs.editor=
 options.title=Opções do Scriptish
 options.toolbarbutton=Botão da barra de ferramentas
 options.toolbarbutton.showScripts=Exibir contador de scripts ativos
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=Scripts desabilitados nesta página!
 statusbar.noScripts.notfound=Nenhum script para esta página!
 statusbar.noScripts.scheme=Scripts desabilitados para este protocolo!
 statusbar.updated=atualizado com sucesso
+sync=
 tooltip.loading=Carregando...
 Uninstall=Desinstalação
 untitledScript=Script sem nome
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 184b5754..cb34d07f 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=Основные
 options.pane.ui=Интерфейс
 options.requireBuiltInCerts=Безопасное обновление требует использование встроенных сертификатов
 options.requireSecured=Разрешить обновления скриптов только по протоколу HTTPS
+options.sync.desc=
+options.sync.ScriptishPrefs=
+options.sync.ScriptishPrefs.common=
+options.sync.ScriptishPrefs.editor=
 options.title=Настройки Scriptish
 options.toolbarbutton=Кнопка на тулбаре
 options.toolbarbutton.showScripts=Показывать количество активных скриптов
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=
 statusbar.noScripts.notfound=Нет скриптов для страницы!
 statusbar.noScripts.scheme=
 statusbar.updated=успешно обновлен(ы)
+sync=
 tooltip.loading=Загрузка...
 Uninstall=Удалить
 untitledScript=Скрипт без имени
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 2a4c3648..1b927ccf 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=Allmänt
 options.pane.ui=Användargränssnitt
 options.requireBuiltInCerts=Säker uppdatering kräver användning av inbyggda certifikat
 options.requireSecured=Kräv att användarskript uppdateras via HTTPS
+options.sync.desc=
+options.sync.ScriptishPrefs=
+options.sync.ScriptishPrefs.common=
+options.sync.ScriptishPrefs.editor=
 options.title=Inställningar för Scriptish
 options.toolbarbutton=Verktygsfältsknapp
 options.toolbarbutton.showScripts=Visa antalet aktiva skript
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=Sidan är undantagen!
 statusbar.noScripts.notfound=Inga skript för sidan!
 statusbar.noScripts.scheme=Schemat är inaktiverat!
 statusbar.updated=har uppdaterats
+sync=
 tooltip.loading=Läser in…
 Uninstall=Avinstallera
 untitledScript=(Namnlöst skript)
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index 9bbbc82f..a2809f28 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=常规
 options.pane.ui=用户界面
 options.requireBuiltInCerts=安全更新需要使用内置的证书
 options.requireSecured=要求用户脚本使用 HTTPS 更新
+options.sync.desc=
+options.sync.ScriptishPrefs=
+options.sync.ScriptishPrefs.common=
+options.sync.ScriptishPrefs.editor=
 options.title=Scriptish 选项
 options.toolbarbutton=工具栏按钮
 options.toolbarbutton.showScripts=显示活动的脚本数
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=页面已排除！
 statusbar.noScripts.notfound=页面上没有脚本在运行！
 statusbar.noScripts.scheme=Scheme 已禁用！
 statusbar.updated=更新成功
+sync=
 tooltip.loading=正在加载...
 Uninstall=卸载
 untitledScript=无标题的脚本
diff --git a/extension/locale/zh-TW/scriptish.properties b/extension/locale/zh-TW/scriptish.properties
index 12cc1d66..ce8077a9 100644
--- a/extension/locale/zh-TW/scriptish.properties
+++ b/extension/locale/zh-TW/scriptish.properties
@@ -131,6 +131,10 @@ options.pane.main=主要
 options.pane.ui=介面
 options.requireBuiltInCerts=安全性更新必須使用內建的憑證
 options.requireSecured=腳本必須使用 HTTPS 更新
+options.sync.desc=
+options.sync.ScriptishPrefs=
+options.sync.ScriptishPrefs.common=
+options.sync.ScriptishPrefs.editor=
 options.title=Scriptish 選項
 options.toolbarbutton=工具列按鈕
 options.toolbarbutton.showScripts=顯示作用中的腳本數
@@ -153,6 +157,7 @@ statusbar.noScripts.excluded=頁面已排除！
 statusbar.noScripts.notfound=沒有在此頁面執行的腳本！
 statusbar.noScripts.scheme=協定已停用！
 statusbar.updated=更新成功
+sync=
 tooltip.loading=載入中…
 Uninstall=移除
 untitledScript=無標題的腳本
diff --git a/extension/modules/prefmanager.js b/extension/modules/prefmanager.js
index 7d59445b..8e64e34e 100644
--- a/extension/modules/prefmanager.js
+++ b/extension/modules/prefmanager.js
@@ -4,6 +4,7 @@ lazyUtil(this, "stringBundle");
 
 const MIN_INT_32 = -0x80000000;
 const MAX_INT_32 = 0x7FFFFFFF;
+const SYNC_PREFIX = "services.sync.prefs.sync.";
 const Scriptish_prefRoot = new Scriptish_PrefManager();
 
 /**
@@ -11,11 +12,12 @@ const Scriptish_prefRoot = new Scriptish_PrefManager();
  * Construct an instance by passing the startPoint of a preferences subtree.
  * "extensions.scriptish." prefix is assumed.
  */
-function Scriptish_PrefManager(startPoint) {
+function Scriptish_PrefManager(startPoint, syncMode) {
   if (!startPoint) startPoint = "";
   startPoint = "extensions.scriptish." + startPoint;
 
-  var pref = Services.prefs.getBranch(startPoint);
+  var pref =
+      Services.prefs.getBranch((syncMode ? SYNC_PREFIX : "") + startPoint);
 
   var observers = {};
 
@@ -133,4 +135,19 @@ function Scriptish_PrefManager(startPoint) {
           .removeObserver(prefName, observers[watcher]);
     }
   }
+
+  // Determine if the preference is currently set to be synchronized
+  this.isSynced = function(prefName) {
+    return this.getValue(prefName, false);
+  }
+
+  // Set a preference to be synchronized
+  this.sync = function(prefName) {
+    this.setValue(prefName, true);
+  }
+
+  // Stop a preference from being synchronized
+  this.unsync = function(prefName) {
+    this.setValue(prefName, false);
+  }
 }
diff --git a/extension/skin/options.css b/extension/skin/options.css
index 1efeb20d..8ec872b3 100644
--- a/extension/skin/options.css
+++ b/extension/skin/options.css
@@ -13,6 +13,9 @@ radio[pane="pane-ui"] {
 radio[pane="pane-excludes"] {
   -moz-image-region: rect(0px, 64px, 32px, 32px);
 }
+radio[pane="pane-sync"] {
+  list-style-image: url(chrome://browser/skin/sync-32.png);
+}
 radio[pane="pane-advanced"] {
   -moz-image-region: rect(0px, 96px, 32px, 64px);
 }

From b0322f465ce3dff94ae21e6485d25b94f5831a2a Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 23 Sep 2012 06:58:21 -0500
Subject: [PATCH 683/829] Updating ru-RU courtesy of iHastr (BabelZilla).

---
 extension/install.rdf                         |   1 +
 extension/locale/ru-RU/description.properties |  26 +--
 extension/locale/ru-RU/scriptish.properties   | 197 +++++++++---------
 3 files changed, 108 insertions(+), 116 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index f3c0f177..15f615d2 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -48,6 +48,7 @@
     <em:translator>Alfredo Fernández Díaz (es-ES)</em:translator>
     <em:translator>allertec (pl)</em:translator>
     <em:translator>barryoni (he)</em:translator>
+    <em:translator>iHastr (ru-RU)</em:translator>
     <em:translator>k2jp (ja-JP)</em:translator>
     <em:translator>Kozák (WonderCsabo) Csaba (hu)</em:translator>
     <em:translator>Mauro José da Silva (pt-BR)</em:translator>
diff --git a/extension/locale/ru-RU/description.properties b/extension/locale/ru-RU/description.properties
index d5a3d842..6efc290a 100644
--- a/extension/locale/ru-RU/description.properties
+++ b/extension/locale/ru-RU/description.properties
@@ -1,13 +1,13 @@
-amo.description.line1=Scriptish это форк Greasemonkey, предлагающий:
-amo.description.line2=Всё что предлагает Greasemonkey (что очень полезно)
-amo.description.line3=Обновление: Пользовательские скрипты могут быть обновлены с помощью @updateURL
-amo.description.line4=Множество новых <a title="Раздел документации Scriptish о метаданных - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">@ключей метаданных</a>
-amo.description.line5=Множество новых <a title="API пользовательских скриптов Scriptish - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">дополненый в GM_ API</a>
-amo.description.line6=Превосходную производительность: более быстрый и производительный базовый код, который использует все последние возможности Firefox.
-amo.description.line7=Превосходную безопасность: Scriptish предлагает возможности безопасности, которые вы не найдёте больше нигде.
-amo.description.line8=Тестирование: Разработчики могут использовать большое количество тестов, позволяющих выявить баги и убедиться в правильности работы Scriptish.
-amo.developerComments.line1=В Scriptish есть всё, что есть в Greasemonkey, плюс много новых функций, о которых можно прочитать здесь: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=Пожалуйста, отправляйте сообщения о багах и запросы на новую функциональность сюда: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
-amo.developerComments.line3=Если у вас есть другие вопросы, пишите сюда: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
-amo.summary=Лучший движок для пользовательских скриптов в интернете.
-extensions.scriptish@erikvold.com.description=Менеджер пользовательских скриптов для Firefox.
\ No newline at end of file
+amo.description.line1=Scriptish – это форк Greasemonkey, предлагающий:
+amo.description.line2=Всё, что делает Greasemonkey (что на самом деле полезно)
+amo.description.line3=Обновление: Пользовательские скрипты могут быть обновлены в Scriptish с помощью @updateURL
+amo.description.line4=Много новых <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">ключей метаданных</a>
+amo.description.line5=Много новых <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">дополнений к GM_ API</a>
+amo.description.line6=Высокая производительность: более быстрая и чистая кодовая база, которая использует всё, что могут предложить последние версии Firefox
+amo.description.line7=Превосходная безопасность: Scriptish обеспечивает функции безопасности, которые вы не найдёте где-либо ещё
+amo.description.line8=Тестирование: разработчики делают множество тестов, чтобы гарантировать правильное функционирование Scriptish и найти какие-либо ошибки как можно скорее
+amo.developerComments.line1=Scriptish имеет всё, что и Greasemonkey, а также множество функций, о которых вы можете прочитать на: <a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=Пожалуйста, присылайте любые ошибки или пожелания на: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
+amo.developerComments.line3=Если у вас есть другие вопросы, пожалуйста, присылайте их в список рассылки: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.summary=Лучший движок пользовательских скриптов в Интернете.
+extensions.scriptish@erikvold.com.description=Менеджер пользовательских скриптов для Firefox
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index cb34d07f..fd7a4ba5 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -1,169 +1,160 @@
-contributions.description=Разработчик этого пользовательского скрипта просит вас помочь поддержать его дальнейшее развитие, сделав небольшой взнос.
-copyDownloadURL=Скопировать ссылку на загрузку
+contributions.description=Разработчик этого пользовательского скрипта просит вас помочь поддержать его дальнейшее развитие, сделав небольшое пожертвование.
+copyDownloadURL=Скопировать URL загрузки
 copyDownloadURL.ak=C
-edit=Редактировать
+edit=Изменить
 edit.ak=E
 editor.couldNotLaunch=Не удалось запустить редактор.
 editor.pleasePickExecutable=Пожалуйста, выберите приложение для редактирования скриптов.
-editor.prompt=Пожалуйста сначала выберите ваш редактор скриптов
-editor.useScratchpad=Вы хотите использовать Scratchpad как редактор по умолчанию?
-editor.useScratchpad.no=Нет (Я укажу свой)
+editor.prompt=Пожалуйста, выберите ваш любимый редактор скриптов
+editor.useScratchpad=Вы хотите использовать Scratchpad в качестве редактора?
+editor.useScratchpad.no=Нет (я выберу свой​​)
 editor.useScratchpad.yes=Да
-error.api.clipboard.type=- тип данных, не поддерживаемый GM_setClipboard.
+error.api.clipboard.type=Тип данных не подходит для GM_setClipboard.
 error.api.noResourceWithName=Нет ресурса с таким именем
-error.api.noSecondArgValue=Следующий аргумент не указан: Значение
+error.api.noSecondArgValue=Второй аргумент - значение - не задан
 error.api.reqURL=Неверный URL
-error.api.reqURL.scheme=Схема URL запрещена
-error.api.safeHTMLParser.url=
-error.api.unsafeAccess=Нарушение доступа Scriptish: из unsafeWindow не позволено работать с
+error.api.reqURL.scheme=Запрещённая схема в URL
+error.api.unsafeAccess=Нарушение доступа Scriptish: unsafeWindow не может работать с
 error.charset=Неверная кодировка.
-error.dependency.loading=Не удалось загрузить зависимость
-error.dependency.local=Исключение безопасности: Вызов локальных путей запрещён
+error.dependency.loading=Ошибка при загрузке зависимости
+error.dependency.local=Исключение безопасности: запросы к локальным и chrome URL запрещены
 error.dependency.serverReturned=Ошибка! Сервер вернул
 error.hash.algorithm=Неверный алгоритм хеширования.
-error.icon.dataURL=Неверный data: URL для @icon
-error.icon.notImage=Ошибка! В @icon отсутствует MIME тип изображения
+error.icon.dataURL=Неверные данные: URL для @icon
+error.icon.notImage=Ошибка! @icon не имеет тип изображения MIME
 error.icon.URL=Неверный URL для @icon
-error.invalidCert=Неверный SSL сертификат.\nЕсли необходимо, разрешите все сертификаты здесь: Настройки Scriptish / Дополнительно / Безопасность обновлений.
-error.isInvalidValue= - неверное значение
-error.matchPattern.rules=шаблон @match не соответствует правилам
-error.matchPattern.rules.file=Шаблон @match схемы file:// не соответствует правилам
-error.notSecure=Небезопасная URI.\nЕсли необходимо, разрешите не-HTTPS обновления здесь: Настройки Scriptish / Дополнительно / Безопасность обновлений.
+error.isInvalidValue=- неверное значение
+error.matchPattern.rules=Шаблон @match не соответствует правилам шаблона
+error.matchPattern.rules.file=Файл схемы @match не соответствует правилам шаблона
 error.notSupported.Firefox=не поддерживается в этой версии Firefox
 error.openingFile=Не удалось открыть файл
-error.pattern.parsing=Не удалось пропарсить шаблон
-error.pref.type=Неподдерживаемый тип настройки. Правильные типы: string, bool и 32-битное целое.
-error.remoteVersionOlder=Удалённый скрипт не новее вашей текущей версии.
-error.resource.dupName= - повторяющееся имя ресурса. Имена @resource должны быть уникальными.
+error.pattern.parsing=Шаблон не парсится
+error.pref.type=Неподдерживаемый тип настройки. Допустимые типы: строка, логический и 32-битное целое число.
+error.resource.dupName=- повторяющееся имя ресурса. Имена ресурсов должны быть уникальными.
 error.resource.syntax=Неправильный синтаксис в обьявлении @resource
 error.retrieving=Не удалось получить
 error.script.installing=Ошибка при установке пользовательского скрипта
 error.script.loading=Ошибка при загрузке пользовательского скрипта
 greeting.btn.ak=I
-greeting.msg=Это пользовательского скрипта. Нажмите "Установить" чтобы начать использовать его.
+greeting.msg=Это пользовательский скрипт. Нажмите «Установить», чтобы начать использовать его.
 install=Установить
 install.domains=домены:
-install.excludes=не запускается на:
-install.includes=запускается на:
-install.matches=соответствует:
-install.requires=зависит от:
+install.excludes=не запускать на:
+install.includes=запуск на:
+install.matches=совпадений:
+install.requires=требуется:
 install.resources=ресурсы:
 install.showScriptSource=Показать исходный код скрипта
-install.title=Установка пользовательского скрипта
-install.warning1=Вредоносные скрипты могут угрожать вашей конфиденциальности и работать от вашего имени без вашего ведома.
+install.title=Установщик скриптов
+install.warning1=Вредоносные скрипты могут нарушить вашу конфиденциальность и действовать от вашего имени без вашего согласия.
 install.warning2=Устанавливайте скрипты только из доверенных источников.
-installFromFile=Установить пользовательский скрипт из файла...
+installFromFile=Установить пользовательский скрипт из файла…
 installFromFile.ak=U
-menu.commands=Команды пользовательских скриптов...
+menu.commands=Команды скрипта…
 menu.commands.ak=C
-menu.install=Установить пользовательский скрипт...
+menu.install=Установить скрипт…
 menu.install.ak=I
-menu.manage=Управление пользовательскими скриптами...
+menu.manage=Управление скриптами…
 menu.manage.ak=M
-menu.new=Новый пользовательский скрипт...
+menu.new=Создать скрипт…
 menu.new.ak=N
 menu.options.ak=O
-menu.show=Просмотреть исходный код пользовательского скрипта
+menu.show=Посмотреть исходный код скрипта
 menu.show.ak=V
 menu.title=Scriptish
 menu.title.ak=S
-menuitem.install=Установить этот пользовательский скрипт...
-menuitem.manage=Управление пользовательскими скриптами
-menuitem.new=Новый пользовательский скрипт
-moving.dependency=Переносится файл зависимости из
-moving.script=Переносится файл скрипта из
+menuitem.install=Установить этот скрипт…
+menuitem.manage=Управление скриптами
+menuitem.new=Новый скрипт
+moving.dependency=Перемещение зависимых файлов из
+moving.script=Перемещение файла скрипта из
 newscript.author=Автор
 newscript.description=Описание
-newscript.excludes=Исключать страницы (Одно правило на строчку)
+newscript.excludes=Исключать страницы (одна на строку)
 newscript.exists=Скрипт с таким именем уже установлен.\nПерезаписать?
-newscript.id=ID
-newscript.includes=Включать страницы (Одно правило на строчку)
-newscript.missing.id=Пожалуйста, укажите идентификатор скрипта.
-newscript.missing.name=Пожалуйста, укажите название. Оно будет показано на странице Менеджера Дополнений.
-newscript.name=Название
+newscript.id=Идентификатор
+newscript.includes=Включать страницы (одна на строку)
+newscript.missing.id=Пожалуйста, укажите идентификатор.
+newscript.missing.name=Укажите имя, которое будет отображаться в Менеджере дополнений.
+newscript.name=Имя
 newscript.namespace=Пространство имён
-newscript.noID=Пожалуйста, укажите идентификатор скрипта
-newscript.noName=Пожалуйста, укажите имя скрипта.
-newscript.runat=Запускать когда
-newscript.runat.documentend=Документ завершает загрузку
-newscript.runat.documentidle=Документ первый простаивает
-newscript.runat.documentstart=Документ начинает загрузку
-newscript.runat.windowload=Весь контент загружен
+newscript.noID=Пожалуйста, введите допустимый идентификатор скрипта.
+newscript.noName=Пожалуйста, введите имя вашего скрипта.
+newscript.runat=Запуск при
+newscript.runat.documentend=Завершении загрузки документа
+newscript.runat.documentidle=Первом простое документа
+newscript.runat.documentstart=Начале загрузки документа
+newscript.runat.windowload=Полной загрузке окна, включая все медиаданные
 newscript.version=Версия
-nothing.timedOut=ничего (превышен интервал ожидания)
-openFolder=Открыть папку скрипта.
+nothing.timedOut=ничего (истекло)
+openFolder=Открыть папку
 openFolder.ak=O
-openUserScriptsManager=Открыть менеджер пользовательских скриптов
+openUserScriptsManager=Открыть менеджер скриптов
 openUserScriptsManager.ak=O
 options=Настройки
-options.addonsManager=Менеджер Дополнений
-options.alsoUninstallPrefs=Удалять также настройки скрипта
-options.cache=Кеш
-options.cache.enabled=Кешировать пользовательские скрипты
+options.addonsManager=Менеджер дополнений
+options.alsoUninstallPrefs=При удалении скрипта также удалять его настройки
+options.cache=Кэш
+options.cache.enabled=Кэшировать пользовательские скрипты
 options.changeEditor=Изменить редактор
 options.editor=Редактор
-options.editor.notset=Не выбран редактор
-options.enableCopyDownloadURL=Включить копирование URL для загрузки
+options.editor.notset=Редактор не выбран
+options.enableCopyDownloadURL=Разрешить копирование URL загрузки
 options.enabledSchemes.about=Протокол about (внутренний)
 options.enabledSchemes.advanced=Дополнительные протоколы
 options.enabledSchemes.chrome=Протокол chrome (внутренний)
-options.enabledSchemes.data=Протокол data
-options.enabledSchemes.file=Протокол file (локальные файлы)
-options.enabledSchemes.ftp=Протокол ftp
-options.enabledSchemes.http=Протокол http/https
+options.enabledSchemes.data=Протокол данных
+options.enabledSchemes.file=Файловый протокол (локальные файлы)
+options.enabledSchemes.ftp=Протокол FTP
+options.enabledSchemes.http=Протокол HTTP/HTTPS
 options.enabledSchemes.main=Протоколы
-options.enabledSchemes.securityRemark=Дополнительные протоколы могут иметь полный доступ к файловой системе.
-options.enabledSchemes.securityRemark2=Следовательно, они представляют значительный риск безопасности, если вы используете не доверенные скрипты!
-options.enabledSchemes.unmht=Протокол unmht (Формат Mozilla Archive)
-options.excludes.desc=Глобальные исключения перекроют любые авторские или пользовательские правила
-options.excludes.empty=Не указаны глобальные исключения
-options.excludes.remark=(Вы можете указывать по одному исключению на строку)
-options.logChrome=Записывать некритические сообщения в Консоль Ошибок to the Error Console
-options.logging=Логи
-options.logToErrorConsole=GM_log использует Консоль Ошибок
+options.enabledSchemes.securityRemark=Дополнительные протоколы могут иметь полный доступ к системе, поэтому
+options.enabledSchemes.securityRemark2=представляют значительную угрозу безопасности от ненадёжных скриптов!
+options.enabledSchemes.unmht=Протокол UnMHT (формат архива Mozilla)
+options.excludes.desc=Глобальное исключение переопределит любой скрипт или правила пользователя
+options.excludes.empty=Глобальные исключения не заданы
+options.excludes.remark=(Можно указать одно исключение на строку)
+options.logChrome=Записывать некритические сообщения в консоли ошибок
+options.logging=Ведение журнала
+options.logToErrorConsole=GM_log использует консоль ошибок
 options.notifications=Уведомления
 options.notifications.popup.enable=Включить всплывающие уведомления
-options.notifications.sliding.enable=Включить анимированные уведомления
-options.notifications.whenDisabled=Когда выключено, любое уведомление будет записано в Консоль Ошибок.
-options.pane.advanced=Дополнительно
+options.notifications.sliding.enable=Включить скользящие уведомления
+options.notifications.whenDisabled=Когда отключено, любые уведомления будут появляться в консоли ошибок.
+options.pane.advanced=Дополнительные
 options.pane.excludes=Глобальные исключения
 options.pane.main=Основные
-options.pane.ui=Интерфейс
-options.requireBuiltInCerts=Безопасное обновление требует использование встроенных сертификатов
+options.pane.ui=Интерфейс пользователя
+options.requireBuiltInCerts=Использовать встроенные сертификаты для безопасного обновления
 options.requireSecured=Разрешить обновления скриптов только по протоколу HTTPS
-options.sync.desc=
-options.sync.ScriptishPrefs=
-options.sync.ScriptishPrefs.common=
-options.sync.ScriptishPrefs.editor=
 options.title=Настройки Scriptish
-options.toolbarbutton=Кнопка на тулбаре
-options.toolbarbutton.showScripts=Показывать количество активных скриптов
+options.toolbarbutton=Кнопка панели инструментов
+options.toolbarbutton.showScripts=Показывать число активных скриптов
 options.translation=Перевод
-options.translation.useEnglish=Всегда использовать Английский
-options.update.security=Безопасность обновлений
-options.useDownloadURL=Использовать URL загрузки для обновления, если не указана URL обновления.
+options.translation.useEnglish=Всегда использовать английский язык
+options.update.security=Безопасность обновления
+options.useDownloadURL=Использовать URL для загрузки обновлений, если не указан URL обновления
 reinstall=Переустановить
 saving=Сохранение
 scratchpad.saveAsUserScript=Сохранить как пользовательский скрипт
 scratchpad.saveAsUserScript.ak=u
-scriptOptions.disableScriptIncludes=Отключить указанные в скрипте @include шаблоны и использовать указанные здесь.
-scriptOptions.excludes=Пользовательские @exclude:
-scriptOptions.includes=Пользовательские @include:
+scriptOptions.disableScriptIncludes=Отключить заданные в скрипте включения и использовать только эти.
+scriptOptions.excludes=Пользовательские исключения:
+scriptOptions.includes=Пользовательские включения:
 statusbar.enabled=Включено
 statusbar.enabled.ak=E
 statusbar.installed=успешно установлен
-statusbar.modified=изменен
-statusbar.noScripts.excluded=
+statusbar.modified=изменён
+statusbar.noScripts.excluded=Страница исключена!
 statusbar.noScripts.notfound=Нет скриптов для страницы!
-statusbar.noScripts.scheme=
-statusbar.updated=успешно обновлен(ы)
-sync=
-tooltip.loading=Загрузка...
+statusbar.noScripts.scheme=Схема отключена!
+statusbar.updated=успешно обновлён
+tooltip.loading=Загрузка…
 Uninstall=Удалить
-untitledScript=Скрипт без имени
+untitledScript=Безымянный скрипт
 Update=Обновить
 userscript=Пользовательский скрипт
 userscripts=Пользовательские скрипты
 userscripts.get=Получить пользовательские скрипты
-userscripts.noneInstalled=У вас нет установленных скриптов
-warning.returnfrommain="return" from the main scope is not generally supported. You should fix that in your user script
+userscripts.noneInstalled=Пользовательские скрипты не установлены
+warning.returnfrommain=«возврат» из основной области обычно не поддерживаются. Вы должны исправить это в пользовательском скрипте.

From e27e72d0cb4c3aed41db4a5a30c0487f76d4b082 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 23 Sep 2012 07:14:36 -0500
Subject: [PATCH 684/829] Adding he and hu locales to chrome.manifest

---
 extension/chrome.manifest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 8f4ca4ca..6ef00de2 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -31,6 +31,8 @@ override chrome://scriptish/content/options.xul chrome://scriptish/content/fenne
 locale     scriptish  en-US  locale/en-US/
 locale     scriptish  de     locale/de/
 locale     scriptish  es-ES  locale/es-ES/
+locale     scriptish  he     locale/he/
+locale     scriptish  hu     locale/hu/
 locale     scriptish  ja-JP  locale/ja-JP/
 locale     scriptish  pl     locale/pl/
 locale     scriptish  pt-BR  locale/pt-BR/

From a00f4cbab3e33b17677ed55638c9793c606f1512 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 23 Sep 2012 09:27:21 -0500
Subject: [PATCH 685/829] Updating ru-RU courtesy of iHastr (BabelZilla).

---
 extension/locale/ru-RU/scriptish.properties | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index fd7a4ba5..5f6322d9 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -14,6 +14,7 @@ error.api.noResourceWithName=Нет ресурса с таким именем
 error.api.noSecondArgValue=Второй аргумент - значение - не задан
 error.api.reqURL=Неверный URL
 error.api.reqURL.scheme=Запрещённая схема в URL
+error.api.safeHTMLParser.url=Не удалось разобрать аргумент «URL» из GM_safeHTMLParser
 error.api.unsafeAccess=Нарушение доступа Scriptish: unsafeWindow не может работать с
 error.charset=Неверная кодировка.
 error.dependency.loading=Ошибка при загрузке зависимости
@@ -23,13 +24,16 @@ error.hash.algorithm=Неверный алгоритм хеширования.
 error.icon.dataURL=Неверные данные: URL для @icon
 error.icon.notImage=Ошибка! @icon не имеет тип изображения MIME
 error.icon.URL=Неверный URL для @icon
+error.invalidCert=Неверный сертификат SSL.\nЕсли необходимо разрешить все сертификаты, включите опцию в настройках Scriptish / Дополнительные / Безопасность обновления.
 error.isInvalidValue=- неверное значение
 error.matchPattern.rules=Шаблон @match не соответствует правилам шаблона
 error.matchPattern.rules.file=Файл схемы @match не соответствует правилам шаблона
+error.notSecure=Небезопасный URI.\nЕсли необходимо разрешить не-HTTPS обновления, включите опцию в настройках Scriptish / Дополнительные / Безопасность обновления.
 error.notSupported.Firefox=не поддерживается в этой версии Firefox
 error.openingFile=Не удалось открыть файл
 error.pattern.parsing=Шаблон не парсится
 error.pref.type=Неподдерживаемый тип настройки. Допустимые типы: строка, логический и 32-битное целое число.
+error.remoteVersionOlder=Удалённый скрипт имеет более старую версию, чем ваш текущий скрипт.
 error.resource.dupName=- повторяющееся имя ресурса. Имена ресурсов должны быть уникальными.
 error.resource.syntax=Неправильный синтаксис в обьявлении @resource
 error.retrieving=Не удалось получить
@@ -124,9 +128,13 @@ options.notifications.whenDisabled=Когда отключено, любые у
 options.pane.advanced=Дополнительные
 options.pane.excludes=Глобальные исключения
 options.pane.main=Основные
-options.pane.ui=Интерфейс пользователя
+options.pane.ui=Интерфейс
 options.requireBuiltInCerts=Использовать встроенные сертификаты для безопасного обновления
 options.requireSecured=Разрешить обновления скриптов только по протоколу HTTPS
+options.sync.desc=Служба снхронизации Firefox и её опция «Настройки» должны быть включены!
+options.sync.ScriptishPrefs=Предпочтения Scriptish
+options.sync.ScriptishPrefs.common=Синхронизировать общие настройки Scriptish
+options.sync.ScriptishPrefs.editor=Синхронизировать настройки редактора
 options.title=Настройки Scriptish
 options.toolbarbutton=Кнопка панели инструментов
 options.toolbarbutton.showScripts=Показывать число активных скриптов
@@ -149,6 +157,7 @@ statusbar.noScripts.excluded=Страница исключена!
 statusbar.noScripts.notfound=Нет скриптов для страницы!
 statusbar.noScripts.scheme=Схема отключена!
 statusbar.updated=успешно обновлён
+sync=Синхронизация
 tooltip.loading=Загрузка…
 Uninstall=Удалить
 untitledScript=Безымянный скрипт

From dd748e4ca2d5cec04bd8fe76be7d16a343775841 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 23 Sep 2012 11:11:46 -0500
Subject: [PATCH 686/829] Updating sv-SE courtesy of Lakrits (BabelZilla).

---
 extension/locale/sv-SE/description.properties |  2 +-
 extension/locale/sv-SE/scriptish.properties   | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/extension/locale/sv-SE/description.properties b/extension/locale/sv-SE/description.properties
index 2afd6cad..0731e874 100644
--- a/extension/locale/sv-SE/description.properties
+++ b/extension/locale/sv-SE/description.properties
@@ -1,5 +1,5 @@
 amo.description.line1=Scriptish är en fristående förgrening av Greasemonkey och erbjuder:
-amo.description.line2=Allting som Greasemonkey erbjuder (vilket faktiskt är riktigt användbart)
+amo.description.line2=Allting som Greasemonkey erbjuder (som är användbart, vill säga)
 amo.description.line3=Uppdatering: Användarskript kan uppdateras i Scriptish m.h.a. @updateURL
 amo.description.line4=Flera nya <a title="Scriptishs metadatablocksdokumentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">metadatanycklar (@keys)</a>
 amo.description.line5=Flera nya <a title="Scriptishs användarskripts-API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">tillägg till GM_-API:n</a>
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 1b927ccf..b69c02a5 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -14,7 +14,7 @@ error.api.noResourceWithName=Det finns ingen resurs med namnet
 error.api.noSecondArgValue=Det andra argumentet har inte angivits: Värde
 error.api.reqURL=Ogiltig URL
 error.api.reqURL.scheme=Otillåtet schema i URL
-error.api.safeHTMLParser.url=
+error.api.safeHTMLParser.url=Argumentet "URL" för GM_safeHTMLParser kunde inte parsas
 error.api.unsafeAccess=Åtkomstfel i Scriptish: unsafeWindow kan inte anropa
 error.charset=Ogiltig teckenuppsättning angavs.
 error.dependency.loading=Fel vid inläsning av beroende
@@ -24,16 +24,16 @@ error.hash.algorithm=Ogiltig hashalgoritm angavs.
 error.icon.dataURL=Ogiltig data: URL för @icon
 error.icon.notImage=Fel! @icon har ingen MIME-bildtyp
 error.icon.URL=Ogiltig URL för @icon
-error.invalidCert=
+error.invalidCert=Ogiltigt SSL-certifikat.\nOm så önskas kan alla certifikat tillåtas genom att aktivera alternativet i Scriptish inställningar > Avancerat > Uppdateringssäkerhet.
 error.isInvalidValue=är ett ogiltigt värde
 error.matchPattern.rules=@match-mönster uppfyller inte mönsterreglerna
 error.matchPattern.rules.file=@match-mönstret för filschema uppfyller inte mönsterreglerna
-error.notSecure=
+error.notSecure=Osäker URI.\nOm så önskas kan icke-HTTPS-uppdateringar tillåtas genom att aktivera alternativet i Scriptish inställningar > Avancerat > Uppdateringssäkerhet.
 error.notSupported.Firefox=stöds inte i denna version av Firefox
 error.openingFile=Det gick inte att öppna filen
 error.pattern.parsing=Det gick inte att parsa mönstret
 error.pref.type=Inställningstypen stöds inte. Giltiga typer är: sträng, boolesk och 32-bitars heltal.
-error.remoteVersionOlder=
+error.remoteVersionOlder=Fjärrskriptet har inget senare versionsnummer än ditt nuvarande skript.
 error.resource.dupName=är en resursnamnsdubblett.  Varje @resource måste ha ett unikt namn.
 error.resource.syntax=Ogiltig syntax för @resource-deklaration
 error.retrieving=Det gick inte att hämta
@@ -131,10 +131,10 @@ options.pane.main=Allmänt
 options.pane.ui=Användargränssnitt
 options.requireBuiltInCerts=Säker uppdatering kräver användning av inbyggda certifikat
 options.requireSecured=Kräv att användarskript uppdateras via HTTPS
-options.sync.desc=
-options.sync.ScriptishPrefs=
-options.sync.ScriptishPrefs.common=
-options.sync.ScriptishPrefs.editor=
+options.sync.desc=Tjänsten Firefox Sync och dess alternativ "Inställningar" måste vara aktiverade!
+options.sync.ScriptishPrefs=Inställningar för Scriptish
+options.sync.ScriptishPrefs.common=Synkronisera allmänna inställningar för tillägget Scriptish
+options.sync.ScriptishPrefs.editor=Synkronisera redigeringsinställningarna
 options.title=Inställningar för Scriptish
 options.toolbarbutton=Verktygsfältsknapp
 options.toolbarbutton.showScripts=Visa antalet aktiva skript
@@ -157,7 +157,7 @@ statusbar.noScripts.excluded=Sidan är undantagen!
 statusbar.noScripts.notfound=Inga skript för sidan!
 statusbar.noScripts.scheme=Schemat är inaktiverat!
 statusbar.updated=har uppdaterats
-sync=
+sync=Synka
 tooltip.loading=Läser in…
 Uninstall=Avinstallera
 untitledScript=(Namnlöst skript)
@@ -166,4 +166,4 @@ userscript=Användarskript
 userscripts=Användarskript
 userscripts.get=Hämta användarskript
 userscripts.noneInstalled=Du har inga användarskript installerade
-warning.returnfrommain=Att \"gå tillbaka\" från huvudområdet stöds som regel inte. Du bör åtgärda det i ditt användarskript.
+warning.returnfrommain=Att "gå tillbaka" från huvudområdet stöds som regel inte. Du bör åtgärda det i ditt användarskript.

From 94f0b4df82bf691225a0f618ba71afa1ca875e88 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 23 Sep 2012 10:38:30 -0700
Subject: [PATCH 687/829] Closes #22 removing old Fennec code

---
 extension/chrome.manifest                     |   9 +-
 extension/components/scriptish.js             |  14 +-
 extension/content/e10s/browser-content.js     |  67 ----------
 extension/content/e10s/browser.js             | 126 ------------------
 extension/content/e10s/browser.xul            |  20 ---
 extension/content/fennec-options.xul          |   8 --
 extension/content/js/updatecheck.js           |  30 ++---
 extension/modules/addonprovider.js            |  21 ---
 extension/modules/api.js                      |  51 +------
 extension/modules/manager.js                  |   4 -
 extension/modules/script/script.js            |   7 +-
 extension/modules/script/scriptdownloader.js  |  23 +---
 .../modules/utils/Scriptish_notification.js   |   6 -
 .../modules/utils/Scriptish_openInTab.js      |   5 -
 .../utils/Scriptish_sendAsyncE10SMessage.js   |  11 --
 15 files changed, 35 insertions(+), 367 deletions(-)
 delete mode 100644 extension/content/e10s/browser-content.js
 delete mode 100644 extension/content/e10s/browser.js
 delete mode 100644 extension/content/e10s/browser.xul
 delete mode 100644 extension/content/fennec-options.xul
 delete mode 100644 extension/modules/utils/Scriptish_sendAsyncE10SMessage.js

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 8f4ca4ca..bc3a8a1d 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -1,20 +1,24 @@
+# TODO: remove/replace/improve
 component {ca39e060-88ab-11df-a4ee-0800200c9a66} components/scriptish.js
 contract  @scriptish.erikvold.com/scriptish-service;1 {ca39e060-88ab-11df-a4ee-0800200c9a66}
 category  content-policy @scriptish.erikvold.com/scriptish-service;1 @scriptish.erikvold.com/scriptish-service;1
 
+# TODO: add this dynamically
 component {5f28a810-8094-11e0-b278-0800200c9a66} components/aboutScriptish.js
 contract  @mozilla.org/network/protocol/about;1?what=scriptish {5f28a810-8094-11e0-b278-0800200c9a66}
 
+# TODO: REMOVE
 content    scriptish    content/
+# TODO: register dynamically
 resource   scriptish    modules/
 skin       scriptish    classic/1.0 skin/
+
 style      chrome://global/content/customizeToolbar.xul chrome://scriptish/skin/browser.css
 style      chrome://global/content/customizeToolbar.xul chrome://scriptish/content/third-party/firebug/startButton.css
 style      chrome://global/content/alerts/alert.xul chrome://scriptish/skin/third-party/alert.css os=Darwin
 
 overlay    chrome://browser/content/browser.xul chrome://scriptish/content/browser.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 overlay    chrome://browser/content/browser.xul chrome://scriptish/content/browser.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
-overlay    chrome://browser/content/browser.xul chrome://scriptish/content/e10s/browser.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
 overlay    chrome://browser/content/scratchpad.xul chrome://scriptish/content/scratchpad.xul
 overlay    chrome://navigator/content/navigator.xul chrome://scriptish/content/browser.xul
 overlay    about:addons chrome://scriptish/content/addonstab.xul
@@ -26,8 +30,7 @@ overlay    chrome://scriptish/content/install.xul chrome://scriptish/content/clo
 overlay    chrome://scriptish/content/options.xul chrome://scriptish/content/closewindow.xul
 overlay    chrome://scriptish/content/newscript.xul chrome://scriptish/content/closewindow.xul
 
-override chrome://scriptish/content/options.xul chrome://scriptish/content/fennec-options.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
-
+# TODO: remove below, do dynamically.
 locale     scriptish  en-US  locale/en-US/
 locale     scriptish  de     locale/de/
 locale     scriptish  es-ES  locale/es-ES/
diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 9321bd32..72348e47 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -33,15 +33,11 @@ const RE_USERSCRIPT = /\.user(?:-\d+)?\.js$/;
 const RE_CONTENTTYPE = /text\/html/i;
 
 function ScriptishService() {
-  if ("Fennec" != Services.appinfo.name) {
-    Scriptish_manager.setup.call(this);
-    Services.obs.addObserver(this, "install-userscript", false);
-    Services.obs.addObserver(this, "scriptish-enabled", false);
-    Services.obs.addObserver(this, "content-document-global-created", false);
-    Services.obs.addObserver(this, "chrome-document-global-created", false);
-  } else {
-    //Services.mm.
-  }
+  Scriptish_manager.setup.call(this);
+  Services.obs.addObserver(this, "install-userscript", false);
+  Services.obs.addObserver(this, "scriptish-enabled", false);
+  Services.obs.addObserver(this, "content-document-global-created", false);
+  Services.obs.addObserver(this, "chrome-document-global-created", false);
 }
 
 ScriptishService.prototype = {
diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
deleted file mode 100644
index cdb55bdc..00000000
--- a/extension/content/e10s/browser-content.js
+++ /dev/null
@@ -1,67 +0,0 @@
-(function(inc, tools, global){
-inc("resource://scriptish/constants.js", tools);
-const {lazyImport, lazyUtil} = tools;
-lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
-lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
-lazyImport(global, "resource://scriptish/script/simple-script.js", ["SimpleScript"]);
-lazyImport(global, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
-  "Scriptish_setExcludes"
-]);
-
-global.Scriptish_installUri = function(aURL) {
-  sendAsyncMessage("Scriptish:InstallScriptURL", aURL);
-}
-
-function updateExcludes({json}) {
-  Scriptish_setExcludes(json);
-}
-
-var configJSON = sendSyncMessage("Scriptish:FrameSetup", "")[0];
-var scripts;
-
-(function(configJSON) {
-  Scriptish_setExcludes(configJSON.excludes);
-
-  scripts = configJSON.scripts.map(function(i) {
-    return SimpleScript.loadFromJSON(i);
-  });
-
-  Scriptish_manager.setup({
-    global: global,
-    content: content,
-    scripts: scripts
-  });
-})(configJSON);
-
-addMessageListener("Scriptish:GlobalExcludesUpdate", updateExcludes);
-addMessageListener("Scriptish:ScriptInstalled", function({json}) {
-  scripts.push(SimpleScript.loadFromJSON(json));
-});
-addMessageListener("Scriptish:ScriptChanged", function({json}) {
-  var script = SimpleScript.loadFromJSON(json);
-  for (var i = scripts.length - 1; ~i; i--) {
-    if (scripts[i].id == script.id) {
-      scripts[i] = script;
-      return;
-    }
-  }
-});
-addMessageListener("Scriptish:ScriptUninstalled", function({json}) {
-  for (var i = scripts.length - 1; ~i; i--) {
-    if (scripts[i].id == json) {
-      scripts.splice(i, 1);
-      return;
-    }
-  }
-});
-})(Components.utils.import, {}, this);
-
-
-addEventListener("load", function() {
-  ContextHandler.registerType("userscript-install", function(popupState, element) {
-    if (/\.user\.js$/.test(element.href)) {
-      return true;
-    }
-    return false;
-  });
-}, true);
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
deleted file mode 100644
index d0ab7ee7..00000000
--- a/extension/content/e10s/browser.js
+++ /dev/null
@@ -1,126 +0,0 @@
-
-(function(inc, tools, global){
-  inc("resource://scriptish/constants.js", tools);
-  const {lazyImport, lazyUtil, Services} = tools;
-  lazyImport(global, "resource://scriptish/logging.js", ["Scriptish_log"]);
-  lazyImport(global, "resource://scriptish/manager.js", ["Scriptish_manager"]);
-  lazyImport(global, "resource://scriptish/config.js", ["Scriptish_config"]);
-  lazyImport(global, "resource://scriptish/api/GM_Resources.js", ["GM_Resources"]);
-  lazyImport(global, "resource://scriptish/api/GM_ScriptStorage.js", ["GM_ScriptStorage"]);
-
-  lazyUtil(global, "installUri");
-  lazyUtil(global, "getScriptHeader");
-  lazyUtil(global, "notification");
-  lazyUtil(global, "openInTab");
-
-  var $ = function(id) document.getElementById(id);
-
-  addEventListener("load", function() {
-    // Check if Scriptish has been updated/installed
-    inc("resource://scriptish/utils/Scriptish_updateChk.js");
-
-    var us_head = $("addons-userscripts");
-    var parent = us_head.parentNode;
-
-    function createNode(script) {
-      var ele = ExtensionsView._createItem(script, "userscript");
-      ele.setAttribute("typeLabel", "User Script");
-      // TODO: implement for Fennec.. #517
-      //ele.setAttribute("optionsURL", script.optionsURL);
-      ele.setAttribute("isDisabled", !script.enabled);
-      ele.setAttribute("data-scriptish-scriptid", script.id);
-      ele.addon = script;
-      return ele;
-    }
-
-    function insertScript(script) {
-      parent.insertBefore(createNode(script), us_head.nextSibling);
-    }
-
-    // insert script nodes into the EM
-    Scriptish_config.scripts.forEach(insertScript);
-    Services.obs.addObserver({
-      observe: function(aSubject, aTopic, aData) {
-        tools.timeout(function() {
-          var script = Scriptish_config.getScriptById(JSON.parse(aData).id);
-          insertScript(script);
-        });
-      }
-    }, "scriptish-script-installed", false);
-
-    // replace script nodes when there is a change to script
-    var updateObs = {
-      observe: function(aSubject, aTopic, aData) {
-        tools.timeout(function() {
-          var script = Scriptish_config.getScriptById(JSON.parse(aData).id);
-          var node = createNode(script);
-          var id = node.getAttribute("id");
-          var oldNode = $(id);
-          if (oldNode) parent.replaceChild(node, oldNode);
-          else insertScript(script); // jic
-        });
-      }
-    };
-    Services.obs.addObserver(updateObs, "scriptish-script-modified", false);
-    Services.obs.addObserver(updateObs, "scriptish-script-updated", false);
-  }, false);
-
-  var mm = messageManager;
-
-  mm.addMessageListener("Scriptish:InstallScriptURL", function({json}) {
-    return Scriptish_installUri(json);
-  });
-
-  mm.addMessageListener("Scriptish:FrameSetup", function() {
-    return Scriptish_config.toJSON();
-  });
-
-  mm.addMessageListener("Scriptish:GetScriptContents", function({json}) {
-    return Scriptish_config.getScriptById(json).textContent;
-  });
-
-  mm.addMessageListener("Scriptish:GetScriptResourceURL", function({json}) {
-    return new GM_Resources(Scriptish_config.getScriptById(json.scriptID)).getResourceURL(json.resource);
-  });
-
-  mm.addMessageListener("Scriptish:GetScriptResourceText", function({json}) {
-    return new GM_Resources(Scriptish_config.getScriptById(json.scriptID)).getResourceText(json.resource);
-  });
-
-  mm.addMessageListener("Scriptish:GetScriptRequires", function({json}) {
-    var script = Scriptish_config.getScriptById(json);
-    if (!script) return [];
-
-    var rtnAry = [];
-    script.requires.forEach(function(req) {
-      rtnAry.push({
-        fileURL: req.fileURL,
-        textContent: req.textContent
-      });
-    });
-    return rtnAry;
-  });
-
-  mm.addMessageListener("Scriptish:ScriptNotification", function({json}) {
-    Scriptish_notification.apply(null, json);
-  });
-
-  mm.addMessageListener("Scriptish:ScriptSetValue", function({json}) {
-    var script = Scriptish_config.getScriptById(json.scriptID);
-    var storage = new GM_ScriptStorage(script);
-    return storage.setValue.apply(storage, json.args);
-  });
-
-  mm.addMessageListener("Scriptish:GetScriptMetadata", function({json}) {
-    return Scriptish_getScriptHeader(Scriptish_config.getScriptById(json.id), json.key, json.localVal);
-  });
-
-  mm.addMessageListener("Scriptish:OpenInTab", function({json}) {
-    json.push(global);
-    return Scriptish_openInTab.apply(null, json);
-  });
-
-  mm.loadFrameScript(
-      "chrome://scriptish/content/e10s/browser-content.js",
-      true); // no delay loading frame script
-})(Components.utils.import, {}, this);
diff --git a/extension/content/e10s/browser.xul b/extension/content/e10s/browser.xul
deleted file mode 100644
index 7f56538a..00000000
--- a/extension/content/e10s/browser.xul
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="chrome://scriptish/skin/browser-fennec.css" type="text/css"?>
-<overlay id="scriptish-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" src="chrome://scriptish/content/e10s/browser.js"/>
-
-  <richlistbox id="context-commands">
-    <richlistitem id="scriptish-userscript-install-context-command"
-                  class="context-command"
-                  type="userscript-install"
-                  onclick="Scriptish_installUri(ContextHelper.popupState.linkURL);">
-      <label value="Install User Script"/>
-    </richlistitem>
-  </richlistbox> 
-
-  <richlistbox id="addons-list">
-    <richlistitem id="addons-userscripts" insertbefore="addons-local" class="section-header" align="center">
-      <label value="Your User Scripts" flex="1"/>
-    </richlistitem>
-  </richlistbox>
-</overlay>
diff --git a/extension/content/fennec-options.xul b/extension/content/fennec-options.xul
deleted file mode 100644
index aab02b0e..00000000
--- a/extension/content/fennec-options.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <setting pref="extensions.scriptish.enabled" type="bool" title="Scripts Enabled"/>
-  <setting pref="extensions.scriptish.cache.enabled" type="bool" title="Cache Enabled"/>
-  <setting pref="extensions.scriptish.uninstallPreferences" type="bool" title="Remove Script Preferences">
-    Remove preferences associated with a user script when the script is uninstalled.
-  </setting>
-</vbox>
diff --git a/extension/content/js/updatecheck.js b/extension/content/js/updatecheck.js
index 3e32b73f..57e836d0 100644
--- a/extension/content/js/updatecheck.js
+++ b/extension/content/js/updatecheck.js
@@ -17,21 +17,19 @@
     (chromeWin.Browser ? chromeWin.Browser : chromeWin.gBrowser)
         .addTab("about:scriptish");
 
-    if ("Fennec" != tools.Services.appinfo.name) {
-      // add toolbaritem to add-on bar
-      var addToBar = chromeWin.document.getElementById("addon-bar");
-      if (!addToBar || chromeWin.document.getElementById("scriptish-button"))
-        return;
-      var addonSet = (addToBar.getAttribute("currentset") || addToBar.getAttribute("defaultset")).split(",");
-      var addonPos = addonSet.indexOf("status-bar");
-      if (addonPos == -1) addonPos = addonSet.length;
-      addonSet.splice(addonPos, 0, "scriptish-button");
-      addonSet = addonSet.join(",");
-      addToBar.setAttribute("currentset", addonSet);
-      addToBar.currentSet = addonSet;
-      chromeWin.BrowserToolboxCustomizeDone(true);
-      chromeWin.document.persist(addToBar.getAttribute("id"), "currentset");
-      if ("addon-bar" == addToBar.getAttribute("id")) addToBar.collapsed = false;
-    }
+    // add toolbaritem to add-on bar
+    var addToBar = chromeWin.document.getElementById("addon-bar");
+    if (!addToBar || chromeWin.document.getElementById("scriptish-button"))
+      return;
+    var addonSet = (addToBar.getAttribute("currentset") || addToBar.getAttribute("defaultset")).split(",");
+    var addonPos = addonSet.indexOf("status-bar");
+    if (addonPos == -1) addonPos = addonSet.length;
+    addonSet.splice(addonPos, 0, "scriptish-button");
+    addonSet = addonSet.join(",");
+    addToBar.setAttribute("currentset", addonSet);
+    addToBar.currentSet = addonSet;
+    chromeWin.BrowserToolboxCustomizeDone(true);
+    chromeWin.document.persist(addToBar.getAttribute("id"), "currentset");
+    if ("addon-bar" == addToBar.getAttribute("id")) addToBar.collapsed = false;
   }
 })(Components.utils.import, {})
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index a11e27f0..a765887f 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -46,11 +46,6 @@ const Scriptish_ScriptProvider = {
         Scriptish_notification(msg, null, null, callback);
       }
 
-      // notify content processes that there is a new script
-      if ("Fennec" == Services.appinfo.name) {
-        Scriptish_sendAsyncE10SMessage("Scriptish:ScriptInstalled", script.toJSON());
-      }
-
       break;
     case "scriptish-script-edit-enabling":
       AddonManagerPrivate.callAddonListeners(
@@ -59,12 +54,6 @@ const Scriptish_ScriptProvider = {
     case "scriptish-script-edit-enabled":
       AddonManagerPrivate.callAddonListeners(
           aData.enabling ? "onEnabled" : "onDisabled", script);
-
-      // notify content processes that a script's enabled state changed
-      if ("Fennec" == Services.appinfo.name) {
-        // TODO: use a more intelligent custom message handler
-        Scriptish_sendAsyncE10SMessage("Scriptish:ScriptChanged", script.toJSON());
-      }
       break;
     case "scriptish-script-modified":
     case "scriptish-script-updated":
@@ -100,22 +89,12 @@ const Scriptish_ScriptProvider = {
         Scriptish_notification(msg, null, null, callback);
       }
 
-      // notify content processes that a script has changed
-      if ("Fennec" == Services.appinfo.name) {
-        Scriptish_sendAsyncE10SMessage("Scriptish:ScriptChanged", script.toJSON());
-      }
-
       break;
     case "scriptish-script-uninstalling":
       AddonManagerPrivate.callAddonListeners("onUninstalling", script, false);
       break;
     case "scriptish-script-uninstalled":
       AddonManagerPrivate.callAddonListeners("onUninstalled", script);
-
-      // notify content processes that a script is uninstalled
-      if ("Fennec" == Services.appinfo.name) {
-        Scriptish_sendAsyncE10SMessage("Scriptish:ScriptUninstalled", script.id);
-      }
       break;
     }
   },
diff --git a/extension/modules/api.js b/extension/modules/api.js
index ca9ff64e..a793d89e 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -142,18 +142,7 @@ function GM_API(options) {
 
   this.GM_setValue = function GM_setValue(aName, aValue) {
     if (!GM_apiLeakCheck("GM_setValue")) return;
-
-    // e10s
-    if (options.global && options.global.sendAsyncMessage) {
-        return options.global.sendSyncMessage("Scriptish:ScriptSetValue", {
-          scriptID: aScript.id,
-          args: [aName, aValue]
-        });
-    }
-    // old school
-    else {
-      return lazyLoaders.storage.setValue.apply(lazyLoaders.storage, arguments);
-    }
+    return lazyLoaders.storage.setValue.apply(lazyLoaders.storage, arguments);
   };
   this.GM_getValue = function GM_getValue() {
     if (!GM_apiLeakCheck("GM_getValue")) return;
@@ -170,56 +159,22 @@ function GM_API(options) {
 
   this.GM_getResourceURL = function GM_getResourceURL(aName) {
     if (!GM_apiLeakCheck("GM_getResourceURL")) return;
-
-    if (options.content) {
-      return options.global.sendSyncMessage("Scriptish:GetScriptResourceURL", {
-        scriptID: aScript.id,
-        resource: aName
-      });
-    }
-
     return lazyLoaders.resources.getResourceURL.apply(lazyLoaders.resources, arguments)
   }
   this.GM_getResourceText = function GM_getResourceText(aName) {
     if (!GM_apiLeakCheck("GM_getResourceText")) return;
-
-    if (options.global && options.global.sendSyncMessage) {
-      return options.global.sendSyncMessage("Scriptish:GetScriptResourceText", {
-        scriptID: aScript.id,
-        resource: aName
-      });
-    }
-
     return lazyLoaders.resources.getResourceText.apply(lazyLoaders.resources, arguments)
   }
 
   this.GM_getMetadata = function(aKey, aLocalVal) {
     if (!GM_apiLeakCheck("GM_getMetadata")) return;
-
-    if (options.global && options.global.sendSyncMessage) {
-      return options.global.sendSyncMessage("Scriptish:GetScriptMetadata", {
-        id: aScript.id,
-        key: aKey, 
-        localVal: aLocalVal
-      })[0];
-    }
-
     return Scriptish_getScriptHeader(aScript, aKey, aLocalVal);
   }
 
   this.GM_openInTab = function GM_openInTab(aURL, aLoadInBackground, aReuse) {
     if (!GM_apiLeakCheck("GM_openInTab")) return;
-
-    if (options.global && options.global.sendSyncMessage) {
-      // TODO: implement aReuse for Fennec
-      options.global.sendAsyncMessage("Scriptish:OpenInTab", [
-          aURL, aLoadInBackground, false]);
-    }
-    else {
-      Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin);
-    }
-
-    return undefined; // can't return window object b/c of e10s, don't bother
+    Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin);
+    return undefined; // don't return the window, this is intentional
   }
 
   this.GM_xmlhttpRequest = function GM_xmlhttpRequest() {
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index 5a0519a3..2272b381 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -123,12 +123,9 @@ const Scriptish_manager = {
 
     if (scripts["document-end"].length || scripts["document-idle"].length) {
       safeWin.addEventListener("DOMContentLoaded", function() {
-        //if (shouldNotRun()) return;
-
         // inject @run-at document-idle scripts
         if (scripts["document-idle"].length) {
           timeout(function() {
-            //if (shouldNotRun()) return;
             Scriptish_injectScripts(extend(options, {
               scripts: scripts["document-idle"],
               url: href,
@@ -148,7 +145,6 @@ const Scriptish_manager = {
 
     if (scripts["window-load"].length) {
       safeWin.addEventListener("load", function() {
-        if (shouldNotRun()) return;
         // inject @run-at window-load scripts
         Scriptish_injectScripts(extend(options, {
           scripts: scripts["window-load"],
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 7078187f..793b2aca 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -281,12 +281,7 @@ Script.prototype = {
   uninstall: function() {
     Scriptish.notify(this, "scriptish-script-uninstalling");
     this.needsUninstall = true;
-    if ("Fennec" == Services.appinfo.name) {
-      this._config.uninstallScripts();
-    }
-    else {
-      this.pendingOperations = AddonManager.PENDING_UNINSTALL;
-    }
+    this.pendingOperations = AddonManager.PENDING_UNINSTALL;
     Scriptish.notify(this, "scriptish-script-uninstalled");
   },
   uninstallProcess: function() {
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 49ed0d45..40931d64 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -10,7 +10,6 @@ lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/script/script.js", ["Script"]);
 lazyImport(this, "resource://scriptish/script/scripticon.js", ["ScriptIcon"]);
-lazyImport(this, "resource://scriptish/third-party/fennec/XPIDialogService.js", ["WebInstallPrompt"]);
 
 lazyUtil(this, "alert");
 lazyUtil(this, "getTempFile");
@@ -400,23 +399,13 @@ ScriptDownloader.prototype.cleanupTempFiles = function() {
 }
 ScriptDownloader.prototype.showInstallDialog = function(aTimer) {
   let self = this;
-  if ("Fennec" == Services.appinfo.name) {
-    WebInstallPrompt.confirm(Scriptish.getMostRecentWindow(), [{
-      name: this.script.name,
-      install: function() {
-        self.installScript();
-      },
-      cancel: function() {}
-    }]);
-  }
-  else {
-    if (!aTimer)
-      return timeout(this.showInstallDialog.bind(this, 1));
 
-    Services.wm.getMostRecentWindow("navigator:browser").openDialog(
-        "chrome://scriptish/content/install.xul", "",
-        "chrome,centerscreen,modal,dialog,titlebar,resizable", this);
-  }
+  if (!aTimer)
+    return timeout(this.showInstallDialog.bind(this, 1));
+
+  Services.wm.getMostRecentWindow("navigator:browser").openDialog(
+      "chrome://scriptish/content/install.xul", "",
+      "chrome,centerscreen,modal,dialog,titlebar,resizable", this);
 }
 ScriptDownloader.prototype.showScriptView = function() {
   Services.wm.getMostRecentWindow("navigator:browser")
diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index 71f0222c..7d8d45f0 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -4,12 +4,6 @@ lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
 function showAlertNotification() {
-  if ("Fennec" == Services.appinfo.name) {
-    return Cc["@mozilla.org/toaster-alerts-service;1"]
-        .getService(Ci.nsIAlertsService)
-        .showAlertNotification;
-  }
-
   return Services.as.showAlertNotification;
 }
 
diff --git a/extension/modules/utils/Scriptish_openInTab.js b/extension/modules/utils/Scriptish_openInTab.js
index c3603711..044c9cdb 100644
--- a/extension/modules/utils/Scriptish_openInTab.js
+++ b/extension/modules/utils/Scriptish_openInTab.js
@@ -7,11 +7,6 @@ lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 function Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin) {
   aChromeWin = aChromeWin || Scriptish.getMostRecentWindow();
 
-  if ("Fennec" == Services.appinfo.name) {
-    aChromeWin.Browser.addTab(aURL);
-    return;
-  }
-
   // Try to reuse an existing tab
   if (aReuse) {
     let browserEnumerator = Services.wm.getEnumerator("navigator:browser");
diff --git a/extension/modules/utils/Scriptish_sendAsyncE10SMessage.js b/extension/modules/utils/Scriptish_sendAsyncE10SMessage.js
deleted file mode 100644
index 726d85f0..00000000
--- a/extension/modules/utils/Scriptish_sendAsyncE10SMessage.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var EXPORTED_SYMBOLS = ["Scriptish_sendAsyncE10SMessage"];
-Components.utils.import("resource://scriptish/constants.js");
-Components.utils.import("resource://scriptish/scriptish.js");
-
-function Scriptish_sendAsyncE10SMessage(aName, aJSON) {
-  let bWins = Scriptish.getWindows();
-  while (bWins.hasMoreElements()) {
-    let bWin = bWins.getNext();
-    bWin.messageManager.sendAsyncMessage(aName, aJSON)
-  }
-}

From d8442cc4b20c67d90e3a072232874d7a04ecd739 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 23 Sep 2012 13:21:01 -0500
Subject: [PATCH 688/829] Updating zh-CN courtesy of dindog (BabelZilla).

---
 extension/install.rdf                       |  1 +
 extension/locale/zh-CN/scriptish.properties | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 15f615d2..871adbcb 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -48,6 +48,7 @@
     <em:translator>Alfredo Fernández Díaz (es-ES)</em:translator>
     <em:translator>allertec (pl)</em:translator>
     <em:translator>barryoni (he)</em:translator>
+    <em:translator>dindog (zh-CN)</em:translator>
     <em:translator>iHastr (ru-RU)</em:translator>
     <em:translator>k2jp (ja-JP)</em:translator>
     <em:translator>Kozák (WonderCsabo) Csaba (hu)</em:translator>
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index a2809f28..48c098ed 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -14,7 +14,7 @@ error.api.noResourceWithName=没有该名称的资源
 error.api.noSecondArgValue=第二个参数未指定：值
 error.api.reqURL=无效的 URL
 error.api.reqURL.scheme=不允许在 URL 中出现 scheme
-error.api.safeHTMLParser.url=
+error.api.safeHTMLParser.url=无法解释 GM_safeHTMLParser 函数的中的 URL参数
 error.api.unsafeAccess=Scriptish 访问冲突：unsafeWindow 无法调用
 error.charset=指定的字符集无效。
 error.dependency.loading=加载依赖文件时发生错误
@@ -24,16 +24,16 @@ error.hash.algorithm=指定的散列算法无效
 error.icon.dataURL=无效的数据：@icon 的 URL
 error.icon.notImage=错误！@icon 没有图像 MIME 类型
 error.icon.URL=无效的 @icon URL
-error.invalidCert=
+error.invalidCert=无效的SSL证书。\n如果确定需要开启，请在Scriptish设置/高级/更新安全 勾选允许所有证书。
 error.isInvalidValue=是个无效的值
 error.matchPattern.rules=@match 模式不符合模式规则
 error.matchPattern.rules.file=文件 scheme @match 模式不符合模式规则
-error.notSecure=
+error.notSecure=非安全URI。\n如果确定需要开启，请在Scriptish设置/高级/更新安全 下开启允许非HTTPS更新。
 error.notSupported.Firefox=不支持这一版本的 Firefox
 error.openingFile=无法打开文件
 error.pattern.parsing=模式不能被解析
 error.pref.type=不支持的首选项类型。有效的类型有：字符串、布尔和32位整数。
-error.remoteVersionOlder=
+error.remoteVersionOlder=更新地址下的脚本版本数字低于本地文件。
 error.resource.dupName=是一个重复的资源名称。每一个 @resource 都必须有唯一的名称。
 error.resource.syntax=无效的 @resource 声明语法
 error.retrieving=检索失败
@@ -131,10 +131,10 @@ options.pane.main=常规
 options.pane.ui=用户界面
 options.requireBuiltInCerts=安全更新需要使用内置的证书
 options.requireSecured=要求用户脚本使用 HTTPS 更新
-options.sync.desc=
-options.sync.ScriptishPrefs=
-options.sync.ScriptishPrefs.common=
-options.sync.ScriptishPrefs.editor=
+options.sync.desc=必须启用Firefox 的Sync同步服务，并且在其设置中开启相关选项
+options.sync.ScriptishPrefs=Scriptish 设置
+options.sync.ScriptishPrefs.common=同步 Scriptish 扩展的普通设置
+options.sync.ScriptishPrefs.editor=同步代码编辑器设置
 options.title=Scriptish 选项
 options.toolbarbutton=工具栏按钮
 options.toolbarbutton.showScripts=显示活动的脚本数
@@ -157,7 +157,7 @@ statusbar.noScripts.excluded=页面已排除！
 statusbar.noScripts.notfound=页面上没有脚本在运行！
 statusbar.noScripts.scheme=Scheme 已禁用！
 statusbar.updated=更新成功
-sync=
+sync=同步
 tooltip.loading=正在加载...
 Uninstall=卸载
 untitledScript=无标题的脚本
@@ -166,4 +166,4 @@ userscript=用户脚本
 userscripts=用户脚本
 userscripts.get=获取用户脚本
 userscripts.noneInstalled=您尚未安装任何用户脚本
-warning.returnfrommain=一般不支持从主体范围“return”。您需要在您的用户脚本中修复这个问题。
+warning.returnfrommain=一般不支持在主执行域里的“return”。您需要在您的用户脚本中修复这个问题。

From 1289b2b3670f0039b0778dc79b75dd878e976d6d Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 23 Sep 2012 11:46:15 -0700
Subject: [PATCH 689/829] <em:version>0.1.8</em:version>

---
 build.sh              |  4 ++++
 extension/install.rdf |  4 ++--
 update.rdf            | 19 +++++--------------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/build.sh b/build.sh
index 76bdce0d..6a9ca747 100755
--- a/build.sh
+++ b/build.sh
@@ -56,3 +56,7 @@ if [ "test" != "$1" ]; then
 fi
 cd ..
 rm -rf build
+
+if [ "amo" == "$1" ] || [ "staging" == "$1" ]; then
+  openssl sha1 "$XPI"
+fi
diff --git a/extension/install.rdf b/extension/install.rdf
index 15f615d2..3f9683d4 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.8pre</em:version>
+    <em:version>0.1.8</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
@@ -68,7 +68,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>12.0a1</em:maxVersion>
+        <em:maxVersion>18.0a1</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- SeaMonkey -->
diff --git a/update.rdf b/update.rdf
index 35ad2945..498ce7e6 100644
--- a/update.rdf
+++ b/update.rdf
@@ -6,14 +6,14 @@
       <RDF:Seq>
         <RDF:li>
           <RDF:Description>
-            <em:version>0.1.7</em:version>
+            <em:version>0.1.8</em:version>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>4.0</em:minVersion>
-                <em:maxVersion>12.0a1</em:maxVersion>
+                <em:maxVersion>18.0a1</em:maxVersion>
                 <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.7.xpi</em:updateLink>
-                <em:updateHash>sha1:1f098ee6a55778e00f057826d39b6fabecd0b8d4</em:updateHash>
+                <em:updateHash>sha1:ee95dd6c12695806daec6d178f8585c46d4e6231</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
             <em:targetApplication>
@@ -22,16 +22,7 @@
                 <em:minVersion>2.1</em:minVersion>
                 <em:maxVersion>2.8.*</em:maxVersion>
                 <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.7.xpi</em:updateLink>
-                <em:updateHash>sha1:1f098ee6a55778e00f057826d39b6fabecd0b8d4</em:updateHash>
-              </RDF:Description>
-            </em:targetApplication>
-            <em:targetApplication>
-              <RDF:Description>
-                <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
-                <em:minVersion>4.0</em:minVersion>
-                <em:maxVersion>10.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.7.xpi</em:updateLink>
-                <em:updateHash>sha1:1f098ee6a55778e00f057826d39b6fabecd0b8d4</em:updateHash>
+                <em:updateHash>sha1:ee95dd6c12695806daec6d178f8585c46d4e6231</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
           </RDF:Description>
@@ -39,6 +30,6 @@
       </RDF:Seq>
     </em:updates>
 
-    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAFxIbXsnLRKFaXW4ebxmIM7rl1dVY1LLIYiygy1LAk50d71NRTh0Sk02zsykZ+/sPIxwaK4giAO/kOQxgkUGlFGk4itCGyhaHr0lAwCVoAL8O+BewwFB48hxFZvu+QRq1QTlPcxHT7RU+bZWYtxGOJhlET5bz68jczYMcDCeDj9w</em:signature>
+    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAHJ+H2ftD8lNU/6orhjTsH8KwJcJpJf3NhYlx1GHG4kmfiRWj+fHp+biDrPS6zxXuvUqzBA9X3UAivtkCkWcRHjZN0B0iNrPv4aWsB9i3L4hsdXXLjBJfOOZzuJE92qYUChXn8K5Q8EgeWSemPlTrvB22LvXWglGA2Lo+g70buIV</em:signature>
   </RDF:Description>
 </RDF:RDF>

From 545bc52c8fcf80145e6d20fc8bed753efcb48f41 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 23 Sep 2012 11:48:33 -0700
Subject: [PATCH 690/829] correcting the update.rdf link

---
 update.rdf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/update.rdf b/update.rdf
index 498ce7e6..b0bfcb74 100644
--- a/update.rdf
+++ b/update.rdf
@@ -12,7 +12,7 @@
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>4.0</em:minVersion>
                 <em:maxVersion>18.0a1</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.7.xpi</em:updateLink>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.8.xpi</em:updateLink>
                 <em:updateHash>sha1:ee95dd6c12695806daec6d178f8585c46d4e6231</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
@@ -21,7 +21,7 @@
                 <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
                 <em:minVersion>2.1</em:minVersion>
                 <em:maxVersion>2.8.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.7.xpi</em:updateLink>
+                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.8.xpi</em:updateLink>
                 <em:updateHash>sha1:ee95dd6c12695806daec6d178f8585c46d4e6231</em:updateHash>
               </RDF:Description>
             </em:targetApplication>
@@ -30,6 +30,6 @@
       </RDF:Seq>
     </em:updates>
 
-    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBAHJ+H2ftD8lNU/6orhjTsH8KwJcJpJf3NhYlx1GHG4kmfiRWj+fHp+biDrPS6zxXuvUqzBA9X3UAivtkCkWcRHjZN0B0iNrPv4aWsB9i3L4hsdXXLjBJfOOZzuJE92qYUChXn8K5Q8EgeWSemPlTrvB22LvXWglGA2Lo+g70buIV</em:signature>
+    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBACaeJuUaRaUBeMEYqnW7QY40djS5WjUFT5iq6j2twbOO3GnmpuaWcFtUVCpvsdBA1e4shCgTYgRpx6Kid7aYVmCWvcu7hiWakfOZvRPLVBPmpN7/dXWvadldcnvduVQsPHxU3UUVqI3aj37V01po1P/44gGK4dvbmRM+Sp1/JImF</em:signature>
   </RDF:Description>
 </RDF:RDF>

From 7b7556e8cbf67c3eabdc74cdaf4a34253d626883 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Sun, 23 Sep 2012 12:14:24 -0700
Subject: [PATCH 691/829] <em:version>0.1.9pre</em:version>

---
 extension/install.rdf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 4ab9e5d0..cb1eac2d 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.8</em:version>
+    <em:version>0.1.9pre</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
@@ -68,7 +68,7 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>4.0</em:minVersion>
+        <em:minVersion>6.0</em:minVersion>
         <em:maxVersion>18.0a1</em:maxVersion>
       </Description>
     </em:targetApplication>

From 241a764365361c7e4032bb67507227aeb32bb07b Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 23 Sep 2012 16:08:30 -0500
Subject: [PATCH 692/829] Updating ja-JP courtesy of k2jp (BabelZilla).

---
 extension/locale/ja-JP/description.properties | 18 ++++-----
 extension/locale/ja-JP/scriptish.properties   | 40 +++++++++----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/extension/locale/ja-JP/description.properties b/extension/locale/ja-JP/description.properties
index 634c1222..3cecca56 100644
--- a/extension/locale/ja-JP/description.properties
+++ b/extension/locale/ja-JP/description.properties
@@ -1,13 +1,13 @@
-amo.description.line1=Scriptish は Greasemonkey からフォーク（派生）しました。特長は以下の通り：
-amo.description.line2=Greasemonkey ができること全て（これホントに便利）
-amo.description.line3=更新：Scriptish では @updateURL を使用することでユーザースクリプトを更新することができます。
+amo.description.line1=Scriptish は Greasemonkey のフォーク（派生）です。その機能は...：
+amo.description.line2=Greasemonkey の全機能（これホント便利）
+amo.description.line3=更新機能：@updateURL を指定することで、ユーザースクリプトを更新することができます
 amo.description.line4=多数の新たな <a title="Scriptish metadata block documentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">メタデータ（@keys）</a>
 amo.description.line5=多数の新たな <a title="Scriptish User Script API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">追加 GM_ API</a>
-amo.description.line6=優れたパフォーマンス：最新の Firefox を使い倒したより速く、よりクリーンなコードベース
+amo.description.line6=優れたパフォーマンス：最新の Firefox を使い倒した、より速く、よりクリーンなコードベース
 amo.description.line7=優れたセキュリティ：Scriptish は他にないセキュリティ機能を提供します
-amo.description.line8=テスト：開発者は Scriptish が正しく機能していることを確認したり、より早くバグを見つけるために多くのテストを利用することができる
-amo.developerComments.line1=Scriptish は Greasemonkey と同じことができます。追加機能については…：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
-amo.developerComments.line2=バグや新機能のリクエストは…：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
-amo.developerComments.line3=他の質問はメーリングリストまで…：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
+amo.description.line8=テスト：開発者は Scriptish が正しく機能していることを確認したり、より早くバグを見つけるために多くのテストを利用しています
+amo.developerComments.line1=Scriptish は Greasemonkey と同じことができます。追加機能の詳細：<a href="http://github.com/scriptish/scriptish/wiki">http://github.com/scriptish/scriptish/wiki</a>
+amo.developerComments.line2=バグや新機能のリクエスト：<a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
+amo.developerComments.line3=他の質問はメーリングリスト：<a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
 amo.summary=インターネット上で最も優れたユーザースクリプトエンジン。
-extensions.scriptish@erikvold.com.description=Firefox 用のユーザースクリプト拡張
+extensions.scriptish@erikvold.com.description=Firefox 用ユーザースクリプトマネージャー
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 374134be..1712093d 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -1,21 +1,21 @@
-contributions.description=このユーザースクリプト開発者は、少額の寄付による開発継続のための支援をあなたに求めています。
-copyDownloadURL=ダウンロード時の URL をコピー
+contributions.description=このユーザースクリプト開発者は開発継続のため、少額の寄付による支援を求めています。
+copyDownloadURL=ダウンロード URL をコピー
 copyDownloadURL.ak=C
 edit=編集
 edit.ak=E
 editor.couldNotLaunch=エディタの起動に失敗しました
-editor.pleasePickExecutable=ユーザースクリプト編集用アプリケーションを指定してください
+editor.pleasePickExecutable=ユーザースクリプトを編集するアプリケーションを指定してください
 editor.prompt=エディタを選択してください
 editor.useScratchpad=エディタとしてスクラッチパッドを使用しますか？
 editor.useScratchpad.no=No（自分でエディタを指定）
 editor.useScratchpad.yes=Yes
-error.api.clipboard.type=は GM_setClipboard がサポートしてない型です
+error.api.clipboard.type=は GM_setClipboard がサポートしていない型（type）です
 error.api.noResourceWithName=名前付きリソースが見つかりません
 error.api.noSecondArgValue=２番目の引数が指定されていません：Value
 error.api.reqURL=不正な URL です
-error.api.reqURL.scheme=URL 内で許されないスキーム（scheme）です
-error.api.safeHTMLParser.url=
-error.api.unsafeAccess=Scriptish アクセス違反： unsafeWindow は以下を呼び出すことが出来ません
+error.api.reqURL.scheme=許可されていないスキーム（scheme）を URL で指定しています
+error.api.safeHTMLParser.url=GM_safeHTMLParser の引数 "URL" をパース（parse）できません
+error.api.unsafeAccess=Scriptish アクセス違反： unsafeWindow は以下を呼び出す（call）ことができません
 error.charset=不正な文字セットが指定されました
 error.dependency.loading=依存関係の読み込みでエラーが発生しました
 error.dependency.local=セキュリティ例外： ローカル及び chrome URL へのリクエストは禁止されています
@@ -24,16 +24,16 @@ error.hash.algorithm=不正なハッシュ・アルゴリズムが指定され
 error.icon.dataURL=不正なデータ： @icon 用 URL
 error.icon.notImage=エラー！ @icon が画像の MIME タイプではありません
 error.icon.URL=@icon の URL が不正です
-error.invalidCert=
+error.invalidCert=不正な SSL 証明書です。\n必要に応じて [Scriptish オプション]>[詳細]>[更新に関するセキュリティ] を調節してみてください。
 error.isInvalidValue=は不正な値です
 error.matchPattern.rules=@match のパターンが記法に適合していません
 error.matchPattern.rules.file=ファイル・スキーム（scheme）の @match パターンが記法に適合していません
-error.notSecure=
+error.notSecure=安全ではない URL です。\n必要に応じて [Scriptish オプション]>[詳細]>[更新に関するセキュリティ] を調節してみてください。
 error.notSupported.Firefox=はこのバージョンの Firefox でサポートされていません
 error.openingFile=ファイルを開くことが出来ませんでした
 error.pattern.parsing=パターンを構文解析（parse）できませんでした
 error.pref.type=サポートしてない設定の型です。正しい型は次の通り： string, bool, 32-bit integers
-error.remoteVersionOlder=
+error.remoteVersionOlder=リモートにローカルより新しいバージョン番号のスクリプトは見つかりませんでした
 error.resource.dupName=はリソース名として重複しています。@resource の名前は一意でなければなりません
 error.resource.syntax=@resource 宣言の構文が不正です
 error.retrieving=取得に失敗しました
@@ -52,22 +52,22 @@ install.showScriptSource=スクリプトのソースを表示
 install.title=ユーザースクリプトのインストール
 install.warning1=悪意のあるスクリプトはあなたの知らぬ間にプライバシーを侵害することがあります
 install.warning2=信頼できる場所からのみスクリプトをインストールすべきです
-installFromFile=ファイルからユーザースクリプトをインストールする…
+installFromFile=ファイルからユーザースクリプトをインストールする...
 installFromFile.ak=U
-menu.commands=ユーザースクリプトのコマンド…
+menu.commands=ユーザースクリプトのコマンド...
 menu.commands.ak=C
-menu.install=ユーザースクリプトをインストール…
+menu.install=ユーザースクリプトをインストール...
 menu.install.ak=I
 menu.manage=ユーザースクリプト管理…
 menu.manage.ak=M
-menu.new=新規ユーザースクリプト…
+menu.new=新規ユーザースクリプト...
 menu.new.ak=N
 menu.options.ak=O
 menu.show=ユーザースクリプトのソースコードを表示
 menu.show.ak=V
 menu.title=Scriptish
 menu.title.ak=S
-menuitem.install=このユーザースクリプトをインストール…
+menuitem.install=このユーザースクリプトをインストール...
 menuitem.manage=ユーザースクリプトを管理
 menuitem.new=新規ユーザースクリプト
 moving.dependency=依存関係ファイルを次から移動：
@@ -131,10 +131,10 @@ options.pane.main=メイン
 options.pane.ui=ユーザーインタフェース
 options.requireBuiltInCerts=安全な更新に built-in 証明書を利用
 options.requireSecured=HTTPS でユーザースクリプトを更新
-options.sync.desc=
-options.sync.ScriptishPrefs=
-options.sync.ScriptishPrefs.common=
-options.sync.ScriptishPrefs.editor=
+options.sync.desc=Firefox Sync サービス及び、その設定を有効にしておく必要があります！
+options.sync.ScriptishPrefs=Scriptish 設定
+options.sync.ScriptishPrefs.common=Scriptish 拡張の設定値を同期する
+options.sync.ScriptishPrefs.editor=エディター設定を同期する
 options.title=Scriptish オプション
 options.toolbarbutton=ツールバーのボタン
 options.toolbarbutton.showScripts=アクティブなスクリプト数を表示
@@ -157,7 +157,7 @@ statusbar.noScripts.excluded=ページが除外（exclude）されました！
 statusbar.noScripts.notfound=このページ用のスクリプトはありません！
 statusbar.noScripts.scheme=スキーム（Scheme）が無効になっています！
 statusbar.updated=は正常に更新されました
-sync=
+sync=Sync
 tooltip.loading=読み込み中…
 Uninstall=アンインストール
 untitledScript=名称未定スクリプト

From 22fbde1c15812d6fdf50d3306016813b9a4f7358 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 22 Sep 2012 22:10:06 -0500
Subject: [PATCH 693/829] Implementing GM_watchValue and GM_unwatchValue. 
 Closes #24 (cherry picked from commit
 4d3e46e178dbee32be406e98904172e60aef4aaf)

---
 extension/locale/de/scriptish.properties    |   2 +
 extension/locale/en-US/scriptish.properties |   2 +
 extension/locale/es-ES/scriptish.properties |   2 +
 extension/locale/he/scriptish.properties    |   2 +
 extension/locale/hu/scriptish.properties    |   2 +
 extension/locale/ja-JP/scriptish.properties |   2 +
 extension/locale/pl/scriptish.properties    |   2 +
 extension/locale/pt-BR/scriptish.properties |   2 +
 extension/locale/ru-RU/scriptish.properties |   2 +
 extension/locale/sv-SE/scriptish.properties |   2 +
 extension/locale/zh-CN/scriptish.properties |   2 +
 extension/locale/zh-TW/scriptish.properties |   2 +
 extension/modules/api.js                    |  16 ++-
 extension/modules/api/GM_ScriptStorage.js   | 104 +++++++++++++++++++-
 14 files changed, 138 insertions(+), 6 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index b7e48c5a..e3a0bd2f 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=Bitte erst den bevorzugten Texteditor wählen
 editor.useScratchpad=
 editor.useScratchpad.no=
 editor.useScratchpad.yes=
+error.api.badArguments=
 error.api.clipboard.type=ist kein von GM_setClipboard unterstützter Typ.
 error.api.noResourceWithName=Keine Resource mit dem Namen
 error.api.noSecondArgValue=Zweites Argument nicht spezifiziert: Value
+error.api.prefNotFound=
 error.api.reqURL=Ungültige URL
 error.api.reqURL.scheme=Verbotenes Schema (Protokoll) in URL
 error.api.safeHTMLParser.url=
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 758b2b38..cc823400 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=Please choose your preferred text editor first
 editor.useScratchpad=Do you want to use Scratchpad as your editor?
 editor.useScratchpad.no=No (I will pick my own)
 editor.useScratchpad.yes=Yes
+error.api.badArguments=Invalid or insufficient arguments were passed to a GM_ function.
 error.api.clipboard.type=is not a type that is supported by GM_setClipboard.
 error.api.noResourceWithName=No resource with name
 error.api.noSecondArgValue=Second argument not specified: Value
+error.api.prefNotFound=An invalid or non-existent preference name was passed to a GM_ function.
 error.api.reqURL=Invalid URL
 error.api.reqURL.scheme=Disallowed scheme in URL
 error.api.safeHTMLParser.url=The "URL" argument of GM_safeHTMLParser could not be parsed
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index b768bb31..a668aba9 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=Por favor, elija antes su editor de texto favorito
 editor.useScratchpad=¿Desea usar Scratchpad como su editor?
 editor.useScratchpad.no=No (yo seleccionaré el mío)
 editor.useScratchpad.yes=Sí
+error.api.badArguments=
 error.api.clipboard.type=no es un tipo soportado por GM_setClipboard.
 error.api.noResourceWithName=No hay recursos con ese nombre
 error.api.noSecondArgValue=Segundo argumento no especificado: Valor
+error.api.prefNotFound=
 error.api.reqURL=URL no válido
 error.api.reqURL.scheme=Esquema no permitido en URL
 error.api.safeHTMLParser.url=
diff --git a/extension/locale/he/scriptish.properties b/extension/locale/he/scriptish.properties
index be93bfc5..86401bc3 100644
--- a/extension/locale/he/scriptish.properties
+++ b/extension/locale/he/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=אנא בחר תחילה את עורך הטקסט המועדף ע
 editor.useScratchpad=האם ברצונך להשתמש ב־Scratchpad כעורך הטקסט שלך?
 editor.useScratchpad.no=לא (אני אבחר בעצמי)
 editor.useScratchpad.yes=כן
+error.api.badArguments=
 error.api.clipboard.type=אינו מסוג שנתמך ע"י GM_setClipboard.
 error.api.noResourceWithName=לא קיים משאב בעל שם
 error.api.noSecondArgValue=לא צוין ערך שני: ערך
+error.api.prefNotFound=
 error.api.reqURL=כתובת URL לא חוקית
 error.api.reqURL.scheme=ערכה לא מורשת בכתובת URL
 error.api.safeHTMLParser.url=
diff --git a/extension/locale/hu/scriptish.properties b/extension/locale/hu/scriptish.properties
index bdf6a48e..feb93a22 100644
--- a/extension/locale/hu/scriptish.properties
+++ b/extension/locale/hu/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=Kérem először válassza ki az Ön által preferált szerkesztő
 editor.useScratchpad=A Scratchpad-et szeretné használni szerkesztőként?
 editor.useScratchpad.no=Nem (kiválasztok egy sajátot)
 editor.useScratchpad.yes=Igen
+error.api.badArguments=
 error.api.clipboard.type=a GM_setClipboard által nem támogatott típus.
 error.api.noResourceWithName=Nincs erőforrás ezen a néven:
 error.api.noSecondArgValue=Második argumentum nincs meghatározva: Érték
+error.api.prefNotFound=
 error.api.reqURL=Érvénytelen URL
 error.api.reqURL.scheme=Az URL formátuma érvénytelen
 error.api.safeHTMLParser.url=
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index 1712093d..eca6ffe7 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=エディタを選択してください
 editor.useScratchpad=エディタとしてスクラッチパッドを使用しますか？
 editor.useScratchpad.no=No（自分でエディタを指定）
 editor.useScratchpad.yes=Yes
+error.api.badArguments=
 error.api.clipboard.type=は GM_setClipboard がサポートしていない型（type）です
 error.api.noResourceWithName=名前付きリソースが見つかりません
 error.api.noSecondArgValue=２番目の引数が指定されていません：Value
+error.api.prefNotFound=
 error.api.reqURL=不正な URL です
 error.api.reqURL.scheme=許可されていないスキーム（scheme）を URL で指定しています
 error.api.safeHTMLParser.url=GM_safeHTMLParser の引数 "URL" をパース（parse）できません
diff --git a/extension/locale/pl/scriptish.properties b/extension/locale/pl/scriptish.properties
index 66c29c3c..197cf2ff 100644
--- a/extension/locale/pl/scriptish.properties
+++ b/extension/locale/pl/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=Najpierw proszę wybrać swój preferowany edytor tekstu
 editor.useScratchpad=Czy chcesz użyć Scratchpad-a jako edytor?
 editor.useScratchpad.no=Nie ( sam wybiorę )
 editor.useScratchpad.yes=Tak
+error.api.badArguments=
 error.api.clipboard.type=nie jest to typ wspierany przez GM_setClipboard.
 error.api.noResourceWithName=Brak źródeł z nazwą
 error.api.noSecondArgValue=Drugi argument nie został określony: Wartość
+error.api.prefNotFound=
 error.api.reqURL=Błędny URL
 error.api.reqURL.scheme=Niedozwolony schemat URL
 error.api.safeHTMLParser.url=
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index e9ecb6fc..0e5a60d2 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=Escolha seu editor de texto preferido
 editor.useScratchpad=Você gostaria de usar o Scratchpad como seu editor?
 editor.useScratchpad.no=Não (eu vou escolher outro)
 editor.useScratchpad.yes=Sim
+error.api.badArguments=
 error.api.clipboard.type=não é um tipo suportado por GM_setClipboard.
 error.api.noResourceWithName=Nenhum recurso com o nome
 error.api.noSecondArgValue=Segundo argumento não especificado: Valor
+error.api.prefNotFound=
 error.api.reqURL=Endereço inválido
 error.api.reqURL.scheme=Esquema não permitido em URL
 error.api.safeHTMLParser.url=
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 5f6322d9..ee3eb4bd 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=Пожалуйста, выберите ваш любимый ре
 editor.useScratchpad=Вы хотите использовать Scratchpad в качестве редактора?
 editor.useScratchpad.no=Нет (я выберу свой​​)
 editor.useScratchpad.yes=Да
+error.api.badArguments=
 error.api.clipboard.type=Тип данных не подходит для GM_setClipboard.
 error.api.noResourceWithName=Нет ресурса с таким именем
 error.api.noSecondArgValue=Второй аргумент - значение - не задан
+error.api.prefNotFound=
 error.api.reqURL=Неверный URL
 error.api.reqURL.scheme=Запрещённая схема в URL
 error.api.safeHTMLParser.url=Не удалось разобрать аргумент «URL» из GM_safeHTMLParser
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index b69c02a5..37d4688f 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=Var vänlig välj först det textredigeringsprogram du föredrar
 editor.useScratchpad=Vill du använda Scratchpad som din textredigerare?
 editor.useScratchpad.no=Nej, jag väljer min egen
 editor.useScratchpad.yes=Ja
+error.api.badArguments=
 error.api.clipboard.type=är inte en typ som stöds av GM_setClipboard.
 error.api.noResourceWithName=Det finns ingen resurs med namnet
 error.api.noSecondArgValue=Det andra argumentet har inte angivits: Värde
+error.api.prefNotFound=
 error.api.reqURL=Ogiltig URL
 error.api.reqURL.scheme=Otillåtet schema i URL
 error.api.safeHTMLParser.url=Argumentet "URL" för GM_safeHTMLParser kunde inte parsas
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index 48c098ed..af5972bc 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=请选择您喜欢的文本编辑器
 editor.useScratchpad=您想使用暂存器作为您的编辑器吗？
 editor.useScratchpad.no=不（我要选择我自己喜欢的）
 editor.useScratchpad.yes=是
+error.api.badArguments=
 error.api.clipboard.type=不是 GM_setClipboard 所支持的类型。
 error.api.noResourceWithName=没有该名称的资源
 error.api.noSecondArgValue=第二个参数未指定：值
+error.api.prefNotFound=
 error.api.reqURL=无效的 URL
 error.api.reqURL.scheme=不允许在 URL 中出现 scheme
 error.api.safeHTMLParser.url=无法解释 GM_safeHTMLParser 函数的中的 URL参数
diff --git a/extension/locale/zh-TW/scriptish.properties b/extension/locale/zh-TW/scriptish.properties
index ce8077a9..8df9d7b6 100644
--- a/extension/locale/zh-TW/scriptish.properties
+++ b/extension/locale/zh-TW/scriptish.properties
@@ -9,9 +9,11 @@ editor.prompt=請先選擇您常用的文字編輯器
 editor.useScratchpad=您想使用程式碼片段速記本作為您的編輯器嗎？
 editor.useScratchpad.no=不（我要自己選擇）
 editor.useScratchpad.yes=是
+error.api.badArguments=
 error.api.clipboard.type=不是 GM_setClipboard 所支援的類型。
 error.api.noResourceWithName=沒有該名稱的資源
 error.api.noSecondArgValue=第二個參數未指定：值
+error.api.prefNotFound=
 error.api.reqURL=無效的網址
 error.api.reqURL.scheme=網址中有不支援的協定
 error.api.safeHTMLParser.url=
diff --git a/extension/modules/api.js b/extension/modules/api.js
index a793d89e..92e06468 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -78,7 +78,7 @@ function GM_API(options) {
     return new GM_xmlhttpRequester(aUnsafeContentWin, aURL, aScript);
   });
   lazy(lazyLoaders, "storage", function() {
-    return new GM_ScriptStorage(aScript);
+    return new GM_ScriptStorage(aScript, aSafeWin);
   });
   lazy(lazyLoaders, "resources", function() {
     return new GM_Resources(aScript);
@@ -152,6 +152,20 @@ function GM_API(options) {
     if (!GM_apiLeakCheck("GM_deleteValue")) return;
     return lazyLoaders.storage.deleteValue.apply(lazyLoaders.storage, arguments);
   };
+  this.GM_watchValue = function GM_watchValue(aName, aListener) {
+    if (!GM_apiLeakCheck("GM_watchValue")) return;
+    let listener = null;
+    if ("function" === typeof aListener) {
+      listener = function(aEvent) {
+        GM_apiSafeCallback(aSafeWin, aScript, null, aListener, [aEvent]);
+      };
+    }
+    return lazyLoaders.storage.watchValue.call(lazyLoaders.storage, aName, listener);
+  }
+  this.GM_unwatchValue = function GM_unwatchValue() {
+    if (!GM_apiLeakCheck("GM_unwatchValue")) return;
+    return lazyLoaders.storage.unwatchValue.apply(lazyLoaders.storage, arguments);
+  }
   this.GM_listValues = function GM_listValues() {
     if (!GM_apiLeakCheck("GM_listValues")) return;
     return lazyLoaders.storage.listValues.apply(lazyLoaders.storage, arguments);
diff --git a/extension/modules/api/GM_ScriptStorage.js b/extension/modules/api/GM_ScriptStorage.js
index 4ee668bb..b278c230 100644
--- a/extension/modules/api/GM_ScriptStorage.js
+++ b/extension/modules/api/GM_ScriptStorage.js
@@ -1,11 +1,26 @@
 var EXPORTED_SYMBOLS = ["GM_ScriptStorage"];
 
-const Cu = Components.utils;
-Cu.import("resource://scriptish/prefmanager.js");
-Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js");
+Components.utils.import("resource://scriptish/constants.js");
 
-function GM_ScriptStorage(script) {
-  this.prefMan = new Scriptish_PrefManager(script.prefroot);
+lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_PrefManager"]);
+
+lazyUtil(this, "getWindowIDs");
+lazyUtil(this, "stringBundle");
+lazyUtil(this, "windowUnloader");
+
+function GM_ScriptStorage(aScript, aSafeWin) {
+  this.prefMan = new Scriptish_PrefManager(aScript.prefroot);
+  this._watchedPrefs = Object.create(null);
+
+  // Be sure to remove any watchers when the window unloads
+  let winID = Scriptish_getWindowIDs(aSafeWin).innerID;
+  Scriptish_windowUnloader(function() {
+    let prefChanged = this._prefChanged.bind(this);
+    for (let name in this._watchedPrefs) {
+      this.prefMan.unwatch(name, prefChanged);
+      delete this._watchedPrefs[name];
+    }
+  }.bind(this), winID);
 }
 
 GM_ScriptStorage.prototype.setValue = function(name, val) {
@@ -24,6 +39,85 @@ GM_ScriptStorage.prototype.deleteValue = function(name) {
   return this.prefMan.remove(name);
 };
 
+// Notifies any script watchers of a preference change
+GM_ScriptStorage.prototype._prefChanged = function(aName) {
+  if (!(aName in this._watchedPrefs)) {
+    return;
+  }
+  let newValue = this.getValue(aName);
+  let watchers = this._watchedPrefs[aName].watchers;
+  for (let i = 0, e = watchers.length; i < e; ++i) {
+    watchers[i].notify({
+      __exposedProps__: {
+        name: "r",
+        oldValue: "r",
+        newValue: "r"
+      },
+      "name": aName,
+      "oldValue": this._watchedPrefs[aName].currentValue,
+      "newValue": newValue
+    });
+  }
+  this._watchedPrefs[aName].currentValue = newValue;
+}
+
+GM_ScriptStorage.prototype.watchValue = function(aName, aListener) {
+  // Make sure we were passed everything
+  if (!(aName && aListener && "function" === typeof aListener)) {
+    throw new Error(Scriptish_stringBundle("error.api.badArguments"));
+  }
+
+  // Nothing to do if the preference doesn't exist
+  if (!this.prefMan.exists(aName)) {
+    throw new Error(Scriptish_stringBundle("error.api.prefNotFound"));
+  }
+
+  // Generate a UUID for the watcher so it can be unwatched by the user
+  let uuid = Services.uuid.generateUUID().toString();
+  let watcher = {"notify": aListener, "uuid": uuid};
+
+  // Add to existing watchers, or set up a new pref watcher
+  if (aName in this._watchedPrefs) {
+    this._watchedPrefs[aName].watchers.push(watcher);
+  }
+  else {
+    this._watchedPrefs[aName] = {
+      "currentValue": this.getValue(aName),
+      "watchers": [watcher]
+    };
+
+    // Start watching the pref
+    this.prefMan.watch(aName, this._prefChanged.bind(this));
+  }
+
+  // Return the watcher's UUID so it can be unwatched by the user
+  return uuid;
+};
+
+GM_ScriptStorage.prototype.unwatchValue = function(aName, aUUID) {
+  // Nothing to do if the preference doesn't exist or isn't watched
+  if (!(aName in this._watchedPrefs && this.prefMan.exists(aName))) {
+    return false;
+  }
+
+  let watchers = this._watchedPrefs[aName].watchers;
+
+  // If given a UUID, only remove the specified watcher
+  if (aUUID) {
+    for (let i = 0, e = watchers.length; i < e; ++i) {
+      if (aUUID === watchers[i].uuid) {
+        watchers.splice(i, 1);
+        return true;
+      }
+    }
+    return false;
+  }
+
+  // Otherwise remove all watchers for the preference
+  watchers.length = 0;
+  return true;
+}
+
 GM_ScriptStorage.prototype.listValues = function() {
   return this.prefMan.listValues();
 };

From edc1cdd0d44a27ea44222a9bfc016e6b06f96648 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 23 Sep 2012 19:12:47 -0500
Subject: [PATCH 694/829] Minor tweaks in GM_ScriptStorage

---
 extension/modules/api/GM_ScriptStorage.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extension/modules/api/GM_ScriptStorage.js b/extension/modules/api/GM_ScriptStorage.js
index b278c230..748d7196 100644
--- a/extension/modules/api/GM_ScriptStorage.js
+++ b/extension/modules/api/GM_ScriptStorage.js
@@ -53,9 +53,9 @@ GM_ScriptStorage.prototype._prefChanged = function(aName) {
         oldValue: "r",
         newValue: "r"
       },
-      "name": aName,
-      "oldValue": this._watchedPrefs[aName].currentValue,
-      "newValue": newValue
+      name: aName,
+      oldValue: this._watchedPrefs[aName].currentValue,
+      newValue: newValue
     });
   }
   this._watchedPrefs[aName].currentValue = newValue;
@@ -82,8 +82,8 @@ GM_ScriptStorage.prototype.watchValue = function(aName, aListener) {
   }
   else {
     this._watchedPrefs[aName] = {
-      "currentValue": this.getValue(aName),
-      "watchers": [watcher]
+      currentValue: this.getValue(aName),
+      watchers: [watcher]
     };
 
     // Start watching the pref
@@ -103,7 +103,7 @@ GM_ScriptStorage.prototype.unwatchValue = function(aName, aUUID) {
   let watchers = this._watchedPrefs[aName].watchers;
 
   // If given a UUID, only remove the specified watcher
-  if (aUUID) {
+  if ("string" === typeof aUUID) {
     for (let i = 0, e = watchers.length; i < e; ++i) {
       if (aUUID === watchers[i].uuid) {
         watchers.splice(i, 1);

From 74f67989e31054fd95223dc7a966d7a066103a97 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Mon, 24 Sep 2012 13:14:18 -0500
Subject: [PATCH 695/829] Updating pl courtesy of allertec (BabelZilla).

---
 extension/locale/pl/scriptish.properties | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/extension/locale/pl/scriptish.properties b/extension/locale/pl/scriptish.properties
index 197cf2ff..967fe89c 100644
--- a/extension/locale/pl/scriptish.properties
+++ b/extension/locale/pl/scriptish.properties
@@ -16,7 +16,7 @@ error.api.noSecondArgValue=Drugi argument nie został określony: Wartość
 error.api.prefNotFound=
 error.api.reqURL=Błędny URL
 error.api.reqURL.scheme=Niedozwolony schemat URL
-error.api.safeHTMLParser.url=
+error.api.safeHTMLParser.url=Argument "URL" z Parsera GM_safeHTMLParser nie może zostać przetworzony
 error.api.unsafeAccess=Naruszenie zasad dostępu Scriptish: nie można wywołać niebezpiecznego Okna
 error.charset=Określony zestaw znaków jest nieprawidłowy.
 error.dependency.loading=Błąd ładowania zależności
@@ -26,16 +26,16 @@ error.hash.algorithm=Błędnie określony algorytm hash.
 error.icon.dataURL=Błąd danych: URL dla @icon
 error.icon.notImage=Błąd! @icon nie posiada obrazu typu MIME
 error.icon.URL=Błędny URL dla @icon
-error.invalidCert=
+error.invalidCert=Nieprawidłowy certyfikat SSL.\nJeżeli jest on wymagany, to włącz wszystkie certyfikaty poprzez aktywację odpowiednich ustawień w Opcje / Zaawansowane / Aktualizuj Zabezpieczenia.
 error.isInvalidValue=jest błędną wartością
 error.matchPattern.rules=wzór @match nie odpowiada regułom wzoru
 error.matchPattern.rules.file=Schemat wzoru @match dla pliku nie odpowiada regułom wzoru
-error.notSecure=
+error.notSecure=Niezabezpieczony URI.\nJeżeli jest wymagany, to włącz aktualizacje nie-HTTPS-owe poprzez aktywację ustawień w Opcje / Zaawansowane / Aktualizuj Zabezpieczenia.
 error.notSupported.Firefox=nie jest wspierany przez tą wersję Firefox-a
 error.openingFile=Nie można otworzyć pliku
 error.pattern.parsing=Wzór nie mógł zostać przetworzony
 error.pref.type=Niewspierany typ preferencji. Obowiązujące typy: string, bool oraz 32-bitowy integer.
-error.remoteVersionOlder=
+error.remoteVersionOlder=Zdalny skrypt nie posiada nowszej wersji niż obecna.
 error.resource.dupName=jest duplikatem nazwy źródła. Każde @resource musi zawierać unikatową nazwę.
 error.resource.syntax=Błąd składni deklaracji @resource
 error.retrieving=Nie odzyskano
@@ -133,10 +133,10 @@ options.pane.main=Główne
 options.pane.ui=Interfejs Użytkownika
 options.requireBuiltInCerts=Aktualizacja bezpieczeństwa wymaga użycia wbudowanych certyfikatów
 options.requireSecured=Wymagane skrypty użytkownika do aktualizacji przez HTTPS
-options.sync.desc=
-options.sync.ScriptishPrefs=
-options.sync.ScriptishPrefs.common=
-options.sync.ScriptishPrefs.editor=
+options.sync.desc=Usługa Firefox Sync i jej "Preferencje" muszą być włączone!
+options.sync.ScriptishPrefs=Preferencje Scriptish
+options.sync.ScriptishPrefs.common=Synchronizuj wspólne preferencje rozszerzeń Scriptish
+options.sync.ScriptishPrefs.editor=Synchronizuj preferencje Edytora
 options.title=Opcje Scriptish
 options.toolbarbutton=Pasek narzędzi
 options.toolbarbutton.showScripts=Pokaż liczbę aktywnych skryptów
@@ -159,7 +159,7 @@ statusbar.noScripts.excluded=Strona została wykluczona!
 statusbar.noScripts.notfound=Brak skryptów dla strony!
 statusbar.noScripts.scheme=Schemat został wyłączony!
 statusbar.updated=poprawnie zaktualizowano
-sync=
+sync=Synchronizuj
 tooltip.loading=Ładowanie...
 Uninstall=Odinstalowanie
 untitledScript=Skrypt bez nazwy

From df0f2f5588b0561a395afc75befaff9a39587836 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 24 Sep 2012 16:25:20 -0700
Subject: [PATCH 696/829] removing Scriptish_openFolder because the amo
 vaildator is complaining about the use of launch(), which doesn't seem
 necessary to me anyhow.

---
 extension/content/addonstab.xml               |  2 +-
 extension/content/js/addonstab.js             |  3 +-
 extension/modules/constants.js                |  4 --
 .../third-party/Scriptish_openFolder.js       | 66 -------------------
 4 files changed, 2 insertions(+), 73 deletions(-)
 delete mode 100644 extension/modules/third-party/Scriptish_openFolder.js

diff --git a/extension/content/addonstab.xml b/extension/content/addonstab.xml
index f417a635..5dec3af4 100644
--- a/extension/content/addonstab.xml
+++ b/extension/content/addonstab.xml
@@ -27,7 +27,7 @@
           break;
 
           case "button_scriptish_userscript_show":
-            Scriptish_openFolder(addon._file);
+            addon._file.reveal();
           break;
         }
       ]]></handler>
diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index c962221d..a19960fd 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -4,7 +4,6 @@ const {lazyImport, lazyUtil} = tools;
 
 lazyImport(window, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(window, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
-lazyImport(window, "resource://scriptish/third-party/Scriptish_openFolder.js", ["Scriptish_openFolder"]);
 
 lazyUtil(window, "ExtendedStringBundle");
 lazyUtil(window, "installUri");
@@ -94,7 +93,7 @@ window.addEventListener("load", function() {
   };
   gViewController.commands.cmd_scriptish_userscript_show = {
     isEnabled: addonIsInstalledScript,
-    doCommand: function(aAddon) Scriptish_openFolder(aAddon._file)
+    doCommand: function(aAddon) aAddon._file.reveal()
   };
   gViewController.commands.cmd_scriptish_userscript_dl_link = {
     isEnabled: function(aAddon) {
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 9682950a..dea88970 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -69,10 +69,6 @@ lazyService(
 lazyService(
     Services, "cs", "@mozilla.org/consoleservice;1", "nsIConsoleService");
 
-lazyService(
-    Services, "eps", "@mozilla.org/uriloader/external-protocol-service;1",
-    "nsIExternalProtocolService");
-
 if (Cc["@mozilla.org/privatebrowsing;1"]) {
   lazyService(
       Services, "pbs", "@mozilla.org/privatebrowsing;1",
diff --git a/extension/modules/third-party/Scriptish_openFolder.js b/extension/modules/third-party/Scriptish_openFolder.js
deleted file mode 100644
index d11b848f..00000000
--- a/extension/modules/third-party/Scriptish_openFolder.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**** BEGIN LICENSE BLOCK *****
-Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
-The contents of this file are subject to the Mozilla Public License Version
-1.1 (the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the
-License.
-
-The Original Code is Mozilla.org Code.
-
-The Initial Developer of the Original Code is
-Netscape Communications Corporation.
-Portions created by the Initial Developer are Copyright (C) 2001
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Blake Ross <blakeross@telocity.com> (Original Author)
-  Ben Goodger <ben@bengoodger.com> (v2.0)
-  Dan Mosedale <dmose@mozilla.org>
-  Fredrik Holmqvist <thesuckiestemail@yahoo.se>
-  Josh Aas <josh@mozilla.com>
-  Shawn Wilsher <me@shawnwilsher.com> (v3.0)
-  Edward Lee <edward.lee@engineering.uiuc.edu>
-
-  Anthony Lieuallen <arantius@gmail.com>
-  Mike Medley <medleymind@gmail.com>
-  Erik Vold <erikvvold@gmail.com>
-
-Alternatively, the contents of this file may be used under the terms of
-either the GNU General Public License Version 2 or later (the "GPL"), or
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of this file only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of this file under
-the terms of any one of the MPL, the GPL or the LGPL.
-
-***** END LICENSE BLOCK ****/
-var EXPORTED_SYMBOLS = ["Scriptish_openFolder"];
-Components.utils.import("resource://scriptish/constants.js");
-
-function Scriptish_openFolder(aFile) {
-  try {
-    // Show the directory containing the file and select the file.
-    aFile.reveal();
-  } catch (e) {
-    // Either the file doesn't exist or reveal is not implemented
-    var fParent = aFile.parent;
-
-    try {
-      // Lauch the parent directory if the file doesn't exist.
-      if (fParent.exists()) fParent.launch();
-    } catch (e) {
-      // If launch also fails let the OS handler try to open the parent.
-      Services.eps.loadUrl(Services.io.newFileURI(fParent));
-    }
-  }
-}

From a673bf36bc397f8671940a0d3a694d162dab9dee Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 24 Sep 2012 16:31:33 -0700
Subject: [PATCH 697/829] no longer supporting FF 14 and below.

---
 extension/components/scriptish.js                   | 2 +-
 extension/install.rdf                               | 2 +-
 extension/modules/prefmanager.js                    | 4 ++--
 extension/modules/script/scriptdownloader.js        | 4 ++--
 extension/modules/utils/Scriptish_getProfileFile.js | 2 +-
 extension/modules/utils/Scriptish_getTempFile.js    | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 72348e47..8ab706f6 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -214,7 +214,7 @@ ScriptishService.prototype = {
 
   shouldProcess: function(ct, cl, org, ctx, mt, ext) CP.ACCEPT,
 
-  _tmpDir: Services.dirsvc.get("TmpD", Ci.nsILocalFile),
+  _tmpDir: Services.dirsvc.get("TmpD", Ci.nsIFile),
   isTempScript: function(uri) {
     if (!(uri instanceof Ci.nsIFileURL)) return false;
 
diff --git a/extension/install.rdf b/extension/install.rdf
index cb1eac2d..e3d5b33b 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -68,7 +68,7 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>6.0</em:minVersion>
+        <em:minVersion>15.0</em:minVersion>
         <em:maxVersion>18.0a1</em:maxVersion>
       </Description>
     </em:targetApplication>
diff --git a/extension/modules/prefmanager.js b/extension/modules/prefmanager.js
index 8e64e34e..ee27ad73 100644
--- a/extension/modules/prefmanager.js
+++ b/extension/modules/prefmanager.js
@@ -124,14 +124,14 @@ function Scriptish_PrefManager(startPoint, syncMode) {
     // store the observer in case we need to remove it later
     observers[watcher] = observer;
 
-    pref.QueryInterface(Ci.nsIPrefBranch2)
+    pref.QueryInterface(Ci.nsIPrefBranch)
         .addObserver(prefName, observer, false);
   }
 
   // stop watching
   this.unwatch = function(prefName, watcher) {
     if (observers[watcher]) {
-      pref.QueryInterface(Ci.nsIPrefBranch2)
+      pref.QueryInterface(Ci.nsIPrefBranch)
           .removeObserver(prefName, observers[watcher]);
     }
   }
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 40931d64..1a9a629e 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -122,10 +122,10 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
     var source = req.responseText;
     this.script = Scriptish_config.parse(source, this.uri_);
 
-    var file = Services.dirsvc.get("TmpD", Ci.nsILocalFile);
+    var file = Services.dirsvc.get("TmpD", Ci.nsIFile);
     var base = this.script.name.replace(/[^A-Z0-9_]/gi, "").toLowerCase();
     file.append(base + ".user.js");
-    file.createUnique(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0640);
+    file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0640);
     this.tempFiles_.push(file);
 
     // sync save file
diff --git a/extension/modules/utils/Scriptish_getProfileFile.js b/extension/modules/utils/Scriptish_getProfileFile.js
index 224228df..5c1880e8 100644
--- a/extension/modules/utils/Scriptish_getProfileFile.js
+++ b/extension/modules/utils/Scriptish_getProfileFile.js
@@ -3,7 +3,7 @@ var EXPORTED_SYMBOLS = ["Scriptish_getProfileFile"];
 Components.utils.import("resource://scriptish/constants.js");
 
 const Scriptish_getProfileFile = function(aFilename) {
-  var file = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
+  var file = Services.dirsvc.get("ProfD", Ci.nsIFile);
   file.append(aFilename);
   return file;
 }
diff --git a/extension/modules/utils/Scriptish_getTempFile.js b/extension/modules/utils/Scriptish_getTempFile.js
index a483111b..e13690a8 100644
--- a/extension/modules/utils/Scriptish_getTempFile.js
+++ b/extension/modules/utils/Scriptish_getTempFile.js
@@ -2,8 +2,8 @@ var EXPORTED_SYMBOLS = ["Scriptish_getTempFile"];
 Components.utils.import("resource://scriptish/constants.js");
 
 function Scriptish_getTempFile() {
-  var file = Services.dirsvc.get("TmpD", Ci.nsILocalFile);
+  var file = Services.dirsvc.get("TmpD", Ci.nsIFile);
   file.append("scriptish-temp");
-  file.createUnique(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0640);
+  file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0640);
   return file;
 }

From fbc7884d36f12e7ad2750dba398fd9966cf6dea7 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Thu, 27 Sep 2012 20:34:01 -0500
Subject: [PATCH 698/829] Updating zh-TW courtesy of shyangs (BabelZilla)

---
 extension/locale/zh-TW/scriptish.properties | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/extension/locale/zh-TW/scriptish.properties b/extension/locale/zh-TW/scriptish.properties
index 8df9d7b6..7ad9cf2b 100644
--- a/extension/locale/zh-TW/scriptish.properties
+++ b/extension/locale/zh-TW/scriptish.properties
@@ -16,7 +16,7 @@ error.api.noSecondArgValue=第二個參數未指定：值
 error.api.prefNotFound=
 error.api.reqURL=無效的網址
 error.api.reqURL.scheme=網址中有不支援的協定
-error.api.safeHTMLParser.url=
+error.api.safeHTMLParser.url=無法剖析 GM_safeHTMLParser 的 URL 引數
 error.api.unsafeAccess=Scriptish 存取失敗: unsafeWindow 無法呼叫
 error.charset=指定的字元編碼無效。
 error.dependency.loading=載入附屬檔案時發生錯誤
@@ -26,16 +26,16 @@ error.hash.algorithm=指定的雜湊演算法無效。
 error.icon.dataURL=無效的資料: @icon 網址
 error.icon.notImage=錯誤！@icon 沒有圖像 MIME 類型
 error.icon.URL=無效的 @icon 網址
-error.invalidCert=
+error.invalidCert=無效的 SSL 憑證。\n如果需要，可由 Scriptish 選項 / 進階 / 安全性更新 允許所有憑證。
 error.isInvalidValue=是無效的值
 error.matchPattern.rules=@match 樣式不符合樣式規則
 error.matchPattern.rules.file=檔案協定 @match 樣式不符合樣式規則
-error.notSecure=
+error.notSecure=不安全的 URI。\n如果需要，可由 Scriptish 選項 / 進階 / 安全性更新 允許非HTTPS更新。
 error.notSupported.Firefox=不支援此版本的 Firefox
 error.openingFile=無法開啟檔案
 error.pattern.parsing=樣式無法解析
 error.pref.type=不支援的選項類型。有效的類型有：字串、真假值和32位元整數。
-error.remoteVersionOlder=
+error.remoteVersionOlder=遠端腳本沒有比本機腳本更新的版本。
 error.resource.dupName=是一個重複的資源名稱。每一個 @resource 名稱必須唯一。
 error.resource.syntax=無效的 @resource 宣告語法
 error.retrieving=檢索失敗
@@ -133,10 +133,10 @@ options.pane.main=主要
 options.pane.ui=介面
 options.requireBuiltInCerts=安全性更新必須使用內建的憑證
 options.requireSecured=腳本必須使用 HTTPS 更新
-options.sync.desc=
-options.sync.ScriptishPrefs=
-options.sync.ScriptishPrefs.common=
-options.sync.ScriptishPrefs.editor=
+options.sync.desc=須啟用 Firefox Sync 服務及其相關選項！
+options.sync.ScriptishPrefs=Scriptish 同步設定
+options.sync.ScriptishPrefs.common=同步 Scriptish 套件的一般設定
+options.sync.ScriptishPrefs.editor=同步編輯器設定
 options.title=Scriptish 選項
 options.toolbarbutton=工具列按鈕
 options.toolbarbutton.showScripts=顯示作用中的腳本數
@@ -159,7 +159,7 @@ statusbar.noScripts.excluded=頁面已排除！
 statusbar.noScripts.notfound=沒有在此頁面執行的腳本！
 statusbar.noScripts.scheme=協定已停用！
 statusbar.updated=更新成功
-sync=
+sync=同步
 tooltip.loading=載入中…
 Uninstall=移除
 untitledScript=無標題的腳本

From 2ceab902ce094ce355e0f7fa1944aca20e239b5e Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 29 Sep 2012 10:16:19 -0500
Subject: [PATCH 699/829] Removing references to
 Scriptish_sendAsyncE10SMessage, which was removed in
 94f0b4df82bf691225a0f618ba71afa1ca875e88 (ref #22)

---
 extension/content/js/options.js    | 3 ---
 extension/modules/addonprovider.js | 1 -
 2 files changed, 4 deletions(-)

diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index d11affd4..d7521920 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -14,7 +14,6 @@ lazyImport(this, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
 ]);
 
 lazyUtil(this, "getEditor");
-lazyUtil(this, "sendAsyncE10SMessage");
 lazyUtil(this, "stringBundle");
 
 const RE_scriptishPrefix = /^extensions\.scriptish\./;
@@ -25,8 +24,6 @@ function changeEditor() Scriptish_getEditor(window, true);
 
 function saveExcludes() {
   Scriptish_setExcludes($("excludes").value.match(/.+/g));
-  if (e10s)
-    Scriptish_sendAsyncE10SMessage("Scriptish:GlobalExcludesUpdate", Scriptish_getExcludes());
   Scriptish.notify(null, "scriptish-preferences-change", true);
 }
 
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index a765887f..ef0e3971 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -9,7 +9,6 @@ lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "Ad
 lazyUtil(this, "notification");
 lazyUtil(this, "openManager");
 lazyUtil(this, "popupNotification");
-lazyUtil(this, "sendAsyncE10SMessage");
 lazyUtil(this, "stringBundle");
 
 const Scriptish_ScriptProvider = {

From 89f7b81879c3ddabf06f23c70cea4e515e0235e7 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 29 Sep 2012 10:57:20 -0500
Subject: [PATCH 700/829] Add a textbox on the Global Excludes pane to test a
 URL against the list.  Closes #31 (cherry picked from commit
 da1947185395fe55bd7da7b2c24468b95826b4fd)

---
 extension/content/js/options.js             | 24 +++++++++++++++++++++
 extension/content/options.xul               |  3 +++
 extension/locale/de/scriptish.properties    |  1 +
 extension/locale/en-US/scriptish.properties |  1 +
 extension/locale/es-ES/scriptish.properties |  1 +
 extension/locale/he/scriptish.properties    |  1 +
 extension/locale/hu/scriptish.properties    |  1 +
 extension/locale/ja-JP/scriptish.properties |  1 +
 extension/locale/pl/scriptish.properties    |  1 +
 extension/locale/pt-BR/scriptish.properties |  1 +
 extension/locale/ru-RU/scriptish.properties |  1 +
 extension/locale/sv-SE/scriptish.properties |  1 +
 extension/locale/zh-CN/scriptish.properties |  1 +
 extension/locale/zh-TW/scriptish.properties |  1 +
 extension/skin/newscript.css                |  1 +
 extension/skin/options.css                  |  9 ++++++++
 16 files changed, 49 insertions(+)

diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index d7521920..986571e4 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -13,6 +13,12 @@ lazyImport(this, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
   "Scriptish_getExcludes"
 ]);
 
+let currentExcludes = {};
+lazyImport(currentExcludes, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
+  "Scriptish_isURLExcluded",
+  "Scriptish_setExcludes"
+]);
+
 lazyUtil(this, "getEditor");
 lazyUtil(this, "stringBundle");
 
@@ -27,6 +33,20 @@ function saveExcludes() {
   Scriptish.notify(null, "scriptish-preferences-change", true);
 }
 
+function testExcludes() {
+  let excludesTest = $("excludesTest");
+  let url = excludesTest.value;
+
+  if (0 === url.length) {
+    excludesTest.className = "";
+    return;
+  }
+
+  currentExcludes.Scriptish_setExcludes($("excludes").value.match(/.+/g));
+  excludesTest.className =
+      currentExcludes.Scriptish_isURLExcluded(url) ? "valid" : "invalid";
+}
+
 function checkSync() {
   let Scriptish_SyncManager = new Scriptish_PrefManager(null, true);
   let prefSyncEnabled;
@@ -103,6 +123,10 @@ addEventListener("load", function init() {
     addEventListener("dialogaccept", saveExcludes, true);
   }
 
+  // Re-test if either value changes
+  excludes.addEventListener("input", testExcludes, false);
+  $("excludesTest").addEventListener("input", testExcludes, false);
+
   // Check sync options to determine whether to add or remove sync service vals.
   // NOTE: Delaying to allow the sync-controlling prefs to update.
   if (instantApply) {
diff --git a/extension/content/options.xul b/extension/content/options.xul
index 1877977b..2e8a8677 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -79,6 +79,9 @@
     <hbox pack="end">
       <label class="remark" control="excludes" value="options.excludes.remark" localize="value"/>
     </hbox>
+    <hbox>
+      <textbox id="excludesTest" flex="1" placeholder="options.excludes.test" localize="placeholder"/>
+    </hbox>
   </prefpane>
 
   <prefpane id="pane-sync" label="sync" localize="label">
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index e3a0bd2f..f41bff2f 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=unmht Protokoll (Mozilla Archive Format)
 options.excludes.desc=Globale Ausnahmen heben Benutzerskript oder Benutzer Regeln auf
 options.excludes.empty=Keine globalen Ausnahmen spezifiziert
 options.excludes.remark=(Sie können eine Ausnahme pro Zeile spezifizieren)
+options.excludes.test=
 options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole loggen
 options.logging=Loggen
 options.logToErrorConsole=GM_log benutzt die Fehlerkonsole
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index cc823400..aef018e4 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=unmht protocol (Mozilla Archive format)
 options.excludes.desc=Global excludes will override any script or user specified rules
 options.excludes.empty=No global excludes specified
 options.excludes.remark=(You may specify one exclude per line)
+options.excludes.test=Enter a URL to test against your global excludes
 options.logChrome=Log non-critical extension messages to the Error Console
 options.logging=Logging
 options.logToErrorConsole=GM_log uses the Error Console
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index a668aba9..29c4282e 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=Protocolo unmht (Formato de Archivo Mozilla, .maf)
 options.excludes.desc=Prevalecen sobre cualquier regla de script, o definida por el usuario
 options.excludes.empty=No hay definidas exclusiones globales
 options.excludes.remark=(Una exclusión por linea)
+options.excludes.test=
 options.logChrome=Registrar en log mensajes de extensión no críticos en la Consola de errores
 options.logging=Registro de eventos (logging)
 options.logToErrorConsole=GM_log usa la Consola de errores
diff --git a/extension/locale/he/scriptish.properties b/extension/locale/he/scriptish.properties
index 86401bc3..81c967c0 100644
--- a/extension/locale/he/scriptish.properties
+++ b/extension/locale/he/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=תקן העברת נתונים של unmht (תבני
 options.excludes.desc=אי הכללה כללית תשבית כל script או כללים מסויימים של משתמש
 options.excludes.empty=לא צוינה אי הכללה כללית
 options.excludes.remark=(באפשרותך לציין הכללה אחת בכל שורה)
+options.excludes.test=
 options.logChrome=לרשום הודעות שאינם קריטיים הרחבה למסוף שגיאה
 options.logging=רישום
 options.logToErrorConsole=GM_log משתמש במסוף שגיאה
diff --git a/extension/locale/hu/scriptish.properties b/extension/locale/hu/scriptish.properties
index feb93a22..6b671827 100644
--- a/extension/locale/hu/scriptish.properties
+++ b/extension/locale/hu/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=unmht protokoll (Mozilla archívum formátum)
 options.excludes.desc=A globális kivételek minden parancsfájl vagy felhasználó által meghatározott szabályt felülírnak
 options.excludes.empty=Nincsenek globális kivételek meghatározva
 options.excludes.remark=(Soronként egyet adhat meg)
+options.excludes.test=
 options.logChrome=Nem kritikus kiterjesztés üzenetek naplózása a Hibakonzolban
 options.logging=Naplózás
 options.logToErrorConsole=A GM_log használja a Hibakonzolt
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index eca6ffe7..cd93a2a3 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=unmht プロトコル（Mozilla Archive フォー
 options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先
 options.excludes.empty=global excludes は指定されていません
 options.excludes.remark=（１行１つずつ除外するものを指定）
+options.excludes.test=
 options.logChrome=重大（Critical）でないエクステンションのメッセージをエラーコンソールに出力
 options.logging=ログ
 options.logToErrorConsole=GM_log でエラーコンソールを使用
diff --git a/extension/locale/pl/scriptish.properties b/extension/locale/pl/scriptish.properties
index 967fe89c..59fed676 100644
--- a/extension/locale/pl/scriptish.properties
+++ b/extension/locale/pl/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=protokół unmht ( format archiwizacji Mozilli )
 options.excludes.desc=Wyjątki globalne nadpiszą każdy skrypt albo reguły zdefiniowane przez użytkownika
 options.excludes.empty=Nie zdefiniowano żadnych wyjątków globalnych
 options.excludes.remark=(Możesz zdefiniować jeden wyjątek na linię)
+options.excludes.test=
 options.logChrome=Zapisuj niekrytyczne wiadomości rozszerzenia do konsoli błędów
 options.logging=Logowanie
 options.logToErrorConsole=GM_log używa Konsoli Błędów
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 0e5a60d2..1ef879bf 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=Protocolo unmht (formato de arquivamento da Mozilla
 options.excludes.desc=Exclusões globais substituem qualquer regra especificada por scripts ou pelo usuário.
 options.excludes.empty=Nenhuma exclusão global
 options.excludes.remark=(Informe uma exclusão por linha)
+options.excludes.test=
 options.logChrome=Registrar mensagens não-críticas da extensão no console de erros
 options.logging=Log
 options.logToErrorConsole=GM_log usa o console de erros
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index ee3eb4bd..41e8d1b2 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=Протокол UnMHT (формат архива M
 options.excludes.desc=Глобальное исключение переопределит любой скрипт или правила пользователя
 options.excludes.empty=Глобальные исключения не заданы
 options.excludes.remark=(Можно указать одно исключение на строку)
+options.excludes.test=
 options.logChrome=Записывать некритические сообщения в консоли ошибок
 options.logging=Ведение журнала
 options.logToErrorConsole=GM_log использует консоль ошибок
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 37d4688f..37f8fbad 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=UNMHT-protokoll (format för Mozilla Archive)
 options.excludes.desc=Globala undantag kommer att åsidosätta alla skript och användardefinierade regler
 options.excludes.empty=Inga globala undantag har angivits
 options.excludes.remark=(Du kan ange ett undantag per rad)
+options.excludes.test=
 options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felkonsolen
 options.logging=Loggning
 options.logToErrorConsole=GM_log använder Felkonsolen
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index af5972bc..9b979148 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=unmht 协议（Mozilla 存档格式）
 options.excludes.desc=全局排除将覆盖任何脚本和用户指定的规则
 options.excludes.empty=当前没有指定全局排除
 options.excludes.remark=（您可以每行指定一条排除网址）
+options.excludes.test=
 options.logChrome=记录非关键的扩展信息到错误控制台
 options.logging=日志
 options.logToErrorConsole=GM_log 使用错误控制台
diff --git a/extension/locale/zh-TW/scriptish.properties b/extension/locale/zh-TW/scriptish.properties
index 7ad9cf2b..84dbfad0 100644
--- a/extension/locale/zh-TW/scriptish.properties
+++ b/extension/locale/zh-TW/scriptish.properties
@@ -120,6 +120,7 @@ options.enabledSchemes.unmht=unmht 協定 (Mozilla Archive format)
 options.excludes.desc=全域排除規則將覆蓋任何腳本和使用者定義的規則
 options.excludes.empty=沒有設定全域排除規則
 options.excludes.remark=（您可以每行指定一條排除網址）
+options.excludes.test=
 options.logChrome=在錯誤主控台記錄非關鍵的擴充套件訊息
 options.logging=記錄
 options.logToErrorConsole=GM_log 使用錯誤主控台
diff --git a/extension/skin/newscript.css b/extension/skin/newscript.css
index a929467a..a13cbd50 100644
--- a/extension/skin/newscript.css
+++ b/extension/skin/newscript.css
@@ -16,6 +16,7 @@ textbox {
   min-width: 35em;
 }
 
+/* NOTE: If changing, keep in sync with options.css */
 *[required][invalid="true"] {
   box-shadow: 0pt 0pt 1.5px 1px red;
 }
diff --git a/extension/skin/options.css b/extension/skin/options.css
index 8ec872b3..99e86062 100644
--- a/extension/skin/options.css
+++ b/extension/skin/options.css
@@ -30,6 +30,15 @@ description {
   font-size: x-small;
 }
 
+/* NOTE: If changing, keep in sync with newscript.css */
+.valid {
+  box-shadow: 0pt 0pt 1.5px 1px green;
+}
+
+.invalid {
+  box-shadow: 0pt 0pt 1.5px 1px red;
+}
+
 tabpanel {
   -moz-box-orient: vertical;
 }

From 63e3aa3af7eaee91b913d1666c51aafaf56feb72 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 29 Sep 2012 11:57:39 -0500
Subject: [PATCH 701/829] Revert commit
 89f7b81879c3ddabf06f23c70cea4e515e0235e7.  Issue with
 Scriptish_isURLExcluded.js

---
 extension/content/js/options.js             | 24 ---------------------
 extension/content/options.xul               |  3 ---
 extension/locale/de/scriptish.properties    |  1 -
 extension/locale/en-US/scriptish.properties |  1 -
 extension/locale/es-ES/scriptish.properties |  1 -
 extension/locale/he/scriptish.properties    |  1 -
 extension/locale/hu/scriptish.properties    |  1 -
 extension/locale/ja-JP/scriptish.properties |  1 -
 extension/locale/pl/scriptish.properties    |  1 -
 extension/locale/pt-BR/scriptish.properties |  1 -
 extension/locale/ru-RU/scriptish.properties |  1 -
 extension/locale/sv-SE/scriptish.properties |  1 -
 extension/locale/zh-CN/scriptish.properties |  1 -
 extension/locale/zh-TW/scriptish.properties |  1 -
 extension/skin/newscript.css                |  1 -
 extension/skin/options.css                  |  9 --------
 16 files changed, 49 deletions(-)

diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index 986571e4..d7521920 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -13,12 +13,6 @@ lazyImport(this, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
   "Scriptish_getExcludes"
 ]);
 
-let currentExcludes = {};
-lazyImport(currentExcludes, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
-  "Scriptish_isURLExcluded",
-  "Scriptish_setExcludes"
-]);
-
 lazyUtil(this, "getEditor");
 lazyUtil(this, "stringBundle");
 
@@ -33,20 +27,6 @@ function saveExcludes() {
   Scriptish.notify(null, "scriptish-preferences-change", true);
 }
 
-function testExcludes() {
-  let excludesTest = $("excludesTest");
-  let url = excludesTest.value;
-
-  if (0 === url.length) {
-    excludesTest.className = "";
-    return;
-  }
-
-  currentExcludes.Scriptish_setExcludes($("excludes").value.match(/.+/g));
-  excludesTest.className =
-      currentExcludes.Scriptish_isURLExcluded(url) ? "valid" : "invalid";
-}
-
 function checkSync() {
   let Scriptish_SyncManager = new Scriptish_PrefManager(null, true);
   let prefSyncEnabled;
@@ -123,10 +103,6 @@ addEventListener("load", function init() {
     addEventListener("dialogaccept", saveExcludes, true);
   }
 
-  // Re-test if either value changes
-  excludes.addEventListener("input", testExcludes, false);
-  $("excludesTest").addEventListener("input", testExcludes, false);
-
   // Check sync options to determine whether to add or remove sync service vals.
   // NOTE: Delaying to allow the sync-controlling prefs to update.
   if (instantApply) {
diff --git a/extension/content/options.xul b/extension/content/options.xul
index 2e8a8677..1877977b 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -79,9 +79,6 @@
     <hbox pack="end">
       <label class="remark" control="excludes" value="options.excludes.remark" localize="value"/>
     </hbox>
-    <hbox>
-      <textbox id="excludesTest" flex="1" placeholder="options.excludes.test" localize="placeholder"/>
-    </hbox>
   </prefpane>
 
   <prefpane id="pane-sync" label="sync" localize="label">
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index f41bff2f..e3a0bd2f 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=unmht Protokoll (Mozilla Archive Format)
 options.excludes.desc=Globale Ausnahmen heben Benutzerskript oder Benutzer Regeln auf
 options.excludes.empty=Keine globalen Ausnahmen spezifiziert
 options.excludes.remark=(Sie können eine Ausnahme pro Zeile spezifizieren)
-options.excludes.test=
 options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole loggen
 options.logging=Loggen
 options.logToErrorConsole=GM_log benutzt die Fehlerkonsole
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index aef018e4..cc823400 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=unmht protocol (Mozilla Archive format)
 options.excludes.desc=Global excludes will override any script or user specified rules
 options.excludes.empty=No global excludes specified
 options.excludes.remark=(You may specify one exclude per line)
-options.excludes.test=Enter a URL to test against your global excludes
 options.logChrome=Log non-critical extension messages to the Error Console
 options.logging=Logging
 options.logToErrorConsole=GM_log uses the Error Console
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index 29c4282e..a668aba9 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=Protocolo unmht (Formato de Archivo Mozilla, .maf)
 options.excludes.desc=Prevalecen sobre cualquier regla de script, o definida por el usuario
 options.excludes.empty=No hay definidas exclusiones globales
 options.excludes.remark=(Una exclusión por linea)
-options.excludes.test=
 options.logChrome=Registrar en log mensajes de extensión no críticos en la Consola de errores
 options.logging=Registro de eventos (logging)
 options.logToErrorConsole=GM_log usa la Consola de errores
diff --git a/extension/locale/he/scriptish.properties b/extension/locale/he/scriptish.properties
index 81c967c0..86401bc3 100644
--- a/extension/locale/he/scriptish.properties
+++ b/extension/locale/he/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=תקן העברת נתונים של unmht (תבני
 options.excludes.desc=אי הכללה כללית תשבית כל script או כללים מסויימים של משתמש
 options.excludes.empty=לא צוינה אי הכללה כללית
 options.excludes.remark=(באפשרותך לציין הכללה אחת בכל שורה)
-options.excludes.test=
 options.logChrome=לרשום הודעות שאינם קריטיים הרחבה למסוף שגיאה
 options.logging=רישום
 options.logToErrorConsole=GM_log משתמש במסוף שגיאה
diff --git a/extension/locale/hu/scriptish.properties b/extension/locale/hu/scriptish.properties
index 6b671827..feb93a22 100644
--- a/extension/locale/hu/scriptish.properties
+++ b/extension/locale/hu/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=unmht protokoll (Mozilla archívum formátum)
 options.excludes.desc=A globális kivételek minden parancsfájl vagy felhasználó által meghatározott szabályt felülírnak
 options.excludes.empty=Nincsenek globális kivételek meghatározva
 options.excludes.remark=(Soronként egyet adhat meg)
-options.excludes.test=
 options.logChrome=Nem kritikus kiterjesztés üzenetek naplózása a Hibakonzolban
 options.logging=Naplózás
 options.logToErrorConsole=A GM_log használja a Hibakonzolt
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index cd93a2a3..eca6ffe7 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=unmht プロトコル（Mozilla Archive フォー
 options.excludes.desc=Global excludes はスクリプトやユーザー指定ルールより優先
 options.excludes.empty=global excludes は指定されていません
 options.excludes.remark=（１行１つずつ除外するものを指定）
-options.excludes.test=
 options.logChrome=重大（Critical）でないエクステンションのメッセージをエラーコンソールに出力
 options.logging=ログ
 options.logToErrorConsole=GM_log でエラーコンソールを使用
diff --git a/extension/locale/pl/scriptish.properties b/extension/locale/pl/scriptish.properties
index 59fed676..967fe89c 100644
--- a/extension/locale/pl/scriptish.properties
+++ b/extension/locale/pl/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=protokół unmht ( format archiwizacji Mozilli )
 options.excludes.desc=Wyjątki globalne nadpiszą każdy skrypt albo reguły zdefiniowane przez użytkownika
 options.excludes.empty=Nie zdefiniowano żadnych wyjątków globalnych
 options.excludes.remark=(Możesz zdefiniować jeden wyjątek na linię)
-options.excludes.test=
 options.logChrome=Zapisuj niekrytyczne wiadomości rozszerzenia do konsoli błędów
 options.logging=Logowanie
 options.logToErrorConsole=GM_log używa Konsoli Błędów
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 1ef879bf..0e5a60d2 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=Protocolo unmht (formato de arquivamento da Mozilla
 options.excludes.desc=Exclusões globais substituem qualquer regra especificada por scripts ou pelo usuário.
 options.excludes.empty=Nenhuma exclusão global
 options.excludes.remark=(Informe uma exclusão por linha)
-options.excludes.test=
 options.logChrome=Registrar mensagens não-críticas da extensão no console de erros
 options.logging=Log
 options.logToErrorConsole=GM_log usa o console de erros
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index 41e8d1b2..ee3eb4bd 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=Протокол UnMHT (формат архива M
 options.excludes.desc=Глобальное исключение переопределит любой скрипт или правила пользователя
 options.excludes.empty=Глобальные исключения не заданы
 options.excludes.remark=(Можно указать одно исключение на строку)
-options.excludes.test=
 options.logChrome=Записывать некритические сообщения в консоли ошибок
 options.logging=Ведение журнала
 options.logToErrorConsole=GM_log использует консоль ошибок
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 37f8fbad..37d4688f 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=UNMHT-protokoll (format för Mozilla Archive)
 options.excludes.desc=Globala undantag kommer att åsidosätta alla skript och användardefinierade regler
 options.excludes.empty=Inga globala undantag har angivits
 options.excludes.remark=(Du kan ange ett undantag per rad)
-options.excludes.test=
 options.logChrome=Logga icke-kritiska tilläggsmeddelanden till Felkonsolen
 options.logging=Loggning
 options.logToErrorConsole=GM_log använder Felkonsolen
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index 9b979148..af5972bc 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=unmht 协议（Mozilla 存档格式）
 options.excludes.desc=全局排除将覆盖任何脚本和用户指定的规则
 options.excludes.empty=当前没有指定全局排除
 options.excludes.remark=（您可以每行指定一条排除网址）
-options.excludes.test=
 options.logChrome=记录非关键的扩展信息到错误控制台
 options.logging=日志
 options.logToErrorConsole=GM_log 使用错误控制台
diff --git a/extension/locale/zh-TW/scriptish.properties b/extension/locale/zh-TW/scriptish.properties
index 84dbfad0..7ad9cf2b 100644
--- a/extension/locale/zh-TW/scriptish.properties
+++ b/extension/locale/zh-TW/scriptish.properties
@@ -120,7 +120,6 @@ options.enabledSchemes.unmht=unmht 協定 (Mozilla Archive format)
 options.excludes.desc=全域排除規則將覆蓋任何腳本和使用者定義的規則
 options.excludes.empty=沒有設定全域排除規則
 options.excludes.remark=（您可以每行指定一條排除網址）
-options.excludes.test=
 options.logChrome=在錯誤主控台記錄非關鍵的擴充套件訊息
 options.logging=記錄
 options.logToErrorConsole=GM_log 使用錯誤主控台
diff --git a/extension/skin/newscript.css b/extension/skin/newscript.css
index a13cbd50..a929467a 100644
--- a/extension/skin/newscript.css
+++ b/extension/skin/newscript.css
@@ -16,7 +16,6 @@ textbox {
   min-width: 35em;
 }
 
-/* NOTE: If changing, keep in sync with options.css */
 *[required][invalid="true"] {
   box-shadow: 0pt 0pt 1.5px 1px red;
 }
diff --git a/extension/skin/options.css b/extension/skin/options.css
index 99e86062..8ec872b3 100644
--- a/extension/skin/options.css
+++ b/extension/skin/options.css
@@ -30,15 +30,6 @@ description {
   font-size: x-small;
 }
 
-/* NOTE: If changing, keep in sync with newscript.css */
-.valid {
-  box-shadow: 0pt 0pt 1.5px 1px green;
-}
-
-.invalid {
-  box-shadow: 0pt 0pt 1.5px 1px red;
-}
-
 tabpanel {
   -moz-box-orient: vertical;
 }

From d2ae5ba183c83150cccf79a36405a4ccaee0a206 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 31 Oct 2012 20:10:32 -0700
Subject: [PATCH 702/829] Update README.md

mention irc channel, remove google group link
---
 README.md | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ecd9995c..7b963f79 100644
--- a/README.md
+++ b/README.md
@@ -2,20 +2,28 @@
 
 Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 
-
 # Browsers Supported
 
 * Firefox 4+
 * Seamonkey 2.1+
 
 
-# Links
+# Download
 
-* [Website](http://scriptish.org)
-* [Blog](http://scriptish.org/blog)
 * [Addons.Mozilla.Org (AMO)](https://addons.mozilla.org/firefox/addon/scriptish)
-* [Userscripts](http://userscripts.org)
+* [Source Code](https://github.com/scriptish/scriptish)
+
+# Community
+
 * [Wiki](https://github.com/scriptish/scriptish/wiki)
 * [Issues](https://github.com/scriptish/scriptish/issues)
-* [Google Group](http://groups.google.com/group/scriptish)
-* [Source Code](https://github.com/scriptish/scriptish)
+* [Blog](http://scriptish.org/blog)
+* [Issues](https://github.com/scriptish/scriptish/issues) 
+
+## IRC
+
+irc.mozilla.orc #scriptish
+
+# UserScripts
+
+* [Userscripts](http://userscripts.org)

From edd650aaed0abe3d513daeb07f14c0d12cb2fa17 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Wed, 31 Oct 2012 20:10:52 -0700
Subject: [PATCH 703/829] Update README.md

orc -> org
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7b963f79..322b945b 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 
 ## IRC
 
-irc.mozilla.orc #scriptish
+irc.mozilla.org #scriptish
 
 # UserScripts
 

From c10f6f14895935b927575a1058100799b20ad720 Mon Sep 17 00:00:00 2001
From: xuan880 <admin@xzcblog.com>
Date: Fri, 31 May 2013 07:15:49 +0200
Subject: [PATCH 704/829] Use sandboxPrototype to construct Sandboxes.

Fixes compatiblity problem with recent Firefox versions.
Closes GH-99.
Closes GH-89.
---
 extension/modules/utils/Scriptish_injectScripts.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 197d7456..06fd5203 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -50,7 +50,7 @@ function Scriptish_injectScripts(options) {
     let script = scripts[i];
     let sandbox = new Cu.Sandbox(safeWin, {
       sandboxName: script.fileURL,
-      //sandboxPrototype: safeWin,
+      sandboxPrototype: safeWin,
       wantXrays: true
     });
 
@@ -90,7 +90,6 @@ function Scriptish_injectScripts(options) {
     });
 
     sandbox.unsafeWindow = unsafeContentWin;
-    sandbox.__proto__ = safeWin;
 
     let delay = script.delay;
     if (delay || delay === 0) {

From 92cb048fcd43379cc2e3f081b0a1671d12ba2d8a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 31 May 2013 07:51:00 +0200
Subject: [PATCH 705/829] Construct about:addons buttons via script.

Fixes GH-92
---
 extension/content/addonstab.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/extension/content/addonstab.xml b/extension/content/addonstab.xml
index 5dec3af4..14ff0e2e 100644
--- a/extension/content/addonstab.xml
+++ b/extension/content/addonstab.xml
@@ -2,16 +2,17 @@
 <bindings xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <binding id="control-container">
-    <content>
-      <!-- do not use the commands, as the controller will check isEnabled with a null argument -->
-      <xul:button class="addon-control button_scriptish_userscript_edit"
-                  anonid="button_scriptish_userscript_edit"
-                  observes="br_scriptish_userscript_edit" />
-      <xul:button class="addon-control button_scriptish_userscript_show"
-                  anonid="button_scriptish_userscript_show"
-                  observes="br_scriptish_userscript_show" />
-      <children includes="button"/>
-    </content>
+    <implementation>
+      <constructor><![CDATA[
+        for (let b of ["edit", "show"]) {
+          let btn = document.createElement("button");
+          btn.setAttribute("class", "addon-control button_scriptish_userscript_" + b);
+          btn.setAttribute("anonid", "button_scriptish_userscript_" + b);
+          btn.setAttribute("observes", "br_scriptish_userscript_" + b);
+          this.insertBefore(btn, this.firstChild);
+        }
+      ]]></constructor>
+    </implementation>
     <handlers>
       <handler event="click" count="1"><![CDATA[
         let button = event.originalTarget;

From c3d06f850b181a862442eb62404be3433a2ae656 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 31 May 2013 08:16:43 +0200
Subject: [PATCH 706/829] Fix about:scriptish author parsing (web-e4x)

---
 extension/content/js/aboutScriptish.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index cc67ebc5..d326f732 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -36,7 +36,7 @@ lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "Ad
       });
       return a < b ? -1 : (a > b ? 1 : 0);
     });
-    for each (var person in aPersons) {
+    for (var person of aPersons) {
       person = person.name.split(/; +/);
       if (!person[1]) {
         person = person[0];

From af414ed2a4ea530f683aa8cca4f77f4b1f5f4611 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 31 May 2013 08:18:15 +0200
Subject: [PATCH 707/829] Remove dead addonstab-moz5 stuff

---
 extension/chrome.manifest            |  2 --
 extension/content/addonstab-moz5.xul | 20 --------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 extension/content/addonstab-moz5.xul

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 2990c4dc..76e27245 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -23,8 +23,6 @@ overlay    chrome://browser/content/scratchpad.xul chrome://scriptish/content/sc
 overlay    chrome://navigator/content/navigator.xul chrome://scriptish/content/browser.xul
 overlay    about:addons chrome://scriptish/content/addonstab.xul
 overlay    chrome://mozapps/content/extensions/extensions.xul chrome://scriptish/content/addonstab.xul
-overlay    chrome://scriptish/content/addonstab.xul chrome://scriptish/content/addonstab-moz5.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} appversion<5.0+
-overlay    chrome://scriptish/content/addonstab.xul chrome://scriptish/content/addonstab-moz5.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} appversion<2.1+
 
 overlay    chrome://scriptish/content/install.xul chrome://scriptish/content/closewindow.xul
 overlay    chrome://scriptish/content/options.xul chrome://scriptish/content/closewindow.xul
diff --git a/extension/content/addonstab-moz5.xul b/extension/content/addonstab-moz5.xul
deleted file mode 100644
index cdc0f010..00000000
--- a/extension/content/addonstab-moz5.xul
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <richlistbox id="categories">
-    <richlistitem id="category-userscript"
-        class="category"
-        insertafter="category-plugins"
-        value="addons://list/userscript">
-    </richlistitem>
-  </richlistbox>
-  <script type="text/javascript"><![CDATA[
-    addEventListener("DOMContentLoaded", function scriptish_dcl() {
-      removeEventListener("DOMContentLoaded", scriptish_dcl, false);
-
-      var sb = {};
-      Components.utils.import("resource://scriptish/utils/Scriptish_stringBundle.js", sb);
-      document.getElementById("category-userscript")
-        .setAttribute("name", sb.Scriptish_stringBundle("userscripts"));
-    }, false);
-  ]]></script>
-</overlay>

From 5cf6c98e6b352aba34511cdb4ddd52ead95483ad Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 31 May 2013 09:03:48 +0200
Subject: [PATCH 708/829] Add makePrivate argument to GM_xhr

Closes GH-93
---
 extension/modules/api.js                     |  2 +-
 extension/modules/api/GM_xmlhttpRequester.js | 40 +++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 92e06468..11b476b1 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -75,7 +75,7 @@ function GM_API(options) {
 
   var lazyLoaders = {};
   lazy(lazyLoaders, "xhr", function() {
-    return new GM_xmlhttpRequester(aUnsafeContentWin, aURL, aScript);
+    return new GM_xmlhttpRequester(aUnsafeContentWin, aSafeWin, aURL, aScript);
   });
   lazy(lazyLoaders, "storage", function() {
     return new GM_ScriptStorage(aScript, aSafeWin);
diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 0e373f50..c3bbb5cc 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -2,10 +2,41 @@
 var EXPORTED_SYMBOLS = ["GM_xmlhttpRequester"];
 
 Components.utils.import("resource://scriptish/constants.js");
+try {
+  Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+}
+catch (ex) {
+  this.PrivateBrowsingUtils = { isWindowPrivate: function() false };
+}
+
 lazyImport(this, "resource://scriptish/api.js", ["GM_apiSafeCallback"]);
 lazyUtil(this, "stringBundle");
 
 const MIME_JSON = /^(application|text)\/(?:x-)?json/i;
+const PRIVATE_CHANNELS = 'nsIPrivateBrowsingChannel' in Ci;
+
+/**
+ * Make a channel private as per pwpbm or LOAD_ANONYMOUS (legacy)
+ */
+function makeChannelPrivate(chan) {
+  if (PRIVATE_CHANNELS && chan instanceof Ci.nsIPrivateBrowsingChannel) {
+    chan.setPrivate(true);
+    return;
+  }
+
+  // legacy / non pbc
+  if (chan instanceof Ci.nsIHttpChannel) {
+    chan.setRequestHeader('Referer', '', false);
+    chan.setRequestHeader('Cookie', '', false);
+    try {
+      chan.referrer = null;
+    }
+    catch (ex) {
+      // ignore
+    }
+  }
+  chan.loadFlags |= Ci.nsIRequest.LOAD_ANONYMOUS;
+}
 
 /**
  * Abstract base class for (chained) request notification callback overrides
@@ -76,8 +107,9 @@ IgnoreRedirect.prototype = {
 };
 
 
-function GM_xmlhttpRequester(unsafeContentWin, originUrl, aScript) {
+function GM_xmlhttpRequester(unsafeContentWin, safeWin, originUrl, aScript) {
   this.unsafeContentWin = unsafeContentWin;
+  this.safeWin = safeWin;
   this.originUrl = originUrl;
   this.script = aScript;
 }
@@ -184,6 +216,12 @@ GM_xmlhttpRequester.prototype.chromeStartRequest =
     }
   }
 
+  // Loads initiated from private windows should always be private as well.
+  let makePrivate = details.makePrivate || PrivateBrowsingUtils.isWindowPrivate(this.safeWin);
+  if (makePrivate) {
+    makeChannelPrivate(req.channel);
+  }
+
   var body = details.data ? details.data : null;
   if (details.binary) req.sendAsBinary(body);
   else req.send(body);

From 59a475e2c1c12b483d773680b1fb8e3ab1de084b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 31 May 2013 13:40:38 -0700
Subject: [PATCH 709/829] no longer recording download urls until pwpb is
 supported

---
 extension/modules/script/script.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 793b2aca..b5914991 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -834,7 +834,8 @@ Script.prototype = {
     var tools = {};
     Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
 
-    if (Services.pbs.privateBrowsingEnabled) this._downloadURL = null;
+    // TODO: see https://github.com/scriptish/scriptish/issues/94
+    if (true) this._downloadURL = null;
 
     // set up _modified and stat thrashing stuff
     this.isModified();
@@ -869,7 +870,8 @@ Script.parseVersion = function Script_parseVersion(aSrc) {
 Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript) {
   var script = new Script(aConfig);
 
-  if (aURI && !Services.pbs.privateBrowsingEnabled)
+  // TODO: see https://github.com/scriptish/scriptish/issues/94
+  if (aURI && false)
     script._downloadURL = aURI.spec;
 
   // read one line at a time looking for start meta delimiter or EOF

From be47e067aeeb3bb004322bc1398ac0b12099487a Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 31 May 2013 13:45:32 -0700
Subject: [PATCH 710/829] Removing Services.pbs constant

---
 extension/modules/constants.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index dea88970..4b789920 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -69,14 +69,6 @@ lazyService(
 lazyService(
     Services, "cs", "@mozilla.org/consoleservice;1", "nsIConsoleService");
 
-if (Cc["@mozilla.org/privatebrowsing;1"]) {
-  lazyService(
-      Services, "pbs", "@mozilla.org/privatebrowsing;1",
-      "nsIPrivateBrowsingService");
-} else {
-  Services.pbs = {privateBrowsingEnabled: false};
-}
-
 if (e10s) {
   lazyService(
       Services, "mm", "@mozilla.org/globalmessagemanager;1",

From deec7a0d7e5f702936cb52d2aba80199078b43cc Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 31 May 2013 13:57:13 -0700
Subject: [PATCH 711/829] bumping min firefox version to 21

---
 extension/install.rdf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index e3d5b33b..b16f4658 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -68,15 +68,15 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>15.0</em:minVersion>
-        <em:maxVersion>18.0a1</em:maxVersion>
+        <em:minVersion>21.0</em:minVersion>
+        <em:maxVersion>25.0a1</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- SeaMonkey -->
     <em:targetApplication>
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.1</em:minVersion>
+        <em:minVersion>2.8</em:minVersion>
         <em:maxVersion>2.8.*</em:maxVersion>
       </Description>
     </em:targetApplication>

From 217cf8e08bc3e29b158be5580254205d5e086196 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 31 May 2013 14:54:43 -0700
Subject: [PATCH 712/829] Using Jetpack (aka Add-on SDK) library, and starting
 the CommonJS conversion on the alert and timer modules

---
 extension/components/scriptish.js             |   2 +-
 extension/content/tests/testAvailability.js   |   2 -
 .../content/tests/testScriptishGetTLDURL.js   |  14 ---
 extension/modules/api.js                      |   2 +-
 extension/modules/config/config.js            |   8 +-
 extension/modules/constants.js                |  37 +++---
 extension/modules/script/scriptdownloader.js  |   2 +-
 extension/modules/third-party/Timer.js        | 115 ------------------
 extension/modules/utils/Scriptish_alert.js    |  13 +-
 .../modules/utils/Scriptish_getEditor.js      |   2 +-
 .../modules/utils/Scriptish_injectScripts.js  |   4 +-
 .../modules/utils/Scriptish_openInEditor.js   |   2 +-
 12 files changed, 39 insertions(+), 164 deletions(-)
 delete mode 100644 extension/modules/third-party/Timer.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 8ab706f6..c5ee812a 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -14,7 +14,7 @@ lazyImport(this, "resource://scriptish/manager.js", ["Scriptish_manager"]);
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
 
-lazyUtil(this, "alert");
+const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
 lazyUtil(this, "injectScripts");
 lazyUtil(this, "installUri");
 lazyUtil(this, "isGreasemonkeyable");
diff --git a/extension/content/tests/testAvailability.js b/extension/content/tests/testAvailability.js
index fa6a0814..27d0fc00 100644
--- a/extension/content/tests/testAvailability.js
+++ b/extension/content/tests/testAvailability.js
@@ -34,7 +34,6 @@ Cu.import("resource://scriptish/utils/Scriptish_openInTab.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js", tools);
 Cu.import("resource://scriptish/third-party/MatchPattern.js", tools);
 Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js", tools);
-Cu.import("resource://scriptish/third-party/Timer.js", tools);
 })(Components.utils);
 
 test("Utils", function() {
@@ -75,5 +74,4 @@ test("3rd Party", function() {
 
   equals(typeof(tools.MatchPattern), "function", "has MatchPattern");
   equals(typeof(tools.MatchPattern), "function", "has Scriptish_openFolder");
-  equals(typeof(tools.Timer), "function", "has Timer");
 });
diff --git a/extension/content/tests/testScriptishGetTLDURL.js b/extension/content/tests/testScriptishGetTLDURL.js
index b7a60a4b..e69de29b 100644
--- a/extension/content/tests/testScriptishGetTLDURL.js
+++ b/extension/content/tests/testScriptishGetTLDURL.js
@@ -1,14 +0,0 @@
-
-Components.utils.import("resource://scriptish/utils/Scriptish_getTLDURL.js");
-
-module("Scriptish_getTLDURL");
-
-test("General", 7, function() {
-  equal(Scriptish_getTLDURL("http://erikvold.com"), "http://erikvold.tld/");
-  equal(Scriptish_getTLDURL("http://erikvold.tld"), "http://erikvold.tld/");
-  equal(Scriptish_getTLDURL("http://erikvold.com?test"), "http://erikvold.tld/?test");
-  equal(Scriptish_getTLDURL("http://erikvold.com/"), "http://erikvold.tld/");
-  equal(Scriptish_getTLDURL("http://images.google.com"), "http://images.google.tld/");
-  equal(Scriptish_getTLDURL("https://images.google.com:90/test?a=b"), "https://images.google.tld:90/test?a=b");
-  equal(Scriptish_getTLDURL("http://test.images.google.com/test"), "http://test.images.google.tld/test");
-});
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 11b476b1..3601824f 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -7,7 +7,7 @@ lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scri
 lazyImport(this, "resource://scriptish/utils/Scriptish_evalInSandbox.js", ["Scriptish_evalInSandbox_filename"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_injectScripts.js", ["Scriptish_injectScripts_filename"]);
 
-lazyUtil(this, "alert");
+const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
 lazyUtil(this, "cryptoHash");
 lazyUtil(this, "getScriptHeader");
 lazyUtil(this, "notification");
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 938beed8..c2d641e4 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -17,7 +17,7 @@ lazyImport(this, "resource://scriptish/utils/Scriptish_isURLExcluded.js", [
   "Scriptish_setExcludes",
   "Scriptish_getExcludes"
 ]);
-lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
+const { setTimeout, clearTimeout } = jetpack('sdk/timers');
 
 lazyUtil(this, "cryptoHash");
 lazyUtil(this, "injectScripts");
@@ -30,7 +30,6 @@ lazyUtil(this, "stringBundle");
 function Config(aBaseDir) {
   var self = this;
   this.loaded = false;
-  this.timer = new Timer();
   this._observers = [];
   this._saveTimer = null;
   this._scripts = [];
@@ -331,9 +330,8 @@ Config.prototype = {
     // via a timer, to avoid locking up the UI.
     if (!aSaveNow) {
       // Reduce work in the case of many changes near to each other in time.
-      if (this._saveTimer) this.timer.clearTimeout(this._saveTimer);
-      this._saveTimer =
-          this.timer.setTimeout(this._save.bind(this, true), 250);
+      if (this._saveTimer) clearTimeout(this._saveTimer);
+      this._saveTimer = setTimeout(this._save.bind(this, true), 250);
       return;
     }
     delete this["_saveTimer"];
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 4b789920..e15eaff3 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -1,5 +1,5 @@
 var EXPORTED_SYMBOLS = [
-    "Cc", "Ci", "Cr", "NetUtil", "XPCOMUtils", "extend",
+    "Cc", "Ci", "Cr", "NetUtil", "XPCOMUtils", "extend", "jetpack",
     "Services", "Instances", "lazy", "lazyImport", "lazyUtil", "timeout", "e10s"];
 
 const {classes: Cc, interfaces: Ci, results: Cr} = Components;
@@ -121,22 +121,6 @@ function lazyUtil(obj, name) lazyImport(obj,
                                         ["Scriptish_" + name]
                                         );
 
-lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
-function timeout(cb, delay) {
-  var callback = function() cb.call(null);
-  delay = delay || 0;
-  if (0 >= delay) {
-    Services.tm.currentThread.dispatch(callback, Ci.nsIThread.DISPATCH_NORMAL);
-    return;
-  }
-
-  if (!global.setTimeout) {
-    global.setTimeout = (new Timer()).setTimeout; // see bug #252
-  }
-
-  setTimeout(callback, delay);
-}
-
 function extend(a, o) {
   for (var k in a) {
     if (!o[k]) {
@@ -145,3 +129,22 @@ function extend(a, o) {
   }
   return o;
 }
+
+var { Loader } = Components.utils.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
+var loader = Loader.Loader({
+  paths: {
+    "sdk/": "resource://gre/modules/commonjs/sdk/",
+    "scriptish/": "resource://scriptish/",
+     "": "globals:///"
+  },
+  resolve: function(id, base) {
+    if (id == "chrome" || id.startsWith("@"))
+      return id;
+    return Loader.resolve(id, base);
+  }
+});
+// fake requirer uri scriptish:// (it's used for relative requires and error messages)
+var module = Loader.Module("main", "scriptish://");
+var jetpack = Loader.Require(loader, module);
+
+const { setTimeout: timeout } = jetpack('sdk/timers');
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 1a9a629e..2925b103 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -11,7 +11,7 @@ lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/script/script.js", ["Script"]);
 lazyImport(this, "resource://scriptish/script/scripticon.js", ["ScriptIcon"]);
 
-lazyUtil(this, "alert");
+const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
 lazyUtil(this, "getTempFile");
 lazyUtil(this, "getWriteStream");
 lazyUtil(this, "stringBundle");
diff --git a/extension/modules/third-party/Timer.js b/extension/modules/third-party/Timer.js
deleted file mode 100644
index f45c534e..00000000
--- a/extension/modules/third-party/Timer.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Jetpack.
- *
- * The Initial Developer of the Original Code is Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Atul Varma <atul@mozilla.com>
- *   Drew Willcoxon <adw@mozilla.com>
- *   Erik Vold <erikvvold@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-var EXPORTED_SYMBOLS = ["Timer"];
-Components.utils.import("resource://scriptish/constants.js");
-
-const Timer = function() {
-  var timers = new Timers();
-
-  this.setTimeout = function(aCallback, aDelay) {
-    return timers.addTimer(
-        false, Ci.nsITimer.TYPE_ONE_SHOT, aCallback, TimeoutCallback, aDelay,
-        Array.slice(arguments, 2));
-  }
-  this.clearTimeout = function(aTimerID) timers.removeTimer(aTimerID);
-
-  this.setInterval = function(aCallback, aDelay) {
-    return timers.addTimer(
-        true, Ci.nsITimer.TYPE_REPEATING_SLACK, aCallback, IntervalCallback,
-        aDelay, Array.slice(arguments, 2));
-  }
-  this.clearInterval = function(aTimerID) timers.removeTimer(aTimerID);
-}
-
-
-const Timers = function() {
-  this.cache = {};
-  this.nextTimerID = 0;
-}
-Timers.prototype = {
-  getTimer: function(aTimerID) {
-    return this.cache[aTimerID];
-  },
-  addTimer: function(aInterval, aType, aCallback, aCbType, aDelay, aParams) {
-    var timerID = this.nextTimerID++;
-    var timer = this.cache[timerID] = Instances.timer;
-    var removeFunc = false;
-
-    if (!aInterval) {
-      var self = this;
-      removeFunc = function() self.removeTimer(timerID);
-    }
-
-    timer.initWithCallback(
-        new aCbType(aCallback, aParams, removeFunc), aDelay, aType);
-    return timerID;
-  },
-  removeTimer: function(aTimerID) {
-    var timer = this.cache[aTimerID];
-    if (!timer) return;
-    timer.cancel();
-    delete this.cache[this.nextTimerID];
-  }
-}
-
-
-function TimerCallback(aCallback, aParams) {
-  this._callback = aCallback;
-  this._params = aParams;
-};
-TimerCallback.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
-};
-
-function TimeoutCallback(aCallback, aParams, aRemoveFunc) {
-  TimerCallback.apply(this, arguments);
-  this._remove = aRemoveFunc;
-};
-TimeoutCallback.prototype = new TimerCallback();
-TimeoutCallback.prototype.notify = function notifyOnTimeout(timer) {
-  this._remove();
-  this._callback.apply(null, this._params);
-};
-
-function IntervalCallback(aCallback, aParams) {
-  TimerCallback.apply(this, arguments)
-};
-IntervalCallback.prototype = new TimerCallback();
-IntervalCallback.prototype.notify = function notifyOnInterval() {
-  this._callback.apply(null, this._params);
-};
diff --git a/extension/modules/utils/Scriptish_alert.js b/extension/modules/utils/Scriptish_alert.js
index ed91d2ae..43659325 100644
--- a/extension/modules/utils/Scriptish_alert.js
+++ b/extension/modules/utils/Scriptish_alert.js
@@ -1,8 +1,13 @@
-var EXPORTED_SYMBOLS = ["Scriptish_alert"];
-Components.utils.import("resource://scriptish/constants.js");
+'use strict';
 
-function Scriptish_alert(aMsg, aTitle, aWait) {
+const { Cu } = require('chrome')
+const { setTimeout } = require('sdk/timers')
+
+const { Services } = Cu.import("resource://scriptish/constants.js", {});
+
+function alert(aMsg, aTitle, aWait) {
   if (typeof aWait == "number")
-    return timeout(function() Scriptish_alert(aMsg, aTitle), aWait);
+    return setTimeout(function() Scriptish_alert(aMsg, aTitle), aWait);
   Services.prompt.alert(null, aTitle || "Scriptish", aMsg+"");
 }
+exports.alert = alert;
diff --git a/extension/modules/utils/Scriptish_getEditor.js b/extension/modules/utils/Scriptish_getEditor.js
index 2b3982cc..6f349fad 100644
--- a/extension/modules/utils/Scriptish_getEditor.js
+++ b/extension/modules/utils/Scriptish_getEditor.js
@@ -4,7 +4,7 @@ const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
-lazyUtil(this, "alert");
+const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
 lazyUtil(this, "stringBundle");
 
 const Scriptish_getEditor = function(parentWindow, change) {
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 06fd5203..f41fe2ac 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -12,7 +12,7 @@ lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
 lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_sandboxScripts"]);
 lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
 lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
-lazyImport(this, "resource://scriptish/third-party/Timer.js", ["Timer"]);
+
 lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
 
 lazyUtil(this, "evalInSandbox");
@@ -20,7 +20,7 @@ lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "windowUnloader");
 
 const Scriptish_injectScripts_filename = Components.stack.filename;
-const gTimer = new Timer();
+const gTimer = jetpack('sdk/timers');
 const {nsIDOMXPathResult: XPATH_RESULT} = Ci;
 
 function Scriptish_injectScripts(options) {
diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index 0dbc0afc..011cf75a 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -7,7 +7,7 @@ Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyUtil(this, "getEditor");
 lazyUtil(this, "launchApplicationWithDoc");
-lazyUtil(this, "alert");
+const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
 lazyUtil(this, "stringBundle");
 
 function Scriptish_openInEditor(script, parentWindow) {

From 226c5a4c5645c3001b0c6f2233a1a86c3c0c3a90 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 31 May 2013 15:15:12 -0700
Subject: [PATCH 713/829] Using sdk/clipboard and now GM_setClipboard supports
 the image type for free!

---
 extension/content/tests/testAvailability.js   |  2 -
 extension/locale/de/scriptish.properties      |  1 -
 extension/locale/en-US/scriptish.properties   |  1 -
 extension/locale/es-ES/scriptish.properties   |  1 -
 extension/locale/he/scriptish.properties      |  1 -
 extension/locale/hu/scriptish.properties      |  1 -
 extension/locale/ja-JP/scriptish.properties   |  1 -
 extension/locale/pl/scriptish.properties      |  1 -
 extension/locale/pt-BR/scriptish.properties   |  1 -
 extension/locale/ru-RU/scriptish.properties   |  1 -
 extension/locale/sv-SE/scriptish.properties   |  1 -
 extension/locale/zh-CN/scriptish.properties   |  1 -
 extension/locale/zh-TW/scriptish.properties   |  1 -
 extension/modules/api/GM_setClipboard.js      | 39 +----------
 .../third-party/fennec/XPIDialogService.js    | 69 -------------------
 15 files changed, 1 insertion(+), 121 deletions(-)
 delete mode 100644 extension/modules/third-party/fennec/XPIDialogService.js

diff --git a/extension/content/tests/testAvailability.js b/extension/content/tests/testAvailability.js
index 27d0fc00..85fe3f4c 100644
--- a/extension/content/tests/testAvailability.js
+++ b/extension/content/tests/testAvailability.js
@@ -30,7 +30,6 @@ Cu.import("resource://scriptish/utils/Scriptish_localizeDOM.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_memoize.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_notification.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_openInEditor.js", tools);
-Cu.import("resource://scriptish/utils/Scriptish_openInTab.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_stringBundle.js", tools);
 Cu.import("resource://scriptish/third-party/MatchPattern.js", tools);
 Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js", tools);
@@ -65,7 +64,6 @@ test("Utils", function() {
   equals(typeof(tools.Scriptish_memoize), "function", "has Scriptish_memoize");
   equals(typeof(tools.Scriptish_notification), "function", "has Scriptish_notification");
   equals(typeof(tools.Scriptish_openInEditor), "function", "has Scriptish_openInEditor");
-  equals(typeof(tools.Scriptish_openInTab), "function", "has Scriptish_openInTab");
   equals(typeof(tools.Scriptish_stringBundle), "function", "has Scriptish_stringBundle");
 });
 
diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index e3a0bd2f..367b8bd8 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=
 editor.useScratchpad.no=
 editor.useScratchpad.yes=
 error.api.badArguments=
-error.api.clipboard.type=ist kein von GM_setClipboard unterstützter Typ.
 error.api.noResourceWithName=Keine Resource mit dem Namen
 error.api.noSecondArgValue=Zweites Argument nicht spezifiziert: Value
 error.api.prefNotFound=
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index cc823400..9db0a326 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=Do you want to use Scratchpad as your editor?
 editor.useScratchpad.no=No (I will pick my own)
 editor.useScratchpad.yes=Yes
 error.api.badArguments=Invalid or insufficient arguments were passed to a GM_ function.
-error.api.clipboard.type=is not a type that is supported by GM_setClipboard.
 error.api.noResourceWithName=No resource with name
 error.api.noSecondArgValue=Second argument not specified: Value
 error.api.prefNotFound=An invalid or non-existent preference name was passed to a GM_ function.
diff --git a/extension/locale/es-ES/scriptish.properties b/extension/locale/es-ES/scriptish.properties
index a668aba9..b113e4f0 100644
--- a/extension/locale/es-ES/scriptish.properties
+++ b/extension/locale/es-ES/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=¿Desea usar Scratchpad como su editor?
 editor.useScratchpad.no=No (yo seleccionaré el mío)
 editor.useScratchpad.yes=Sí
 error.api.badArguments=
-error.api.clipboard.type=no es un tipo soportado por GM_setClipboard.
 error.api.noResourceWithName=No hay recursos con ese nombre
 error.api.noSecondArgValue=Segundo argumento no especificado: Valor
 error.api.prefNotFound=
diff --git a/extension/locale/he/scriptish.properties b/extension/locale/he/scriptish.properties
index 86401bc3..8a12c4ee 100644
--- a/extension/locale/he/scriptish.properties
+++ b/extension/locale/he/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=האם ברצונך להשתמש ב־Scratchpad כעורך
 editor.useScratchpad.no=לא (אני אבחר בעצמי)
 editor.useScratchpad.yes=כן
 error.api.badArguments=
-error.api.clipboard.type=אינו מסוג שנתמך ע"י GM_setClipboard.
 error.api.noResourceWithName=לא קיים משאב בעל שם
 error.api.noSecondArgValue=לא צוין ערך שני: ערך
 error.api.prefNotFound=
diff --git a/extension/locale/hu/scriptish.properties b/extension/locale/hu/scriptish.properties
index feb93a22..6e8721b4 100644
--- a/extension/locale/hu/scriptish.properties
+++ b/extension/locale/hu/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=A Scratchpad-et szeretné használni szerkesztőként?
 editor.useScratchpad.no=Nem (kiválasztok egy sajátot)
 editor.useScratchpad.yes=Igen
 error.api.badArguments=
-error.api.clipboard.type=a GM_setClipboard által nem támogatott típus.
 error.api.noResourceWithName=Nincs erőforrás ezen a néven:
 error.api.noSecondArgValue=Második argumentum nincs meghatározva: Érték
 error.api.prefNotFound=
diff --git a/extension/locale/ja-JP/scriptish.properties b/extension/locale/ja-JP/scriptish.properties
index eca6ffe7..fbd5518e 100644
--- a/extension/locale/ja-JP/scriptish.properties
+++ b/extension/locale/ja-JP/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=エディタとしてスクラッチパッドを使用し
 editor.useScratchpad.no=No（自分でエディタを指定）
 editor.useScratchpad.yes=Yes
 error.api.badArguments=
-error.api.clipboard.type=は GM_setClipboard がサポートしていない型（type）です
 error.api.noResourceWithName=名前付きリソースが見つかりません
 error.api.noSecondArgValue=２番目の引数が指定されていません：Value
 error.api.prefNotFound=
diff --git a/extension/locale/pl/scriptish.properties b/extension/locale/pl/scriptish.properties
index 967fe89c..fc86ee0b 100644
--- a/extension/locale/pl/scriptish.properties
+++ b/extension/locale/pl/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=Czy chcesz użyć Scratchpad-a jako edytor?
 editor.useScratchpad.no=Nie ( sam wybiorę )
 editor.useScratchpad.yes=Tak
 error.api.badArguments=
-error.api.clipboard.type=nie jest to typ wspierany przez GM_setClipboard.
 error.api.noResourceWithName=Brak źródeł z nazwą
 error.api.noSecondArgValue=Drugi argument nie został określony: Wartość
 error.api.prefNotFound=
diff --git a/extension/locale/pt-BR/scriptish.properties b/extension/locale/pt-BR/scriptish.properties
index 0e5a60d2..34ffb07a 100644
--- a/extension/locale/pt-BR/scriptish.properties
+++ b/extension/locale/pt-BR/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=Você gostaria de usar o Scratchpad como seu editor?
 editor.useScratchpad.no=Não (eu vou escolher outro)
 editor.useScratchpad.yes=Sim
 error.api.badArguments=
-error.api.clipboard.type=não é um tipo suportado por GM_setClipboard.
 error.api.noResourceWithName=Nenhum recurso com o nome
 error.api.noSecondArgValue=Segundo argumento não especificado: Valor
 error.api.prefNotFound=
diff --git a/extension/locale/ru-RU/scriptish.properties b/extension/locale/ru-RU/scriptish.properties
index ee3eb4bd..f1947536 100644
--- a/extension/locale/ru-RU/scriptish.properties
+++ b/extension/locale/ru-RU/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=Вы хотите использовать Scratchpad в к
 editor.useScratchpad.no=Нет (я выберу свой​​)
 editor.useScratchpad.yes=Да
 error.api.badArguments=
-error.api.clipboard.type=Тип данных не подходит для GM_setClipboard.
 error.api.noResourceWithName=Нет ресурса с таким именем
 error.api.noSecondArgValue=Второй аргумент - значение - не задан
 error.api.prefNotFound=
diff --git a/extension/locale/sv-SE/scriptish.properties b/extension/locale/sv-SE/scriptish.properties
index 37d4688f..9f60be2a 100644
--- a/extension/locale/sv-SE/scriptish.properties
+++ b/extension/locale/sv-SE/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=Vill du använda Scratchpad som din textredigerare?
 editor.useScratchpad.no=Nej, jag väljer min egen
 editor.useScratchpad.yes=Ja
 error.api.badArguments=
-error.api.clipboard.type=är inte en typ som stöds av GM_setClipboard.
 error.api.noResourceWithName=Det finns ingen resurs med namnet
 error.api.noSecondArgValue=Det andra argumentet har inte angivits: Värde
 error.api.prefNotFound=
diff --git a/extension/locale/zh-CN/scriptish.properties b/extension/locale/zh-CN/scriptish.properties
index af5972bc..54c21f09 100644
--- a/extension/locale/zh-CN/scriptish.properties
+++ b/extension/locale/zh-CN/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=您想使用暂存器作为您的编辑器吗？
 editor.useScratchpad.no=不（我要选择我自己喜欢的）
 editor.useScratchpad.yes=是
 error.api.badArguments=
-error.api.clipboard.type=不是 GM_setClipboard 所支持的类型。
 error.api.noResourceWithName=没有该名称的资源
 error.api.noSecondArgValue=第二个参数未指定：值
 error.api.prefNotFound=
diff --git a/extension/locale/zh-TW/scriptish.properties b/extension/locale/zh-TW/scriptish.properties
index 7ad9cf2b..def9bec6 100644
--- a/extension/locale/zh-TW/scriptish.properties
+++ b/extension/locale/zh-TW/scriptish.properties
@@ -10,7 +10,6 @@ editor.useScratchpad=您想使用程式碼片段速記本作為您的編輯器
 editor.useScratchpad.no=不（我要自己選擇）
 editor.useScratchpad.yes=是
 error.api.badArguments=
-error.api.clipboard.type=不是 GM_setClipboard 所支援的類型。
 error.api.noResourceWithName=沒有該名稱的資源
 error.api.noSecondArgValue=第二個參數未指定：值
 error.api.prefNotFound=
diff --git a/extension/modules/api/GM_setClipboard.js b/extension/modules/api/GM_setClipboard.js
index 192c4ad2..8d082225 100644
--- a/extension/modules/api/GM_setClipboard.js
+++ b/extension/modules/api/GM_setClipboard.js
@@ -1,40 +1,3 @@
 var EXPORTED_SYMBOLS = ["GM_setClipboard"];
 Components.utils.import("resource://scriptish/constants.js");
-lazyUtil(this, "stringBundle");
-
-const FLAVOR_TEXT = "text/unicode";
-const FLAVOR_HTML = "text/html";
-
-function GM_setClipboard(aData, aType) {
-  aType = (aType || "text").toLowerCase();
-
-  switch (aType) {
-  case "text":
-    Services.cb.copyString(aData);
-    return;
-  case "html":
-    var trans = Instances.xfr;
-
-    // add text/html flavor
-    var str = Instances.ss;
-    str.data = aData;
-    trans.addDataFlavor(FLAVOR_HTML);
-    trans.setTransferData(FLAVOR_HTML, str, (aData.length * 2));
-
-    // add a text/unicode flavor (html converted to plain text)
-    var str = Instances.ss;
-    let (converter = Instances.ftc) {
-      converter.type = aType;
-      converter.text = aData;
-      str.data = converter.plainText();
-    }
-    trans.addDataFlavor(FLAVOR_TEXT);
-    trans.setTransferData(FLAVOR_TEXT, str, (str.data.length * 2));
-    break;
-  default:
-    throw new Error("'" + aType + "' " + Scriptish_stringBundle("error.api.clipboard.type"));
-  }
-
-  var cbs = Services.cbs;
-  cbs.setData(trans, null, cbs.kGlobalClipboard);
-}
+const { set: GM_setClipboard } = jetpack("sdk/clipboard");
diff --git a/extension/modules/third-party/fennec/XPIDialogService.js b/extension/modules/third-party/fennec/XPIDialogService.js
deleted file mode 100644
index 1fd171f9..00000000
--- a/extension/modules/third-party/fennec/XPIDialogService.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is XPI Dialog Service.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Mark Finkle <mfinkle@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-var EXPORTED_SYMBOLS = ["WebInstallPrompt"];
-
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-const WebInstallPrompt = {
-  confirm: function(aWindow, aInstalls) {
-    // first check if the extensions panel is open : fast path to return true
-    let browser = Services.wm.getMostRecentWindow("navigator:browser");
-    if (browser.ExtensionsView.visible) {
-      aInstalls.forEach(function(install) {
-        install.install();
-      });
-      return;
-    }
-
-    let prompt = Services.prompt;
-    let flags = prompt.BUTTON_POS_0 * prompt.BUTTON_TITLE_IS_STRING + prompt.BUTTON_POS_1 * prompt.BUTTON_TITLE_CANCEL;
-    let title = "Installing User Script";
-    let button = "Install";
-
-    aInstalls.forEach(function(install) {
-      let result = (prompt.confirmEx(aWindow, title, install.name, flags, button, null, null, null, {value: false}) == 0);
-      if (result)
-        install.install();
-      else
-        install.cancel();
-    });
-  }
-};

From 615135392d5696e554ab8e86f09b6995f2dd2fc0 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 31 May 2013 15:27:20 -0700
Subject: [PATCH 714/829] removing unused Scriptish_findError

---
 extension/content/tests/testAvailability.js   |  2 --
 .../modules/utils/Scriptish_findError.js      | 23 -------------------
 2 files changed, 25 deletions(-)
 delete mode 100644 extension/modules/utils/Scriptish_findError.js

diff --git a/extension/content/tests/testAvailability.js b/extension/content/tests/testAvailability.js
index 85fe3f4c..6d864d5e 100644
--- a/extension/content/tests/testAvailability.js
+++ b/extension/content/tests/testAvailability.js
@@ -11,7 +11,6 @@ Cu.import("resource://scriptish/utils/Scriptish_convert2RegExp.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_createUserScriptSource.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_ExtendedStringBundle.js", tools);
-Cu.import("resource://scriptish/utils/Scriptish_findError.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_getBinaryContents.js", tools);
 Cu.import("resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_getContents.js", tools);
@@ -44,7 +43,6 @@ test("Utils", function() {
   equals(typeof(tools.Scriptish_createUserScriptSource), "function", "has Scriptish_createUserScriptSource");
   equals(typeof(tools.Scriptish_cryptoHash), "function", "has Scriptish_cryptoHash");
   equals(typeof(tools.Scriptish_ExtendedStringBundle), "function", "has Scriptish_ExtendedStringBundle");
-  equals(typeof(tools.Scriptish_findError), "function", "has Scriptish_findError");
   equals(typeof(tools.Scriptish_getBinaryContents), "function", "has Scriptish_getBinaryContents");
   equals(typeof(tools.Scriptish_getBrowserForContentWindow), "function", "has Scriptish_getBrowserForContentWindow");
   equals(typeof(tools.Scriptish_getContents), "function", "has Scriptish_getContents");
diff --git a/extension/modules/utils/Scriptish_findError.js b/extension/modules/utils/Scriptish_findError.js
deleted file mode 100644
index 5fff1c66..00000000
--- a/extension/modules/utils/Scriptish_findError.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var EXPORTED_SYMBOLS = ["Scriptish_findError"];
-
-function Scriptish_findError(aScript, aLineNum) {
-  var start = 0;
-  var end = 1;
-  var len = aScript.offsets.length;
-
-  for (var i = 0; i < len; i++) {
-    end = aScript.offsets[i];
-    if (aLineNum < end) {
-      return {
-        uri: aScript.requires[i].fileURL,
-        lineNumber: (aLineNum - start)
-      };
-    }
-    start = end;
-  }
-
-  return {
-    uri: aScript.fileURL,
-    lineNumber: (aLineNum - end)
-  };
-}

From 2c92f478e6e2d0058594765abf5418967b6e070b Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 31 May 2013 15:40:31 -0700
Subject: [PATCH 715/829] removing Q library

---
 extension/content/js/third-party/q.js       | 30 ---------------------
 extension/content/tests/testAvailability.js |  2 --
 extension/modules/utils/q.js                | 11 ++------
 3 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 extension/content/js/third-party/q.js

diff --git a/extension/content/js/third-party/q.js b/extension/content/js/third-party/q.js
deleted file mode 100644
index cd4451e6..00000000
--- a/extension/content/js/third-party/q.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2009, 2010 Kristopher Michael Kowal. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
-https://github.com/kriskowal/q/
-*/
-(function(d,f){function k(a){return a}function l(){var a=[],b,c=m(g.prototype);c.promiseSend=function(){var c=Array.prototype.slice.call(arguments);a?a.push(c):n.apply(f,[b].concat(c))};c.valueOf=function(){if(a)return c;return h(b)};var d=function(c){var d;if(a){b=j(c);c=0;for(d=a.length;c<d;++c)n.apply(f,[b].concat(a[c]));a=f;return b}};return{promise:q(c),resolve:d,reject:function(a){return d(e(a))}}}function g(a,b,c){b===f&&(b=function(a){return e("Promise does not support operation: "+a)});var d=
-m(g.prototype);d.promiseSend=function(c,d){var e=Array.prototype.slice.call(arguments,2),e=a[c]?a[c].apply(a,e):b.apply(a,[c].concat(e)),d=d||k;return d(e)};if(c)d.valueOf=c;return q(d)}function o(a){return a&&typeof a.promiseSend==="function"}function u(a){return!o(h(a))&&!r(a)}function r(a){a=h(a);if(a===f||a===null)return!1;return!!a.promiseRejected}function e(a){return g({when:function(b){return b?b(a):e(a)}},function(){return e(a)},function(){var b=m(e.prototype);b.promiseRejected=!0;b.reason=
-a;return b})}function j(a){if(o(a))return a;if(a&&typeof a.then==="function")return g({},function(b){return b!=="when"?Q.when(a,function(a){return Q.ref(a).promiseSend.apply(null,arguments)}):(b=l(),a.then(b.resolve,b.reject),b.promise)});return g({when:function(){return a},get:function(b){if(a===f||a===null)return e("Cannot access property "+b+" of "+a);return a[b]},put:function(b,c){if(a===f||a===null)return e("Cannot set property "+b+" of "+a+" to "+c);return a[b]=c},del:function(b){if(a===f||
-a===null)return e("Cannot delete property "+b+" of "+a);return delete a[b]},post:function(b,c){if(a===f||a===null)return e(""+a+" has no methods");var d=a[b];if(!d)return e("No such method "+b+" on object "+a);if(!d.apply)return e("Property "+b+" on object "+a+" is not a method");return a[b].apply(a,c)},keys:function(){return Object.keys(a)}},f,function(){return a})}function s(a,b,c){function d(a){try{return b?b(a):a}catch(c){return typeof process!=="undefined"?process.emit("uncaughtException",c):
-v(c&&c.stack||c),e(c)}}function f(a){try{return c?c(a):e(a)}catch(b){return v(b&&b.stack||b),e(b)}}var g=l(),h=!1;n(j(a),"when",function(a){h||(h=!0,g.resolve(j(a).promiseSend("when",d,f)))},function(a){h||(h=!0,g.resolve(f(a)))});return g.promise}function i(a){return function(b){var c=Array.prototype.slice.call(arguments,1);return t.apply(f,[b,a].concat(c))}}function t(a,b){var c=l(),d=Array.prototype.slice.call(arguments,2);n.apply(f,[j(a),b,c.resolve].concat(d));return c.promise}function n(a){var b=
-Array.prototype.slice.call(arguments,1);p(function(){a.promiseSend.apply(a,b)})}var p;try{p=require("event-queue").enqueue}catch(x){p=function(a){setTimeout(a,0)}}var q=Object.freeze||k,m=Object.create||function(a){var b=function(){};b.prototype=a;return new b},v=typeof console==="undefined"?k:function(a){console.log(a)};d.enqueue=p;d.defer=l;d.makePromise=g;g.prototype.then=function(a,b){return s(this,a,b)};g.prototype.toSource=function(){return this.toString()};g.prototype.toString=function(){return"[object Promise]"};
-q(g.prototype);d.isPromise=o;d.isResolved=function(a){return!o(h(a.valueOf()))};d.isFulfilled=u;d.isRejected=r;d.reject=e;e.prototype=m(g.prototype,{constructor:{value:e}});d.ref=j;d.def=function(a){return g({isDef:function(){}},function(){var b=Array.prototype.slice.call(arguments);return t.apply(f,[a].concat(b))},function(){return a.valueOf()})};d.when=s;d.asap=function(a,b,c){b=b||k;if(u(a))return h(b(h(a)));else if(r(a))if(a=a.valueOf().reason,c)return c(a);else throw a;else return s(a,b,c)};
-var h=function(a){return a===f||a===null?a:a.valueOf()};d.Method=i;d.send=t;d.get=i("get");d.put=i("put");d.del=i("del");var w=d.post=i("post");d.invoke=function(a,b){var c=Array.prototype.slice.call(arguments,2);return w(a,b,c)};d.keys=i("keys");d.error=function(a){throw a;}})(typeof exports!=="undefined"?exports:Q={});
diff --git a/extension/content/tests/testAvailability.js b/extension/content/tests/testAvailability.js
index 6d864d5e..12a0fded 100644
--- a/extension/content/tests/testAvailability.js
+++ b/extension/content/tests/testAvailability.js
@@ -5,7 +5,6 @@ var tools = {};
 
 (function(Cu) {
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/utils/q.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_alert.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_convert2RegExp.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_createUserScriptSource.js", tools);
@@ -37,7 +36,6 @@ Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js", tools);
 test("Utils", function() {
   expect(28);
 
-  equals(typeof(tools.Q), "object", "has Q");
   equals(typeof(tools.Scriptish_alert), "function", "has Scriptish_alert");
   equals(typeof(tools.Scriptish_convert2RegExp), "function", "has Scriptish_convert2RegExp");
   equals(typeof(tools.Scriptish_createUserScriptSource), "function", "has Scriptish_createUserScriptSource");
diff --git a/extension/modules/utils/q.js b/extension/modules/utils/q.js
index 8da34d7d..01bee7b8 100644
--- a/extension/modules/utils/q.js
+++ b/extension/modules/utils/q.js
@@ -2,16 +2,9 @@ var EXPORTED_SYMBOLS = ["Q"];
 
 Components.utils.import("resource://scriptish/constants.js");
 
-const setTimeout = timeout;
+let Q = {};
 
-Services.scriptloader
-    .loadSubScript("chrome://scriptish/content/js/third-party/q.js", this);
-
-Q.and = function and() {
-  var promises = Array.prototype.slice.call(arguments);
-  if (!promises.length) return true;
-  return promises.shift().then(function() Q.and.apply(null, promises));
-}
+Q.defer = jetpack('sdk/core/promise').defer;
 
 Q.chain = function chain() {
   var funcs = Array.prototype.slice.call(arguments);

From 3cde5df8635049cf6a594b8823e2bb2a43235a6c Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 31 May 2013 15:46:13 -0700
Subject: [PATCH 716/829] <em:version>0.1.9</em:version>

---
 extension/install.rdf |  2 +-
 update.rdf            | 35 -----------------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 update.rdf

diff --git a/extension/install.rdf b/extension/install.rdf
index b16f4658..a4d952f0 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.9pre</em:version>
+    <em:version>0.1.9</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
diff --git a/update.rdf b/update.rdf
deleted file mode 100644
index b0bfcb74..00000000
--- a/update.rdf
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-  <RDF:Description about="urn:mozilla:extension:scriptish@erikvold.com">
-    <em:updates>
-      <RDF:Seq>
-        <RDF:li>
-          <RDF:Description>
-            <em:version>0.1.8</em:version>
-            <em:targetApplication>
-              <RDF:Description>
-                <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-                <em:minVersion>4.0</em:minVersion>
-                <em:maxVersion>18.0a1</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.8.xpi</em:updateLink>
-                <em:updateHash>sha1:ee95dd6c12695806daec6d178f8585c46d4e6231</em:updateHash>
-              </RDF:Description>
-            </em:targetApplication>
-            <em:targetApplication>
-              <RDF:Description>
-                <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-                <em:minVersion>2.1</em:minVersion>
-                <em:maxVersion>2.8.*</em:maxVersion>
-                <em:updateLink>http://github.com/downloads/scriptish/scriptish/scriptish-0.1.8.xpi</em:updateLink>
-                <em:updateHash>sha1:ee95dd6c12695806daec6d178f8585c46d4e6231</em:updateHash>
-              </RDF:Description>
-            </em:targetApplication>
-          </RDF:Description>
-        </RDF:li>
-      </RDF:Seq>
-    </em:updates>
-
-    <em:signature>MIGTMA0GCSqGSIb3DQEBDQUAA4GBACaeJuUaRaUBeMEYqnW7QY40djS5WjUFT5iq6j2twbOO3GnmpuaWcFtUVCpvsdBA1e4shCgTYgRpx6Kid7aYVmCWvcu7hiWakfOZvRPLVBPmpN7/dXWvadldcnvduVQsPHxU3UUVqI3aj37V01po1P/44gGK4dvbmRM+Sp1/JImF</em:signature>
-  </RDF:Description>
-</RDF:RDF>

From dc488c08d64175d6ec67e503164e8f36a7d806ef Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 31 May 2013 15:54:06 -0700
Subject: [PATCH 717/829] <em:version>0.1.10pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index a4d952f0..10ef3765 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.9</em:version>
+    <em:version>0.1.10pre</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>

From d5489f80f0f5fc71063b1f942f56f05c8570f2e5 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sat, 1 Jun 2013 11:26:01 +0200
Subject: [PATCH 718/829] Properly handle redirects in Script Dependencies

Closes GH-72
---
 extension/modules/script/scriptdownloader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 2925b103..c5220599 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -228,7 +228,7 @@ ScriptDownloader.prototype.downloadNextDependency = function() {
 
     var progressListener = new PersistProgressListener(persist);
     progressListener.onFinish =
-        this.handleDependencyDownloadComplete.bind(this, dep, file, sourceChannel);
+        this.handleDependencyDownloadComplete.bind(this, dep, file);
     persist.progressListener = progressListener;
     persist.saveChannel(sourceChannel, file);
   } catch (e) {
@@ -447,6 +447,6 @@ PersistProgressListener.prototype.onStateChange =
   function(aWebProgress, aRequest, aStateFlags, aStatus) {
     if (this.persist.currentState == this.persist.PERSIST_STATE_FINISHED) {
       Scriptish_log("Persister: Download complete " + aRequest.status);
-      this.onFinish();
+      this.onFinish(aRequest);
     }
   };

From 65ca727e53dcfc588537ad84a108c3cc78de7ac5 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sat, 1 Jun 2013 12:10:06 +0200
Subject: [PATCH 719/829] Convert scriptish-button to type="menu" (kinda)

---
 extension/content/js/browser.js                       |  1 -
 extension/content/third-party/firebug/startButton.css |  2 +-
 extension/content/third-party/firebug/startButton.xml | 11 +++++------
 extension/skin/browser.css                            | 10 +++++++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 2600a995..c4835a59 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -39,7 +39,6 @@ Scriptish_BrowserUI.tbBtnSetup = function() {
   }
 
   var tbBtnBrd = $("scriptish-button-brd");
-  tbBtnBrd.setAttribute("onclick", "Scriptish_BrowserUIM.onIconClick(event)");
   updateShowScripts();
   Scriptish_prefRoot.watch("enabled", updateShowScripts);
   Scriptish_prefRoot.watch("toolbarbutton.showScripts", updateShowScripts);
diff --git a/extension/content/third-party/firebug/startButton.css b/extension/content/third-party/firebug/startButton.css
index ea37c96c..3910f140 100755
--- a/extension/content/third-party/firebug/startButton.css
+++ b/extension/content/third-party/firebug/startButton.css
@@ -7,7 +7,7 @@
   border: 1px solid rgba(0,90,0,0.5);
   margin: 0;
   margin-left: -3px;
-  margin-right: -5px;
+  margin-right: -7px;
 }
 
 /* Slightly different sizes for "small" toolbars */
diff --git a/extension/content/third-party/firebug/startButton.xml b/extension/content/third-party/firebug/startButton.xml
index 631c37ce..ff0afb89 100755
--- a/extension/content/third-party/firebug/startButton.xml
+++ b/extension/content/third-party/firebug/startButton.xml
@@ -6,18 +6,17 @@
   <binding id="scriptish-button" display="xul:menu"
       extends="chrome://global/content/bindings/toolbarbutton.xml#menu-button">
       <content>
-          <children includes="observes|template|menupopup|panel|tooltip"/>
           <xul:stack>
             <xul:hbox class="badge" pack="center" align="center">
               <xul:label class="label" value="0" xbl:inherits="value=scriptCount"/>
             </xul:hbox>
           </xul:stack>
 
-          <xul:toolbarbutton class="scriptish-button box-inherit toolbarbutton-menubutton-button"
-              anonid="button" flex="1" allowevents="true"
-              xbl:inherits="disabled,crop,image,label,accesskey,command,align,dir,pack,orient"/>
-          <xul:dropmarker type="menu-button" class="toolbarbutton-menubutton-dropmarker"
-              xbl:inherits="align,dir,pack,orient,disabled,label"/>
+          <xul:toolbarbutton class="scriptish-button toolbarbutton-1"
+              anonid="button" flex="1" allowevents="true" type="menu"
+              xbl:inherits="disabled,crop,image,label,accesskey,command,align,dir,pack,orient,scriptish-disabled">
+            <children includes="observes|template|menupopup|panel|tooltip"/>
+          </xul:toolbarbutton>
       </content>
   </binding>
 </bindings>
diff --git a/extension/skin/browser.css b/extension/skin/browser.css
index 59771b97..c8525e56 100644
--- a/extension/skin/browser.css
+++ b/extension/skin/browser.css
@@ -4,17 +4,21 @@
 }
 toolbar #scriptish-button {
   -moz-binding: url("chrome://scriptish/content/third-party/firebug/startButton.xml#scriptish-button");
+  -moz-box-orient: horizontal;
 }
 
-toolbar[iconsize="small"] #scriptish-button {
+.scriptish-button {
+  -moz-box-orient: horizontal !important;
+}
+toolbar[iconsize="small"] .scriptish-button {
   list-style-image: url("chrome://scriptish/skin/scriptish16.png");
 }
 
-#scriptish-button[scriptish-disabled] {
+.scriptish-button[scriptish-disabled] {
   list-style-image: url("chrome://scriptish/skin/scriptish24_disabled.png");
 }
 
-toolbar[iconsize="small"] #scriptish-button[scriptish-disabled] {
+toolbar[iconsize="small"] .scriptish-button[scriptish-disabled] {
   list-style-image: url("chrome://scriptish/skin/scriptish16_disabled.png");
 }
 

From 9fa2a3dfa5108a1756a2326a62025020ac384cb3 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 3 Jun 2013 12:56:11 -0700
Subject: [PATCH 720/829] fixing the sdk globals, which were not defined before

---
 extension/modules/constants.js | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index e15eaff3..7ed0078d 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -2,7 +2,10 @@ var EXPORTED_SYMBOLS = [
     "Cc", "Ci", "Cr", "NetUtil", "XPCOMUtils", "extend", "jetpack",
     "Services", "Instances", "lazy", "lazyImport", "lazyUtil", "timeout", "e10s"];
 
-const {classes: Cc, interfaces: Ci, results: Cr} = Components;
+const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu, Constructor: CC} = Components;
+
+const systemPrincipal = CC('@mozilla.org/systemprincipal;1', 'nsIPrincipal')();
+
 const e10s = !!Cc["@mozilla.org/globalmessagemanager;1"];
 const global = this;
 var Services = {};
@@ -130,19 +133,34 @@ function extend(a, o) {
   return o;
 }
 
-var { Loader } = Components.utils.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
-var loader = Loader.Loader({
+
+function descriptor(object) {
+  let value = {};
+  getOwnPropertyNames(object).forEach(function(name) {
+    value[name] = getOwnPropertyDescriptor(object, name)
+  });
+  return value;
+}
+
+const { Loader } = Components.utils.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
+
+const loader = Loader.Loader({
+   modules: {
+     "toolkit/loader": Loader
+   },
   paths: {
-    "sdk/": "resource://gre/modules/commonjs/sdk/",
+    "devtools": "resource:///modules/devtools",
     "scriptish/": "resource://scriptish/",
-     "": "globals:///"
+    "": "resource://gre/modules/commonjs/"
   },
   resolve: function(id, base) {
     if (id == "chrome" || id.startsWith("@"))
       return id;
     return Loader.resolve(id, base);
-  }
+  },
+
 });
+
 // fake requirer uri scriptish:// (it's used for relative requires and error messages)
 var module = Loader.Module("main", "scriptish://");
 var jetpack = Loader.Require(loader, module);

From 004621a10d70e79967bb9b78a05162db3ccc25fc Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 3 Jun 2013 13:23:50 -0700
Subject: [PATCH 721/829] <em:version>0.1.10</em:version>wq

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 10ef3765..0ff3a970 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.10pre</em:version>
+    <em:version>0.1.10</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>

From 45a8fa9abccccad34785a9a69f420ab377211add Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Mon, 3 Jun 2013 13:27:56 -0700
Subject: [PATCH 722/829] <em:version>0.1.11pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 0ff3a970..ffbde01e 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.10</em:version>
+    <em:version>0.1.11pre</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>

From 9400d6613eaba2eb10a4731f9669adada34e864b Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 9 Jun 2013 19:16:39 +0200
Subject: [PATCH 723/829] TBB: Do not block right click button.

Closes GH-104
---
 extension/content/browser.xul | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index e06a46eb..0d7954b3 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -44,7 +44,6 @@
     <toolbarbutton id="scriptish-button"
         observes="scriptish-button-brd"
         type="menu-button"
-        context=""
         class="toolbarbutton-1 chromeclass-toolbar-additional"
         label="Scriptish">
       <menupopup id="scriptish-tb-popup" observes="scriptish-tb-popup-brd">

From 67a6b2c705607d47f3be18886945ed7b2dea5d14 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sun, 9 Jun 2013 20:35:41 +0200
Subject: [PATCH 724/829] Middle-click on toolbar button should open manager

Closes GH-105
---
 extension/content/js/browser.js      |  1 +
 extension/modules/content/browser.js | 15 ++++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index c4835a59..2600a995 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -39,6 +39,7 @@ Scriptish_BrowserUI.tbBtnSetup = function() {
   }
 
   var tbBtnBrd = $("scriptish-button-brd");
+  tbBtnBrd.setAttribute("onclick", "Scriptish_BrowserUIM.onIconClick(event)");
   updateShowScripts();
   Scriptish_prefRoot.watch("enabled", updateShowScripts);
   Scriptish_prefRoot.watch("toolbarbutton.showScripts", updateShowScripts);
diff --git a/extension/modules/content/browser.js b/extension/modules/content/browser.js
index ed6e9e9b..6c855a24 100644
--- a/extension/modules/content/browser.js
+++ b/extension/modules/content/browser.js
@@ -18,17 +18,10 @@ function Scriptish_BrowserUIM(aWin, aBrowserUI) {
 }
 Scriptish_BrowserUIM.prototype = {
   onIconClick: function(aEvt) {
-    if ("menu-button" == aEvt.originalTarget.type) return;
-    switch (aEvt.button) {
-      case 0:
-        this.onToggleStatus();
-        break;
-      case 1:
-        Scriptish_openManager();
-        break;
-      case 2:
-        this.$("scriptish-tb-popup").openPopup(this.$("scriptish-button"), "before_end", 0, 0, false, false);
-        break;
+    if (aEvt.button === 1 && aEvt.target.id === "scriptish-button") {
+      Scriptish_openManager();
+      aEvt.preventDefault();
+      aEvt.stopPropagation();
     }
   },
   onToggleStatus: function() Scriptish.enabled = !Scriptish.enabled,

From 5735b88d6b039ea7b16de1dbb6e998618c2a98c5 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sat, 15 Jun 2013 01:45:57 +0200
Subject: [PATCH 725/829] Toolbar icon glitches with linux themes.

CSS specificity killed us with that theme.
Also remove the outer button appearance.

Partily addresses GH-107
---
 .../third-party/firebug/startButton.xml       |  5 +++--
 extension/skin/browser.css                    | 19 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extension/content/third-party/firebug/startButton.xml b/extension/content/third-party/firebug/startButton.xml
index ff0afb89..7845f74c 100755
--- a/extension/content/third-party/firebug/startButton.xml
+++ b/extension/content/third-party/firebug/startButton.xml
@@ -12,8 +12,9 @@
             </xul:hbox>
           </xul:stack>
 
-          <xul:toolbarbutton class="scriptish-button toolbarbutton-1"
-              anonid="button" flex="1" allowevents="true" type="menu"
+          <xul:toolbarbutton id="scriptish-button-inner"
+              class="scriptish-button toolbarbutton-1" anonid="button" flex="1"
+              allowevents="true" type="menu"
               xbl:inherits="disabled,crop,image,label,accesskey,command,align,dir,pack,orient,scriptish-disabled">
             <children includes="observes|template|menupopup|panel|tooltip"/>
           </xul:toolbarbutton>
diff --git a/extension/skin/browser.css b/extension/skin/browser.css
index c8525e56..6b108e62 100644
--- a/extension/skin/browser.css
+++ b/extension/skin/browser.css
@@ -1,24 +1,23 @@
 #scriptish-button {
-  -moz-box-orient: horizontal;
-  list-style-image: url("chrome://scriptish/skin/scriptish24.png");
-}
-toolbar #scriptish-button {
   -moz-binding: url("chrome://scriptish/content/third-party/firebug/startButton.xml#scriptish-button");
   -moz-box-orient: horizontal;
+  -moz-appearance: none;
+  padding: 0;
+  margin: 0;
 }
 
-.scriptish-button {
-  -moz-box-orient: horizontal !important;
+#scriptish-button-inner {
+  -moz-box-orient: horizontal;
+  list-style-image: url("chrome://scriptish/skin/scriptish24.png");
 }
-toolbar[iconsize="small"] .scriptish-button {
+toolbar[iconsize="small"] #scriptish-button-inner {
   list-style-image: url("chrome://scriptish/skin/scriptish16.png");
 }
 
-.scriptish-button[scriptish-disabled] {
+#scriptish-button-inner[scriptish-disabled] {
   list-style-image: url("chrome://scriptish/skin/scriptish24_disabled.png");
 }
-
-toolbar[iconsize="small"] .scriptish-button[scriptish-disabled] {
+toolbar[iconsize="small"] #scriptish-button-inner[scriptish-disabled] {
   list-style-image: url("chrome://scriptish/skin/scriptish16_disabled.png");
 }
 

From 6088ce99877f1a36d0235beae0dfe9dfd8fe89d2 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Sat, 15 Jun 2013 02:12:40 +0200
Subject: [PATCH 726/829] Default icon image for "outer" #scriptish-button.

Supposed to fix GH-108
---
 extension/skin/browser.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extension/skin/browser.css b/extension/skin/browser.css
index 6b108e62..0511d4f8 100644
--- a/extension/skin/browser.css
+++ b/extension/skin/browser.css
@@ -6,10 +6,15 @@
   margin: 0;
 }
 
+/* Also set a default icon for the "outer" #scriptish-button.
+   It will be disabled while the binding is still loading.
+   See GH-108 */
+#scriptish-button,
 #scriptish-button-inner {
   -moz-box-orient: horizontal;
   list-style-image: url("chrome://scriptish/skin/scriptish24.png");
 }
+toolbar[iconsize="small"] #scriptish-button,
 toolbar[iconsize="small"] #scriptish-button-inner {
   list-style-image: url("chrome://scriptish/skin/scriptish16.png");
 }

From 4acb77c3767b6a764da66bec24e9a8b597bf696c Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 14 Jun 2013 21:19:17 -0700
Subject: [PATCH 727/829] <em:version>0.1.11</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index ffbde01e..f10826bc 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.11pre</em:version>
+    <em:version>0.1.11</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>

From 215d8aa83522d739bb5bd45824bf54ede86b3457 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 13 Jul 2013 22:01:29 -0700
Subject: [PATCH 728/829] Closes #94 Supporting PWPB

---
 extension/components/scriptish.js             |  4 ++--
 extension/content/js/addonstab.js             |  2 +-
 extension/content/js/browser.js               |  5 +++--
 extension/install.rdf                         |  2 +-
 extension/modules/config/config.js            |  4 ++--
 extension/modules/config/configdownloader.js  |  4 ++--
 extension/modules/constants.js                | 19 +++++++++++++------
 extension/modules/script/script.js            | 12 +++++-------
 extension/modules/script/scriptdownloader.js  |  5 +++--
 .../modules/utils/Scriptish_installUri.js     |  8 +++++---
 10 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index c5ee812a..b939710b 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -25,7 +25,7 @@ lazyUtil(this, "updateModifiedScripts");
 lazyUtil(this, "windowEventTracker");
 lazyUtil(this, "windowUnloader");
 
-const {nsIContentPolicy: CP} = Ci;
+const CP = Ci.nsIContentPolicy;
 
 // If the file was previously cached it might have been given a number after
 // .user, like gmScript.user-12.js
@@ -206,7 +206,7 @@ ScriptishService.prototype = {
     // CP.TYPE is not binary, so do not use bitwise logic tricks
     if ((ct == CP.TYPE_DOCUMENT || ct == CP.TYPE_SUBDOCUMENT)
         && this._reg_userjs.test(cl.spec) && !this.isTempScript(cl)) {
-      Scriptish_installUri(cl);
+      Scriptish_installUri(cl, ctx);
     }
 
     return CP.ACCEPT;
diff --git a/extension/content/js/addonstab.js b/extension/content/js/addonstab.js
index a19960fd..330d6850 100644
--- a/extension/content/js/addonstab.js
+++ b/extension/content/js/addonstab.js
@@ -46,7 +46,7 @@ window.addEventListener("load", function() {
       dt.mozClearDataAt(type, i);
     }
 
-    for (var i = dt.mozItemCount - 1; ~i; i--) {
+    for (let i = dt.mozItemCount - 1; ~i; i--) {
       if (handleStrType("text/uri-list", i)) continue;
       if (handleStrType("text/x-moz-url", i)) continue;
 
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 2600a995..70c6339d 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -5,7 +5,7 @@ var Scriptish_BrowserUI = {
 
 (function(inc, tools){
 inc("resource://scriptish/constants.js", tools);
-const {lazyImport, lazyUtil} = tools;
+const { lazyImport, lazyUtil, jetpack } = tools;
 
 lazyImport(window, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(window, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
@@ -132,7 +132,8 @@ Scriptish_BrowserUI.chromeLoad = function(e) {
   this.contextItemInstall.setAttribute("accesskey", Scriptish_stringBundle("menu.install.ak"));
   this.contextItemInstall.addEventListener("command", function(aEvt) {
     Scriptish_installUri(
-        Scriptish_BrowserUI.getUserScriptLinkUnderPointer(), window);
+        Scriptish_BrowserUI.getUserScriptLinkUnderPointer(),
+        window);
   }, false)
 
   this.contextItemVS.setAttribute("label", Scriptish_stringBundle("menu.show"));
diff --git a/extension/install.rdf b/extension/install.rdf
index f10826bc..d419fd8a 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.11</em:version>
+    <em:version>0.1.12pre</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index c2d641e4..1245db98 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -364,8 +364,8 @@ Config.prototype = {
       }.bind(this));
   },
 
-  parse: function(source, uri, aUpdateScript) (
-      Script.parse(this, source, uri, aUpdateScript)),
+  parse: function(source, uri, aUpdateScript, aPrivate) (
+      Script.parse(this, source, uri, aUpdateScript, aPrivate)),
 
   install: function(aNewScript) {
     var existingIndex = this._find(aNewScript.id);
diff --git a/extension/modules/config/configdownloader.js b/extension/modules/config/configdownloader.js
index 6c6f7a75..7bd1c3e8 100644
--- a/extension/modules/config/configdownloader.js
+++ b/extension/modules/config/configdownloader.js
@@ -3,8 +3,8 @@ Components.utils.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/script/scriptdownloader.js", ["ScriptDownloader"]);
 
 var Scriptish_configDownloader = {
-  startInstall: function(aURI) {
-    new ScriptDownloader(aURI).startInstall();
+  startInstall: function(aURI, aPrivate) {
+    new ScriptDownloader(aURI, aPrivate).startInstall();
   },
   startViewScript: function(aURI) {
     new ScriptDownloader(aURI).startViewScript();
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 7ed0078d..432a8c63 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -145,20 +145,27 @@ function descriptor(object) {
 const { Loader } = Components.utils.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
 
 const loader = Loader.Loader({
-   modules: {
-     "toolkit/loader": Loader
-   },
+  modules: {
+    "toolkit/loader": Loader
+  },
   paths: {
-    "devtools": "resource:///modules/devtools",
+    "devtools": "resource:///modules/devtools/",
     "scriptish/": "resource://scriptish/",
+    "pathfinder/": "resource://scriptish/pathfinder/",
+    "sdk/": "resource://gre/modules/commonjs/sdk/",
     "": "resource://gre/modules/commonjs/"
   },
+  rootURI: '',
+  metadata: {
+    'permissions': {
+      'private-browsing': true
+    }
+  },
   resolve: function(id, base) {
     if (id == "chrome" || id.startsWith("@"))
       return id;
     return Loader.resolve(id, base);
-  },
-
+  }
 });
 
 // fake requirer uri scriptish:// (it's used for relative requires and error messages)
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index b5914991..97429769 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -834,9 +834,6 @@ Script.prototype = {
     var tools = {};
     Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
 
-    // TODO: see https://github.com/scriptish/scriptish/issues/94
-    if (true) this._downloadURL = null;
-
     // set up _modified and stat thrashing stuff
     this.isModified();
 
@@ -867,11 +864,10 @@ Script.parseVersion = function Script_parseVersion(aSrc) {
 }
 
 // TODO: DRY this by combining this with Scriptish_parser some way..
-Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript) {
+Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPrivate) {
   var script = new Script(aConfig);
 
-  // TODO: see https://github.com/scriptish/scriptish/issues/94
-  if (aURI && false)
+  if (aURI && aPrivate === false)
     script._downloadURL = aURI.spec;
 
   // read one line at a time looking for start meta delimiter or EOF
@@ -1244,10 +1240,12 @@ Script.loadFromXML = function(aConfig, aNode) {
         aConfig, Scriptish_getContents(script._file),
         script._downloadURL && NetUtil.newURI(script._downloadURL),
         script);
+
     script._dependhash = tools.Scriptish_cryptoHash(parsedScript._rawMeta);
     script._version = parsedScript._version;
     fileModified = true;
-  } else {
+  }
+  else {
     script._modified = aNode.getAttribute("modified");
     script._dependhash = aNode.getAttribute("dependhash");
     script._version = aNode.getAttribute("version");
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index c5220599..945db8c4 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -16,7 +16,7 @@ lazyUtil(this, "getTempFile");
 lazyUtil(this, "getWriteStream");
 lazyUtil(this, "stringBundle");
 
-function ScriptDownloader(uri) {
+function ScriptDownloader(uri, aPrivate) {
   this.uri_ = uri || null;
   this.req_ = null;
   this.script = null;
@@ -25,6 +25,7 @@ function ScriptDownloader(uri) {
   this.installOnCompletion_ = false;
   this.tempFiles_ = [];
   this.updateScript = false;
+  this._private = aPrivate;
 }
 ScriptDownloader.prototype.startInstall = function() {
   this.type = "install";
@@ -120,7 +121,7 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
     }
 
     var source = req.responseText;
-    this.script = Scriptish_config.parse(source, this.uri_);
+    this.script = Scriptish_config.parse(source, this.uri_, undefined, this._private);
 
     var file = Services.dirsvc.get("TmpD", Ci.nsIFile);
     var base = this.script.name.replace(/[^A-Z0-9_]/gi, "").toLowerCase();
diff --git a/extension/modules/utils/Scriptish_installUri.js b/extension/modules/utils/Scriptish_installUri.js
index 5f6b2a31..a3c2550e 100644
--- a/extension/modules/utils/Scriptish_installUri.js
+++ b/extension/modules/utils/Scriptish_installUri.js
@@ -1,13 +1,15 @@
 var EXPORTED_SYMBOLS = ["Scriptish_installUri"];
+
 Components.utils.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyImport(this, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
 
-function Scriptish_installUri(aURI) {
-  aURI = (typeof aURI == "string") ? NetUtil.newURI(aURI) : aURI;
+let { isPrivate } = jetpack('sdk/private-browsing');
 
+function Scriptish_installUri(aURI, aWin) {
   // docs for nsicontentpolicy say we're not supposed to block, so short timer.
   timeout(function() {
-    Scriptish_configDownloader.startInstall(aURI);
+    aURI = (typeof aURI == "string") ? NetUtil.newURI(aURI) : aURI;
+    Scriptish_configDownloader.startInstall(aURI, (aWin && isPrivate(aWin)));
   });
 }

From f276ac348baa0a34771589926ffa8edd75a19ed8 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 13 Jul 2013 23:55:50 -0700
Subject: [PATCH 729/829] Closes #13 Implmenting @grant

---
 extension/modules/api.js                      |  1 +
 extension/modules/api/GM_sandboxScripts.js    | 20 ++++++--
 extension/modules/api/sandbox/GM_addStyle.js  | 12 +++++
 .../modules/api/sandbox/GM_updatingEnabled.js |  2 +
 .../api/{sandbox.js => sandbox/GM_xpath.js}   | 15 ------
 extension/modules/script/script.js            | 10 ++++
 .../modules/utils/Scriptish_injectScripts.js  | 48 ++++++++++++-------
 7 files changed, 74 insertions(+), 34 deletions(-)
 create mode 100644 extension/modules/api/sandbox/GM_addStyle.js
 create mode 100644 extension/modules/api/sandbox/GM_updatingEnabled.js
 rename extension/modules/api/{sandbox.js => sandbox/GM_xpath.js} (83%)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 3601824f..0bc018ea 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -68,6 +68,7 @@ function GM_API(options) {
     unsafeWin: aUnsafeContentWin,
     chromeWin: aChromeWin
   } = options;
+
   var document = aSafeWin.document;
   var menuCmdIDs = [];
   var Scriptish_BrowserUI = aChromeWin ? aChromeWin.Scriptish_BrowserUI : null;
diff --git a/extension/modules/api/GM_sandboxScripts.js b/extension/modules/api/GM_sandboxScripts.js
index 7a625429..616065c8 100644
--- a/extension/modules/api/GM_sandboxScripts.js
+++ b/extension/modules/api/GM_sandboxScripts.js
@@ -1,13 +1,27 @@
 "use strict";
-const EXPORTED_SYMBOLS = ["GM_sandboxScripts"];
+const EXPORTED_SYMBOLS = ["GM_updatingEnabled", "GM_addStyle", "GM_xpath"];
 
 if (!('XMLHttpRequest' in this))
   this.XMLHttpRequest = Components.Constructor(
       "@mozilla.org/xmlextras/xmlhttprequest;1", "nsIXMLHttpRequest");
 
-const GM_sandboxScripts = (function(r) {
+const GM_updatingEnabled = (function(r) {
   r.overrideMimeType('text/javascript'); // don't try to parse as XML
-  r.open('GET', 'resource://scriptish/api/sandbox.js', false);
+  r.open('GET', 'resource://scriptish/api/sandbox/GM_updatingEnabled.js', false);
+  r.send(null);
+  return r.responseText;
+})(new XMLHttpRequest());
+
+const GM_xpath = (function(r) {
+  r.overrideMimeType('text/javascript'); // don't try to parse as XML
+  r.open('GET', 'resource://scriptish/api/sandbox/GM_xpath.js', false);
+  r.send(null);
+  return r.responseText;
+})(new XMLHttpRequest());
+
+const GM_addStyle = (function(r) {
+  r.overrideMimeType('text/javascript'); // don't try to parse as XML
+  r.open('GET', 'resource://scriptish/api/sandbox/GM_addStyle.js', false);
   r.send(null);
   return r.responseText;
 })(new XMLHttpRequest());
diff --git a/extension/modules/api/sandbox/GM_addStyle.js b/extension/modules/api/sandbox/GM_addStyle.js
new file mode 100644
index 00000000..80c2caaf
--- /dev/null
+++ b/extension/modules/api/sandbox/GM_addStyle.js
@@ -0,0 +1,12 @@
+
+function GM_addStyle(css, node) {
+  node = node || document.getElementsByTagName("head")[0];
+  if (node) {
+    var style = document.createElement("style");
+    style.textContent = css;
+    style.type = "text/css";
+    node.appendChild(style);
+  }
+
+  return style;
+}
diff --git a/extension/modules/api/sandbox/GM_updatingEnabled.js b/extension/modules/api/sandbox/GM_updatingEnabled.js
new file mode 100644
index 00000000..8b7a71d6
--- /dev/null
+++ b/extension/modules/api/sandbox/GM_updatingEnabled.js
@@ -0,0 +1,2 @@
+
+const GM_updatingEnabled = true;
diff --git a/extension/modules/api/sandbox.js b/extension/modules/api/sandbox/GM_xpath.js
similarity index 83%
rename from extension/modules/api/sandbox.js
rename to extension/modules/api/sandbox/GM_xpath.js
index 6f221f25..b57ec00c 100644
--- a/extension/modules/api/sandbox.js
+++ b/extension/modules/api/sandbox/GM_xpath.js
@@ -1,17 +1,3 @@
-// These script bits will only run unprivileged in a sandbox
-
-const GM_updatingEnabled = true;
-
-function GM_addStyle(css, node) {
-  node = node || document.getElementsByTagName("head")[0];
-  if (node) {
-    var style = document.createElement("style");
-    style.textContent = css;
-    style.type = "text/css";
-    node.appendChild(style);
-  }
-  return style;
-}
 
 function GM_xpath(details) {
   var contextNode, contextDocument, paths, resolver, namespace, result;
@@ -73,7 +59,6 @@ function GM_xpath(details) {
     return rv;
   }
 
-
   for (var [,path] in Iterator(paths)) {
      result = contextDocument.evaluate(
         path,
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 97429769..425ecb7f 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -76,6 +76,7 @@ function Script(config) {
   this._applyBackgroundUpdates = defaultAutoUpdateState;
   this._developers = [];
   this._contributors = [];
+  this.grant = {};
   this._description = null;
   this._version = null;
   this._icon = new ScriptIcon(this);
@@ -695,6 +696,7 @@ Script.prototype = {
     // Copy new values.
     this.blocked = newScript.blocked;
     this.domains = newScript.domains;
+    this.grant = newScript.grant || {};
     this._includes = newScript._includes;
     this._excludes = newScript._excludes;
     delete this.__all_includes;
@@ -766,6 +768,7 @@ Script.prototype = {
 
   toJSON: function() ({
     domains: this.domains,
+    grant: this.grant,
     includes: this._includes.patterns,
     excludes: this._excludes.patterns,
     matches: this._matches.map(function(match) match.pattern),
@@ -1001,6 +1004,9 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
         case "domain":
           script.domains.push(value);
           continue;
+        case "grant":
+          script.grant[value] = true;
+          continue;
         case "include":
           script.addInclude(value);
           continue;
@@ -1152,6 +1158,7 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
   script._noframes = aSkeleton.noframes;
 
   script.domains = aSkeleton.domains;
+  script.grant = aSkeleton.grant || {};
   if (aSkeleton.developers)
     aSkeleton.developers.forEach(script.addDeveloper.bind(script));
   if (aSkeleton.contributors)
@@ -1259,6 +1266,9 @@ Script.loadFromXML = function(aConfig, aNode) {
       case "Domain":
           script.domains.push(childNode.firstChild.nodeValue.trim());
           break;
+      case "Grant":
+        script.grant[childNode.textContent] = true;
+        break;
       case "Include":
         script.addInclude(childNode.firstChild.nodeValue.trim());
         break;
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index f41fe2ac..c6ae811f 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -9,7 +9,7 @@ Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish_logError"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
-lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_sandboxScripts"]);
+lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_updatingEnabled", "GM_addStyle", "GM_xpath"]);
 lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
 lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
 
@@ -42,12 +42,13 @@ function Scriptish_injectScripts(options) {
     delays.length = 0;
   }, winID);
 
-  for (var i = 0, e = scripts.length; i < e; ++i) {
+  for (let i = 0, e = scripts.length; i < e; ++i) {
     // Do not "optimize" |script| out of the loop block and into the loop
     // declaration!
-    // Need to keep a valid reference to |script| around so that GM_log
+    // Need to keep a block scoped reference to |script| around so that GM_log
     // and the delay code (and probably other consumer work).
     let script = scripts[i];
+
     let sandbox = new Cu.Sandbox(safeWin, {
       sandboxName: script.fileURL,
       sandboxPrototype: safeWin,
@@ -57,7 +58,14 @@ function Scriptish_injectScripts(options) {
     // hack XPathResult since that is so commonly used
     sandbox.XPathResult = XPATH_RESULT;
 
-    Cu.evalInSandbox(GM_sandboxScripts, sandbox);
+    Cu.evalInSandbox(GM_updatingEnabled, sandbox);
+
+    if (script.grant['GM_addStyle']) {
+      Cu.evalInSandbox(GM_addStyle, sandbox);
+    }
+    if (script.grant['GM_xpath']) {
+      Cu.evalInSandbox(GM_xpath, sandbox);
+    }
 
     // add GM_* API to sandbox
     let (GM_api = new GM_API(extend(options, {
@@ -69,25 +77,32 @@ function Scriptish_injectScripts(options) {
       chromeWin: chromeWin
     }))) {
       for (var funcName in GM_api) {
-        sandbox[funcName] = GM_api[funcName];
+        if (script.grant[funcName]) {
+          sandbox[funcName] = GM_api[funcName];
+        }
+        else {
+          delete GM_api[funcName];
+        }
       }
     }
+
     lazy(sandbox, "console", function() {
       return GM_console(script, safeWin, chromeWin);
     });
 
-
-    lazy(sandbox, "GM_log", function() {
-      if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
-        var logger = new GM_ScriptLogger(script);
-        return function() {
-          const args = Array.slice(arguments);
-          logger.log(args.join(" "));
-          sandbox.console.log.apply(sandbox.console, args);
+    if (script.grant['GM_log']) {
+      lazy(sandbox, "GM_log", function() {
+        if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
+          var logger = new GM_ScriptLogger(script);
+          return function() {
+            const args = Array.slice(arguments);
+            logger.log(args.join(" "));
+            sandbox.console.log.apply(sandbox.console, args);
+          }
         }
-      }
-      return sandbox.console.log.bind(sandbox.console);
-    });
+        return sandbox.console.log.bind(sandbox.console);
+      });
+    }
 
     sandbox.unsafeWindow = unsafeContentWin;
 
@@ -102,6 +117,7 @@ function Scriptish_injectScripts(options) {
       Scriptish_evalInSandbox(script, sandbox, safeWin, options);
     }
 
+    // TODO: remove this if check
     // window destroyed handler
     if ("nukeSandbox" in Cu) {
       Scriptish_windowUnloader(function() {

From 92533da2c8ac98f396dcf5a9a228e9f09c2ffde8 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 14 Jul 2013 00:14:59 -0700
Subject: [PATCH 730/829] Closes #80 Generating a random id by default for new
 scripts

---
 extension/content/js/newscript.js |  25 +++++++++++--------------
 extension/content/newscript.xul   |   5 +----
 extension/skin/generate.png       | Bin 793 -> 0 bytes
 extension/skin/newscript.css      |   4 ----
 4 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 extension/skin/generate.png

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 5e67854c..11475480 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -41,11 +41,6 @@ addEventListener("DOMContentLoaded", function init() {
     return false;
   }, false);
 
-  // load defaults
-  $("id").value = Scriptish_prefRoot.getValue("newscript_id", "");
-  $("namespace").value = Scriptish_prefRoot.getValue("newscript_namespace", "");
-  $("author").value = Scriptish_prefRoot.getValue("newscript_author", "");
-
   (function considerLocation() {
     if (!window.opener.gBrowser) {
       return;
@@ -57,15 +52,10 @@ addEventListener("DOMContentLoaded", function init() {
     }
     let host = contentLocation.host;
 
-    let generateIdButton = $('generate-id');
-    generateIdButton.hidden = false;
-    generateIdButton.addEventListener("command", function generateId() {
-      let gid = contentLocation.host;
-      gid += "-" + Services.uuid.generateUUID().toString().slice(1, -1);
-      gid += "@" + ($("namespace").value || "scriptish").replace(/^@/, "");
-      $("id").value = gid;
-    }, false);
-
+    // load defaults
+    $("namespace").value = Scriptish_prefRoot.getValue("newscript_namespace", "");
+    $("author").value = Scriptish_prefRoot.getValue("newscript_author", "");
+    $("id").value = Scriptish_prefRoot.getValue("newscript_id", "") || generateId(contentLocation);
   })();
 }, false);
 
@@ -138,3 +128,10 @@ function createScriptSource() {
     alert(e.message);
   }
 }
+
+function generateId(contentLocation) {
+  let gid = contentLocation.host;
+  gid += "-" + Services.uuid.generateUUID().toString().slice(1, -1);
+  gid += "@" + ($("namespace").value || "scriptish").replace(/^@/, "");
+  return gid;
+}
diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index 1abca9c1..e434058a 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -17,10 +17,7 @@
     <rows>
       <row>
         <label control="id" value="newscript.id" localize="value"/>
-        <hbox>
-          <textbox id="id" placeholder="newscript.missing.id" localize="placeholder" required="true"/>
-          <toolbarbutton id="generate-id" hidden="true"/>
-        </hbox>
+        <textbox id="id" placeholder="newscript.missing.id" localize="placeholder" required="true"/>
       </row>
       <row>
         <label control="name" value="newscript.name" localize="value"/>
diff --git a/extension/skin/generate.png b/extension/skin/generate.png
deleted file mode 100644
index 49520969fa7a069ec763d60879a7e43b86b9ce9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 793
zcmV+!1LpjRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H103UQkSaeirbZlh+M`dnha$$63AYyfNbZ>4TC}?4GXmnv`DY~jz
z?EnA(5p+dZbU}4=Xm4@=PHAj&AWdOuWpc7bwI%=n02p*dSad^jWnpw_Z*Cw|X>DZy
zGB7bQFEBPQGB`G>53K+I0xC&FK~y-6Ws@;z6hRb*zc(|xcV|LKcEh>ZA}R_2J291|
z1hlfSwy?9bwY9NIYh#m25epFnL9nv7uuuydE0YVkpdq=v+ufOGkvYAbuY2&`|Nrm*
zXGB$*mWT+@$@Bb%wf5Tn{{9Ydl4aQy=iF`Y{k!3C_+3@o>5k!S3DC9H-gnMD0aBo2
zjJf5U+YTXIn&0``M0N{wM5I*J!zqA>tOJb4<3qs2*?#~cVt_7?0jnZ%UR8eqD?mR2
z_^PT}U>WGf9Yj?T5trxr^)yXCL@_-;RdpPRIwIm!^#stmuD6E6;U`sXT^vyF{hs%J
zJA|;5rs+fP{a5e(d%z?~axaA7+qQjfj5+q+?*XUo#}ouefaN4fHp{Zqe!u?=xBzSv
zMe(yJijTlWU@6Xus-AH)08OvgTLlOq>;e_g7-O;!!a?jSpw-AcJ;4DBz_PXWGC<q5
zzk#gV?Uq1CRgWTj4IBf_RJs5QMNzyEk((mofDSNLRUace2Q;c$hY;Qj27?E{NL6*J
zz&B0v${6#-7_()q-K^_+2RJsyY&hrcG)?ms_y&BA=Q3-ejV$Z^e*g8_+FAo#1=h1H
zdt8>KE-o(K1#+MVSXD(;Pd$iIYhY}QSpg1!BVcT;&7-M5;_bE0e4zOhS`k?R2EYXH
z#+VFfMx)U#;AfX-Q-ITlQB5Y3M<IkNvQgLdQ)}(ZsK_%{GWVTL1l5^g8<X;?`X9g_
X<j4Tz=-5p>00000NkvXXu0mjfY+zHP

diff --git a/extension/skin/newscript.css b/extension/skin/newscript.css
index a929467a..a4b4be2d 100644
--- a/extension/skin/newscript.css
+++ b/extension/skin/newscript.css
@@ -19,7 +19,3 @@ textbox {
 *[required][invalid="true"] {
   box-shadow: 0pt 0pt 1.5px 1px red;
 }
-
-#generate-id {
-  list-style-image: url(generate.png);
-}

From f9f793ec3e18bbf15e472724820e28002aec5563 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 14 Jul 2013 00:24:46 -0700
Subject: [PATCH 731/829] Updating version numbers mentioned on README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 322b945b..26a49c7c 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 
 # Browsers Supported
 
-* Firefox 4+
-* Seamonkey 2.1+
+* Firefox 21+
+* Seamonkey 2.8+
 
 
 # Download

From 47e28b4cfe383dd12e7010bcb616b90882706e8d Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 14 Jul 2013 00:25:33 -0700
Subject: [PATCH 732/829] removing redundant issues link from README

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 26a49c7c..f9614b58 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,6 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 * [Wiki](https://github.com/scriptish/scriptish/wiki)
 * [Issues](https://github.com/scriptish/scriptish/issues)
 * [Blog](http://scriptish.org/blog)
-* [Issues](https://github.com/scriptish/scriptish/issues) 
 
 ## IRC
 

From 65dc2d2829d161646bd02845898258b71745a074 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 14 Jul 2013 00:34:30 -0700
Subject: [PATCH 733/829] No need to check if Cu.nukeSandbox is available, we
 only support versions that do support it now

---
 extension/modules/utils/Scriptish_injectScripts.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index c6ae811f..3e8a7c81 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -117,13 +117,10 @@ function Scriptish_injectScripts(options) {
       Scriptish_evalInSandbox(script, sandbox, safeWin, options);
     }
 
-    // TODO: remove this if check
     // window destroyed handler
-    if ("nukeSandbox" in Cu) {
-      Scriptish_windowUnloader(function() {
-        // try to nuke the sandbox (FF 17+ see bug 769273)
-        Cu.nukeSandbox(sandbox);
-      }, winID);
-    }
+    Scriptish_windowUnloader(function() {
+      // try to nuke the sandbox (FF 17+ see bug 769273)
+      Cu.nukeSandbox(sandbox);
+    }, winID);
   }
 }

From 2e5fe19ed7ee6bc4c592c89429fbe57017e1da89 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 14 Jul 2013 10:16:07 -0700
Subject: [PATCH 734/829] GM_addStyle now uses the new AUTHOR_SHEET type of
 user style

---
 extension/modules/api.js                           |  9 ++++++++-
 extension/modules/api/GM_sandboxScripts.js         |  7 -------
 extension/modules/api/sandbox/GM_addStyle.js       | 12 ------------
 extension/modules/utils/Scriptish_injectScripts.js |  5 +----
 4 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100644 extension/modules/api/sandbox/GM_addStyle.js

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 0bc018ea..5ebf0494 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -7,7 +7,10 @@ lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scri
 lazyImport(this, "resource://scriptish/utils/Scriptish_evalInSandbox.js", ["Scriptish_evalInSandbox_filename"]);
 lazyImport(this, "resource://scriptish/utils/Scriptish_injectScripts.js", ["Scriptish_injectScripts_filename"]);
 
+const { Style } = jetpack("sdk/stylesheet/style");
+const { attach, detach } = jetpack("sdk/content/mod");
 const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
+
 lazyUtil(this, "cryptoHash");
 lazyUtil(this, "getScriptHeader");
 lazyUtil(this, "notification");
@@ -237,6 +240,11 @@ function GM_API(options) {
       if (!~i) return false; // check the uuid is for a cmd made by the same script
       return Scriptish_BrowserUI.disableMenuCommand(aUUID, windowID);
     }
+
+    this.GM_addStyle = function GM_addStyle(aSource) {
+      if (!GM_apiLeakCheck("GM_addStyle")) return;
+      attach(Style({ source: aSource }), aSafeWin);
+    }
   }
 
   this.GM_cryptoHash = function GM_cryptoHash() {
@@ -249,7 +257,6 @@ function GM_API(options) {
   this.alert = function alert(aMsg) {
     Scriptish_alert(aMsg, scriptName);
   }
-
 }
 
 GM_API.prototype.GM_generateUUID = function GM_generateUUID() (
diff --git a/extension/modules/api/GM_sandboxScripts.js b/extension/modules/api/GM_sandboxScripts.js
index 616065c8..c2860613 100644
--- a/extension/modules/api/GM_sandboxScripts.js
+++ b/extension/modules/api/GM_sandboxScripts.js
@@ -18,10 +18,3 @@ const GM_xpath = (function(r) {
   r.send(null);
   return r.responseText;
 })(new XMLHttpRequest());
-
-const GM_addStyle = (function(r) {
-  r.overrideMimeType('text/javascript'); // don't try to parse as XML
-  r.open('GET', 'resource://scriptish/api/sandbox/GM_addStyle.js', false);
-  r.send(null);
-  return r.responseText;
-})(new XMLHttpRequest());
diff --git a/extension/modules/api/sandbox/GM_addStyle.js b/extension/modules/api/sandbox/GM_addStyle.js
deleted file mode 100644
index 80c2caaf..00000000
--- a/extension/modules/api/sandbox/GM_addStyle.js
+++ /dev/null
@@ -1,12 +0,0 @@
-
-function GM_addStyle(css, node) {
-  node = node || document.getElementsByTagName("head")[0];
-  if (node) {
-    var style = document.createElement("style");
-    style.textContent = css;
-    style.type = "text/css";
-    node.appendChild(style);
-  }
-
-  return style;
-}
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 3e8a7c81..4ed2c0cf 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -9,7 +9,7 @@ Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish_logError"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
-lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_updatingEnabled", "GM_addStyle", "GM_xpath"]);
+lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_updatingEnabled", "GM_xpath"]);
 lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
 lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
 
@@ -60,9 +60,6 @@ function Scriptish_injectScripts(options) {
 
     Cu.evalInSandbox(GM_updatingEnabled, sandbox);
 
-    if (script.grant['GM_addStyle']) {
-      Cu.evalInSandbox(GM_addStyle, sandbox);
-    }
     if (script.grant['GM_xpath']) {
       Cu.evalInSandbox(GM_xpath, sandbox);
     }

From e328ffb780a27ea376c022c3e276b8da8d9605d1 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 14 Jul 2013 10:37:23 -0700
Subject: [PATCH 735/829] Closes #123 removing legacy xml config code

---
 extension/modules/config/config.js |  50 +----------
 extension/modules/script/script.js | 128 -----------------------------
 2 files changed, 4 insertions(+), 174 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 1245db98..4ec5324c 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -170,41 +170,6 @@ Config.prototype = {
     });
   },
 
-  _loadXML: function(aFile, aCallback) {
-    Scriptish_log("Scriptish Config._loadXML");
-    var self = this;
-
-    if (aFile.exists()) {
-      var str = Scriptish_getContents(aFile);
-      if (!str) return aCallback(false);
-
-      var doc = Instances.dp.parseFromString(str, "text/xml");
-
-      // Stop if there was a parsing error
-      if (doc.documentElement.nodeName == "parsererror")
-        return aCallback(false);
-
-      var nodes = doc.evaluate("/UserScriptConfig/Script | /UserScriptConfig/Exclude", doc, null, 0, null);
-      let excludes = [];
-
-      for (var node; node = nodes.iterateNext();) {
-        switch (node.nodeName) {
-        case "Script":
-          Script.loadFromXML(self, node);
-          break;
-        case "Exclude":
-          excludes.push(node.firstChild.nodeValue.trim());
-          break;
-        }
-      }
-      Scriptish_addExcludes(excludes);
-
-      return aCallback(true);
-    }
-
-    aCallback(false);
-  },
-
   _loadJSON: function(aFile, aCallback) {
     Scriptish_log("Scriptish Config._loadJSON");
     var self = this;
@@ -274,6 +239,7 @@ Config.prototype = {
 
     // Load the config (trying from various sources)
     var configFile;
+
     // source: Scriptish JSON tmp; for pre-nsISafeOutputStream compatiblity
     self._loadJSON(self._tempFile, function(aSuccess) {
       if (aSuccess) return callback(true);
@@ -282,17 +248,9 @@ Config.prototype = {
       // NOTE: this is the only case where we care if the file was modified
       (configFile = self._scriptDir).append(SCRIPTISH_CONFIG_JSON);
       self._loadJSON(configFile, function(aSuccess, aModified) {
-        if (aSuccess) return callback(aModified);
-
-        // source: Scriptish XML
-        (configFile = self._scriptDir).append(SCRIPTISH_CONFIG_XML);
-        self._loadXML(configFile, function(aSuccess) {
-          if (aSuccess) return callback(true);
-
-          // source: Older GM Style XML
-          (configFile = self._scriptDir).append("config.xml");
-          self._loadXML(configFile, function() callback(true));
-        });
+        if (aSuccess)
+          return callback(aModified);
+        callback(true);
       });
     });
 
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 425ecb7f..393ed44f 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1207,133 +1207,5 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
   return false;
 }
 
-Script.loadFromXML = function(aConfig, aNode) {
-  var script = new Script(aConfig);
-  var fileModified = false;
-  let tmp;
-
-  script._filename = aNode.getAttribute("filename");
-  script._basedir = aNode.getAttribute("basedir") || ".";
-  script._downloadURL = aNode.getAttribute("downloadURL")
-      || aNode.getAttribute("installurl") || null;
-  script._updateURL = aNode.getAttribute("updateURL") || null;
-  script._applyBackgroundUpdates =
-      parseInt(aNode.getAttribute("applyBackgroundUpdates"), 10)
-      || defaultAutoUpdateState;
-  script._homepageURL = aNode.getAttribute("homepageURL")
-      || aNode.getAttribute("homepage") || null;
-  if (aNode.getAttribute("supportURL"))
-    script.supportURL = aNode.getAttribute("supportURL");
-  script._jsversion = aNode.getAttribute("jsversion") || null;
-  script["_run-at"] = aNode.getAttribute("run-at") || null;
-  tmp = (aNode.getAttribute("includesDisabled") || "").toLowerCase();
-  if (tmp) script.includesDisabled = ("false" == tmp) ? false : true;
-
-  if (!script.fileExists()) {
-    script.uninstallProcess();
-    return true;
-  }
-
-  if (!aNode.hasAttribute("modified")
-      || !aNode.hasAttribute("dependhash")
-      || !aNode.hasAttribute("version")) {
-    var tools = {};
-    Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
-
-    // set up _modified and stat thrashing stuff
-    script.isModified();
-
-    var parsedScript = Script.parse(
-        aConfig, Scriptish_getContents(script._file),
-        script._downloadURL && NetUtil.newURI(script._downloadURL),
-        script);
-
-    script._dependhash = tools.Scriptish_cryptoHash(parsedScript._rawMeta);
-    script._version = parsedScript._version;
-    fileModified = true;
-  }
-  else {
-    script._modified = aNode.getAttribute("modified");
-    script._dependhash = aNode.getAttribute("dependhash");
-    script._version = aNode.getAttribute("version");
-  }
-
-  for (var i = 0, childNode; childNode = aNode.childNodes[i]; i++) {
-    switch (childNode.nodeName) {
-      case "Contributor":
-        script.addContributor(childNode.firstChild.nodeValue.trim());
-        break;
-      case "Domain":
-          script.domains.push(childNode.firstChild.nodeValue.trim());
-          break;
-      case "Grant":
-        script.grant[childNode.textContent] = true;
-        break;
-      case "Include":
-        script.addInclude(childNode.firstChild.nodeValue.trim());
-        break;
-      case "Exclude":
-        script.addExclude(childNode.firstChild.nodeValue.trim());
-        break;
-      case "Match":
-        script._matches.push(new MatchPattern(childNode.firstChild.nodeValue.trim()));
-        break;
-      case "UserInclude":
-          script.addInclude(childNode.firstChild.nodeValue.trim(), true);
-          break;
-      case "UserExclude":
-          script.addExclude(childNode.firstChild.nodeValue.trim(), true);
-          break;
-      case "Require":
-        var scriptRequire = new ScriptRequire(script);
-        scriptRequire._filename = childNode.getAttribute("filename");
-        script._requires.push(scriptRequire);
-        break;
-      case "Resource":
-        var scriptResource = new ScriptResource(script);
-        scriptResource._name = childNode.getAttribute("name");
-        scriptResource._filename = childNode.getAttribute("filename");
-        scriptResource._mimetype = childNode.getAttribute("mimetype");
-        scriptResource._charset = childNode.getAttribute("charset");
-        script._resources.push(scriptResource);
-        break;
-      case "Screenshot":
-        var thumb = "";
-        if (childNode.hasAttribute("thumb"))
-          thumb = childNode.getAttribute("thumb");
-
-        script.addScreenShot(childNode.firstChild.nodeValue.trim(), thumb);
-        break;
-      case "Noframes":
-        script["_" + childNode.nodeName.toLowerCase()] = true;
-        break;
-    }
-  }
-
-  script._id = aNode.getAttribute("id") || null;
-  script._name = aNode.getAttribute("name");
-  script._namespace = aNode.getAttribute("namespace");
-  script.author = aNode.getAttribute("author");
-  script._description = aNode.getAttribute("description");
-  script.icon.fileURL = aNode.getAttribute("icon");
-  script.icon64.fileURL = aNode.getAttribute("icon64");
-  let blocklistState = parseInt(aNode.getAttribute("blocklistState"), 10);
-  if (blocklistState) script.blocklistState = blocklistState;
-  script._enabled = aNode.getAttribute("enabled") == true.toString();
-  script.delay = aNode.getAttribute("delay");
-  script.priority = parseInt(aNode.getAttribute("priority"), 10) || 0;
-  if (aNode.getAttribute("averageRating"))
-    script.averageRating = aNode.getAttribute("averageRating") * 1;
-  if (aNode.getAttribute("reviewCount"))
-    script.reviewCount = aNode.getAttribute("reviewCount") * 1;
-  if (aNode.getAttribute("totalDownloads"))
-    script.totalDownloads = aNode.getAttribute("totalDownloads") * 1;
-
-  script.update();
-
-  aConfig.addScript(script);
-  return fileModified;
-};
-
 Script.parseScriptName = function(aURL) ((
     /\/([^\/]+)\.user(?:-\d+)?\.js(?:[\?#].*)?$/.test(aURL || "")) ? RegExp.$1 : "")

From 76138c6d0fad30eaa925243f414c41312a64c163 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 14 Jul 2013 19:44:45 -0700
Subject: [PATCH 736/829] Closes #70 Implementing @css

---
 extension/modules/api.js                      |  4 +-
 extension/modules/api/GM_sandboxScripts.js    |  2 +-
 extension/modules/script/script.js            | 84 +++++++++++++++----
 extension/modules/script/scriptcss.js         |  8 ++
 extension/modules/script/scriptdownloader.js  | 31 +++++--
 .../modules/utils/Scriptish_evalInSandbox.js  | 49 ++++++-----
 6 files changed, 123 insertions(+), 55 deletions(-)
 create mode 100644 extension/modules/script/scriptcss.js

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 5ebf0494..4aa3ce0f 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -55,8 +55,8 @@ function GM_apiSafeCallback(aWindow, aScript, aThis, aCb, aArgs) {
     try {
       aCb.apply(aThis, aArgs);
     }
-    catch (ex) {
-      Scriptish_logScriptError(ex, aWindow, aScript.fileURL, aScript.id);
+    catch (e) {
+      Scriptish_logScriptError(e, aWindow, aScript.fileURL, aScript.id);
     }
   }, 0);
 }
diff --git a/extension/modules/api/GM_sandboxScripts.js b/extension/modules/api/GM_sandboxScripts.js
index c2860613..deefd213 100644
--- a/extension/modules/api/GM_sandboxScripts.js
+++ b/extension/modules/api/GM_sandboxScripts.js
@@ -1,5 +1,5 @@
 "use strict";
-const EXPORTED_SYMBOLS = ["GM_updatingEnabled", "GM_addStyle", "GM_xpath"];
+const EXPORTED_SYMBOLS = ["GM_updatingEnabled", "GM_xpath"];
 
 if (!('XMLHttpRequest' in this))
   this.XMLHttpRequest = Components.Constructor(
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 393ed44f..c479654c 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -5,6 +5,7 @@ const valueSplitter = /(\S+)(?:\s+([^\r\f\n]+))?/;
 const Cu = Components.utils;
 Cu.import("resource://gre/modules/CertUtils.jsm");
 Cu.import("resource://scriptish/constants.js");
+
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish_logError"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
@@ -14,6 +15,7 @@ lazyImport(this, "resource://scriptish/script/scriptinstaller.js", ["ScriptInsta
 lazyImport(this, "resource://scriptish/script/scripticon.js", ["ScriptIcon"]);
 lazyImport(this, "resource://scriptish/script/scriptrequire.js", ["ScriptRequire"]);
 lazyImport(this, "resource://scriptish/script/scriptresource.js", ["ScriptResource"]);
+lazyImport(this, "resource://scriptish/script/scriptcss.js", ["ScriptCSS"]);
 lazyImport(this, "resource://scriptish/third-party/MatchPattern.js", ["MatchPattern"]);
 lazyImport(this, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
 lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "AddonManagerPrivate"]);
@@ -93,6 +95,7 @@ function Script(config) {
   this.priority = 0;
   this._requires = [];
   this._resources = [];
+  this._css = [];
   this._screenshots = [];
   this._noframes = false;
   this._dependFail = false
@@ -484,6 +487,7 @@ Script.prototype = {
   },
   get requires() this._requires.concat(),
   get resources() this._resources.concat(),
+  get css() this._css.concat(),
   get noframes() this._noframes,
   get jsversion() this._jsversion || maxJSVer,
   get runAt() this["_run-at"] || defaultRunAt,
@@ -571,8 +575,9 @@ Script.prototype = {
   get size() {
     if (!this._size) {
       var size = this._file.fileSize;
-      for each (var r in this._requires) size += r._file.fileSize;
-      for each (var r in this._resources) size += r._file.fileSize;
+      for each (let r in this._requires) size += r._file.fileSize;
+      for each (let r in this._resources) size += r._file.fileSize;
+      for each (let r in this._css) size += r._file.fileSize;
       this._size = size;
     }
     return this._size;
@@ -729,10 +734,12 @@ Script.prototype = {
       this._icon64 = newScript._icon64;
       this._requires = newScript._requires;
       this._resources = newScript._resources;
+      this._css = newScript._css;
       this._modified = newScript._modified;
       this._dependhash = newScript._dependhash;
       if (newScript._downloadURL) this._downloadURL = newScript._downloadURL;
-    } else {
+    }
+    else {
       var dependhash = tools.Scriptish_cryptoHash(newScript._rawMeta);
       if (dependhash != this._dependhash && !newScript._dependFail) {
         this._dependhash = dependhash;
@@ -740,6 +747,7 @@ Script.prototype = {
         this._icon64 = newScript._icon64;
         this._requires = newScript._requires;
         this._resources = newScript._resources;
+        this._css = newScript._css;
 
         // Get rid of old dependencies.
         var dirFiles = this._basedirFile.directoryEntries;
@@ -785,6 +793,7 @@ Script.prototype = {
       mimetype: res._mimetype,
       charset: res._charset
     })),
+    css: this._css.map(function(req) req._filename),
     noframes: this._noframes,
     filename: this._filename,
     id: this.id,
@@ -828,12 +837,15 @@ Script.prototype = {
     if (this.icon.hasDownloadURL()) this.icon._initFile();
     if (this.icon64.hasDownloadURL()) this.icon64._initFile();
 
-    for (var i = 0; i < this._requires.length; i++)
+    for (let i = 0, l = this._requires.length; i < l; i++)
       this._requires[i]._initFile();
 
-    for (var i = 0; i < this._resources.length; i++)
+    for (let i = 0, l = this._resources.length; i < l; i++)
       this._resources[i]._initFile();
 
+    for (let i = 0, l = this._css.length; i < l; i++)
+      this._css[i]._initFile();
+
     var tools = {};
     Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
 
@@ -1068,16 +1080,19 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
           continue;
         case "require":
           try {
-            var reqUri = NetUtil.newURI(value, null, aURI);
-            var scriptRequire = new ScriptRequire(script);
+            let reqUri = NetUtil.newURI(value, null, aURI);
+            let scriptRequire = new ScriptRequire(script);
+
             scriptRequire._downloadURL = reqUri.spec;
             script._requires.push(scriptRequire);
             script._rawMeta += header + '\0' + value + '\0';
-          } catch (e) {
+          }
+          catch (e) {
             if (aUpdateScript) {
               script._dependFail = true;
-            } else {
-              throw new Error(Scriptish_stringBundle("error.retrieving") +
+            }
+            else {
+              throw Error(Scriptish_stringBundle("error.retrieving") +
                               " @require: '" + value + "'");
             }
           }
@@ -1085,34 +1100,58 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
         case "resource":
           var res = value.match(valueSplitter);
           if (res === null) {
-            throw new Error(Scriptish_stringBundle("error.resource.syntax") +
+            throw Error(Scriptish_stringBundle("error.resource.syntax") +
                             ": '" + value + "'");
           }
           var resName = res[1];
           if (previousResourceNames[resName]) {
-            throw new Error("'" + resName + "' " +
+            throw Error("'" + resName + "' " +
                             Scriptish_stringBundle("error.resource.dupName"));
-          } else {
+          }
+          else {
             previousResourceNames[resName] = true;
           }
+
           try {
-            var resUri = NetUtil.newURI(res[2], null, aURI);
-            var scriptResource = new ScriptResource(script);
+            let resUri = NetUtil.newURI(res[2], null, aURI);
+            let scriptResource = new ScriptResource(script);
+
             scriptResource._name = resName;
             scriptResource._downloadURL = resUri.spec;
             script._resources.push(scriptResource);
             script._rawMeta +=
                 header + '\0' + resName + '\0' + resUri.spec + '\0';
-          } catch (e) {
+          }
+          catch (e) {
             if (aUpdateScript) {
               script._dependFail = true;
-            } else {
-              throw new Error(
+            }
+            else {
+              throw Error(
                   Scriptish_stringBundle("error.retrieving") +
                   " @resource '" + resName + "' (" + res[2] + ")");
             }
           }
           continue;
+        case "css":
+          try {
+            let reqUri = NetUtil.newURI(value, null, aURI);
+            let scriptCSS = new ScriptCSS(script);
+
+            scriptCSS._downloadURL = reqUri.spec;
+            script._css.push(scriptCSS);
+            script._rawMeta += header + '\0' + value + '\0';
+          }
+          catch (e) {
+            if (aUpdateScript) {
+              script._dependFail = true;
+            }
+            else {
+              throw Error(Scriptish_stringBundle("error.retrieving") +
+                              " @css: '" + value + "'");
+            }
+          }
+          continue;
       }
     }
   }
@@ -1168,11 +1207,13 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
   script.addInclude(aSkeleton.user_includes, true);
   script.addExclude(aSkeleton.user_excludes, true);
   aSkeleton.matches.forEach(function(i) script._matches.push(new MatchPattern(i)));
+
   aSkeleton.requires.forEach(function(i) {
     var scriptRequire = new ScriptRequire(script);
     scriptRequire._filename = i;
     script._requires.push(scriptRequire);
   });
+
   aSkeleton.resources.forEach(function(i) {
     var scriptResource = new ScriptResource(script);
     scriptResource._name = i.name;
@@ -1181,6 +1222,13 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
     scriptResource._charset = i.charset;
     script._resources.push(scriptResource);
   });
+
+  aSkeleton.css.forEach(function(i) {
+    let scriptCSS = new ScriptCSS(script);
+    scriptCSS._filename = i;
+    script._css.push(scriptCSS);
+  });
+
   aSkeleton.screenshots.forEach(function(i) {
     script.addScreenShot(i.url, i.thumbnailURL);
   });
diff --git a/extension/modules/script/scriptcss.js b/extension/modules/script/scriptcss.js
new file mode 100644
index 00000000..74132d08
--- /dev/null
+++ b/extension/modules/script/scriptcss.js
@@ -0,0 +1,8 @@
+var EXPORTED_SYMBOLS = ["ScriptCSS"];
+Components.utils.import("resource://scriptish/script/scriptdependency.js");
+
+function ScriptCSS() {
+  ScriptDependency.apply(this, arguments);
+}
+ScriptCSS.prototype = new ScriptDependency();
+ScriptCSS.prototype.constructor = ScriptCSS;
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index 945db8c4..d46132da 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -47,17 +47,21 @@ ScriptDownloader.prototype.startDownload = function(bypassCache) {
   let req = this.req_ = Instances.xhr;
   req.overrideMimeType("text/plain");
   req.open("GET", this.uri_.spec, true);
+
   if (bypassCache && (req.channel instanceof Ci.nsIRequest)) {
     req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE;
   }
+
   if (this.secure) {
     // suppress "bad certificate" dialogs and fail on redirects from a bad certificate.
     req.channel.notificationCallbacks =
         new BadCertHandler(!Scriptish_prefRoot.getValue("update.requireBuiltInCerts"));
   }
+
   if (req.channel instanceof Ci.nsIHttpChannelInternal) {
     req.channel.forceAllowThirdPartyCookie = true;
   }
+
   req.onerror = this.handleErr.bind(this);
   req.onreadystatechange = this.chkContentTypeB4DL.bind(this);
   req.onload = this.handleScriptDownloadComplete.bind(this);
@@ -156,8 +160,8 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
         this.showScriptView();
         break;
     }
-
-  } catch (e) {
+  }
+  catch (e) {
     Scriptish_alert(Scriptish_stringBundle("error.script.installing") + ": " + e);
     throw e;
   }
@@ -166,24 +170,33 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
 ScriptDownloader.prototype.fetchDependencies = function() {
   Scriptish_log("Fetching Dependencies");
 
-  var deps = this.script.requires.concat(this.script.resources);
+  let { script } = this;
+  Scriptish_log(script.requires.join(',,'));
+
+  const deps = script.requires.
+               concat(script.resources).
+               concat(script.css);
+
   // if this.script.icon._filename exists then the icon is a data scheme
-  if (this.script.icon.hasDownloadURL())
-    deps.push(this.script.icon);
-  if (this.script.icon64.hasDownloadURL())
-    deps.push(this.script.icon64);
+  if (script.icon.hasDownloadURL())
+    deps.push(script.icon);
+
+  if (script.icon64.hasDownloadURL())
+    deps.push(script.icon64);
 
   for (let [, dep] in Iterator(deps)) {
     if (this.checkDependencyURL(dep.urlToDownload)) {
       this.depQueue_.push(dep);
-    } else {
+    }
+    else {
       let errMsg = Scriptish_stringBundle("error.dependency.local");
       if (dep instanceof ScriptIcon) {
         dep.reset();
         Scriptish_logError(new Error(
             Scriptish_stringBundle("error.dependency.loading") + ": " +
             dep.urlToDownload + "\n" + errMsg));
-      } else {
+      }
+      else {
         this.errorInstallDependency(dep, errMsg);
         return;
       }
diff --git a/extension/modules/utils/Scriptish_evalInSandbox.js b/extension/modules/utils/Scriptish_evalInSandbox.js
index 5257905f..87d222b5 100644
--- a/extension/modules/utils/Scriptish_evalInSandbox.js
+++ b/extension/modules/utils/Scriptish_evalInSandbox.js
@@ -5,9 +5,13 @@ var EXPORTED_SYMBOLS = [
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
-lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError"]);
+lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish_logError", "Scriptish_logScriptError"]);
 lazyUtil(this, "stringBundle");
 
+const { Style } = jetpack("sdk/stylesheet/style");
+const { attach, detach } = jetpack("sdk/content/mod");
+const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
+
 const fileURLPrefix = "chrome://scriptish/content/scriptish.js -> ";
 const Scriptish_evalInSandbox_filename = Components.stack.filename;
 
@@ -15,20 +19,16 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow, options) {
   const jsVer = aScript.jsversion;
   const fileURL = aScript.fileURL;
   const id = aScript.id;
+  const scriptText = aScript.textContent + "\n";
 
-  // e10s
-  if (options && options.global && options.global.sendSyncMessage) {
-    var reqAry = options.global.sendSyncMessage("Scriptish:GetScriptRequires", id)[0];
-    var scriptText = options.global.sendSyncMessage("Scriptish:GetScriptContents", id)[0];
-  }
-  else {
-    var reqAry = aScript.requires;
-    var scriptText = aScript.textContent;
-  }
+  // add script @css
+  aScript.css.forEach(function(aScriptCSS) {
+    attach(Style({ source: aScriptCSS.textContent }), aWindow);
+  });
 
   // eval script @requires
   try {
-    for (let [, req] in Iterator(reqAry)) {
+    for (let [, req] in Iterator(aScript.requires)) {
       var rfileURL = req.fileURL;
       try {
         Cu.evalInSandbox(
@@ -36,13 +36,14 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow, options) {
           aSandbox,
           jsVer,
           fileURLPrefix + rfileURL,
-          1
-          );
-      } catch (ex) {
-        Scriptish_logScriptError(ex, aWindow, rfileURL, id);
+          1);
+      }
+      catch (e) {
+        Scriptish_logScriptError(e, aWindow, rfileURL, id);
       }
     }
-  } catch (e) {
+  }
+  catch (e) {
     return Scriptish_logError(e, 0, fileURL, e.lineNumber);
   }
 
@@ -50,12 +51,11 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow, options) {
   try {
     try {
       Cu.evalInSandbox(
-        scriptText + "\n",
+        scriptText,
         aSandbox,
         jsVer,
         fileURLPrefix + fileURL,
-        1
-        );
+        1);
     }
     catch (e if (e.message == "return not in function"
         || /\(NS_ERROR_OUT_OF_MEMORY\) \[nsIXPCComponents_Utils.evalInSandbox\]/.test(e.message))) {
@@ -69,18 +69,17 @@ function Scriptish_evalInSandbox(aScript, aSandbox, aWindow, options) {
         e.lineNumber || 0,
         e.columnNumber || 0,
         sw.warningFlag,
-        "scriptish userscript warnings"
-        );
+        "scriptish userscript warnings");
       Scriptish_logScriptError(sw, aWindow, fileURL, id);
       Cu.evalInSandbox(
-        "(function(){" + scriptText + "\n})()",
+        "(function(){" + scriptText + "})()",
         aSandbox,
         jsVer,
         fileURLPrefix + fileURL,
-        1
-        );
+        1);
     }
-  } catch (e) {
+  }
+  catch (e) {
     Scriptish_logScriptError(e, aWindow, fileURL, id);
   }
 }

From 26e7e0ef67f468dda81a55dde4b5db19ba63cf5c Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 14 Jul 2013 19:57:38 -0700
Subject: [PATCH 737/829] Closes #124 Removing e10s legacy code

---
 extension/modules/api.js       | 16 ++++------------
 extension/modules/constants.js |  9 +--------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 4aa3ce0f..51d21b34 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -130,18 +130,10 @@ function GM_API(options) {
     if (typeof aTitle != "string") aTitle = aScript.name;
     if (typeof aIcon != "string") aIcon = aScript.iconURL;
 
-    // e10s
-    if (options.global && options.global.sendAsyncMessage) {
-      options.global.sendAsyncMessage("Scriptish:ScriptNotification", [
-          aMsg, aTitle, aIcon]);
-    }
-    // old school
-    else {
-      var callback = null;
-      if (typeof aCallback == "function")
-        callback = function() GM_apiSafeCallback(aSafeWin, aScript, null, aCallback);
-      Scriptish_notification(aMsg, aTitle, aIcon, callback);
-    }
+    var callback = null;
+    if (typeof aCallback == "function")
+      callback = function() GM_apiSafeCallback(aSafeWin, aScript, null, aCallback);
+    Scriptish_notification(aMsg, aTitle, aIcon, callback);
   };
 
   this.GM_setValue = function GM_setValue(aName, aValue) {
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 432a8c63..6363759c 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -1,12 +1,11 @@
 var EXPORTED_SYMBOLS = [
     "Cc", "Ci", "Cr", "NetUtil", "XPCOMUtils", "extend", "jetpack",
-    "Services", "Instances", "lazy", "lazyImport", "lazyUtil", "timeout", "e10s"];
+    "Services", "Instances", "lazy", "lazyImport", "lazyUtil", "timeout"];
 
 const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu, Constructor: CC} = Components;
 
 const systemPrincipal = CC('@mozilla.org/systemprincipal;1', 'nsIPrincipal')();
 
-const e10s = !!Cc["@mozilla.org/globalmessagemanager;1"];
 const global = this;
 var Services = {};
 (function(inc, tools){
@@ -72,12 +71,6 @@ lazyService(
 lazyService(
     Services, "cs", "@mozilla.org/consoleservice;1", "nsIConsoleService");
 
-if (e10s) {
-  lazyService(
-      Services, "mm", "@mozilla.org/globalmessagemanager;1",
-      "nsIChromeFrameMessageManager");
-}
-
 if (Cc["@mozilla.org/parserutils;1"]) {
   lazyService(
       Services, "pu", "@mozilla.org/parserutils;1", "nsIParserUtils");

From 86d477e09d6846fd79ae0ffc9d5fd995b8a7a3fe Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 14 Jul 2013 20:53:48 -0700
Subject: [PATCH 738/829] Closes #125 Support @downloadURL

---
 extension/modules/config/config.js |  4 ++--
 extension/modules/script/script.js | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 4ec5324c..d6c63bf0 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -322,8 +322,8 @@ Config.prototype = {
       }.bind(this));
   },
 
-  parse: function(source, uri, aUpdateScript, aPrivate) (
-      Script.parse(this, source, uri, aUpdateScript, aPrivate)),
+  parse: function(source, aDownloadURI, aUpdateScript, aPrivate) (
+      Script.parse(this, source, aDownloadURI, aUpdateScript, aPrivate)),
 
   install: function(aNewScript) {
     var existingIndex = this._find(aNewScript.id);
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index c479654c..aaf88acf 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -711,6 +711,7 @@ Script.prototype = {
     this.priority = newPriority;
     this._screenshots = newScript._screenshots;
     this._homepageURL = newScript.homepageURL;
+    this._downloadURL = newScript._downloadURL;
     this._contributionURL = newScript.contributionURL;
     this._contributionAmount = newScript.contributionAmount;
     this.supportURL = newScript.supportURL;
@@ -969,11 +970,19 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
         case "homepage":
         case "homepageurl":
           try {
-            var uri = NetUtil.newURI(value);
-          } catch (e) {
-            break;
+            let uri = NetUtil.newURI(value);
+            script._homepageURL = uri.spec;
+          }
+          catch (e) {}
+          break;
+        case "downloadurl":
+          try {
+            let uri = NetUtil.newURI(value);
+            script._downloadURL = uri.spec;
+          }
+          catch (e) {
+            Scriptish_logError(e)
           }
-          script._homepageURL = uri.spec;
           break;
         case "contributionurl":
           try {
@@ -989,7 +998,8 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
         case "supporturl":
           try {
             var uri = NetUtil.newURI(value);
-          } catch (e) {
+          }
+          catch (e) {
             break;
           }
           script.supportURL = uri.spec;

From 5c64f15f4f5e819d6916a894223b68ce428fd2b0 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Tue, 16 Jul 2013 00:16:34 -0700
Subject: [PATCH 739/829] Cleanups: using sdk/notifications, removing the
 updateURL, and misc

---
 extension/content/install.xul                 |  1 +
 extension/content/js/newscript.js             |  3 +-
 extension/content/newscript.xul               |  3 +-
 extension/install.rdf                         |  6 +--
 extension/modules/api.js                      |  3 +-
 extension/modules/api/GM_ScriptStorage.js     |  1 +
 extension/modules/constants.js                |  3 --
 .../modules/utils/Scriptish_notification.js   | 44 +++++--------------
 8 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/extension/content/install.xul b/extension/content/install.xul
index 593fd3cd..f3bc42e4 100644
--- a/extension/content/install.xul
+++ b/extension/content/install.xul
@@ -11,6 +11,7 @@
     localize="title"
     defaultButton="cancel">
   <script type="text/javascript" src="chrome://scriptish/content/js/install.js"/>
+
   <hbox align="start" id="xpinstallheader">
     <image class="alert-icon"/>
     <vbox flex="1">
diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 11475480..5ac4ffc6 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -21,7 +21,8 @@ try {
   scriptContent = window.arguments[0]
       .QueryInterface(Components.interfaces.nsIDialogParamBlock)
       .GetString(0);
-} catch(e) {}
+}
+catch(e) {}
 
 addEventListener("DOMContentLoaded", function init() {
   removeEventListener("DOMContentLoaded", init, false);
diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index e434058a..85307d9d 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -5,8 +5,7 @@
     buttons="accept,cancel"
     orient="vertical"
     title="menu.new"
-    localize="title"
-    >
+    localize="title">
   <script type="application/x-javascript" src="chrome://scriptish/content/js/newscript.js" />
 
   <grid flex="1">
diff --git a/extension/install.rdf b/extension/install.rdf
index d419fd8a..1b0d3883 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -61,17 +61,15 @@
     <em:translator>strel (es-ES)</em:translator>
     <em:translator>yfdyh000 (zh-CN); mailto:yfdyh000@gmail.com</em:translator>
 
-    <em:updateURL>http://github.com/downloads/scriptish/scriptish/update.rdf</em:updateURL>
-    <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjEA/hqcsMgPctoWvqJFfjtNcQbfBi1uP3zoWR3PPMRSXnpBJv/5Kb5lJD9HJ+963CFQ3oFvkgO9+oEWisiKBjxhx94Bynl0Ym2sZ1DdEzTsH9kV4HGFLjeYTix5WkQqdoswyM32ebtDSYrFbSqxpBrgHwVLELfFYM1qZsnWpJKwIDAQAB</em:updateKey>
-
     <!-- Firefox -->
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>21.0</em:minVersion>
-        <em:maxVersion>25.0a1</em:maxVersion>
+        <em:maxVersion>25.0</em:maxVersion>
       </Description>
     </em:targetApplication>
+
     <!-- SeaMonkey -->
     <em:targetApplication>
       <Description>
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 51d21b34..3389c8f7 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -196,7 +196,8 @@ function GM_API(options) {
   if (!Scriptish_BrowserUI || aSafeWin !== aSafeWin.top) {
     this.GM_unregisterMenuCommand = this.GM_registerMenuCommand
         = this.GM_disableMenuCommand = this.GM_enableMenuCommand = DOLITTLE;
-  } else {
+  }
+  else {
     this.GM_registerMenuCommand = function GM_registerMenuCommand(
         aCmdName, aCmdFunc, aAccelKey, aAccelModifiers, aAccessKey) {
       if (!GM_apiLeakCheck("GM_registerMenuCommand")) return;
diff --git a/extension/modules/api/GM_ScriptStorage.js b/extension/modules/api/GM_ScriptStorage.js
index 748d7196..dfa5f7ac 100644
--- a/extension/modules/api/GM_ScriptStorage.js
+++ b/extension/modules/api/GM_ScriptStorage.js
@@ -16,6 +16,7 @@ function GM_ScriptStorage(aScript, aSafeWin) {
   let winID = Scriptish_getWindowIDs(aSafeWin).innerID;
   Scriptish_windowUnloader(function() {
     let prefChanged = this._prefChanged.bind(this);
+
     for (let name in this._watchedPrefs) {
       this.prefMan.unwatch(name, prefChanged);
       delete this._watchedPrefs[name];
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 6363759c..1b1306bd 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -54,9 +54,6 @@ var Instances = {
 const lazy = XPCOMUtils.defineLazyGetter.bind(XPCOMUtils);
 const lazyService = XPCOMUtils.defineLazyServiceGetter.bind(XPCOMUtils);
 
-lazyService(
-     Services, "as", "@mozilla.org/alerts-service;1", "nsIAlertsService");
-
 lazyService(
     Services, "ass", "@mozilla.org/appshell/appShellService;1",
     "nsIAppShellService");
diff --git a/extension/modules/utils/Scriptish_notification.js b/extension/modules/utils/Scriptish_notification.js
index 7d8d45f0..ce8a652c 100644
--- a/extension/modules/utils/Scriptish_notification.js
+++ b/extension/modules/utils/Scriptish_notification.js
@@ -1,46 +1,24 @@
 var EXPORTED_SYMBOLS = ["Scriptish_notification"];
+
 Components.utils.import("resource://scriptish/constants.js");
+
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 
-function showAlertNotification() {
-  return Services.as.showAlertNotification;
-}
+const { notify } = jetpack("sdk/notifications");
+
+const DO_NOTHING = function(){};
 
 function Scriptish_notification(aMsg, aTitle, aIconURL, aCallback) {
   if (!Scriptish_prefRoot.getValue("enabledNotifications.sliding"))
     return Scriptish_log(aMsg);
 
   timeout(function() {
-    var callback = (aCallback) ? new Observer(aCallback) : null;
-    var args = [
-      aIconURL || "chrome://scriptish/skin/scriptish32.png",
-      aTitle || "Scriptish",
-      aMsg+"",
-      !!callback,
-      "",
-      callback
-    ];
-
-    // if Growl is not installed or disabled on OSX, then use a fallback
-    try {
-      showAlertNotification().apply(null, args);
-    } catch (e) {
-      let win = Services.ww.openWindow(
-          null, 'chrome://global/content/alerts/alert.xul',
-          '_blank', 'chrome,titlebar=no,popup=yes', null);
-      args[6] = callback;
-      args[5] = "";
-      win.arguments = args;
-    }
+    notify({
+      title: aTitle || "Scriptish",
+      text: aMsg + "",
+      iconURL: aIconURL || "chrome://scriptish/skin/scriptish32.png",
+      onClick: aCallback || DO_NOTHING
+    });
   });
 };
-
-function Observer(aCallback) {
-  this._callback = aCallback;
-}
-Observer.prototype.observe = function() {
-  if ("alertclickcallback" != arguments[1]) return;
-  let self = this;
-  timeout(function() { self._callback.call(null); }, 0);
-}

From 5976fb2ce74f8737d530128d17363a8710c8a838 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Wed, 17 Jul 2013 11:43:38 -0500
Subject: [PATCH 740/829] Don't assume a script skeleton's array properties
 exist.  Closes #131

---
 extension/modules/script/script.js | 65 +++++++++++++++++-------------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index aaf88acf..1f00bdcf 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1208,40 +1208,49 @@ Script.loadFromJSON = function(aConfig, aSkeleton) {
 
   script.domains = aSkeleton.domains;
   script.grant = aSkeleton.grant || {};
-  if (aSkeleton.developers)
+  if (Array.isArray(aSkeleton.developers))
     aSkeleton.developers.forEach(script.addDeveloper.bind(script));
-  if (aSkeleton.contributors)
+  if (Array.isArray(aSkeleton.contributors))
     aSkeleton.contributors.forEach(script.addContributor.bind(script));
   script.addInclude(aSkeleton.includes);
   script.addExclude(aSkeleton.excludes);
   script.addInclude(aSkeleton.user_includes, true);
   script.addExclude(aSkeleton.user_excludes, true);
-  aSkeleton.matches.forEach(function(i) script._matches.push(new MatchPattern(i)));
-
-  aSkeleton.requires.forEach(function(i) {
-    var scriptRequire = new ScriptRequire(script);
-    scriptRequire._filename = i;
-    script._requires.push(scriptRequire);
-  });
-
-  aSkeleton.resources.forEach(function(i) {
-    var scriptResource = new ScriptResource(script);
-    scriptResource._name = i.name;
-    scriptResource._filename = i.filename;
-    scriptResource._mimetype = i.mimetype;
-    scriptResource._charset = i.charset;
-    script._resources.push(scriptResource);
-  });
-
-  aSkeleton.css.forEach(function(i) {
-    let scriptCSS = new ScriptCSS(script);
-    scriptCSS._filename = i;
-    script._css.push(scriptCSS);
-  });
-
-  aSkeleton.screenshots.forEach(function(i) {
-    script.addScreenShot(i.url, i.thumbnailURL);
-  });
+  if (Array.isArray(aSkeleton.matches))
+    aSkeleton.matches.forEach(function(i) script._matches.push(new MatchPattern(i)));
+
+  if (Array.isArray(aSkeleton.requires)) {
+    aSkeleton.requires.forEach(function(i) {
+      var scriptRequire = new ScriptRequire(script);
+      scriptRequire._filename = i;
+      script._requires.push(scriptRequire);
+    });
+  }
+
+  if (Array.isArray(aSkeleton.resources)) {
+    aSkeleton.resources.forEach(function(i) {
+      var scriptResource = new ScriptResource(script);
+      scriptResource._name = i.name;
+      scriptResource._filename = i.filename;
+      scriptResource._mimetype = i.mimetype;
+      scriptResource._charset = i.charset;
+      script._resources.push(scriptResource);
+    });
+  }
+
+  if (Array.isArray(aSkeleton.css)) {
+    aSkeleton.css.forEach(function(i) {
+      let scriptCSS = new ScriptCSS(script);
+      scriptCSS._filename = i;
+      script._css.push(scriptCSS);
+    });
+  }
+
+  if (Array.isArray(aSkeleton.screenshots)) {
+    aSkeleton.screenshots.forEach(function(i) {
+      script.addScreenShot(i.url, i.thumbnailURL);
+    });
+  }
 
   script.id = aSkeleton.id;
   script._name = aSkeleton.name;

From a79328a4cfffa4067f246f5677fc0e3c82c78cfb Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 14:11:25 -0700
Subject: [PATCH 741/829] Closes #130 adding jetpack globals to the jetpack
 loader

---
 extension/modules/constants.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 1b1306bd..72a9ffb1 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -109,10 +109,9 @@ function lazyImport(obj, resource, symbols) {
     lazy(obj, s, function() _lazyModules[resource][s]);
   }
 }
-function lazyUtil(obj, name) lazyImport(obj,
-                                        "resource://scriptish/utils/Scriptish_" + name + ".js",
-                                        ["Scriptish_" + name]
-                                        );
+function lazyUtil(obj, name) {
+  return lazyImport(obj, "resource://scriptish/utils/Scriptish_" + name + ".js", ["Scriptish_" + name]);
+}
 
 function extend(a, o) {
   for (var k in a) {
@@ -123,11 +122,10 @@ function extend(a, o) {
   return o;
 }
 
-
 function descriptor(object) {
   let value = {};
-  getOwnPropertyNames(object).forEach(function(name) {
-    value[name] = getOwnPropertyDescriptor(object, name)
+  Object.getOwnPropertyNames(object).forEach(function(name) {
+    value[name] = Object.getOwnPropertyDescriptor(object, name)
   });
   return value;
 }
@@ -159,7 +157,12 @@ const loader = Loader.Loader({
 });
 
 // fake requirer uri scriptish:// (it's used for relative requires and error messages)
-var module = Loader.Module("main", "scriptish://");
-var jetpack = Loader.Require(loader, module);
+const module = Loader.Module("main", "scriptish://");
+const jetpack = Loader.Require(loader, module);
+
+const jpGlobals = jetpack('sdk/system/globals');
+
+// Inject globals ASAP in order to have console API working ASAP
+Object.defineProperties(loader.globals, descriptor(jpGlobals));
 
 const { setTimeout: timeout } = jetpack('sdk/timers');

From fd79a06e922a1a999daeede1e7718b8b3e66b7a0 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 14:45:06 -0700
Subject: [PATCH 742/829] Closes #134 adding the button to the nav-bar on first
 run instead of the addon-bar which will not exist in Fx26 (see Australis)

---
 extension/content/js/updatecheck.js | 57 +++++++++++++++--------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/extension/content/js/updatecheck.js b/extension/content/js/updatecheck.js
index 57e836d0..94391543 100644
--- a/extension/content/js/updatecheck.js
+++ b/extension/content/js/updatecheck.js
@@ -1,35 +1,38 @@
 // Checks if Scriptish was updated/installed
-(function(inc, tools) {
-  inc("resource://scriptish/prefmanager.js", tools);
-  inc("resource://scriptish/constants.js", tools);
-  inc("resource://gre/modules/AddonManager.jsm", tools);
+(function(inc) {
+  let { Scriptish_prefRoot } = inc("resource://scriptish/prefmanager.js", {});
+  let { Services, jetpack } = inc("resource://scriptish/constants.js", {});
+  let { AddonManager } = inc("resource://gre/modules/AddonManager.jsm", {});
 
-  var pref = tools.Scriptish_prefRoot;
-  var currentVer = pref.getValue("version", "0.0");
+  var currentVer = Scriptish_prefRoot.getValue("version", "0.0");
 
   // update the currently initialized version so we don't do this work again.
-  tools.AddonManager.getAddonByID("scriptish@erikvold.com", function(aAddon) {
-    pref.setValue("version", aAddon.version);
+  AddonManager.getAddonByID("scriptish@erikvold.com", function(aAddon) {
+    Scriptish_prefRoot.setValue("version", aAddon.version);
   });
 
-  if (0 >= tools.Services.vc.compare(currentVer, "0.1b5")) {
-    var chromeWin = tools.Services.wm.getMostRecentWindow("navigator:browser");
-    (chromeWin.Browser ? chromeWin.Browser : chromeWin.gBrowser)
-        .addTab("about:scriptish");
+  // FIRST RUN STUFF!
+  if (0 >= Services.vc.compare(currentVer, "0.1b5")) {
+    let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
+    let { document, gBrowser } = chromeWin;
 
-    // add toolbaritem to add-on bar
-    var addToBar = chromeWin.document.getElementById("addon-bar");
-    if (!addToBar || chromeWin.document.getElementById("scriptish-button"))
-      return;
-    var addonSet = (addToBar.getAttribute("currentset") || addToBar.getAttribute("defaultset")).split(",");
-    var addonPos = addonSet.indexOf("status-bar");
-    if (addonPos == -1) addonPos = addonSet.length;
-    addonSet.splice(addonPos, 0, "scriptish-button");
-    addonSet = addonSet.join(",");
-    addToBar.setAttribute("currentset", addonSet);
-    addToBar.currentSet = addonSet;
-    chromeWin.BrowserToolboxCustomizeDone(true);
-    chromeWin.document.persist(addToBar.getAttribute("id"), "currentset");
-    if ("addon-bar" == addToBar.getAttribute("id")) addToBar.collapsed = false;
+    // Open about:scriptish in a tab
+    gBrowser.addTab("about:scriptish");
+
+    // Add toolbaritem to add-on bar
+    let addToBar = document.getElementById("nav-bar");
+    let scriptishBtn = document.getElementById("scriptish-button");
+    if (addToBar && !scriptishBtn) {
+      var addonSet = (addToBar.getAttribute("currentset") || addToBar.getAttribute("defaultset")).split(",");
+      var addonPos = addonSet.indexOf("status-bar");
+      if (addonPos == -1) addonPos = addonSet.length;
+      addonSet.splice(addonPos, 0, "scriptish-button");
+      addonSet = addonSet.join(",");
+      addToBar.setAttribute("currentset", addonSet);
+      addToBar.currentSet = addonSet;
+      chromeWin.BrowserToolboxCustomizeDone(true);
+      document.persist(addToBar.getAttribute("id"), "currentset");
+      if ("addon-bar" == addToBar.getAttribute("id")) addToBar.collapsed = false;
+    }
   }
-})(Components.utils.import, {})
+})(Components.utils.import)

From e900de66f55362562257650832b8381ab6e80092 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 14:56:17 -0700
Subject: [PATCH 743/829] Closes #113 Inverting the Scriptish menu-button menu
 elements

---
 extension/content/browser.xul   | 17 +++++++++++++----
 extension/content/js/browser.js |  6 ++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index 0d7954b3..b08dba3c 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -47,16 +47,25 @@
         class="toolbarbutton-1 chromeclass-toolbar-additional"
         label="Scriptish">
       <menupopup id="scriptish-tb-popup" observes="scriptish-tb-popup-brd">
-        <menuitem id="scriptish-tb-no-scripts"/>
-        <menuseparator id="scriptish-tb-no-scripts-sep"/>
-        <menu id="scriptish-tb-cmds" observes="scriptish-tb-cmds-brd" disabled="false"><menupopup/></menu>
+        <menuitem id="scriptish-tb-enabled-item" observes="scriptish-tb-enabled-brd" type="checkbox"/>
+
         <menuseparator/>
+
         <menuitem id="scriptish-tb-options" observes="scriptish-options-brd"/>
+
         <menuseparator/>
+
         <menuitem id="scriptish-tb-new-us" observes="scriptish-tb-new-us-brd"/>
+
         <menuitem id="scriptish-tb-show-us" observes="scriptish-tb-show-us-brd"/>
+        
         <menuseparator/>
-        <menuitem id="scriptish-tb-enabled-item" observes="scriptish-tb-enabled-brd" type="checkbox"/>
+
+        <menu id="scriptish-tb-cmds" observes="scriptish-tb-cmds-brd" disabled="false"><menupopup/></menu>
+
+        <menuseparator id="scriptish-tb-no-scripts-sep"/>
+
+        <menuitem id="scriptish-tb-no-scripts"/>
       </menupopup>
     </toolbarbutton>
   </toolbarpalette>
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 70c6339d..cac49f9b 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -377,11 +377,9 @@ function Scriptish_setupPopup() {
     mi.setAttribute("type", "checkbox");
     mi.setAttribute("closemenu", "none");
     mi.setAttribute("checked", script.enabled.toString());
-    popup.insertBefore(mi, tail);
+    popup.appendChild(mi);
   }
 
-  var tail = $("scriptish-tb-no-scripts-sep");
-
   // remove all the scripts from the list
   for (var i = popup.childNodes.length - 1; ~i; i--) {
     var node = popup.childNodes[i];
@@ -414,7 +412,7 @@ function Scriptish_setupPopup() {
     if (runsOnTop.length) { // only add the separator if there is stuff below
       var separator = document.createElement("menuseparator");
       separator.setAttribute("value", "hack"); // remove it in the loop above
-      popup.insertBefore(separator, tail);
+      popup.appendChild(separator);
     }
   }
   runsOnTop.forEach(appendScriptToPopup);

From 0658cda7e58f5a81dc0ed7d55744dc8a672774f8 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 16:11:10 -0700
Subject: [PATCH 744/829] Closes #129 Open the add-on details page when
 clicking Open Manager in the install door hanger notification

---
 extension/modules/addonprovider.js            | 12 +++--------
 .../modules/utils/Scriptish_openManager.js    | 21 +++++++++++++------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index ef0e3971..b013288b 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -25,7 +25,6 @@ const Scriptish_ScriptProvider = {
       var msg = "'" + script.name;
       if (script.version) msg += " " + script.version;
       msg += "' " + Scriptish_stringBundle("statusbar.installed");
-      var callback = Scriptish_openManager;
 
       var showedMsg = Scriptish_popupNotification({
         id: "scriptish-install-popup-notification",
@@ -33,7 +32,7 @@ const Scriptish_ScriptProvider = {
         mainAction: {
           label: Scriptish_stringBundle("openUserScriptsManager"),
           accessKey: Scriptish_stringBundle("openUserScriptsManager.ak"),
-          callback: callback
+          callback: Scriptish_openManager.bind(null, null, script.id)
         },
         options: {
           removeOnDismissal: true,
@@ -68,15 +67,14 @@ const Scriptish_ScriptProvider = {
       msg += "' " + (("scriptish-script-updated" == aTopic)
           ? Scriptish_stringBundle("statusbar.updated")
           : Scriptish_stringBundle("statusbar.modified"));
-      var callback = Scriptish_openManager;
 
-      var showedMsg = Scriptish_popupNotification({
+      Scriptish_popupNotification({
         id: "scriptish-install-popup-notification",
         message: msg,
         mainAction: {
           label: Scriptish_stringBundle("openUserScriptsManager"),
           accessKey: Scriptish_stringBundle("openUserScriptsManager.ak"),
-          callback: callback
+          callback: Scriptish_openManager.bind(null, null, script.id)
         },
         options: {
           removeOnDismissal: true,
@@ -84,10 +82,6 @@ const Scriptish_ScriptProvider = {
         }
       });
 
-      if (!showedMsg) {
-        Scriptish_notification(msg, null, null, callback);
-      }
-
       break;
     case "scriptish-script-uninstalling":
       AddonManagerPrivate.callAddonListeners("onUninstalling", script, false);
diff --git a/extension/modules/utils/Scriptish_openManager.js b/extension/modules/utils/Scriptish_openManager.js
index 6ee9967f..98bf9504 100644
--- a/extension/modules/utils/Scriptish_openManager.js
+++ b/extension/modules/utils/Scriptish_openManager.js
@@ -1,10 +1,19 @@
 var EXPORTED_SYMBOLS = ["Scriptish_openManager"];
 Components.utils.import("resource://scriptish/constants.js");
 
-function Scriptish_openManager() {
-  var browserWin = Services.wm.getMostRecentWindow("navigator:browser");
-  if (browserWin.BrowserOpenAddonsMgr) // ff
-    browserWin.BrowserOpenAddonsMgr("addons://list/userscript");
-  else if (browserWin.toEM) // sm
-    browserWin.toEM("addons://list/userscript");
+function Scriptish_openManager(aURL, aID) {
+  aURL = aURL || "addons://list/userscript";
+  if (aID) {
+    aURL = 'addons://detail/' + encodeURIComponent(aID) + '/preferences';
+  }
+
+  let browserWin = Services.wm.getMostRecentWindow("navigator:browser");
+  // Fx
+  if (browserWin.BrowserOpenAddonsMgr) {
+    browserWin.BrowserOpenAddonsMgr(aURL);
+  }
+  // Sm
+  else if (browserWin.toEM) {
+    browserWin.toEM(aURL);
+  }
 }

From df5288422fb071dde61d5e0afce4a7769e0ea037 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 20 Jul 2013 19:02:26 -0500
Subject: [PATCH 745/829] Support multiple GM_ values per @grant.  Closes #132

---
 extension/modules/script/script.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 1f00bdcf..030ad296 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1027,7 +1027,8 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
           script.domains.push(value);
           continue;
         case "grant":
-          script.grant[value] = true;
+          var splitValue = value.split(/[ \t]+/);
+          splitValue.forEach(function(i) script.grant[i] = true);
           continue;
         case "include":
           script.addInclude(value);
@@ -1038,7 +1039,7 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
         case "match":
           script._matches.push(new MatchPattern(value));
           continue;
-        case 'screenshot':
+        case "screenshot":
           var splitValue = value.match(valueSplitter);
 
           // if there is a thumb url provided

From 0cb1cec3550142236e011fe884fd89fb00ea1485 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 17:26:15 -0700
Subject: [PATCH 746/829] Closes #78 I did not see anything wrong and things
 appear to be working, pushing this change to use https tho

---
 extension/modules/config/config.js | 21 +++++++++++++--------
 extension/modules/script/script.js | 19 ++++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index d6c63bf0..8a0d5a87 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -215,14 +215,15 @@ Config.prototype = {
         let interval = Scriptish_prefRoot.getValue("update.uso.interval");
         let lastFetch = Scriptish_prefRoot.getValue("update.uso.lastFetch");
         let now = Math.ceil(Date.now() / 1E3);
-        if (now - lastFetch >= interval) {
+
+        if ((now - lastFetch) >= interval) {
           Scriptish_prefRoot.setValue("update.uso.lastFetch", now);
 
           // Fetch uso data
-          for (var i = len - 1; ~i; i--) {
+          for (let i = len - 1; i >= 0; i--) {
             let script = scripts[i];
             if (!script.blocked && script.isUSOScript())
-              timeout(script.updateUSOData.bind(script), i * 100);
+              timeout(script.updateUSOData.bind(script), i * 1000);
           }
         }
       }
@@ -326,20 +327,24 @@ Config.prototype = {
       Script.parse(this, source, aDownloadURI, aUpdateScript, aPrivate)),
 
   install: function(aNewScript) {
-    var existingIndex = this._find(aNewScript.id);
-    var exists = existingIndex > -1;
+    let existingIndex = this._find(aNewScript.id);
+    let script = null;
 
-    if (exists) {
-      this._scripts[existingIndex].replaceScriptWith(aNewScript);
+    if (existingIndex >= 0) {
+      script = this._scripts[existingIndex];
+      script.replaceScriptWith(aNewScript);
     }
     else {
       aNewScript.installProcess();
-      timeout(aNewScript.updateUSOData.bind(aNewScript));
       this.addScript(aNewScript);
+      script = aNewScript;
 
       Scriptish.notify(aNewScript, "scriptish-script-installed", true);
     }
 
+    // Update the USO review data
+    script.updateUSOData();
+
     this.sortScripts();
   },
 
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 1f00bdcf..2d364cfb 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -160,7 +160,8 @@ Script.prototype = {
       return usoURLChk.test(this._downloadURL)
           || usoURLChk.test(this._homepageURL)
           || usoURLChk.test(this._updateURL);
-    } catch (e) {
+    }
+    catch (e) {
       return false;
     }
   },
@@ -197,11 +198,13 @@ Script.prototype = {
   get updateDate () new Date(parseInt(this._modified)),
 
   updateUSOData: function() {
-    if (this.blocked || !this.isUSOScript()) return;
-    var script = this;
-    var scriptID = RegExp.$1;
-    var metaURL = "http://userscripts.org/scripts/source/" + scriptID + ".meta.js";
-    var req = Instances.xhr;
+    if (this.blocked || !this.isUSOScript())
+      return;
+    const script = this;
+    const scriptID = RegExp.$1;
+    const metaURL = "https://userscripts.org/scripts/source/" + scriptID + ".meta.js";
+
+    let req = Instances.xhr;
     req.overrideMimeType("text/plain");
     req.open("GET", metaURL, true);
     req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE; // bypass cache
@@ -209,10 +212,12 @@ Script.prototype = {
       if (4 > req.readyState || (req.status != 200 && req.status != 0)
           || !req.responseText)
         return;
-      var data = Scriptish_parser(req.responseText);
+
+      let data = Scriptish_parser(req.responseText);
       if (!data["uso:rating"] || !data["uso:script"] || data["uso:script"][0] != scriptID
           || !data["uso:reviews"] || !data["uso:installs"])
         return;
+
       script.reviewCount = data["uso:reviews"][0] * 1;
       script.averageRating = data["uso:rating"][0] * 1;
       script.totalDownloads = data["uso:installs"][0] * 1;

From 751f11f58b064a07f06b4a13a97b35d5abae1224 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 17:39:32 -0700
Subject: [PATCH 747/829] Updating userscript USO data 1sec after Fx boots,
 with a 100ms delay between script updates.

---
 extension/modules/config/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 8a0d5a87..1c7705dd 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -223,7 +223,7 @@ Config.prototype = {
           for (let i = len - 1; i >= 0; i--) {
             let script = scripts[i];
             if (!script.blocked && script.isUSOScript())
-              timeout(script.updateUSOData.bind(script), i * 1000);
+              timeout(script.updateUSOData.bind(script), ((i * 100) + 1000));
           }
         }
       }

From 4dd77021a46206eeb282fcd24e4b5bf7b407120a Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 18:07:53 -0700
Subject: [PATCH 748/829] Removing window event listeners when the event
 happens

---
 .../utils/Scriptish_windowEventTracker.js     | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/extension/modules/utils/Scriptish_windowEventTracker.js b/extension/modules/utils/Scriptish_windowEventTracker.js
index 1ba59baa..d9bbc1c1 100644
--- a/extension/modules/utils/Scriptish_windowEventTracker.js
+++ b/extension/modules/utils/Scriptish_windowEventTracker.js
@@ -1,35 +1,36 @@
 "use strict";
+
 var EXPORTED_SYMBOLS = ["Scriptish_windowEventTracker"];
 
 Components.utils.import("resource://scriptish/constants.js");
 
-lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
-
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "windowUnloader");
 
 const events = ["DOMContentLoaded", "load"];
 
-const trackers = {};
+const trackers = Object.create(null);
 
 function Scriptish_windowEventTracker(aWin) {
-  var winID = Scriptish_getWindowIDs(aWin).innerID;
-  if (trackers[winID]) return trackers[winID];
+  const winID = Scriptish_getWindowIDs(aWin).innerID;
+  if (winID in trackers)
+    return trackers[winID];
+
   trackers[winID] = "start";
 
-  aWin.addEventListener("DOMContentLoaded", function() {
+  aWin.addEventListener("DOMContentLoaded", function onDOMContentLoaded() {
+    aWin.removeEventListener("DOMContentLoaded", onDOMContentLoaded, false);
+
     // if the tracker event gte to this one has occurred then ignore
-    if (~events.indexOf(trackers[winID])) return;
+    if (~events.indexOf(trackers[winID]))
+      return;
 
     trackers[winID] = "DOMContentLoaded";
   }, false);
-  /*
-  aWin.document.addEventListener("readystatechange", function() {
-    if ("complete" != aWin.document.readyState) return;
-    trackers[winID] = "readystate@complete";
-  }, false);
-  */
-  aWin.addEventListener("load", function() {
+
+  aWin.addEventListener("load", function onLoad() {
+    aWin.removeEventListener("load", onLoad, false);
+
     trackers[winID] = "load";
   }, false);
 

From 070b49300be83015f6ab879d5bb5bfd2eb154c2e Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 20 Jul 2013 20:38:27 -0500
Subject: [PATCH 749/829] Remove unused Config.injectScript

---
 extension/modules/config/config.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 1c7705dd..7ff523fe 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -382,20 +382,6 @@ Config.prototype = {
   get scripts() this._scripts.concat(),
   getMatchingScripts: function(testFunc) this.scripts.filter(testFunc),
   sortScripts: function() this._scripts.sort(function(a, b) b.priority - a.priority),
-  injectScript: function(script) {
-    var safeWin = this.wrappedContentWin;
-    var unsafeWin = safeWin.wrappedJSObject;
-    var unsafeLoc = new XPCNativeWrapper(unsafeWin, "location").location;
-    var href = new XPCNativeWrapper(unsafeLoc, "href").href;
-
-    if (script.enabled && !script.needsUninstall && script.matchesURL(href)) {
-      Scriptish_injectScripts({
-        scripts: [script],
-        url: href,
-        safeWin: safeWin
-      });
-    }
-  },
 
   updateModifiedScripts: function(scriptInjector) {
     var self = this;

From 7b49a01faa9836f0be8c69d651240e5be700cb7a Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 19:30:33 -0700
Subject: [PATCH 750/829] Closes #130 Making USO data requests private

---
 extension/modules/constants.js     | 5 +++--
 extension/modules/script/script.js | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 72a9ffb1..a2f34038 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -97,9 +97,10 @@ function lazyImport(obj, resource, symbols) {
       try {
         Components.utils.import(resource, _m);
       }
-      catch (ex) {
+      catch (e) {
         Components.utils.reportError("Failed to import resource: " + resource);
-        throw ex;
+        Components.utils.reportError(e);
+        throw e;
       }
       return _m;
     });
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index f1180414..4a33a95e 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -207,7 +207,10 @@ Script.prototype = {
     let req = Instances.xhr;
     req.overrideMimeType("text/plain");
     req.open("GET", metaURL, true);
-    req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE; // bypass cache
+    // bypass cache
+    req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE;
+    // private channel
+    req.channel.QueryInterface(Components.interfaces.nsIPrivateBrowsingChannel).setPrivate(true);
     req.onload = function() {
       if (4 > req.readyState || (req.status != 200 && req.status != 0)
           || !req.responseText)

From 2156103fbc93d8cc64b2b8d62fa95b9f65fe62fa Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 19:31:45 -0700
Subject: [PATCH 751/829] <em:minVersion>23.0</em:minVersion> @css DNW on < Fx
 23

---
 extension/install.rdf          | 2 +-
 extension/modules/constants.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 1b0d3883..d9c75da6 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -65,7 +65,7 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>21.0</em:minVersion>
+        <em:minVersion>23.0</em:minVersion>
         <em:maxVersion>25.0</em:maxVersion>
       </Description>
     </em:targetApplication>
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index a2f34038..5e6cc00e 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -105,6 +105,7 @@ function lazyImport(obj, resource, symbols) {
       return _m;
     });
   }
+
   for (let i = symbols.length; ~--i;) {
     let s = symbols[i];
     lazy(obj, s, function() _lazyModules[resource][s]);

From 94a90ea4637472fb8474d07b16a91860fac79fc3 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 19:40:52 -0700
Subject: [PATCH 752/829] no need to try catch importing of
 resource://gre/modules/PrivateBrowsingUtils.jsm now

---
 extension/modules/api/GM_xmlhttpRequester.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index c3bbb5cc..600cb0f7 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -2,12 +2,7 @@
 var EXPORTED_SYMBOLS = ["GM_xmlhttpRequester"];
 
 Components.utils.import("resource://scriptish/constants.js");
-try {
-  Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
-}
-catch (ex) {
-  this.PrivateBrowsingUtils = { isWindowPrivate: function() false };
-}
+Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 
 lazyImport(this, "resource://scriptish/api.js", ["GM_apiSafeCallback"]);
 lazyUtil(this, "stringBundle");

From 3c03d704668363b79dfc33252cc0c206507bd845 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 20:01:00 -0700
Subject: [PATCH 753/829] Removing all of the nsIPrivateBrowsingChannel
 checking

---
 extension/modules/api/GM_xmlhttpRequester.js | 26 +-------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 600cb0f7..a5def995 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -8,30 +8,6 @@ lazyImport(this, "resource://scriptish/api.js", ["GM_apiSafeCallback"]);
 lazyUtil(this, "stringBundle");
 
 const MIME_JSON = /^(application|text)\/(?:x-)?json/i;
-const PRIVATE_CHANNELS = 'nsIPrivateBrowsingChannel' in Ci;
-
-/**
- * Make a channel private as per pwpbm or LOAD_ANONYMOUS (legacy)
- */
-function makeChannelPrivate(chan) {
-  if (PRIVATE_CHANNELS && chan instanceof Ci.nsIPrivateBrowsingChannel) {
-    chan.setPrivate(true);
-    return;
-  }
-
-  // legacy / non pbc
-  if (chan instanceof Ci.nsIHttpChannel) {
-    chan.setRequestHeader('Referer', '', false);
-    chan.setRequestHeader('Cookie', '', false);
-    try {
-      chan.referrer = null;
-    }
-    catch (ex) {
-      // ignore
-    }
-  }
-  chan.loadFlags |= Ci.nsIRequest.LOAD_ANONYMOUS;
-}
 
 /**
  * Abstract base class for (chained) request notification callback overrides
@@ -214,7 +190,7 @@ GM_xmlhttpRequester.prototype.chromeStartRequest =
   // Loads initiated from private windows should always be private as well.
   let makePrivate = details.makePrivate || PrivateBrowsingUtils.isWindowPrivate(this.safeWin);
   if (makePrivate) {
-    makeChannelPrivate(req.channel);
+    req.channel.QueryInterface(Ci.nsIPrivateBrowsingChannel).setPrivate(true);
   }
 
   var body = details.data ? details.data : null;

From dc6b51f50c58a9e382960a46c54f93e56b80c938 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 20:09:19 -0700
Subject: [PATCH 754/829] Removing old alert bug workaround which does not
 appear to be an issue any longer

---
 extension/components/scriptish.js              | 6 +++---
 extension/modules/api.js                       | 6 ------
 extension/modules/utils/Scriptish_getEditor.js | 3 ++-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index b939710b..2a5f830b 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -14,7 +14,6 @@ lazyImport(this, "resource://scriptish/manager.js", ["Scriptish_manager"]);
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
 
-const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
 lazyUtil(this, "injectScripts");
 lazyUtil(this, "installUri");
 lazyUtil(this, "isGreasemonkeyable");
@@ -216,9 +215,10 @@ ScriptishService.prototype = {
 
   _tmpDir: Services.dirsvc.get("TmpD", Ci.nsIFile),
   isTempScript: function(uri) {
-    if (!(uri instanceof Ci.nsIFileURL)) return false;
+    if (!(uri instanceof Ci.nsIFileURL))
+      return false;
 
-    var file = uri.file;
+    let file = uri.file;
     return file.parent.equals(this._tmpDir) && file.leafName != "newscript.user.js";
   }
 }
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 3389c8f7..81d67210 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -244,12 +244,6 @@ function GM_API(options) {
     if (!GM_apiLeakCheck("GM_cryptoHash")) return;
     return Scriptish_cryptoHash.apply(null, arguments);
   }
-
-  //temp solution for #422
-  let scriptName = aScript.name || aScript.id;
-  this.alert = function alert(aMsg) {
-    Scriptish_alert(aMsg, scriptName);
-  }
 }
 
 GM_API.prototype.GM_generateUUID = function GM_generateUUID() (
diff --git a/extension/modules/utils/Scriptish_getEditor.js b/extension/modules/utils/Scriptish_getEditor.js
index 6f349fad..38017f0d 100644
--- a/extension/modules/utils/Scriptish_getEditor.js
+++ b/extension/modules/utils/Scriptish_getEditor.js
@@ -89,7 +89,8 @@ const Scriptish_getEditor = function(parentWindow, change) {
     if (fp.file.exists() && fp.file.isExecutable()) {
       Scriptish_prefRoot.setValue("editor", fp.file.path);
       return fp.file;
-    } else {
+    }
+    else {
       Scriptish_alert(Scriptish_stringBundle("editor.pleasePickExecutable"));
     }
   }

From 22f2936cad35b2a0f5d0d5ace737cc454d488435 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 21:00:21 -0700
Subject: [PATCH 755/829] Closes #133 @grant is now optional

---
 extension/content/options.xul               | 5 +++++
 extension/defaults/preferences/scriptish.js | 1 +
 extension/locale/en-US/scriptish.properties | 2 ++
 extension/modules/script/script.js          | 8 +++++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index 1877977b..7e2db1d2 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -105,6 +105,7 @@
       <preference id="pref-enabledSchemes-about" name="extensions.scriptish.enabledSchemes.about" type="bool"/>
       <preference id="pref-logChrome" name="extensions.scriptish.logChrome" type="bool"/>
       <preference id="pref-logToErrorConsole" name="extensions.scriptish.logToErrorConsole" type="bool"/>
+      <preference id="pref-enableScriptGrantSniffing" name="extensions.scriptish.enableScriptGrantSniffing" type="bool"/>
       <preference id="pref-update-requireSecured" name="extensions.scriptish.update.requireSecured" type="bool"/>
       <preference id="pref-update-requireBuiltInCerts" name="extensions.scriptish.update.requireBuiltInCerts" type="bool"/>
     </preferences>
@@ -126,6 +127,10 @@
             <checkbox preference="pref-logChrome" label="options.logChrome" localize="label"/>
             <checkbox preference="pref-logToErrorConsole" label="options.logToErrorConsole" localize="label"/>
           </groupbox>
+          <groupbox>
+          <caption label="options.other" localize="label" />
+            <checkbox preference="pref-enableScriptGrantSniffing" label="options.grant.sniffing" localize="label"/>
+          </groupbox>
         </tabpanel>
         <tabpanel>
           <checkbox preference="pref-enabledSchemes-file" label="options.enabledSchemes.file" localize="label"/>
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 4a0ce9ae..dd3798b9 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -17,6 +17,7 @@ pref("extensions.scriptish.enableCopyDownloadURL", false);
 pref("extensions.scriptish.enabledNotifications.popup", true);
 pref("extensions.scriptish.enabledNotifications.sliding", true);
 pref("extensions.scriptish.enableScriptRefreshing", true);
+pref("extensions.scriptish.enableScriptGrantSniffing", true);
 pref("extensions.scriptish.logChrome", false);
 pref("extensions.scriptish.logToErrorConsole", true);
 pref("extensions.scriptish.optimizingRegexpMerge", false);
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 9db0a326..bb461599 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -119,6 +119,7 @@ options.enabledSchemes.unmht=unmht protocol (Mozilla Archive format)
 options.excludes.desc=Global excludes will override any script or user specified rules
 options.excludes.empty=No global excludes specified
 options.excludes.remark=(You may specify one exclude per line)
+options.grant.sniffing=Enable @Grant Sniffing
 options.logChrome=Log non-critical extension messages to the Error Console
 options.logging=Logging
 options.logToErrorConsole=GM_log uses the Error Console
@@ -126,6 +127,7 @@ options.notifications=Notifications
 options.notifications.popup.enable=Enable popup notifications
 options.notifications.sliding.enable=Enable sliding notifications
 options.notifications.whenDisabled=When disabled, any notification will appear in the Error Console.
+options.other=Other
 options.pane.advanced=Advanced
 options.pane.excludes=Global Excludes
 options.pane.main=Main
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 4a33a95e..bd41bf40 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1,6 +1,7 @@
 var EXPORTED_SYMBOLS = ["Script"];
 
 const valueSplitter = /(\S+)(?:\s+([^\r\f\n]+))?/;
+const GRANT_REGEX = /GM_[a-z]+/gi;
 
 const Cu = Components.utils;
 Cu.import("resource://gre/modules/CertUtils.jsm");
@@ -889,11 +890,16 @@ Script.parseVersion = function Script_parseVersion(aSrc) {
 
 // TODO: DRY this by combining this with Scriptish_parser some way..
 Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPrivate) {
-  var script = new Script(aConfig);
+  const script = new Script(aConfig);
 
   if (aURI && aPrivate === false)
     script._downloadURL = aURI.spec;
 
+  // sniff @grant ?
+  if (Scriptish_prefRoot.getValue("enableScriptGrantSniffing")) {
+    (aSource.match(GRANT_REGEX) || []).forEach(function(i) script.grant[i] = true);
+  }
+
   // read one line at a time looking for start meta delimiter or EOF
   var lines = aSource.match(metaRegExp);
   var i = 0;

From 1784c8ab7c5be4a5d32fbfd1c95169592dd91b97 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 20 Jul 2013 22:15:06 -0700
Subject: [PATCH 756/829] Closes #122 Lising the APIs a userscript uses in the
 install window

---
 extension/content/install.xul                 |  4 ++
 extension/content/js/install.js               |  2 +-
 extension/locale/en-US/scriptish.properties   |  1 +
 extension/modules/script/script.js            |  2 +-
 .../utils/Scriptish_getScriptHeader.js        | 56 ++++++++++---------
 extension/skin/install.css                    |  8 ++-
 6 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/extension/content/install.xul b/extension/content/install.xul
index f3bc42e4..505b14ad 100644
--- a/extension/content/install.xul
+++ b/extension/content/install.xul
@@ -54,6 +54,10 @@
         <label id="resources-label"/>
         <description id="resources-desc"/>
       </vbox>
+      <vbox id="grants">
+        <label id="grants-label"/>
+        <description id="grants-desc"/>
+      </vbox>
     </vbox>
     <hbox id="showSource-box">
       <label id="showSource" class="text-link" value="install.showScriptSource" localize="value"/>
diff --git a/extension/content/js/install.js b/extension/content/js/install.js
index c530bdaf..8ac1dc50 100644
--- a/extension/content/js/install.js
+++ b/extension/content/js/install.js
@@ -44,7 +44,6 @@ function setupIncludes(type, items) {
 function cleanup() scriptDownloader.cleanupTempFiles();
 function delayedClose() timeout(close, 1);
 
-
 on("load", function() {
   let script = scriptDownloader.script;
   let headers = Scriptish_getScriptHeader(script);
@@ -55,6 +54,7 @@ on("load", function() {
   });
   setupIncludes("requires", headers.require || []);
   setupIncludes("resources", headers.resource || []);
+  setupIncludes("grants", Scriptish_getScriptHeader(script, 'grant', true) || []);
 
   // setup buttons
   let dialog = document.documentElement;
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index bb461599..31ca7aad 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -49,6 +49,7 @@ install.includes=runs on:
 install.matches=matches:
 install.requires=requires:
 install.resources=resources:
+install.grants=grants:
 install.showScriptSource=Show Script Source
 install.title=User Script Installation
 install.warning1=Malicious scripts can violate your privacy and act on your behalf without your knowledge.
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index bd41bf40..14e8dcd3 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -710,7 +710,7 @@ Script.prototype = {
     // Copy new values.
     this.blocked = newScript.blocked;
     this.domains = newScript.domains;
-    this.grant = newScript.grant || {};
+    this.grant = newScript.grant || Object.create(null);
     this._includes = newScript._includes;
     this._excludes = newScript._excludes;
     delete this.__all_includes;
diff --git a/extension/modules/utils/Scriptish_getScriptHeader.js b/extension/modules/utils/Scriptish_getScriptHeader.js
index 223dfb2f..8c59b51c 100644
--- a/extension/modules/utils/Scriptish_getScriptHeader.js
+++ b/extension/modules/utils/Scriptish_getScriptHeader.js
@@ -9,34 +9,40 @@ function Scriptish_getScriptHeader(aScript, aKey, aLocalVal) {
     let key = aKey ? aKey.toLowerCase().trim() : "";
 
     switch (key) {
-    case "id":
-    case "name":
-    case "namespace":
-    case "creator":
-    case "author":
-    case "description":
-    case "version":
-    case "jsversion":
-    case "delay":
-    case "noframes":
-      return aScript[key];
-    case "homepage":
-    case "homepageurl":
-      return aScript.homepageURL;
-    case "updateurl":
-      return aScript.updateURL;
-    case "contributor":
-    case "include":
-    case "exclude":
-    case "screenshot":
-      return aScript[key + "s"];
-    case "match":
-      return aScript[key + "es"];
+      case "id":
+      case "name":
+      case "namespace":
+      case "creator":
+      case "author":
+      case "description":
+      case "version":
+      case "jsversion":
+      case "delay":
+      case "noframes":
+        return aScript[key];
+      case "homepage":
+      case "homepageurl":
+        return aScript.homepageURL;
+      case "updateurl":
+        return aScript.updateURL;
+      case "contributor":
+      case "include":
+      case "exclude":
+      case "screenshot":
+        return aScript[key + "s"];
+      case "match":
+        return aScript[key + "es"];
+      case "grant":
+        return Object.keys(aScript.grant);
     }
   }
 
   // TODO: cache headers and clear cache when the script is modified..
   // TODO: should not use privates here
-  var headers = Scriptish_parser(Scriptish_getContents(aScript._tempFile || aScript._file));
-  return aKey ? headers[aKey] : headers;
+  let headers = Scriptish_parser(Scriptish_getContents(aScript._tempFile || aScript._file));
+  if (aKey) {
+    return headers[aKey]
+  }
+
+  return headers;
 }
diff --git a/extension/skin/install.css b/extension/skin/install.css
index c41054cb..5557fb6e 100644
--- a/extension/skin/install.css
+++ b/extension/skin/install.css
@@ -59,9 +59,13 @@
   display:none;
 }
 
-#excludes-desc, #includes-desc, #matches-desc{font-style:italic;}
+#excludes-desc, #includes-desc, #matches-desc {
+  font-style:italic;
+}
 
-#itemBox vbox.display:not(#script-desc-vbox){display:inherit;}
+#itemBox vbox.display:not(#script-desc-vbox) {
+  display:inherit;
+}
 
 html|ul {
   margin-top: 0;

From ce22786b9124f20262b7cfe67c3a7151455e6d6c Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 21 Jul 2013 13:12:46 -0500
Subject: [PATCH 757/829] minor: '@Grant Sniffing' -> '@grant sniffing' to be
 consistent

---
 extension/locale/en-US/scriptish.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 31ca7aad..9423bd40 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -120,7 +120,7 @@ options.enabledSchemes.unmht=unmht protocol (Mozilla Archive format)
 options.excludes.desc=Global excludes will override any script or user specified rules
 options.excludes.empty=No global excludes specified
 options.excludes.remark=(You may specify one exclude per line)
-options.grant.sniffing=Enable @Grant Sniffing
+options.grant.sniffing=Enable @grant sniffing
 options.logChrome=Log non-critical extension messages to the Error Console
 options.logging=Logging
 options.logToErrorConsole=GM_log uses the Error Console

From 7a127e975793e34a7000a2c9fb094f2e2866aa2a Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 21 Jul 2013 15:17:56 -0500
Subject: [PATCH 758/829] Resolve non-absolute URLs passed to `GM_openInTab`,
 referencing the safe window.  Closes #139

---
 extension/modules/api.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 81d67210..e374fcd7 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -183,6 +183,8 @@ function GM_API(options) {
 
   this.GM_openInTab = function GM_openInTab(aURL, aLoadInBackground, aReuse) {
     if (!GM_apiLeakCheck("GM_openInTab")) return;
+    aURL = NetUtil.newURI(
+        aURL, null, NetUtil.newURI(aSafeWin.location.href, null, null)).spec;
     Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin);
     return undefined; // don't return the window, this is intentional
   }

From c6cbcc21eb09671764e607baa5988b2274214c8f Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 21 Jul 2013 16:26:39 -0500
Subject: [PATCH 759/829] Update scratchpad.xul reference for FF23 (current
 Scriptish minVersion) compatibility.  Closes #142

---
 extension/chrome.manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 76e27245..831944ec 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -19,7 +19,7 @@ style      chrome://global/content/alerts/alert.xul chrome://scriptish/skin/thir
 
 overlay    chrome://browser/content/browser.xul chrome://scriptish/content/browser.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 overlay    chrome://browser/content/browser.xul chrome://scriptish/content/browser.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
-overlay    chrome://browser/content/scratchpad.xul chrome://scriptish/content/scratchpad.xul
+overlay    chrome://browser/content/devtools/scratchpad.xul chrome://scriptish/content/scratchpad.xul
 overlay    chrome://navigator/content/navigator.xul chrome://scriptish/content/browser.xul
 overlay    about:addons chrome://scriptish/content/addonstab.xul
 overlay    chrome://mozapps/content/extensions/extensions.xul chrome://scriptish/content/addonstab.xul

From eb5d9b2981b49271a36cbaa93bff358cfa63aedd Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 21 Jul 2013 18:55:20 -0500
Subject: [PATCH 760/829] Remove special Scratchpad handling in
 `Scriptish_openInEditor`.  Closes #145

---
 .../modules/utils/Scriptish_openInEditor.js   | 80 ++++---------------
 1 file changed, 16 insertions(+), 64 deletions(-)

diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index 011cf75a..0c96e8ae 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -4,10 +4,10 @@ var EXPORTED_SYMBOLS = ["Scriptish_openInEditor"];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
+const { alert: Scriptish_alert } = jetpack("scriptish/utils/Scriptish_alert");
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyUtil(this, "getEditor");
 lazyUtil(this, "launchApplicationWithDoc");
-const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
 lazyUtil(this, "stringBundle");
 
 function Scriptish_openInEditor(script, parentWindow) {
@@ -17,12 +17,10 @@ function Scriptish_openInEditor(script, parentWindow) {
   if (!editor) return;
 
   try {
-    if ("Scratchpad" == editor) {
-      openScriptInScratchpad(script, parentWindow, file);
-    }
-    else {
+    if ("Scratchpad" == editor)
+      openScriptInScratchpad(parentWindow, file);
+    else
       Scriptish_launchApplicationWithDoc(editor, file);
-    }
   }
   catch (e) {
     // Something may be wrong with the editor the user selected. Remove it.
@@ -32,67 +30,21 @@ function Scriptish_openInEditor(script, parentWindow) {
   }
 }
 
-function openScriptInScratchpad(script, parentWindow, file) {
-    let spWin = (parentWindow.Scratchpad
-            || Services.wm.getMostRecentWindow("navigator:browser").Scratchpad)
-            .openScratchpad();
+function openScriptInScratchpad(parentWindow, file) {
+  let spWin = (parentWindow.Scratchpad
+      || Services.wm.getMostRecentWindow("navigator:browser").Scratchpad)
+      .openScratchpad();
 
-        spWin.addEventListener("load", function spWinLoaded() {
-          spWin.removeEventListener("load", spWinLoaded, false);
+  spWin.addEventListener("load", function spWinLoaded() {
+    spWin.removeEventListener("load", spWinLoaded, false);
 
-          let Scratchpad = spWin.Scratchpad;
-          setFilenameForScratchpadWindow(spWin, file);
-
-          if (Scratchpad.addObserver) {
-            Scratchpad.addObserver({"onReady": importFileForScratchpad.bind(null, spWin, file)});
-          }
-          else {
-            importFileForScratchpad(spWin, file);
-          }
-        }, false);
-}
-
-function setFilenameForScratchpadWindow(spWin, file) {
-    let Scratchpad = spWin.Scratchpad;
-
-    // Set the filename
-    if (Scratchpad.setFilename) {
-      Scratchpad.setFilename(file.path);
-    }
-    else {
-      spWin.document.title = Scratchpad.filename = file.path;
-    }
-}
-
-function importFileForScratchpad(spWin, file) {
     let Scratchpad = spWin.Scratchpad;
-
-    // Open the user script in Scratchpad
-    // NOTE: Resetting the "undo/redo" state on our own until Scratchpad
-    // handles it.  We want to ensure user scripts don't get screwed up.
-    // See: https://bug684546.bugzilla.mozilla.org/
-    Scratchpad.importFromFile(file, false, function() {
-      let spEditor = Scratchpad.editor;
-
-      // For the Orion editor...
-      if (spEditor && spEditor._undoStack && spEditor._undoStack.reset) {
-        spEditor._undoStack.reset();
-        return;
-      }
-
-      // If not using Orion, pick out the proper editor
-      // Scratchpad in FF6 still uses 'textbox'
-      if (spEditor && spEditor._editor)
-        spEditor = spEditor._editor;
-      else if (Scratchpad.textbox)
-        spEditor = Scratchpad.textbox.editor;
-
-      if (spEditor
-          && spEditor.resetModificationCount
-          && spEditor.transactionManager
-          && spEditor.transactionManager.clear) {
-        spEditor.resetModificationCount();
-        spEditor.transactionManager.clear();
+    Scratchpad.setFilename(file.path);
+    Scratchpad.addObserver({
+      onReady: function() {
+        Scratchpad.removeObserver(this);
+        Scratchpad.importFromFile.call(Scratchpad, file);
       }
     });
+  }, false);
 }

From 733c70efd070164f0f4db905b5b8f97445d6a77d Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 21 Jul 2013 18:48:17 -0700
Subject: [PATCH 761/829] Closes #16 window.document.documentElement DNE with
 @run-at document-start Closes #23 Implementing @run-at document-complete

---
 extension/components/scriptish.js             |  78 +----
 extension/content/newscript.xul               |   3 +-
 extension/content/scratchpad.xul              |   7 +-
 extension/locale/en-US/scriptish.properties   |   5 +-
 extension/modules/config/config.js            |   4 +-
 extension/modules/manager.js                  | 289 ++++++++----------
 extension/modules/script/script.js            |   2 +-
 extension/modules/script/simple-script.js     |   2 +-
 .../utils/Scriptish_updateModifiedScripts.js  |  59 ++--
 .../utils/Scriptish_windowEventTracker.js     |  16 +-
 10 files changed, 196 insertions(+), 269 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 2a5f830b..f1b7ea6b 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -11,7 +11,6 @@ lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scri
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/manager.js", ["Scriptish_manager"]);
-lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
 
 lazyUtil(this, "injectScripts");
@@ -20,7 +19,6 @@ lazyUtil(this, "isGreasemonkeyable");
 lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "stringBundle");
-lazyUtil(this, "updateModifiedScripts");
 lazyUtil(this, "windowEventTracker");
 lazyUtil(this, "windowUnloader");
 
@@ -32,7 +30,8 @@ const RE_USERSCRIPT = /\.user(?:-\d+)?\.js$/;
 const RE_CONTENTTYPE = /text\/html/i;
 
 function ScriptishService() {
-  Scriptish_manager.setup.call(this);
+  Scriptish_manager();
+
   Services.obs.addObserver(this, "install-userscript", false);
   Services.obs.addObserver(this, "scriptish-enabled", false);
   Services.obs.addObserver(this, "content-document-global-created", false);
@@ -105,79 +104,6 @@ ScriptishService.prototype = {
     }
   },
 
-  docReady: function(href, safeWin) {
-    let unsafeWin = safeWin.wrappedJSObject;
-    let self = this;
-    let winClosed = false;
-    let tracker = Scriptish_windowEventTracker(safeWin);
-
-    // rechecks values that can change at any moment
-    function shouldNotRun() (
-      winClosed || !Scriptish.enabled || !Scriptish_isGreasemonkeyable(href));
-
-    // check if there are any modified scripts
-    Scriptish_updateModifiedScripts(href, safeWin, shouldNotRun);
-
-    // find matching scripts
-    Scriptish_config.initScripts(href, (safeWin === safeWin.top), function(scripts) {
-       let (windowLoaded = ("load" == tracker)) {
-         if (windowLoaded || "DOMContentLoaded" == tracker) {
-           scripts["document-start"] = scripts["document-start"].concat(scripts["document-end"], scripts["document-idle"]);
-           scripts["document-end"] = scripts["document-idle"] = [];
-         }
-
-         if (windowLoaded) {
-           scripts["document-start"] = scripts["document-start"].concat(scripts["window-load"]);
-           scripts["window-load"] = [];
-         }
-       }
-
-      if (scripts["document-end"].length || scripts["document-idle"].length) {
-        safeWin.addEventListener("DOMContentLoaded", function() {
-          if (shouldNotRun()) return;
-
-          if (scripts["document-idle"].length)
-            timeout(function() {
-              if (shouldNotRun()) return;
-              Scriptish_injectScripts({
-                scripts: scripts["document-idle"],
-                url: href,
-                safeWin: safeWin
-              });
-            });
-
-          Scriptish_injectScripts({
-            scripts: scripts["document-end"],
-            url: href,
-            safeWin: safeWin
-          });
-        }, true);
-      }
-
-      if (scripts["window-load"].length) {
-        safeWin.addEventListener("load", function() {
-          if (shouldNotRun()) return;
-          // inject @run-at window-load scripts
-          Scriptish_injectScripts({
-            scripts: scripts["window-load"],
-            url: href,
-            safeWin: safeWin
-          });
-        }, true);
-      }
-
-      Scriptish_injectScripts({
-        scripts: scripts["document-start"],
-        url: href,
-        safeWin: safeWin
-      });
-
-      Scriptish_windowUnloader(function() {
-        winClosed = true;
-      }, Scriptish_getWindowIDs(safeWin).innerID);
-    });
-  },
-
   _test_org: {
     "chrome": true,
     "about": true
diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index 85307d9d..ba9848b3 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -50,9 +50,10 @@
         <label control="run-at" value="newscript.runat" localize="value"/>
         <menulist id="run-at">
           <menupopup>
-            <menuitem label="newscript.runat.documentend" value="document-end" localize="label"/>
             <menuitem label="newscript.runat.documentstart" value="document-start" localize="label"/>
             <menuitem label="newscript.runat.documentidle" value="document-idle" localize="label"/>
+            <menuitem label="newscript.runat.documentend" value="document-end" localize="label"/>
+            <menuitem label="newscript.runat.documentcomplete" value="document-complete" localize="label"/>
             <menuitem label="newscript.runat.windowload" value="window-load" localize="label"/>
           </menupopup>
         </menulist>
diff --git a/extension/content/scratchpad.xul b/extension/content/scratchpad.xul
index a1c4ad13..fd72beef 100644
--- a/extension/content/scratchpad.xul
+++ b/extension/content/scratchpad.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-
 <overlay id="scriptish-scratchpad-overlay"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/x-javascript" src="chrome://scriptish/content/js/scratchpad.js"/>
@@ -11,15 +10,13 @@
 
   <keyset id="sp-keyset">
     <key id="sp-key-scriptish-saveasuserscript"
-      command="sp-cmd-scriptish-saveasuserscript"
-      />
+      command="sp-cmd-scriptish-saveasuserscript"/>
   </keyset>
 
   <menupopup id="sp-menu-filepopup">
     <menuitem id="sp-menu-scriptish-saveasuserscript"
       command="sp-cmd-scriptish-saveasuserscript"
       key="sp-key-scriptish-saveasuserscript"
-      insertafter="sp-menu-saveas"
-      />
+      insertafter="sp-menu-saveas"/>
   </menupopup>
 </overlay>
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 9423bd40..611ed045 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -87,9 +87,10 @@ newscript.namespace=Namespace
 newscript.noID=Please provide a valid ID for your script.
 newscript.noName=Please provide a name for your script.
 newscript.runat=Run when
-newscript.runat.documentend=Document finishes loading
-newscript.runat.documentidle=Document is first idle
 newscript.runat.documentstart=Document starts loading
+newscript.runat.documentend=Document finishes loading (not resources)
+newscript.runat.documentidle=Document is first idle
+newscript.runat.documentcomplete=Document finishes loading (including resources)
 newscript.runat.windowload=Window incl. all media is fully loaded
 newscript.version=Version
 nothing.timedOut=nothing (timed out)
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 7ff523fe..ffe09300 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -392,7 +392,8 @@ Config.prototype = {
         continue;
       }
 
-      if (!script.isModified()) continue;
+      if (!script.isModified())
+        continue;
 
       let theScript = script;
       Scriptish_getContents(script._file, 0, function(content) {
@@ -412,6 +413,7 @@ Config.prototype.initScripts = function(url, isTopWin, aCallback) {
     "document-start": [],
     "document-end": [],
     "document-idle": [],
+    "document-complete": [],
     "window-load": []
   };
 
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index 2272b381..53c21deb 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -6,55 +6,52 @@ Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
+lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 
+lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "injectScripts");
 lazyUtil(this, "isGreasemonkeyable");
 lazyUtil(this, "isScriptRunnable");
 lazyUtil(this, "isURLExcluded");
-lazyUtil(this, "getWindowIDs");
+lazyUtil(this, "updateModifiedScripts");
 lazyUtil(this, "windowEventTracker");
 lazyUtil(this, "windowUnloader");
 
-const tests = {
-  _test_org: {
-    "chrome": true,
-    "about": true
-  },
-  _test_cl: {
-    "chrome": true,
-    "resource": true
-  },
-  _reg_userjs: /\.user\.js$/,
-  isTempScript: function(uri) {
-    if (!(uri instanceof Ci.nsIFileURL)) return false;
+const { Class } = jetpack('sdk/core/heritage');
+const { add } = jetpack('sdk/deprecated/observer-service');
 
-    var file = uri.file;
-    return file.parent.equals(this._tmpDir) && file.leafName != "newscript.user.js";
-  }
-};
-
-const Scriptish_manager = {
-  setup: function(options) {
-    options = options || {};
-
-    var observer = {
-      observe: (function(aSubject, aTopic, aData) {
-        switch (aTopic) {
-        case "chrome-document-global-created":
-        case "content-document-global-created":
-          Scriptish_manager.docReady_start.call(this, aSubject, options);
-          break;
-        }
-      }).bind(this)
-    };
-
-    Services.obs.addObserver(observer, "content-document-global-created", false);
-    Services.obs.addObserver(observer, "chrome-document-global-created", false);
+const windowsTracked = Object.create(null);
+
+const Scriptish_manager = Class({
+  initialize: function() {
+    const self = this;
+
+    add("document-element-inserted", function(aDocument) {
+      let win = aDocument.defaultView;
+      if (!win) {
+        return;
+      }
+      self.docReady_start(win);
+    });
+
+    add("content-document-global-created", self.docReady_start.bind(self));
+    add("chrome-document-global-created", self.docReady_start.bind(self));
   },
 
-  docReady_start: function(safeWin, options) {
+  docReady_start: function(safeWin) {
     // TODO: disable observer that calls this when Scriptish is disabled
-    if (!Scriptish.enabled) return;
+    if (!Scriptish.enabled)
+      return;
+
+    if (!('document' in safeWin && safeWin.document.documentElement)) {
+      return;
+    }
+
+    let id = Scriptish_getWindowIDs(safeWin).innerID;
+    if (windowsTracked[id]) {
+      return;
+    }
+    windowsTracked[id] = true;
 
     // start tracking the window's progress
     Scriptish_windowEventTracker(safeWin);
@@ -62,152 +59,128 @@ const Scriptish_manager = {
     // try to get the windows href..
     let href = getURLForWin(safeWin);
 
-    // if we don't have a href and the window is a frame, then wait until we do
-    if (!href && safeWin.frameElement) {
-      Scriptish_manager.waitForFrame.call(this, safeWin, options);
+    if (!Scriptish_isGreasemonkeyable(href))
       return;
-    }
-
-    if (!href || "about:blank" == href) {
-      if ("complete" != safeWin.document.readyState) {
-        Scriptish_manager.waitForAboutBlank.call(this, safeWin, options);
-        return;
-      }
-    }
-
-    if (!Scriptish_isGreasemonkeyable(href)) return;
 
     // if the url is a excluded url then stop
-    if (Scriptish_isURLExcluded(href)) return;
+    if (Scriptish_isURLExcluded(href))
+      return;
 
-    this.docReady(href, safeWin, options);
+    this.docReady(href, safeWin);
   },
 
-  docReady: function(href, safeWin, options) {
-    // ignore window if it is not the same window used by options
-    if (JSON.stringify(Scriptish_getWindowIDs(options.content))
-        != JSON.stringify(Scriptish_getWindowIDs(safeWin)))
-      return;
+  docReady: function(href, safeWin) {
+    let unsafeWin = safeWin.wrappedJSObject;
+    let id = Scriptish_getWindowIDs(safeWin).innerID;
 
-    var uri = Services.io.newURI(href, null, null);
-    if (tests._reg_userjs.test(href) && !tests.isTempScript(uri)
-        && "view-source" != uri.scheme) {
-      options.global.sendAsyncMessage("Scriptish:InstallScriptURL", href);
-    }
+    let winClosed = false;    
+    Scriptish_windowUnloader(function() {
+      winClosed = true;
+      delete windowsTracked[id];
+    }, id);
 
-    var scripts = {
-      "document-start": [],
-      "document-end": [],
-      "document-idle": [],
-      "window-load": []
-    };
+    let tracker = Scriptish_windowEventTracker(safeWin);
 
-    options.scripts.forEach(function(script) {
-      if (Scriptish_isScriptRunnable(script, href, (safeWin === safeWin.top))) {
-        scripts[script.runAt].push(script);
-      }
-    });
+    // rechecks values that can change at any moment
+    function shouldNotRun() (
+      winClosed || !Scriptish.enabled || !Scriptish_isGreasemonkeyable(href));
+
+    // check if there are any modified scripts
+    Scriptish_updateModifiedScripts(href, safeWin, shouldNotRun);
+
+    // find matching scripts
+    Scriptish_config.initScripts(href, (safeWin === safeWin.top), function(scripts) {
+      let windowLoaded = ("load" == tracker); 
 
-    let tracker = Scriptish_windowEventTracker(safeWin);
-    let (windowLoaded = ("load" == tracker)) {
       if (windowLoaded || "DOMContentLoaded" == tracker) {
         scripts["document-start"] = scripts["document-start"].concat(scripts["document-end"], scripts["document-idle"]);
         scripts["document-end"] = scripts["document-idle"] = [];
       }
 
+      if (windowLoaded || "readystate@complete" == tracker) {
+        scripts["document-start"] = scripts["document-start"].concat(scripts["document-complete"]);
+        scripts["document-complete"] = [];
+      }
+
       if (windowLoaded) {
         scripts["document-start"] = scripts["document-start"].concat(scripts["window-load"]);
         scripts["window-load"] = [];
       }
-    }
 
-    if (scripts["document-end"].length || scripts["document-idle"].length) {
-      safeWin.addEventListener("DOMContentLoaded", function() {
-        // inject @run-at document-idle scripts
-        if (scripts["document-idle"].length) {
-          timeout(function() {
-            Scriptish_injectScripts(extend(options, {
-              scripts: scripts["document-idle"],
-              url: href,
-              safeWin: safeWin
-            }));
+      // inject @run-at document-start scripts
+      Scriptish_injectScripts({
+        scripts: scripts["document-start"],
+        url: href,
+        safeWin: safeWin
+      });
+
+      // handle @run-at document-end and document-idle
+      if (scripts["document-end"].length || scripts["document-idle"].length) {
+        safeWin.addEventListener("DOMContentLoaded", function listener() {
+          safeWin.removeEventListener("DOMContentLoaded", listener, true);
+          if (shouldNotRun())
+            return;
+
+          // inject @run-at document-end scripts
+          Scriptish_injectScripts({
+            scripts: scripts["document-end"],
+            url: href,
+            safeWin: safeWin
           });
-        }
-
-        // inject @run-at document-end scripts
-        Scriptish_injectScripts(extend(options, {
-          scripts: scripts["document-end"],
-          url: href,
-          safeWin: safeWin
-        }));
-      }, true);
-    }
-
-    if (scripts["window-load"].length) {
-      safeWin.addEventListener("load", function() {
-        // inject @run-at window-load scripts
-        Scriptish_injectScripts(extend(options, {
-          scripts: scripts["window-load"],
-          url: href,
-          safeWin: safeWin
-        }));
-      }, true);
-    }
-
-    // inject @run-at document-start scripts
-    Scriptish_injectScripts(extend(options, {
-      scripts: scripts["document-start"],
-      url: href,
-      safeWin: safeWin
-    }));
-  },
-
-  waitForFrame: function(safeWin, options) {
-    let self = this;
-    safeWin.addEventListener("DOMContentLoaded", function _frame_loader() {
-      // not perfect, but anyway
-      let href = getURLForWin(safeWin);
-
-      if (!href) return; // wait for it :p
-      safeWin.removeEventListener("DOMContentLoaded", _frame_loader, false);
-      Scriptish_manager.docReady_start.call(self, safeWin, options);
-    }, false);
-  },
-
-  // not perfect, but anyway
-  waitForAboutBlank: function(safeWin, options) {
-    let self = this;
-
-    // check if we have a url @ DOMContentLoaded
-    function _loader1() {
-      safeWin.removeEventListener("DOMContentLoaded", _loader1, false);
-
-      let href = getURLForWin(safeWin);
-
-      if (!href || "about:blank" == href) return; // not done yet..
-      Scriptish_manager.docReady_start.call(self, safeWin, options);
-      safeWin.document.removeEventListener("readystatechange", _loader2, false);
-    }
-    safeWin.addEventListener("DOMContentLoaded", _loader1, false);
-
-    // check if we have a url @ readyState == "complete"
-    function _loader2() {
-      if ("complete" != safeWin.document.readyState) return;
 
-      safeWin.removeEventListener("DOMContentLoaded", _loader1, false);
-      safeWin.document.removeEventListener("readystatechange", _loader2, false);
+          // handle @run-at document-idle
+          if (scripts["document-idle"].length) {
+            timeout(function() {
+              if (shouldNotRun())
+                return;
+
+              // inject @run-at document-idle scripts
+              Scriptish_injectScripts({
+                scripts: scripts["document-idle"],
+                url: href,
+                safeWin: safeWin
+              });
+            });
+          }
+        }, true);
+      }
 
-      let href = getURLForWin(safeWin);
-      Scriptish_manager.docReady_start.call(self, safeWin, options);
+      // handle @run-at document-complete
+      if (scripts["document-complete"].length) {
+        safeWin.document.addEventListener("readystatechange", function listener() {
+          if ("complete" != safeWin.document.readyState)
+            return;
+          safeWin.document.removeEventListener("readystatechange", listener, true);
+          if (shouldNotRun())
+            return;
+
+          // inject @run-at document-complete scripts
+          Scriptish_injectScripts({
+            scripts: scripts["document-complete"],
+            url: href,
+            safeWin: safeWin
+          });
+        }, true);
+      }
 
-      // fake DOMContentLoaded to get things rolling
-      var evt = safeWin.document.createEvent("Events");
-      evt.initEvent("DOMContentLoaded", true, true);
-      safeWin.dispatchEvent(evt);
-    }
-    safeWin.document.addEventListener("readystatechange", _loader2, false);
+      // handle @run-at window-load
+      if (scripts["window-load"].length) {
+        safeWin.addEventListener("load", function listener() {
+          safeWin.removeEventListener("load", listener, true);
+          if (shouldNotRun())
+            return;
+
+          // inject @run-at window-load scripts
+          Scriptish_injectScripts({
+            scripts: scripts["window-load"],
+            url: href,
+            safeWin: safeWin
+          });
+        }, true);
+      }
+    });
   }
-};
+});
 
 function getURLForWin(safeWin) {
   return (safeWin.location.href
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 14e8dcd3..70e312c8 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -33,7 +33,7 @@ const metaRegExp = /\/\/[ \t]*(?:==\/?UserScript==|\@\S+(?:[ \t]+(?:[^\r\f\n]+))
 const nonIdChars = /[^\w@\.\-_]+/g; // any char matched by this is not valid
 const JSVersions = ['1.6', '1.7', '1.8', '1.8.1'];
 const maxJSVer = JSVersions[2];
-const runAtValues = ["document-start", "document-end", "document-idle", "window-load"];
+const runAtValues = ["document-start", "document-end", "document-idle", "document-complete", "window-load"];
 const defaultRunAt = runAtValues[1];
 const defaultAutoUpdateState = AddonManager.AUTOUPDATE_DISABLE;
 const usoURLChk = /^https?:\/\/userscripts\.org\/scripts\/[^\d]+(\d+)/i;
diff --git a/extension/modules/script/simple-script.js b/extension/modules/script/simple-script.js
index 2c87fb5b..2ad106aa 100644
--- a/extension/modules/script/simple-script.js
+++ b/extension/modules/script/simple-script.js
@@ -11,7 +11,7 @@ lazyUtil(this, "isGreasemonkeyable");
 
 const JSVersions = ['1.6', '1.7', '1.8', '1.8.1'];
 const maxJSVer = JSVersions[2];
-const runAtValues = ["document-start", "document-end", "document-idle", "window-load"];
+const runAtValues = ["document-start", "document-end", "document-idle", "document-complete", "window-load"];
 const defaultRunAt = runAtValues[1];
 
 function SimpleScript() {
diff --git a/extension/modules/utils/Scriptish_updateModifiedScripts.js b/extension/modules/utils/Scriptish_updateModifiedScripts.js
index 245645a6..54b4f773 100644
--- a/extension/modules/utils/Scriptish_updateModifiedScripts.js
+++ b/extension/modules/utils/Scriptish_updateModifiedScripts.js
@@ -21,7 +21,9 @@ function Scriptish_updateModifiedScripts(href, safeWin, shouldNotRun) {
 
     let rdyStateIdx = docRdyStates.indexOf(safeWin.document.readyState);
     function inject() {
-      if (shouldNotRun()) return;
+      if (shouldNotRun())
+        return;
+
       Scriptish_injectScripts({
         scripts: [script],
         url: href,
@@ -30,25 +32,42 @@ function Scriptish_updateModifiedScripts(href, safeWin, shouldNotRun) {
     }
 
     switch (script.runAt) {
-    case "document-end":
-      if (2 > rdyStateIdx) {
-        safeWin.addEventListener("DOMContentLoaded", inject, true);
-        return;
-      }
-      break;
-    case "document-idle":
-      if (2 > rdyStateIdx) {
-        safeWin.addEventListener(
-            "DOMContentLoaded", function() timeout(inject), true);
-        return;
-      }
-      break;
-    case "window-load":
-      if (4 > rdyStateIdx) {
-        safeWin.addEventListener("load", inject, true);
-        return;
-      }
-      break;
+      case "document-end":
+        if (2 > rdyStateIdx) {
+          safeWin.addEventListener("DOMContentLoaded", function listener() {
+            safeWin.removeEventListener("DOMContentLoaded", listener, true);
+            inject();
+          }, true);
+          return;
+        }
+        break;
+      case "document-idle":
+        if (2 > rdyStateIdx) {
+          safeWin.addEventListener("DOMContentLoaded", function listener() {
+            safeWin.removeEventListener("DOMContentLoaded", listener, true);
+            timeout(inject);
+          }, true);
+          return;
+        }
+        break;
+      case "document-complete":
+        if (4 > rdyStateIdx) {
+          safeWin.addEventListener("DOMContentLoaded", function listener() {
+            safeWin.removeEventListener("DOMContentLoaded", listener, true);
+            inject();
+          }, true);
+          return;
+        }
+        break;
+      case "window-load":
+        if (4 > rdyStateIdx) {
+          safeWin.addEventListener("load", function listener() {
+            safeWin.removeEventListener("load", listener, true);
+            inject();
+          }, true);
+          return;
+        }
+        break;
     }
 
     inject();
diff --git a/extension/modules/utils/Scriptish_windowEventTracker.js b/extension/modules/utils/Scriptish_windowEventTracker.js
index d9bbc1c1..62ad76e5 100644
--- a/extension/modules/utils/Scriptish_windowEventTracker.js
+++ b/extension/modules/utils/Scriptish_windowEventTracker.js
@@ -19,20 +19,28 @@ function Scriptish_windowEventTracker(aWin) {
   trackers[winID] = "start";
 
   aWin.addEventListener("DOMContentLoaded", function onDOMContentLoaded() {
-    aWin.removeEventListener("DOMContentLoaded", onDOMContentLoaded, false);
+    aWin.removeEventListener("DOMContentLoaded", onDOMContentLoaded, true);
 
     // if the tracker event gte to this one has occurred then ignore
     if (~events.indexOf(trackers[winID]))
       return;
 
     trackers[winID] = "DOMContentLoaded";
-  }, false);
+  }, true);
+
+  aWin.document.addEventListener("readystatechange", function readyStateListener() {
+    if ("complete" != aWin.document.readyState)
+      return;
+    aWin.document.removeEventListener("readystatechange", readyStateListener, true);
+
+    trackers[winID] = "readystate@complete";
+  }, true);
 
   aWin.addEventListener("load", function onLoad() {
-    aWin.removeEventListener("load", onLoad, false);
+    aWin.removeEventListener("load", onLoad, true);
 
     trackers[winID] = "load";
-  }, false);
+  }, true);
 
   Scriptish_windowUnloader(function() {
     delete trackers[winID];

From 61db86650059fec3426ce0b4caa8f0a1655e43b2 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 21 Jul 2013 19:28:25 -0700
Subject: [PATCH 762/829] Bug fix for Scriptish_updateModifiedScripts handling
 of document-complete

---
 extension/modules/utils/Scriptish_updateModifiedScripts.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/extension/modules/utils/Scriptish_updateModifiedScripts.js b/extension/modules/utils/Scriptish_updateModifiedScripts.js
index 54b4f773..1095c262 100644
--- a/extension/modules/utils/Scriptish_updateModifiedScripts.js
+++ b/extension/modules/utils/Scriptish_updateModifiedScripts.js
@@ -52,8 +52,10 @@ function Scriptish_updateModifiedScripts(href, safeWin, shouldNotRun) {
         break;
       case "document-complete":
         if (4 > rdyStateIdx) {
-          safeWin.addEventListener("DOMContentLoaded", function listener() {
-            safeWin.removeEventListener("DOMContentLoaded", listener, true);
+          safeWin.document.addEventListener("readystatechange", function listener() {
+            if ("complete" != safeWin.document.readyState)
+              return;
+            safeWin.document.removeEventListener("readystatechange", listener, true);
             inject();
           }, true);
           return;

From c63159254754f8a231ac3bf68a064161a41bf6e0 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 21 Jul 2013 19:45:44 -0700
Subject: [PATCH 763/829] Using the Add-on SDK to get window inner ids

---
 extension/components/scriptish.js                     |  5 +++--
 extension/content/js/browser.js                       |  5 +++--
 extension/content/tests/testAvailability.js           |  2 --
 extension/modules/api/GM_ScriptStorage.js             |  5 +++--
 extension/modules/manager.js                          |  6 +++---
 extension/modules/utils/Scriptish_getWindowIDs.js     | 11 -----------
 extension/modules/utils/Scriptish_injectScripts.js    |  5 +++--
 .../modules/utils/Scriptish_windowEventTracker.js     |  5 +++--
 8 files changed, 18 insertions(+), 26 deletions(-)
 delete mode 100644 extension/modules/utils/Scriptish_getWindowIDs.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index f1b7ea6b..c7988692 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -17,11 +17,12 @@ lazyUtil(this, "injectScripts");
 lazyUtil(this, "installUri");
 lazyUtil(this, "isGreasemonkeyable");
 lazyUtil(this, "isScriptRunnable");
-lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "stringBundle");
 lazyUtil(this, "windowEventTracker");
 lazyUtil(this, "windowUnloader");
 
+const { getInnerId } = jetpack('sdk/window/utils');
+
 const CP = Ci.nsIContentPolicy;
 
 // If the file was previously cached it might have been given a number after
@@ -73,7 +74,7 @@ ScriptishService.prototype = {
               gBrowser.getBrowserForDocument(safeWin.document));
         }
 
-        let currentInnerWindowID = Scriptish_getWindowIDs(safeWin).innerID;
+        let currentInnerWindowID = getInnerId(safeWin);
         // if the focused tab's window is the one loading, then attach menuCommander
         if (safeWin === gBrowser.selectedBrowser.contentWindow) {
           if (gmBrowserUI.currentMenuCommander)
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index cac49f9b..18ae0f65 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -15,7 +15,6 @@ lazyImport(window, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(window, "resource://scriptish/config/configdownloader.js", ["Scriptish_configDownloader"]);
 
 lazyUtil(window, "getURLsForContentWindow");
-lazyUtil(window, "getWindowIDs");
 lazyUtil(window, "installUri");
 lazyUtil(window, "isGreasemonkeyable");
 lazyUtil(window, "isURLExcluded");
@@ -23,6 +22,8 @@ lazyUtil(window, "openInEditor");
 lazyUtil(window, "openInTab");
 lazyUtil(window, "stringBundle");
 
+const { getInnerId } = jetpack('sdk/window/utils');
+
 var Ci = tools.Ci;
 var Services = tools.Services;
 var $ = function(aID) document.getElementById(aID);
@@ -243,7 +244,7 @@ Scriptish_BrowserUI.reattachMenuCmds = function() {
     Scriptish_BrowserUI.currentMenuCommander = null;
   }
   var menuCommander = Scriptish_BrowserUI.getCommander(
-      Scriptish_getWindowIDs(gBrowser.selectedBrowser.contentWindow).innerID);
+      getInnerId(gBrowser.selectedBrowser.contentWindow));
   if (menuCommander) (Scriptish_BrowserUI.currentMenuCommander = menuCommander).attach();
 }
 
diff --git a/extension/content/tests/testAvailability.js b/extension/content/tests/testAvailability.js
index 12a0fded..169a3816 100644
--- a/extension/content/tests/testAvailability.js
+++ b/extension/content/tests/testAvailability.js
@@ -20,7 +20,6 @@ Cu.import("resource://scriptish/utils/Scriptish_getTempFile.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_getTLDURL.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_getUriFromFile.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_getURLsForContentWindow.js", tools);
-Cu.import("resource://scriptish/utils/Scriptish_getWindowIDs.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_getWriteStream.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_installUri.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_launchApplicationWithDoc.js", tools);
@@ -51,7 +50,6 @@ test("Utils", function() {
   equals(typeof(tools.Scriptish_getTLDURL), "function", "has Scriptish_getTLDURL");
   equals(typeof(tools.Scriptish_getUriFromFile), "function", "has Scriptish_getUriFromFile");
   equals(typeof(tools.Scriptish_getURLsForContentWindow), "function", "has Scriptish_getURLsForContentWindow");
-  equals(typeof(tools.Scriptish_getWindowIDs), "function", "has Scriptish_getWindowIDs");
   equals(typeof(tools.Scriptish_getWriteStream), "function", "has Scriptish_getWriteStream");
   equals(typeof(tools.Scriptish_installUri), "function", "has Scriptish_installUri");
   equals(typeof(tools.Scriptish_launchApplicationWithDoc), "function", "has Scriptish_launchApplicationWithDoc");
diff --git a/extension/modules/api/GM_ScriptStorage.js b/extension/modules/api/GM_ScriptStorage.js
index dfa5f7ac..4d1fe4a4 100644
--- a/extension/modules/api/GM_ScriptStorage.js
+++ b/extension/modules/api/GM_ScriptStorage.js
@@ -4,16 +4,17 @@ Components.utils.import("resource://scriptish/constants.js");
 
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_PrefManager"]);
 
-lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "stringBundle");
 lazyUtil(this, "windowUnloader");
 
+const { getInnerId } = jetpack('sdk/window/utils');
+
 function GM_ScriptStorage(aScript, aSafeWin) {
   this.prefMan = new Scriptish_PrefManager(aScript.prefroot);
   this._watchedPrefs = Object.create(null);
 
   // Be sure to remove any watchers when the window unloads
-  let winID = Scriptish_getWindowIDs(aSafeWin).innerID;
+  let winID = getInnerId(aSafeWin);
   Scriptish_windowUnloader(function() {
     let prefChanged = this._prefChanged.bind(this);
 
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index 53c21deb..95a850f1 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -8,7 +8,6 @@ lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/config.js", ["Scriptish_config"]);
 
-lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "injectScripts");
 lazyUtil(this, "isGreasemonkeyable");
 lazyUtil(this, "isScriptRunnable");
@@ -19,6 +18,7 @@ lazyUtil(this, "windowUnloader");
 
 const { Class } = jetpack('sdk/core/heritage');
 const { add } = jetpack('sdk/deprecated/observer-service');
+const { getInnerId } = jetpack('sdk/window/utils');
 
 const windowsTracked = Object.create(null);
 
@@ -47,7 +47,7 @@ const Scriptish_manager = Class({
       return;
     }
 
-    let id = Scriptish_getWindowIDs(safeWin).innerID;
+    let id = getInnerId(safeWin);
     if (windowsTracked[id]) {
       return;
     }
@@ -71,7 +71,7 @@ const Scriptish_manager = Class({
 
   docReady: function(href, safeWin) {
     let unsafeWin = safeWin.wrappedJSObject;
-    let id = Scriptish_getWindowIDs(safeWin).innerID;
+    let id = getInnerId(safeWin);
 
     let winClosed = false;    
     Scriptish_windowUnloader(function() {
diff --git a/extension/modules/utils/Scriptish_getWindowIDs.js b/extension/modules/utils/Scriptish_getWindowIDs.js
deleted file mode 100644
index 53335e13..00000000
--- a/extension/modules/utils/Scriptish_getWindowIDs.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var EXPORTED_SYMBOLS = ["Scriptish_getWindowIDs"];
-const Ci = Components.interfaces;
-
-function Scriptish_getWindowIDs(aWin) {
-  let utils = aWin.QueryInterface(Ci.nsIInterfaceRequestor)
-      .getInterface(Ci.nsIDOMWindowUtils);
-  return {
-    innerID: utils.currentInnerWindowID,
-    outerID: utils.outerWindowID
-  };
-}
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 4ed2c0cf..4de509a6 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -16,11 +16,12 @@ lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogge
 lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
 
 lazyUtil(this, "evalInSandbox");
-lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "windowUnloader");
 
 const Scriptish_injectScripts_filename = Components.stack.filename;
 const gTimer = jetpack('sdk/timers');
+const { getInnerId } = jetpack('sdk/window/utils');
+
 const {nsIDOMXPathResult: XPATH_RESULT} = Ci;
 
 function Scriptish_injectScripts(options) {
@@ -31,7 +32,7 @@ function Scriptish_injectScripts(options) {
   if (0 >= scripts.length) return;
 
   let unsafeContentWin = safeWin.wrappedJSObject;
-  let winID = Scriptish_getWindowIDs(safeWin).innerID;
+  let winID = getInnerId(safeWin);
 
   let delays = [];
 
diff --git a/extension/modules/utils/Scriptish_windowEventTracker.js b/extension/modules/utils/Scriptish_windowEventTracker.js
index 62ad76e5..3e7a045d 100644
--- a/extension/modules/utils/Scriptish_windowEventTracker.js
+++ b/extension/modules/utils/Scriptish_windowEventTracker.js
@@ -4,15 +4,16 @@ var EXPORTED_SYMBOLS = ["Scriptish_windowEventTracker"];
 
 Components.utils.import("resource://scriptish/constants.js");
 
-lazyUtil(this, "getWindowIDs");
 lazyUtil(this, "windowUnloader");
 
+const { getInnerId } = jetpack('sdk/window/utils');
+
 const events = ["DOMContentLoaded", "load"];
 
 const trackers = Object.create(null);
 
 function Scriptish_windowEventTracker(aWin) {
-  const winID = Scriptish_getWindowIDs(aWin).innerID;
+  const winID = getInnerId(aWin);
   if (winID in trackers)
     return trackers[winID];
 

From f903841d5b66550ffe4d0d7ef590bb3f27f2bdad Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 21 Jul 2013 20:04:06 -0700
Subject: [PATCH 764/829] Closes #33 use the browser.tabs.loadInBackground pref
 as the default for GM_openInTab

---
 extension/modules/utils/Scriptish_openInTab.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extension/modules/utils/Scriptish_openInTab.js b/extension/modules/utils/Scriptish_openInTab.js
index 044c9cdb..b418a129 100644
--- a/extension/modules/utils/Scriptish_openInTab.js
+++ b/extension/modules/utils/Scriptish_openInTab.js
@@ -4,8 +4,12 @@ const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 
+const tabs = jetpack('sdk/tabs');
+const prefs = jetpack('sdk/preferences/service');
+
 function Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin) {
   aChromeWin = aChromeWin || Scriptish.getMostRecentWindow();
+  aLoadInBackground = aLoadInBackground || prefs.get('browser.tabs.loadInBackground', true);
 
   // Try to reuse an existing tab
   if (aReuse) {

From f56fc4bb8831d07457f0cf2696635e2ca35991ae Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 21 Jul 2013 20:16:22 -0700
Subject: [PATCH 765/829] removing mistaken use of sdk/tabs and another minor
 clean up for GM_openInTab

---
 extension/modules/utils/Scriptish_openInTab.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/extension/modules/utils/Scriptish_openInTab.js b/extension/modules/utils/Scriptish_openInTab.js
index b418a129..17682ad5 100644
--- a/extension/modules/utils/Scriptish_openInTab.js
+++ b/extension/modules/utils/Scriptish_openInTab.js
@@ -4,7 +4,6 @@ const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 
-const tabs = jetpack('sdk/tabs');
 const prefs = jetpack('sdk/preferences/service');
 
 function Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin) {
@@ -38,9 +37,7 @@ function Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin) {
   var browser = aChromeWin.gBrowser;
   var selectedTab = browser.selectedTab;
   var newTab = browser.loadOneTab(aURL, {"inBackground": !!aLoadInBackground});
-  var afterCurrent = Services.prefs
-      .getBranch("browser.tabs.")
-      .getBoolPref("insertRelatedAfterCurrent");
+  var afterCurrent = prefs.get('browser.tabs.insertRelatedAfterCurrent', true);
 
   if (afterCurrent)
     browser.moveTabTo(newTab, selectedTab._tPos + 1);

From b18578e059a338109d17a8b950f2557bb276adcc Mon Sep 17 00:00:00 2001
From: SHIMODA Hiroshi <shimoda@clear-code.com>
Date: Wed, 2 May 2012 18:27:59 +0900
Subject: [PATCH 766/829] Closes #9 Open new tab via GM_openInTab as a child
 tab of the caller tab (if Tree Style Tab is installed)

Conflicts:
	extension/modules/api.js
---
 extension/modules/api.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index e374fcd7..f7c58b85 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -183,8 +183,18 @@ function GM_API(options) {
 
   this.GM_openInTab = function GM_openInTab(aURL, aLoadInBackground, aReuse) {
     if (!GM_apiLeakCheck("GM_openInTab")) return;
+
+    // fix relative links
     aURL = NetUtil.newURI(
         aURL, null, NetUtil.newURI(aSafeWin.location.href, null, null)).spec;
+
+    // open new tab as a child tab of the caller if Tree Style Tab
+    // ( https://addons.mozilla.org/firefox/addon/tree-style-tab/ ) there.
+    if (aChromeWin.TreeStyleTabService &&
+        aChromeWin.TreeStyleTabService.readyToOpenChildTabNow) {
+      aChromeWin.TreeStyleTabService.readyToOpenChildTabNow(aSafeWin);
+    }
+
     Scriptish_openInTab(aURL, aLoadInBackground, aReuse, aChromeWin);
     return undefined; // don't return the window, this is intentional
   }

From 8be52a1d2df7cde340138f01286a0e229112c64b Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Thu, 25 Jul 2013 21:55:58 -0700
Subject: [PATCH 767/829] Closes #155 supporting string input for GM_xpath

---
 extension/modules/api/sandbox/GM_xpath.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extension/modules/api/sandbox/GM_xpath.js b/extension/modules/api/sandbox/GM_xpath.js
index b57ec00c..aca65407 100644
--- a/extension/modules/api/sandbox/GM_xpath.js
+++ b/extension/modules/api/sandbox/GM_xpath.js
@@ -2,6 +2,10 @@
 function GM_xpath(details) {
   var contextNode, contextDocument, paths, resolver, namespace, result;
 
+  if (typeof details == 'string') {
+    details = { path: details }
+  }
+
   contextNode = "node" in details ? details.node : document;
   if (!contextNode) {
     throw new Error("The value specified for node is invalid");
@@ -67,9 +71,11 @@ function GM_xpath(details) {
         XPathResult.FIRST_ORDERED_NODE_TYPE,
         null
     ).singleNodeValue;
+
     if (result) {
       return result;
     }
   }
+
   return null;
 }

From d142ecfb329f6e684fc6167b1884b489bc4080e9 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Thu, 25 Jul 2013 22:29:22 -0700
Subject: [PATCH 768/829] Closes #152 Adding "Report An Issue" menuitem to the
 toolbar button

---
 extension/content/browser.xul               |  6 +++++-
 extension/content/js/browser.js             |  6 ++++++
 extension/locale/en-US/scriptish.properties | 10 ++++++----
 extension/modules/content/browser.js        | 10 +++++++++-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index b08dba3c..65150903 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -58,7 +58,11 @@
         <menuitem id="scriptish-tb-new-us" observes="scriptish-tb-new-us-brd"/>
 
         <menuitem id="scriptish-tb-show-us" observes="scriptish-tb-show-us-brd"/>
-        
+
+        <menuseparator/>
+
+        <menuitem id="scriptish-tb-report-issue"/>
+
         <menuseparator/>
 
         <menu id="scriptish-tb-cmds" observes="scriptish-tb-cmds-brd" disabled="false"><menupopup/></menu>
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 18ae0f65..1f834692 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -66,6 +66,12 @@ Scriptish_BrowserUI.tbBtnSetup = function() {
   sbShowUSEle.setAttribute("oncommand",
       "Scriptish_BrowserUIM.showUserscriptList()");
 
+  let sbReportIssue = $("scriptish-tb-report-issue");
+  sbReportIssue.setAttribute("label", Scriptish_stringBundle("menu.report"));
+  sbReportIssue.setAttribute("accesskey", Scriptish_stringBundle("menu.report.ak"));
+  sbReportIssue.setAttribute("oncommand",
+      "Scriptish_BrowserUIM.reportIssue()");
+
   var sbPopUp = $("scriptish-tb-popup-brd");
   sbPopUp.setAttribute("onclick",
       "Scriptish_popupClicked(event);event.stopPropagation();");
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 611ed045..6bbe1619 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -56,13 +56,15 @@ install.warning1=Malicious scripts can violate your privacy and act on your beha
 install.warning2=You should only install scripts from sources that you trust.
 installFromFile=Install User Script From File...
 installFromFile.ak=U
-menu.commands=User Script Commands...
+menu.commands=User Script Commands
 menu.commands.ak=C
-menu.install=Install User Script...
+menu.install=Install User Script
 menu.install.ak=I
-menu.manage=Manage User Scripts...
+menu.manage=Manage User Scripts
 menu.manage.ak=M
-menu.new=New User Script...
+menu.report=Report An Issue
+menu.report.ak=R
+menu.new=New User Script
 menu.new.ak=N
 menu.options.ak=O
 menu.show=View User Script Source
diff --git a/extension/modules/content/browser.js b/extension/modules/content/browser.js
index 6c855a24..96251e78 100644
--- a/extension/modules/content/browser.js
+++ b/extension/modules/content/browser.js
@@ -5,6 +5,8 @@ Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyUtil(this, "openManager");
 
+const tabs = jetpack('sdk/tabs');
+
 const ICON_16_ON = "chrome://scriptish/skin/scriptish16.png";
 const ICON_16_OFF = "chrome://scriptish/skin/scriptish16_disabled.png";
 const ICON_24_ON = "chrome://scriptish/skin/scriptish24.png";
@@ -33,7 +35,8 @@ Scriptish_BrowserUIM.prototype = {
     if (Scriptish.enabled) {
       menu.setAttribute("image", ICON_16_ON);
       tbImg.removeAttribute("scriptish-disabled");
-    } else {
+    }
+    else {
       menu.setAttribute("image", ICON_16_OFF);
       tbImg.setAttribute("scriptish-disabled", "scriptish-disabled");
     }
@@ -72,5 +75,10 @@ Scriptish_BrowserUIM.prototype = {
   },
   showUserscriptList: function() {
     timeout(Scriptish_openManager);
+  },
+  reportIssue: function() {
+    tabs.open({
+      url: 'https://github.com/scriptish/scriptish/issues'
+    })
   }
 }

From 2295d556a1f5d68bcf1bdf9c877ce6d1c84ebacb Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Thu, 25 Jul 2013 22:49:21 -0700
Subject: [PATCH 769/829] minor cleanups to
 extension/modules/content/browser.js

---
 extension/modules/content/browser.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/extension/modules/content/browser.js b/extension/modules/content/browser.js
index 96251e78..c833c61f 100644
--- a/extension/modules/content/browser.js
+++ b/extension/modules/content/browser.js
@@ -1,11 +1,11 @@
 var EXPORTED_SYMBOLS = ["Scriptish_BrowserUIM"];
 
-const Cu = Components.utils;
-Cu.import("resource://scriptish/constants.js");
+Components.utils.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyUtil(this, "openManager");
 
 const tabs = jetpack('sdk/tabs');
+const prefs = jetpack('sdk/preferences/service');
 
 const ICON_16_ON = "chrome://scriptish/skin/scriptish16.png";
 const ICON_16_OFF = "chrome://scriptish/skin/scriptish16_disabled.png";
@@ -30,7 +30,6 @@ Scriptish_BrowserUIM.prototype = {
   refreshStatus: function() {
     var tbImg = this.$("scriptish-button-brd");
     var menu = this.$("scriptish_general_menu");
-    var appName = Services.appinfo.name;
 
     if (Scriptish.enabled) {
       menu.setAttribute("image", ICON_16_ON);
@@ -58,11 +57,7 @@ Scriptish_BrowserUIM.prototype = {
     this.openChromeWindow("chrome://scriptish/content/newscript.xul", params);
   },
   openOptionsWin: function() {
-    var instantApply = false;
-    try {
-      instantApply = Services.prefs.getBoolPref("browser.preferences.instantApply");
-    }
-    catch (ex) {};
+    let instantApply = prefs.get("browser.preferences.instantApply", false);
 
     if (!this._optionsWin || this._optionsWin.closed) {
       this._optionsWin = this._win.openDialog(
@@ -74,7 +69,7 @@ Scriptish_BrowserUIM.prototype = {
     this._optionsWin.focus();
   },
   showUserscriptList: function() {
-    timeout(Scriptish_openManager);
+    Scriptish_openManager();
   },
   reportIssue: function() {
     tabs.open({

From 670e22964e54f39266db0f66caf9acaa54be283c Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 26 Jul 2013 00:14:32 -0700
Subject: [PATCH 770/829] changing the irc channel to be #userscripts

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f9614b58..22f99bd0 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 
 ## IRC
 
-irc.mozilla.org #scriptish
+irc.mozilla.org #userscripts
 
 # UserScripts
 

From b40de526b6e519bb3ae616bc39b66564241e9443 Mon Sep 17 00:00:00 2001
From: Erik Vold <erikvvold@gmail.com>
Date: Fri, 26 Jul 2013 00:47:53 -0700
Subject: [PATCH 771/829] making a help section in the README

---
 README.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 22f99bd0..7bd4ad2f 100644
--- a/README.md
+++ b/README.md
@@ -13,15 +13,13 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 * [Addons.Mozilla.Org (AMO)](https://addons.mozilla.org/firefox/addon/scriptish)
 * [Source Code](https://github.com/scriptish/scriptish)
 
-# Community
+# Help
 
 * [Wiki](https://github.com/scriptish/scriptish/wiki)
 * [Issues](https://github.com/scriptish/scriptish/issues)
 * [Blog](http://scriptish.org/blog)
-
-## IRC
-
-irc.mozilla.org #userscripts
+* irc.mozilla.org #userscripts
+* [StackOverflow](http://stackoverflow.com/questions/tagged/userscripts)
 
 # UserScripts
 

From 3df885ed121e15f632a957aea571ed4e3c20ab2a Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Fri, 26 Jul 2013 13:40:03 -0500
Subject: [PATCH 772/829] minor: remove unused SCRIPTISH_CONFIG_XML constant

---
 extension/modules/config/config.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index ffe09300..01a3ec5c 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -1,6 +1,5 @@
 var EXPORTED_SYMBOLS = ["Config"];
 
-const SCRIPTISH_CONFIG_XML = "scriptish-config.xml";
 const SCRIPTISH_CONFIG_JSON = "scriptish-config.json";
 const SCRIPTISH_BLOCKLIST = "scriptish-blocklist.json";
 

From 4f3c6cee053241f1c04cba3db41f67f3a0d953cc Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 26 Jul 2013 22:42:18 +0200
Subject: [PATCH 773/829] Check for Ci.nsIPrivateBrowsingChannel in GM_xhr

Closes GH-147
---
 extension/modules/api/GM_xmlhttpRequester.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index a5def995..86961eb6 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -189,8 +189,8 @@ GM_xmlhttpRequester.prototype.chromeStartRequest =
 
   // Loads initiated from private windows should always be private as well.
   let makePrivate = details.makePrivate || PrivateBrowsingUtils.isWindowPrivate(this.safeWin);
-  if (makePrivate) {
-    req.channel.QueryInterface(Ci.nsIPrivateBrowsingChannel).setPrivate(true);
+  if (makePrivate && req.channel instanceof Ci.nsIPrivateBrowsingChannel) {
+    req.channel.setPrivate(true);
   }
 
   var body = details.data ? details.data : null;

From 169bad7d31ec8e814ad627da1ed353525d2bed85 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 26 Jul 2013 22:43:10 +0200
Subject: [PATCH 774/829] Add additional protocols to GM_xhr whitelist

 - data: should be unproblematic to access. Already accessible through
   other means.
 - blob: should be unproblematic to access. Already accessible through
   other means (FileReader, etc).
---
 extension/modules/api/GM_xmlhttpRequester.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 86961eb6..a1c9f530 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -115,6 +115,9 @@ GM_xmlhttpRequester.prototype.contentStartRequest = function(details) {
     case "http":
     case "https":
     case "ftp":
+    case "data":
+    case "moz-blob":
+    case "blob":
       var req = Instances.xhr;
       this.chromeStartRequest(url, details, req);
       break;

From d95909b508b45a78ee160396d0bcb0df05271e6a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 26 Jul 2013 22:44:56 +0200
Subject: [PATCH 775/829] Add first GM_xhr tests

---
 extension/content/tests/runTests.js           |  1 +
 .../content/tests/testGM_xmlhttpRequester.js  | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 extension/content/tests/testGM_xmlhttpRequester.js

diff --git a/extension/content/tests/runTests.js b/extension/content/tests/runTests.js
index 645aeb26..afc9b13d 100644
--- a/extension/content/tests/runTests.js
+++ b/extension/content/tests/runTests.js
@@ -80,6 +80,7 @@ function runTests() {
     function() include("tests/testScriptishMemoize.js"),
     function() include("tests/testScriptishLogger.js"),
     function() include("tests/testTimeout.js"),
+    function() include("tests/testGM_xmlhttpRequester.js"),
     function() include("tests/endTests.js")).then(function() {
       QUnit.start(); // once all tests have been loaded run them
     });
diff --git a/extension/content/tests/testGM_xmlhttpRequester.js b/extension/content/tests/testGM_xmlhttpRequester.js
new file mode 100644
index 00000000..45e516ee
--- /dev/null
+++ b/extension/content/tests/testGM_xmlhttpRequester.js
@@ -0,0 +1,45 @@
+module("GM_xmlhttpRequester");
+
+test("exports", function() {
+  checkExports(
+    "resource://scriptish/api/GM_xmlhttpRequester.js",
+    ["GM_xmlhttpRequester"]
+    );
+});
+
+(function() {
+  "use strict";
+  const {GM_xmlhttpRequester} = Cu.import("resource://scriptish/api/GM_xmlhttpRequester.js");
+  var script = {
+    fileURL: "file:///test.js",
+    matchesDomain: function() true
+  };
+  const xhrp = new GM_xmlhttpRequester(window, window, "http://example.org", script);
+  const xhr = xhrp.contentStartRequest.bind(xhrp);
+
+  asyncTest("plain GET", function() {
+    xhr({url: "data:text/plain,test", onload: function(r) {
+      QUnit.start();
+      strictEqual(r.responseText, "test");
+    }});
+  });
+
+  asyncTest("plain POST", function() {
+    xhr({method: "POST", url: "data:text/plain,test", onload: function(r) {
+      QUnit.start();
+      strictEqual(r.responseText, "test");
+    }});
+  });
+
+  test("invalid protos", function() {
+    for (var p of ["file", "gopher", "magnet", "torrent", "call"]) {
+      raises(function() xhr({url: p + ":text/plain,test"}));
+    }
+  });
+
+  // TODO redirect + ignores
+  // TODO private
+  // TODO payload
+  // TODO ssl + errors
+  // TODO full response object
+})();

From d811be5e760e959e6326efe2540482dff0d08e1a Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 27 Jul 2013 13:54:17 -0700
Subject: [PATCH 776/829] Closes #161 Force use of HTTPS on userscripts.org

---
 extension/components/scriptish.js            |  5 +++++
 extension/modules/commonjs/uso-redirector.js | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 extension/modules/commonjs/uso-redirector.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index c7988692..f1270f0c 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -30,7 +30,12 @@ const CP = Ci.nsIContentPolicy;
 const RE_USERSCRIPT = /\.user(?:-\d+)?\.js$/;
 const RE_CONTENTTYPE = /text\/html/i;
 
+// load the USo HTTPS redirector
+jetpack('scriptish/commonjs/uso-redirector');
+
 function ScriptishService() {
+
+  // load the manager
   Scriptish_manager();
 
   Services.obs.addObserver(this, "install-userscript", false);
diff --git a/extension/modules/commonjs/uso-redirector.js b/extension/modules/commonjs/uso-redirector.js
new file mode 100644
index 00000000..edd66fe8
--- /dev/null
+++ b/extension/modules/commonjs/uso-redirector.js
@@ -0,0 +1,19 @@
+'use strict';
+
+const { Ci, Cu } = require('chrome');
+const events = require('sdk/system/events');
+
+const { NetUtil } = Cu.import('resource://gre/modules/NetUtil.jsm', {});
+
+function applyRedirect({ subject }) {
+  const channel = subject.QueryInterface(Ci.nsIHttpChannel);
+  const { URI } = channel;
+
+  if (URI.host == 'userscripts.org' && URI.scheme == 'http') {
+    let to = NetUtil.newURI(URI.spec);
+    to.scheme = 'https';
+
+    channel.redirectTo(to);
+  }
+}
+events.on('http-on-modify-request', applyRedirect);

From ef0a1ae973b29fc1280d5b3b59b51a70ddfbd57d Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 27 Jul 2013 14:25:54 -0700
Subject: [PATCH 777/829] moving commonjs files to a separate folder

---
 extension/components/scriptish.js                      |  3 +--
 extension/content/tests/testAvailability.js            |  2 --
 extension/modules/api.js                               |  1 -
 .../{utils/Scriptish_alert.js => commonjs/alert.js}    |  2 +-
 extension/modules/constants.js                         |  4 ++--
 extension/modules/script/scriptdownloader.js           | 10 +++++-----
 extension/modules/utils/Scriptish_evalInSandbox.js     |  1 -
 extension/modules/utils/Scriptish_getEditor.js         |  4 ++--
 extension/modules/utils/Scriptish_openInEditor.js      |  4 ++--
 9 files changed, 13 insertions(+), 18 deletions(-)
 rename extension/modules/{utils/Scriptish_alert.js => commonjs/alert.js} (81%)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index f1270f0c..c603ca0f 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -31,10 +31,9 @@ const RE_USERSCRIPT = /\.user(?:-\d+)?\.js$/;
 const RE_CONTENTTYPE = /text\/html/i;
 
 // load the USo HTTPS redirector
-jetpack('scriptish/commonjs/uso-redirector');
+jetpack('scriptish/uso-redirector');
 
 function ScriptishService() {
-
   // load the manager
   Scriptish_manager();
 
diff --git a/extension/content/tests/testAvailability.js b/extension/content/tests/testAvailability.js
index 169a3816..1b4d1ca7 100644
--- a/extension/content/tests/testAvailability.js
+++ b/extension/content/tests/testAvailability.js
@@ -5,7 +5,6 @@ var tools = {};
 
 (function(Cu) {
 Cu.import("resource://scriptish/constants.js");
-Cu.import("resource://scriptish/utils/Scriptish_alert.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_convert2RegExp.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_createUserScriptSource.js", tools);
 Cu.import("resource://scriptish/utils/Scriptish_cryptoHash.js", tools);
@@ -35,7 +34,6 @@ Cu.import("resource://scriptish/third-party/Scriptish_openFolder.js", tools);
 test("Utils", function() {
   expect(28);
 
-  equals(typeof(tools.Scriptish_alert), "function", "has Scriptish_alert");
   equals(typeof(tools.Scriptish_convert2RegExp), "function", "has Scriptish_convert2RegExp");
   equals(typeof(tools.Scriptish_createUserScriptSource), "function", "has Scriptish_createUserScriptSource");
   equals(typeof(tools.Scriptish_cryptoHash), "function", "has Scriptish_cryptoHash");
diff --git a/extension/modules/api.js b/extension/modules/api.js
index f7c58b85..0d58257f 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -9,7 +9,6 @@ lazyImport(this, "resource://scriptish/utils/Scriptish_injectScripts.js", ["Scri
 
 const { Style } = jetpack("sdk/stylesheet/style");
 const { attach, detach } = jetpack("sdk/content/mod");
-const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
 
 lazyUtil(this, "cryptoHash");
 lazyUtil(this, "getScriptHeader");
diff --git a/extension/modules/utils/Scriptish_alert.js b/extension/modules/commonjs/alert.js
similarity index 81%
rename from extension/modules/utils/Scriptish_alert.js
rename to extension/modules/commonjs/alert.js
index 43659325..c0eb4920 100644
--- a/extension/modules/utils/Scriptish_alert.js
+++ b/extension/modules/commonjs/alert.js
@@ -7,7 +7,7 @@ const { Services } = Cu.import("resource://scriptish/constants.js", {});
 
 function alert(aMsg, aTitle, aWait) {
   if (typeof aWait == "number")
-    return setTimeout(function() Scriptish_alert(aMsg, aTitle), aWait);
+    return setTimeout(function() alert(aMsg, aTitle), aWait);
   Services.prompt.alert(null, aTitle || "Scriptish", aMsg+"");
 }
 exports.alert = alert;
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 5e6cc00e..889f0a77 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -40,7 +40,7 @@ var Instances = {
       .createInstance(Ci.nsISupportsString),
   get suc() Cc["@mozilla.org/intl/scriptableunicodeconverter"]
       .createInstance(Ci.nsIScriptableUnicodeConverter),
-  get cos() Cc["@mozilla.org/intl/converter-output-stream;1"]  
+  get cos() Cc["@mozilla.org/intl/converter-output-stream;1"]
        .createInstance(Ci.nsIConverterOutputStream),
   get timer() Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer),
   get wbp() Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
@@ -140,7 +140,7 @@ const loader = Loader.Loader({
   },
   paths: {
     "devtools": "resource:///modules/devtools/",
-    "scriptish/": "resource://scriptish/",
+    "scriptish/": "resource://scriptish/commonjs/",
     "pathfinder/": "resource://scriptish/pathfinder/",
     "sdk/": "resource://gre/modules/commonjs/sdk/",
     "": "resource://gre/modules/commonjs/"
diff --git a/extension/modules/script/scriptdownloader.js b/extension/modules/script/scriptdownloader.js
index d46132da..b90b704e 100644
--- a/extension/modules/script/scriptdownloader.js
+++ b/extension/modules/script/scriptdownloader.js
@@ -11,7 +11,7 @@ lazyImport(this, "resource://scriptish/scriptish.js", ["Scriptish"]);
 lazyImport(this, "resource://scriptish/script/script.js", ["Script"]);
 lazyImport(this, "resource://scriptish/script/scripticon.js", ["ScriptIcon"]);
 
-const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
+const { alert } = jetpack('scriptish/alert');
 lazyUtil(this, "getTempFile");
 lazyUtil(this, "getWriteStream");
 lazyUtil(this, "stringBundle");
@@ -96,7 +96,7 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
   try {
     // If loading from file, status might be zero on success
     if (req.status != 200 && req.status != 0) {
-      Scriptish_alert(Scriptish_stringBundle("error.script.loading") + ":\n"
+      alert(Scriptish_stringBundle("error.script.loading") + ":\n"
           + req.status + ": " + req.statusText);
       return;
     }
@@ -162,7 +162,7 @@ ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
     }
   }
   catch (e) {
-    Scriptish_alert(Scriptish_stringBundle("error.script.installing") + ": " + e);
+    alert(Scriptish_stringBundle("error.script.installing") + ": " + e);
     throw e;
   }
 }
@@ -373,7 +373,7 @@ ScriptDownloader.prototype.errorInstallDependency = function(dep, msg) {
 
   // if the user has already clicked a nonEM 'install'/'upgrade' button
   if (this.installOnCompletion_) {
-    Scriptish_alert(this.dependencyError);
+    alert(this.dependencyError);
   }
 
   this._callback && this._callback(); // show install dialog
@@ -387,7 +387,7 @@ ScriptDownloader.prototype.installScript = function() {
   if (this.dependencyError) {
     // use timeout to avoid race condition that causes install window to fail
     // to be closed..
-    Scriptish_alert(this.dependencyError, null, 100); 
+    alert(this.dependencyError, null, 100);
     return false;
   }
 
diff --git a/extension/modules/utils/Scriptish_evalInSandbox.js b/extension/modules/utils/Scriptish_evalInSandbox.js
index 87d222b5..e6c11601 100644
--- a/extension/modules/utils/Scriptish_evalInSandbox.js
+++ b/extension/modules/utils/Scriptish_evalInSandbox.js
@@ -10,7 +10,6 @@ lazyUtil(this, "stringBundle");
 
 const { Style } = jetpack("sdk/stylesheet/style");
 const { attach, detach } = jetpack("sdk/content/mod");
-const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
 
 const fileURLPrefix = "chrome://scriptish/content/scriptish.js -> ";
 const Scriptish_evalInSandbox_filename = Components.stack.filename;
diff --git a/extension/modules/utils/Scriptish_getEditor.js b/extension/modules/utils/Scriptish_getEditor.js
index 38017f0d..165de110 100644
--- a/extension/modules/utils/Scriptish_getEditor.js
+++ b/extension/modules/utils/Scriptish_getEditor.js
@@ -4,7 +4,7 @@ const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log"]);
-const { alert: Scriptish_alert } = jetpack('scriptish/utils/Scriptish_alert');
+const { alert } = jetpack('scriptish/alert');
 lazyUtil(this, "stringBundle");
 
 const Scriptish_getEditor = function(parentWindow, change) {
@@ -91,7 +91,7 @@ const Scriptish_getEditor = function(parentWindow, change) {
       return fp.file;
     }
     else {
-      Scriptish_alert(Scriptish_stringBundle("editor.pleasePickExecutable"));
+      alert(Scriptish_stringBundle("editor.pleasePickExecutable"));
     }
   }
 }
diff --git a/extension/modules/utils/Scriptish_openInEditor.js b/extension/modules/utils/Scriptish_openInEditor.js
index 0c96e8ae..b793bed1 100644
--- a/extension/modules/utils/Scriptish_openInEditor.js
+++ b/extension/modules/utils/Scriptish_openInEditor.js
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = ["Scriptish_openInEditor"];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
-const { alert: Scriptish_alert } = jetpack("scriptish/utils/Scriptish_alert");
+const { alert } = jetpack("scriptish/alert");
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyUtil(this, "getEditor");
 lazyUtil(this, "launchApplicationWithDoc");
@@ -24,7 +24,7 @@ function Scriptish_openInEditor(script, parentWindow) {
   }
   catch (e) {
     // Something may be wrong with the editor the user selected. Remove it.
-    Scriptish_alert(Scriptish_stringBundle("editor.couldNotLaunch") + "\n" + e);
+    alert(Scriptish_stringBundle("editor.couldNotLaunch") + "\n" + e);
     Scriptish_prefRoot.remove("editor");
     throw e;
   }

From 88fe26cb2a311e05037f7676b6cbf69fe5f77392 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 27 Jul 2013 16:05:56 -0700
Subject: [PATCH 778/829] Closes #160 Ignoring @requires from
 usocheckup.dune.net (which are old school update scripts)

---
 extension/modules/script/script.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 70e312c8..a0b68797 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -40,6 +40,10 @@ const usoURLChk = /^https?:\/\/userscripts\.org\/scripts\/[^\d]+(\d+)/i;
 const RE_USERSCRIPT_HEADER_START = /\/\/[ \t]*==UserScript==/i;
 const RE_USERSCRIPT_HEADER_END = /\/\/[ \t]*==\/UserScript==/i;
 
+const BLOCKED_DOMAINS = {
+  'usocheckup.dune.net': true
+}
+
 function noUpdateFound(aListener, aReason) {
   if (aListener.onNoUpdateAvailable)
     aListener.onNoUpdateAvailable(this);
@@ -1106,6 +1110,12 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
         case "require":
           try {
             let reqUri = NetUtil.newURI(value, null, aURI);
+
+            // if the uri domain is blocked, then ignore
+            if (BLOCKED_DOMAINS[reqUri.host]) {
+              continue;
+            }
+
             let scriptRequire = new ScriptRequire(script);
 
             scriptRequire._downloadURL = reqUri.spec;

From f4c127eb024bd9f0b22f5eb2d089775f39f61e79 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 27 Jul 2013 16:12:56 -0700
Subject: [PATCH 779/829] Closes #153 Making document-end the new default for
 new scripts created by Scriptish

---
 extension/content/js/newscript.js           | 10 ++++++----
 extension/content/newscript.xul             |  2 +-
 extension/locale/en-US/scriptish.properties |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 5ac4ffc6..2b8ccdc8 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -79,9 +79,9 @@ function doInstall() {
   var tempFile = Scriptish_getTempFile();
   var foStream = Scriptish_getWriteStream(tempFile);
   var converter = Instances.cos;
-	converter.init(foStream, "UTF-8", 0, 0);  
-	converter.writeString(script);  
-	converter.close(); // this closes foStream  
+	converter.init(foStream, "UTF-8", 0, 0);
+	converter.writeString(script);
+	converter.close(); // this closes foStream
 
   // create a script object with parsed metadata,
   script = Scriptish_config.parse(script);
@@ -123,9 +123,11 @@ function createScriptSource() {
     exclude: $("excludes").value ? $("excludes").value.match(/.+/g) : [],
     "run-at": $("run-at").value
   }
+
   try {
     return Scriptish_createUserScriptSource(header, scriptContent);
-  } catch (e) {
+  }
+  catch (e) {
     alert(e.message);
   }
 }
diff --git a/extension/content/newscript.xul b/extension/content/newscript.xul
index ba9848b3..d372f62f 100644
--- a/extension/content/newscript.xul
+++ b/extension/content/newscript.xul
@@ -52,7 +52,7 @@
           <menupopup>
             <menuitem label="newscript.runat.documentstart" value="document-start" localize="label"/>
             <menuitem label="newscript.runat.documentidle" value="document-idle" localize="label"/>
-            <menuitem label="newscript.runat.documentend" value="document-end" localize="label"/>
+            <menuitem label="newscript.runat.documentend" selected="true" value="document-end" localize="label"/>
             <menuitem label="newscript.runat.documentcomplete" value="document-complete" localize="label"/>
             <menuitem label="newscript.runat.windowload" value="window-load" localize="label"/>
           </menupopup>
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 6bbe1619..0bd98132 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -93,7 +93,7 @@ newscript.runat.documentstart=Document starts loading
 newscript.runat.documentend=Document finishes loading (not resources)
 newscript.runat.documentidle=Document is first idle
 newscript.runat.documentcomplete=Document finishes loading (including resources)
-newscript.runat.windowload=Window incl. all media is fully loaded
+newscript.runat.windowload=Window Loaded (the page has finished rendering)
 newscript.version=Version
 nothing.timedOut=nothing (timed out)
 openFolder=Open Folder

From 106c7dc533cb45dfe3d919d25bbcad598a01617a Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 27 Jul 2013 19:14:40 -0700
Subject: [PATCH 780/829] Removing hidden @applybackgroundupdates

---
 extension/modules/script/script.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index a0b68797..b320bd51 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -976,10 +976,6 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
           if (uri.scheme == "https" || uri.scheme == "http")
             script._updateURL = uri.spec;
           break;
-        case "applybackgroundupdates":
-          script._applyBackgroundUpdates =
-              parseInt(value, 10) || defaultAutoUpdateState;
-          continue;
         case "injectframes":
           if (value != "0") continue;
           script["_noframes"] = true;

From d5b54014ecf4f36b992faf64643b1f23d6ac8e18 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 27 Jul 2013 19:26:24 -0700
Subject: [PATCH 781/829] Closes #154 Reduce `throw new Error` to `throw Error`

---
 extension/content/js/third-party/html/html.js       |  2 +-
 extension/content/js/third-party/qunit/qunit.js     |  8 +++++---
 extension/modules/api.js                            |  2 +-
 extension/modules/api/GM_Resources.js               |  2 +-
 extension/modules/api/GM_ScriptStorage.js           |  6 +++---
 extension/modules/api/GM_xmlhttpRequester.js        | 13 +++++++------
 extension/modules/logging.js                        |  4 ++--
 extension/modules/menucommander.js                  |  6 +++---
 extension/modules/prefmanager.js                    |  2 +-
 extension/modules/script/script.js                  | 12 +++++++-----
 extension/modules/script/scripticon.js              | 12 ++++++++----
 extension/modules/third-party/MatchPattern.js       | 11 ++++++-----
 .../utils/Scriptish_createUserScriptSource.js       |  2 +-
 extension/modules/utils/Scriptish_cryptoHash.js     | 12 +++++++-----
 extension/modules/utils/Scriptish_memoize.js        |  2 +-
 15 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/extension/content/js/third-party/html/html.js b/extension/content/js/third-party/html/html.js
index 8092eed4..e5b3e23a 100755
--- a/extension/content/js/third-party/html/html.js
+++ b/extension/content/js/third-party/html/html.js
@@ -86,7 +86,7 @@ var html = (function() {
   html.render = function html_render(aKey, aData) {
     var template = templates[aKey];
     if (!template)
-      throw new Error("There is no template with the key '" + aKey + "'");
+      throw Error("There is no template with the key '" + aKey + "'");
 
     if ("[object Array]" == Object.prototype.toString.call(aData)) {
       var rtn = [];
diff --git a/extension/content/js/third-party/qunit/qunit.js b/extension/content/js/third-party/qunit/qunit.js
index 5d72dcc3..0cc248c4 100644
--- a/extension/content/js/third-party/qunit/qunit.js
+++ b/extension/content/js/third-party/qunit/qunit.js
@@ -814,12 +814,14 @@ function validTest( name ) {
 // could be extended in the future to use something like https://github.com/csnover/TraceKit
 function sourceFromStacktrace() {
 	try {
-		throw new Error();
-	} catch ( e ) {
+		throw Error();
+	}
+  catch ( e ) {
 		if (e.stacktrace) {
 			// Opera
 			return e.stacktrace.split("\n")[6];
-		} else if (e.stack) {
+		}
+    else if (e.stack) {
 			// Firefox, Chrome
 			return e.stack.split("\n")[4];
 		}
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 0d58257f..4d30dec1 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -103,7 +103,7 @@ function GM_API(options) {
         baseURI = NetUtil.newURI(aBaseURL);
       }
       catch(e) {
-        throw new Error(Scriptish_stringBundle("error.api.safeHTMLParser.url"));
+        throw Error(Scriptish_stringBundle("error.api.safeHTMLParser.url"));
       }
     }
     else {
diff --git a/extension/modules/api/GM_Resources.js b/extension/modules/api/GM_Resources.js
index bb448084..c569adc0 100644
--- a/extension/modules/api/GM_Resources.js
+++ b/extension/modules/api/GM_Resources.js
@@ -26,6 +26,6 @@ GM_Resources.prototype.getDep = function(name) {
       return resource;
     }
   }
-  throw new Error(
+  throw Error(
       Scriptish_stringBundle("error.api.noResourceWithName") + ": '" + name + "'");
 }
diff --git a/extension/modules/api/GM_ScriptStorage.js b/extension/modules/api/GM_ScriptStorage.js
index 4d1fe4a4..11d4be24 100644
--- a/extension/modules/api/GM_ScriptStorage.js
+++ b/extension/modules/api/GM_ScriptStorage.js
@@ -27,7 +27,7 @@ function GM_ScriptStorage(aScript, aSafeWin) {
 
 GM_ScriptStorage.prototype.setValue = function(name, val) {
   if (2 !== arguments.length) {
-    throw new Error(Scriptish_stringBundle("error.api.noSecondArgValue"));
+    throw Error(Scriptish_stringBundle("error.api.noSecondArgValue"));
   }
 
   return this.prefMan.setValue(name, val);
@@ -66,12 +66,12 @@ GM_ScriptStorage.prototype._prefChanged = function(aName) {
 GM_ScriptStorage.prototype.watchValue = function(aName, aListener) {
   // Make sure we were passed everything
   if (!(aName && aListener && "function" === typeof aListener)) {
-    throw new Error(Scriptish_stringBundle("error.api.badArguments"));
+    throw Error(Scriptish_stringBundle("error.api.badArguments"));
   }
 
   // Nothing to do if the preference doesn't exist
   if (!this.prefMan.exists(aName)) {
-    throw new Error(Scriptish_stringBundle("error.api.prefNotFound"));
+    throw Error(Scriptish_stringBundle("error.api.prefNotFound"));
   }
 
   // Generate a UUID for the watcher so it can be unwatched by the user
diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index a1c9f530..0d449339 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -19,7 +19,7 @@ const MIME_JSON = /^(application|text)\/(?:x-)?json/i;
  * @author Nils Maier
  */
 function NotificationCallbacks(req) {
-  throw new Error("trying to initiate an abstract NotificationCallbacks");
+  throw Error("trying to initiate an abstract NotificationCallbacks");
 }
 NotificationCallbacks.prototype = {
   init: function(req) {
@@ -98,14 +98,15 @@ GM_xmlhttpRequester.prototype.contentStartRequest = function(details) {
     // Validate and parse the (possibly relative) given URL.
     var uri = NetUtil.newURI(details.url, null, NetUtil.newURI(this.originUrl));
     var url = uri.spec;
-  } catch (e) {
+  }
+  catch (e) {
     // A malformed URL won't be parsed properly.
-    throw new Error(Scriptish_stringBundle("error.api.reqURL") + ": " + details.url);
+    throw Error(Scriptish_stringBundle("error.api.reqURL") + ": " + details.url);
   }
 
   // check if the script is allowed to access the url
   if (!this.script.matchesDomain(url))
-    throw new Error(
+    throw Error(
         "User script is attempting access to restricted domain '" + uri.host + "'",
         this.script.fileURL);
 
@@ -122,7 +123,7 @@ GM_xmlhttpRequester.prototype.contentStartRequest = function(details) {
       this.chromeStartRequest(url, details, req);
       break;
     default:
-      throw new Error(Scriptish_stringBundle("error.api.reqURL.scheme") + ": " + details.url);
+      throw Error(Scriptish_stringBundle("error.api.reqURL.scheme") + ": " + details.url);
   }
 
   return {
@@ -173,7 +174,7 @@ GM_xmlhttpRequester.prototype.chromeStartRequest =
   }
   if ("redirectionLimit" in details) {
     if (details.redirectionLimit < 0 || details.redirectionLimit > 10) {
-      throw new Error("redirectionLimit must be within (0, 10), but it is " + details.redirectionLimit);
+      throw Error("redirectionLimit must be within (0, 10), but it is " + details.redirectionLimit);
     }
     redirectionLimit = details.redirectionLimit;
   }
diff --git a/extension/modules/logging.js b/extension/modules/logging.js
index 077b27f1..15f1c354 100644
--- a/extension/modules/logging.js
+++ b/extension/modules/logging.js
@@ -36,8 +36,8 @@ function Scriptish_logScriptError(aError, aWindow, aFileURL, aId) {
         .getInterface(Ci.nsIDOMWindowUtils)
         .currentInnerWindowID;
     }
-    catch (ex) {
-      throw new Error("failed to get window id");
+    catch (e) {
+      throw Error("failed to get window id");
     }
 
     // defaults
diff --git a/extension/modules/menucommander.js b/extension/modules/menucommander.js
index 3b998871..16ee0b8e 100644
--- a/extension/modules/menucommander.js
+++ b/extension/modules/menucommander.js
@@ -77,7 +77,7 @@ Scriptish_MenuCommander.prototype.modifyMenuCommand =
           keys[i].setAttribute("disabled", aAction == "disable");
           break;
         default:
-          throw new Error("Invalid menu command action");
+          throw Error("Invalid menu command action");
       }
       found = true;
       break;
@@ -98,7 +98,7 @@ Scriptish_MenuCommander.prototype.modifyMenuCommand =
           toolsMenuItems[i].setAttribute("disabled", aAction == "disable");
           break;
         default:
-          throw new Error("Invalid menu command action");
+          throw Error("Invalid menu command action");
       }
       found = true;
       break;
@@ -122,7 +122,7 @@ Scriptish_MenuCommander.prototype.modifyMenuCommand =
             tbMenuItems[i].setAttribute("disabled", aAction == "disable");
             break;
           default:
-            throw new Error("Invalid menu command action");
+            throw Error("Invalid menu command action");
         }
         found = true;
         break;
diff --git a/extension/modules/prefmanager.js b/extension/modules/prefmanager.js
index ee27ad73..cd0f606a 100644
--- a/extension/modules/prefmanager.js
+++ b/extension/modules/prefmanager.js
@@ -81,7 +81,7 @@ function Scriptish_PrefManager(startPoint, syncMode) {
     }
 
     if (!goodType)
-      throw new Error(Scriptish_stringBundle("error.pref.type"));
+      throw Error(Scriptish_stringBundle("error.pref.type"));
 
     // underlying preferences object throws an exception if new pref has a
     // different type than old one. i think we should not do this, so delete
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index b320bd51..c9c3b576 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1021,19 +1021,21 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
         case "jsversion":
           let jsVerIndx = JSVersions.indexOf(value);
           if (-1 === jsVerIndx) {
-            throw new Error("@jsversion " + value + " " +
+            throw Error("@jsversion " + value + " " +
                 Scriptish_stringBundle("error.isInvalidValue"));
-          } else if (jsVerIndx > JSVersions.indexOf(maxJSVer)) {
-            throw new Error("@jsversion " + value + " " +
+          }
+          else if (jsVerIndx > JSVersions.indexOf(maxJSVer)) {
+            throw Error("@jsversion " + value + " " +
                 Scriptish_stringBundle("error.notSupported.Firefox"));
-          } else {
+          }
+          else {
             script._jsversion = JSVersions[jsVerIndx];
           }
           continue;
         case "run-at":
           let runAtIndx = runAtValues.indexOf(value);
           if (0 > runAtIndx)
-            throw new Error("@run-at " + value + " " +
+            throw Error("@run-at " + value + " " +
                 Scriptish_stringBundle("error.isInvalidValue"));
           script["_run-at"] = runAtValues[runAtIndx];
           continue;
diff --git a/extension/modules/script/scripticon.js b/extension/modules/script/scripticon.js
index f872ec68..cb2bb28e 100644
--- a/extension/modules/script/scripticon.js
+++ b/extension/modules/script/scripticon.js
@@ -34,13 +34,17 @@ ScriptIcon.prototype.__defineSetter__("fileURL", function(aURL) {
 });
 ScriptIcon.prototype.setIcon = function(aVal, aURI) {
   // aceept data uri schemes for image MIME types
-  if (/^data:image\//i.test(aVal)) return this._dataURI = aVal;
+  if (/^data:image\//i.test(aVal))
+    return this._dataURI = aVal;
+
   if (/^data:/i.test(aVal))
-    throw new Error(Scriptish_stringBundle("error.icon.dataURL"));
+    throw Error(Scriptish_stringBundle("error.icon.dataURL"));
+
   try {
     this._downloadURL = NetUtil.newURI(aVal, null, aURI).spec;
-  } catch (e) {
-    throw new Error(Scriptish_stringBundle("error.icon.URL"));
+  }
+  catch (e) {
+    throw Error(Scriptish_stringBundle("error.icon.URL"));
   }
 }
 ScriptIcon.prototype.isImage = function(aMIMEType) /^image\//i.test(aMIMEType);
diff --git a/extension/modules/third-party/MatchPattern.js b/extension/modules/third-party/MatchPattern.js
index d9f77123..db0b6708 100644
--- a/extension/modules/third-party/MatchPattern.js
+++ b/extension/modules/third-party/MatchPattern.js
@@ -65,8 +65,9 @@ function MatchPattern(pattern) {
 
   try {
     var uri = NetUtil.newURI(pattern);
-  } catch (e) {
-    throw new Error(Scriptish_stringBundle("error.pattern.parsing") + ": " + e);
+  }
+  catch (e) {
+    throw Error(Scriptish_stringBundle("error.pattern.parsing") + ": " + e);
   }
 
   var scheme = this.wildScheme ? "all" : uri.scheme;
@@ -74,13 +75,13 @@ function MatchPattern(pattern) {
   var path = uri.path;
 
   if (scheme != "all" && validSchemes.indexOf(scheme) == -1) {
-    throw new Error(Scriptish_stringBundle("error.matchPattern.rules"));
+    throw Error(Scriptish_stringBundle("error.matchPattern.rules"));
   }
   if (!REG_HOST.test(host)) {
-    throw new Error(Scriptish_stringBundle("error.matchPattern.rules"));
+    throw Error(Scriptish_stringBundle("error.matchPattern.rules"));
   }
   if (path[0] !== "/") {
-    throw new Error(Scriptish_stringBundle("error.matchPattern.rules"));
+    throw Error(Scriptish_stringBundle("error.matchPattern.rules"));
   }
 
   this.scheme = scheme;
diff --git a/extension/modules/utils/Scriptish_createUserScriptSource.js b/extension/modules/utils/Scriptish_createUserScriptSource.js
index d3c0543c..1685034c 100644
--- a/extension/modules/utils/Scriptish_createUserScriptSource.js
+++ b/extension/modules/utils/Scriptish_createUserScriptSource.js
@@ -38,7 +38,7 @@ function Scriptish_createUserScriptSource(aHeader, aContent) {
   }
 
   if (!aHeader.id || typeof aHeader.id != "string") {
-    throw new Error(Scriptish_stringBundle("newscript.noID"));
+    throw Error(Scriptish_stringBundle("newscript.noID"));
   }
   // push the id first, always
   push("id", aHeader.id);
diff --git a/extension/modules/utils/Scriptish_cryptoHash.js b/extension/modules/utils/Scriptish_cryptoHash.js
index 662385dc..dd983c03 100644
--- a/extension/modules/utils/Scriptish_cryptoHash.js
+++ b/extension/modules/utils/Scriptish_cryptoHash.js
@@ -2,7 +2,7 @@ var EXPORTED_SYMBOLS = ["Scriptish_cryptoHash"];
 Components.utils.import("resource://scriptish/constants.js");
 lazyUtil(this, "stringBundle");
 
-// this tells updateFromStream to read the entire string 
+// this tells updateFromStream to read the entire string
 const PR_UINT32_MAX = 0xffffffff;
 
 function Scriptish_cryptoHash(aString, aAlg, aCharset) {
@@ -14,14 +14,16 @@ function Scriptish_cryptoHash(aString, aAlg, aCharset) {
 
   try {
     ch.initWithString(alg);
-  } catch (e) {
-    throw new Error(Scriptish_stringBundle("error.hash.algorithm"));
+  }
+  catch (e) {
+    throw Error(Scriptish_stringBundle("error.hash.algorithm"));
   }
 
   try {
     unicodeConverter.charset = charset;
-  } catch(e) {
-    throw new Error(Scriptish_stringBundle("error.charset"));
+  }
+  catch(e) {
+    throw Error(Scriptish_stringBundle("error.charset"));
   }
 
   if (str)
diff --git a/extension/modules/utils/Scriptish_memoize.js b/extension/modules/utils/Scriptish_memoize.js
index 3b2bfb1f..16afcd9e 100644
--- a/extension/modules/utils/Scriptish_memoize.js
+++ b/extension/modules/utils/Scriptish_memoize.js
@@ -28,7 +28,7 @@ function Scriptish_memoize(func, limit, num_args) {
 
   switch (num_args) {
   case 0:
-    throw new Error("memoize does not support functions without arguments");
+    throw Error("memoize does not support functions without arguments");
   case 1:
     return function memoize_one_arg(a) {
       key = a.toString();

From bc292d8d32fab66ad1584b1037c94a75ee69275d Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 27 Jul 2013 20:10:52 -0700
Subject: [PATCH 782/829] Closes #106 offer an opt-out for the install
 detection so that GM and Scriptish can be used together

---
 extension/components/scriptish.js           |  6 ++++--
 extension/content/options.xul               |  2 ++
 extension/defaults/preferences/scriptish.js |  1 +
 extension/locale/en-US/scriptish.properties |  1 +
 extension/modules/scriptish.js              | 14 ++++++++++++--
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index c603ca0f..490d34b5 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -128,10 +128,12 @@ ScriptishService.prototype = {
     }
 
     // don't intercept anything when Scriptish is not enabled
-    if (!Scriptish.enabled) return CP.ACCEPT;
+    if (!Scriptish.enabled || !Scriptish.enableInstallDetection)
+      return CP.ACCEPT;
 
     // don't interrupt the view-source: scheme
-    if ("view-source" == cl.scheme) return CP.ACCEPT;
+    if ("view-source" == cl.scheme)
+      return CP.ACCEPT;
 
     // CP.TYPE is not binary, so do not use bitwise logic tricks
     if ((ct == CP.TYPE_DOCUMENT || ct == CP.TYPE_SUBDOCUMENT)
diff --git a/extension/content/options.xul b/extension/content/options.xul
index 7e2db1d2..97f02ea9 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -106,6 +106,7 @@
       <preference id="pref-logChrome" name="extensions.scriptish.logChrome" type="bool"/>
       <preference id="pref-logToErrorConsole" name="extensions.scriptish.logToErrorConsole" type="bool"/>
       <preference id="pref-enableScriptGrantSniffing" name="extensions.scriptish.enableScriptGrantSniffing" type="bool"/>
+      <preference id="pref-enableInstallDetection" name="extensions.scriptish.enableInstallDetection" type="bool"/>
       <preference id="pref-update-requireSecured" name="extensions.scriptish.update.requireSecured" type="bool"/>
       <preference id="pref-update-requireBuiltInCerts" name="extensions.scriptish.update.requireBuiltInCerts" type="bool"/>
     </preferences>
@@ -130,6 +131,7 @@
           <groupbox>
           <caption label="options.other" localize="label" />
             <checkbox preference="pref-enableScriptGrantSniffing" label="options.grant.sniffing" localize="label"/>
+            <checkbox preference="pref-enableInstallDetection" label="options.enableInstallDetection" localize="label"/>
           </groupbox>
         </tabpanel>
         <tabpanel>
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index dd3798b9..76c80beb 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -18,6 +18,7 @@ pref("extensions.scriptish.enabledNotifications.popup", true);
 pref("extensions.scriptish.enabledNotifications.sliding", true);
 pref("extensions.scriptish.enableScriptRefreshing", true);
 pref("extensions.scriptish.enableScriptGrantSniffing", true);
+pref("extensions.scriptish.enableInstallDetection", true);
 pref("extensions.scriptish.logChrome", false);
 pref("extensions.scriptish.logToErrorConsole", true);
 pref("extensions.scriptish.optimizingRegexpMerge", false);
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 0bd98132..2b9ae3c6 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -109,6 +109,7 @@ options.changeEditor=Change Editor
 options.editor=Editor
 options.editor.notset=No editor selected
 options.enableCopyDownloadURL=Enable copying of download URL
+options.enableInstallDetection=Enable install detection
 options.enabledSchemes.about=about protocol (internal)
 options.enabledSchemes.advanced=Additional protocols
 options.enabledSchemes.chrome=chrome protocol (internal)
diff --git a/extension/modules/scriptish.js b/extension/modules/scriptish.js
index 92ffebe3..e1092046 100644
--- a/extension/modules/scriptish.js
+++ b/extension/modules/scriptish.js
@@ -15,6 +15,13 @@ Scriptish_prefRoot.watch("enabled", function() {
   notifyStatusChg(setStatus());
 });
 
+let enableInstallDetection = true;
+function setEnableInstallDetection() {
+  enableInstallDetection = Scriptish_prefRoot.getValue("enableInstallDetection", true);
+}
+setEnableInstallDetection();
+Scriptish_prefRoot.watch("enableInstallDetection", setEnableInstallDetection);
+
 var global = this;
 
 const Scriptish = {
@@ -22,16 +29,19 @@ const Scriptish = {
   notify: function(aSubject, aTopic, aData) {
     if (true === aData) {
       aData = {saved: true};
-    } else if (null !== aData) {
+    }
+    else if (null !== aData) {
       if (!aData) {
         aData = {saved: false};
-      } else if (!aData.saved) {
+      }
+      else if (!aData.saved) {
         aData.saved = false;
       }
     }
     if (aData && aSubject) aData.id = aSubject.id;
     Services.obs.notifyObservers(null, aTopic, JSON.stringify(aData));
   },
+  get enableInstallDetection() enableInstallDetection,
   get enabled() enabled,
   set enabled(aVal) {
     ignoreEnable = true;

From d76fb0f7d9e46dec8a7d3b5b3bc6b7485dab9509 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 27 Jul 2013 20:26:01 -0700
Subject: [PATCH 783/829] Script._file has no setter

---
 extension/modules/script/script.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index c9c3b576..6492d4c0 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -741,7 +741,6 @@ Script.prototype = {
     this._version = newScript._version;
 
     if (!scriptInjector) {
-      this._file = newScript._file;
       this._basedir = newScript._basedir;
       this._filename = newScript._filename;
       this._icon = newScript._icon;
@@ -751,7 +750,8 @@ Script.prototype = {
       this._css = newScript._css;
       this._modified = newScript._modified;
       this._dependhash = newScript._dependhash;
-      if (newScript._downloadURL) this._downloadURL = newScript._downloadURL;
+      if (newScript._downloadURL)
+        this._downloadURL = newScript._downloadURL;
     }
     else {
       var dependhash = tools.Scriptish_cryptoHash(newScript._rawMeta);
@@ -778,7 +778,8 @@ Script.prototype = {
         Cu.import("resource://scriptish/config/configdownloader.js", tools);
         // Redownload dependencies.
         tools.Scriptish_configDownloader.refetchDependencies(this);
-      } else {
+      }
+      else {
         Scriptish.notify(this, "scriptish-script-modified", {saved: true, reloadUI: true});
       }
     }

From 5f748fdf86cf730967d87a5f14678ebcea63cca5 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sat, 27 Jul 2013 21:15:21 -0700
Subject: [PATCH 784/829] Closes #135 Making sure that only a single USO data
 request is made at a time

---
 extension/modules/config/config.js | 15 +++++++-------
 extension/modules/script/script.js | 32 +++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 01a3ec5c..89aff213 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -205,11 +205,10 @@ Config.prototype = {
 
     // called after the config has been loaded
     function callback(fileModified) {
-      let scripts = self._scripts;
-      let len = scripts.length;
+      let scripts = self.scripts;
 
       // Improves first-run startup time to punt this until a script is installed
-      if (len) {
+      if (scripts.length) {
         // Try to fetch uso usage data if some time has passed
         let interval = Scriptish_prefRoot.getValue("update.uso.interval");
         let lastFetch = Scriptish_prefRoot.getValue("update.uso.lastFetch");
@@ -219,11 +218,11 @@ Config.prototype = {
           Scriptish_prefRoot.setValue("update.uso.lastFetch", now);
 
           // Fetch uso data
-          for (let i = len - 1; i >= 0; i--) {
-            let script = scripts[i];
-            if (!script.blocked && script.isUSOScript())
-              timeout(script.updateUSOData.bind(script), ((i * 100) + 1000));
-          }
+          setTimeout(function next() {
+            if (!scripts.length)
+              return;
+            return scripts.pop().updateUSOData().then(next, next);
+          }, 500);
         }
       }
 
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 6492d4c0..335350b6 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -28,6 +28,8 @@ lazyUtil(this, "memoize");
 lazyUtil(this, "parser");
 lazyUtil(this, "stringBundle");
 
+const { defer } = jetpack('sdk/core/promise');
+
 const MAX_NAME_LENGTH = 60;
 const metaRegExp = /\/\/[ \t]*(?:==\/?UserScript==|\@\S+(?:[ \t]+(?:[^\r\f\n]+))?)/g;
 const nonIdChars = /[^\w@\.\-_]+/g; // any char matched by this is not valid
@@ -170,9 +172,6 @@ Script.prototype = {
       return false;
     }
   },
-  /*averageRating: undefined,
-  reviewCount: undefined,
-  totalDownloads: undefined,*/
   get reviewURL() ((this.isUSOScript()) ? "http://userscripts.org/scripts/reviews/" + RegExp.$1 : ""),
   get sourceURI () this._downloadURL && NetUtil.newURI(this._downloadURL),
   get userDisabled() !this.enabled,
@@ -203,8 +202,13 @@ Script.prototype = {
   get updateDate () new Date(parseInt(this._modified)),
 
   updateUSOData: function() {
-    if (this.blocked || !this.isUSOScript())
-      return;
+    let { promise, resolve, reject } = defer();
+
+    if (this.blocked || !this.isUSOScript()) {
+      reject();
+      return promise;
+    }
+
     const script = this;
     const scriptID = RegExp.$1;
     const metaURL = "https://userscripts.org/scripts/source/" + scriptID + ".meta.js";
@@ -212,27 +216,37 @@ Script.prototype = {
     let req = Instances.xhr;
     req.overrideMimeType("text/plain");
     req.open("GET", metaURL, true);
+
     // bypass cache
     req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE;
+
     // private channel
     req.channel.QueryInterface(Components.interfaces.nsIPrivateBrowsingChannel).setPrivate(true);
+
     req.onload = function() {
       if (4 > req.readyState || (req.status != 200 && req.status != 0)
-          || !req.responseText)
-        return;
+          || !req.responseText) {
+        return reject();
+      }
 
       let data = Scriptish_parser(req.responseText);
       if (!data["uso:rating"] || !data["uso:script"] || data["uso:script"][0] != scriptID
-          || !data["uso:reviews"] || !data["uso:installs"])
-        return;
+          || !data["uso:reviews"] || !data["uso:installs"]) {
+        return reject();
+      }
 
       script.reviewCount = data["uso:reviews"][0] * 1;
       script.averageRating = data["uso:rating"][0] * 1;
       script.totalDownloads = data["uso:installs"][0] * 1;
 
       Scriptish.notify(null, "scriptish-config-saved", null);
+
+      return resolve(req.responseText);
     }
+    req.onerror = function() reject();
     req.send(null);
+
+    return promise;
   },
 
   findUpdates: function(aListener, aReason) {

From 23dc319db5055db6ef7f42c23e3c57b97dc61744 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Tue, 30 Jul 2013 09:32:22 -0700
Subject: [PATCH 785/829] Adding 167885 to uso block list

---
 blocklist.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blocklist.json b/blocklist.json
index 880ca2ec..c00ff1d7 100644
--- a/blocklist.json
+++ b/blocklist.json
@@ -1,3 +1,3 @@
 {
-  "uso": [20145, 26062, 35611, 38017, 59744, 68219, 92054, 114457, 128437, 130770]
-}
\ No newline at end of file
+  "uso": [20145, 26062, 35611, 38017, 59744, 68219, 92054, 114457, 128437, 130770, 167885]
+}

From d06b3604793393e78298bf1ce49cfa3a4e3d63b8 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Tue, 30 Jul 2013 09:35:10 -0700
Subject: [PATCH 786/829] Closes #159 Replacing the Install button with a
 Blocked button that does nothing, for blocked scripts on USO

---
 .../modules/commonjs/setup-uso-blocking.js    | 13 +++++++++++
 extension/modules/config/config.js            | 23 +++++++++++++++----
 .../modules/page-mods/blocked-uso-scripts.js  | 19 +++++++++++++++
 extension/modules/setup-page-mods.js          |  0
 .../utils/Scriptish_isGreasemonkeyable.js     | 12 ++++++----
 5 files changed, 59 insertions(+), 8 deletions(-)
 create mode 100644 extension/modules/commonjs/setup-uso-blocking.js
 create mode 100644 extension/modules/page-mods/blocked-uso-scripts.js
 create mode 100644 extension/modules/setup-page-mods.js

diff --git a/extension/modules/commonjs/setup-uso-blocking.js b/extension/modules/commonjs/setup-uso-blocking.js
new file mode 100644
index 00000000..b345a555
--- /dev/null
+++ b/extension/modules/commonjs/setup-uso-blocking.js
@@ -0,0 +1,13 @@
+'use strict';
+
+const { PageMod } = require('sdk/page-mod');
+
+exports.setup = function(IDs) {
+  let mod = PageMod({
+    include: RegExp('https?://userscripts.org/scripts/[^/]*/(' + IDs.join('|') + ').*'),
+    contentScriptFile: 'resource://scriptish/page-mods/blocked-uso-scripts.js',
+    contentScriptWhen: 'end',
+    attachTo: ['existing', 'top', 'frame']
+  });
+  return mod;
+}
diff --git a/extension/modules/config/config.js b/extension/modules/config/config.js
index 89aff213..e1f8f0f1 100644
--- a/extension/modules/config/config.js
+++ b/extension/modules/config/config.js
@@ -129,7 +129,8 @@ Config.prototype = {
       if (!blocklist.uso) return;
 
       var hash = Scriptish_cryptoHash(json);
-      if (self._blocklistHash == hash) return;
+      if (self._blocklistHash == hash)
+        return;
 
       let file = self._blocklistFile;
 
@@ -160,6 +161,7 @@ Config.prototype = {
       if (file.exists()) {
         Scriptish_getContents(file, 0, function(str) {
           self._blocklist = JSON.parse(str);
+
           self._blocklistHash = Scriptish_cryptoHash(str);
 
           // block scripts
@@ -227,7 +229,9 @@ Config.prototype = {
       }
 
       // Load the blocklist
-      if (self._useBlocklist) self._loadBlocklist();
+      if (self._useBlocklist) {
+        self._loadBlocklist();
+      }
 
       // Flag config as loaded
       self.loaded = true;
@@ -263,7 +267,8 @@ Config.prototype = {
       if (self._useBlocklist) {
         // Blocklist was enabled.  Load the blocklist.
         self._loadBlocklist();
-      } else {
+      }
+      else {
         // Blocklist was disabled.  Clean things up.
         self._blocklist = {};
       }
@@ -275,9 +280,19 @@ Config.prototype = {
     scripts: this.scripts.map(function(script) script.toJSON())
   }),
 
+  _usoBlockingPageMod: null,
   _blockScripts: function() {
     var scripts = this._scripts;
-    for (var i = scripts.length - 1; ~i; i--) scripts[i].doBlockCheck();
+    for (let i = scripts.length - 1; ~i; i--) {
+      scripts[i].doBlockCheck();
+    }
+
+    // setup USO blocking page mod
+    if (this._usoBlockingPageMod) {
+      this._usoBlockingPageMod.destroy();
+      this._usoBlockingPageMod = null;
+    }
+    this._usoBlockingPageMod = jetpack('scriptish/setup-uso-blocking').setup(this._blocklist.uso);
   },
 
   _save: function(aSaveNow) {
diff --git a/extension/modules/page-mods/blocked-uso-scripts.js b/extension/modules/page-mods/blocked-uso-scripts.js
new file mode 100644
index 00000000..9dbd0575
--- /dev/null
+++ b/extension/modules/page-mods/blocked-uso-scripts.js
@@ -0,0 +1,19 @@
+'use strict';
+
+(function() {
+  let installDiv = document.getElementById('install_script');
+  if (!installDiv)
+    return;
+
+  let installLink = document.evaluate(".//a[@class='userjs']", installDiv, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
+  if (!installLink)
+    return;
+  installLink.href = '#';
+  installLink.textContent = 'Blocked';
+  installLink.style.background = 'no-repeat scroll right -130px red';
+
+  let installHelp = document.evaluate(".//a[@class='help']", installDiv, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
+  if (!installHelp)
+    return;
+  installHelp.parentNode.removeChild(installHelp);
+})();
diff --git a/extension/modules/setup-page-mods.js b/extension/modules/setup-page-mods.js
new file mode 100644
index 00000000..e69de29b
diff --git a/extension/modules/utils/Scriptish_isGreasemonkeyable.js b/extension/modules/utils/Scriptish_isGreasemonkeyable.js
index 21a6c03f..75bfb35a 100644
--- a/extension/modules/utils/Scriptish_isGreasemonkeyable.js
+++ b/extension/modules/utils/Scriptish_isGreasemonkeyable.js
@@ -5,7 +5,8 @@ Components.utils.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 
 function Scriptish_isGreasemonkeyable(aURL) {
-  if (!aURL) return false;
+  if (!aURL)
+    return false;
 
   // if the url provide is not a valid url, then an error could be thrown
   try {
@@ -13,9 +14,11 @@ function Scriptish_isGreasemonkeyable(aURL) {
     if (!scheme) {
       return false;
     }
-  } catch (e) {
+  }
+  catch (e) {
     return false;
   }
+
   switch (scheme) {
     case "http":
     case "https":
@@ -27,9 +30,10 @@ function Scriptish_isGreasemonkeyable(aURL) {
 
     case "about":
       // Always allow "about:blank".
-      if (/^about:blank(?:[#?].*)?$/.test(aURL)) return true;
+      if (/^about:blank(?:[#?].*)?$/.test(aURL))
+        return true;
       // no break
     default:
       return Scriptish_prefRoot.getBoolValue("enabledSchemes." + scheme, false);
   }
-};
\ No newline at end of file
+};

From 78407cb52ab5e929a93f4652843bdcd31a1d8b04 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Tue, 30 Jul 2013 11:06:53 -0700
Subject: [PATCH 787/829] Closes #59 Chinese chars in the @name are supported

---
 extension/modules/script/script.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 335350b6..ab782191 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -32,7 +32,9 @@ const { defer } = jetpack('sdk/core/promise');
 
 const MAX_NAME_LENGTH = 60;
 const metaRegExp = /\/\/[ \t]*(?:==\/?UserScript==|\@\S+(?:[ \t]+(?:[^\r\f\n]+))?)/g;
-const nonIdChars = /[^\w@\.\-_]+/g; // any char matched by this is not valid
+// any char matched by this is not valid
+const nonIdChars = /[^-_@\.\u0400-\u04FF\u3300-\u33FF\u4E00-\u9FFF\w]+/g;
+
 const JSVersions = ['1.6', '1.7', '1.8', '1.8.1'];
 const maxJSVer = JSVersions[2];
 const runAtValues = ["document-start", "document-end", "document-idle", "document-complete", "window-load"];
@@ -387,7 +389,10 @@ Script.prototype = {
     this.matchesURL = Scriptish_memoize(this.matchesURL, 100);
   },
   get id() {
-    if (!this._id) this.id = this.name + "@" + this.namespace;
+    if (!this._id) {
+      this.id = this.name + "@" + this.namespace;
+    }
+
     return this._id;
   },
   set id(aId) {
@@ -622,7 +627,7 @@ Script.prototype = {
       name = name.substring(0, dotIndex);
     }
 
-    name = name.replace(/[^-_A-Z0-9@]+/gi, "");
+    name = name.replace(nonIdChars, "");
     ext = ext.replace(/\s+/g, "_").replace(/[^-_A-Z0-9]+/gi, "");
 
     // Limit long names to a reasonable length
@@ -701,7 +706,8 @@ Script.prototype = {
   fileExists: function() {
     try {
       return this._file.exists();
-    } catch (e) {
+    }
+    catch (e) {
       return false;
     }
   },

From 2a39849e379b5fe547802ec633e110d331f3091b Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Tue, 30 Jul 2013 18:43:15 -0700
Subject: [PATCH 788/829] Closes #165 == -> = and removing the staging build

---
 build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index 6a9ca747..8782d42a 100755
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # Set up variables
-if [ "amo" == "$1" ] || [ "staging" == "$1" ]; then
+if [ "amo" = "$1" ]; then
   # For official builds, use the version in install.rdf.
   VER=`grep -Go 'em:version\>\(.*\)\<' extension/install.rdf | grep -Go '>\(.*\)<' | sed -e 's/[><]*//g'`
-elif [ "test" == "$1" ]; then
+elif [ "test" = "$1" ]; then
   VER=`echo test`
 else
   # For beta builds, generate a version number.
@@ -57,6 +57,6 @@ fi
 cd ..
 rm -rf build
 
-if [ "amo" == "$1" ] || [ "staging" == "$1" ]; then
+if [ "amo" = "$1" ]; then
   openssl sha1 "$XPI"
 fi

From 8bcbda022ae26e43c977bef04e51992743663b47 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Tue, 30 Jul 2013 19:09:01 -0700
Subject: [PATCH 789/829] Closes #167 adding an undo secondary action to the
 door hanger displayed when installing an userscript

---
 extension/locale/en-US/scriptish.properties        |  1 +
 extension/modules/addonprovider.js                 | 14 ++++++++++++++
 .../modules/utils/Scriptish_popupNotification.js   |  4 +++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 2b9ae3c6..1e90b882 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -168,6 +168,7 @@ statusbar.updated=updated successfully
 sync=Sync
 tooltip.loading=Loading...
 Uninstall=Uninstall
+Uninstall.ak=U
 untitledScript=Untitled Script
 Update=Update
 userscript=User Script
diff --git a/extension/modules/addonprovider.js b/extension/modules/addonprovider.js
index b013288b..804bf384 100644
--- a/extension/modules/addonprovider.js
+++ b/extension/modules/addonprovider.js
@@ -34,6 +34,13 @@ const Scriptish_ScriptProvider = {
           accessKey: Scriptish_stringBundle("openUserScriptsManager.ak"),
           callback: Scriptish_openManager.bind(null, null, script.id)
         },
+        secondaryActions: [{
+          label: Scriptish_stringBundle("Uninstall"),
+          accessKey: Scriptish_stringBundle("Uninstall.ak"),
+          callback: function() {
+            script.uninstall();
+          }
+        }],
         options: {
           removeOnDismissal: true,
           persistWhileVisible: true
@@ -76,6 +83,13 @@ const Scriptish_ScriptProvider = {
           accessKey: Scriptish_stringBundle("openUserScriptsManager.ak"),
           callback: Scriptish_openManager.bind(null, null, script.id)
         },
+        secondaryActions: [{
+          label: Scriptish_stringBundle("Uninstall"),
+          accessKey: Scriptish_stringBundle("Uninstall.ak"),
+          callback: function() {
+            script.uninstall();
+          }
+        }],
         options: {
           removeOnDismissal: true,
           persistWhileVisible: true
diff --git a/extension/modules/utils/Scriptish_popupNotification.js b/extension/modules/utils/Scriptish_popupNotification.js
index 46a54d06..cc53ab4e 100644
--- a/extension/modules/utils/Scriptish_popupNotification.js
+++ b/extension/modules/utils/Scriptish_popupNotification.js
@@ -9,6 +9,8 @@ function Scriptish_popupNotification(details) {
   if (!Scriptish_prefRoot.getValue("enabledNotifications.popup"))
     return Scriptish_log(details.message);
 
+  let secondaryActions = details.secondaryActions || [];
+
   var win = Scriptish.getMostRecentWindow();
   if (win && win.PopupNotifications) {
     timeout(function() {
@@ -24,7 +26,7 @@ function Scriptish_popupNotification(details) {
             details.mainAction.callback();
           }
         },
-        null  /* secondary action */,
+        secondaryActions,
         details.options
       );
     });

From 44eae288461fbce5275fb1e0e0c5c740ab44be8e Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Tue, 30 Jul 2013 19:35:34 -0700
Subject: [PATCH 790/829] Closes #164 adding @grant unsafeWindow

---
 extension/modules/script/script.js                 | 2 +-
 extension/modules/utils/Scriptish_injectScripts.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index ab782191..3aff0e06 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1,7 +1,7 @@
 var EXPORTED_SYMBOLS = ["Script"];
 
 const valueSplitter = /(\S+)(?:\s+([^\r\f\n]+))?/;
-const GRANT_REGEX = /GM_[a-z]+/gi;
+const GRANT_REGEX = /(?:unsafeWindow|GM_[a-z]+)/gi;
 
 const Cu = Components.utils;
 Cu.import("resource://gre/modules/CertUtils.jsm");
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 4de509a6..3edc39c6 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -102,7 +102,9 @@ function Scriptish_injectScripts(options) {
       });
     }
 
-    sandbox.unsafeWindow = unsafeContentWin;
+    if (script.grant['unsafeWindow']) {
+      sandbox.unsafeWindow = unsafeContentWin;
+    }
 
     let delay = script.delay;
     if (delay || delay === 0) {

From 15699952385a90a45b8d55f45933af7b3dd86fe3 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Fri, 2 Aug 2013 11:00:31 -0700
Subject: [PATCH 791/829] Mention the #scriptish and #userscripts channels in
 the README

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7bd4ad2f..6c1c85a6 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,8 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 * [Wiki](https://github.com/scriptish/scriptish/wiki)
 * [Issues](https://github.com/scriptish/scriptish/issues)
 * [Blog](http://scriptish.org/blog)
-* irc.mozilla.org #userscripts
+* irc.mozilla.org #userscripts (for UserScript development help)
+* irc.mozilla.org #scriptish (for Scriptish development)
 * [StackOverflow](http://stackoverflow.com/questions/tagged/userscripts)
 
 # UserScripts

From f1bd61dd1c1c246fbb7a1a022da4cce590fec914 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Tue, 6 Aug 2013 21:00:50 -0700
Subject: [PATCH 792/829] Blocking @requires from secure.dune.net for scripts
 like https://secure.dune.net/usocheckup/#.js?maxage=#

---
 extension/modules/script/script.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 3aff0e06..62e56cf0 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -45,7 +45,8 @@ const RE_USERSCRIPT_HEADER_START = /\/\/[ \t]*==UserScript==/i;
 const RE_USERSCRIPT_HEADER_END = /\/\/[ \t]*==\/UserScript==/i;
 
 const BLOCKED_DOMAINS = {
-  'usocheckup.dune.net': true
+  'usocheckup.dune.net': true,
+  'secure.dune.net': true
 }
 
 function noUpdateFound(aListener, aReason) {

From ac7f143045f5cb52c1e580ba27c8f30c4a8512db Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 30 Sep 2013 22:18:24 +0200
Subject: [PATCH 793/829] Disabling the cache should not actually cache the
 content.

See #185
---
 extension/modules/script/cachedresource.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/extension/modules/script/cachedresource.js b/extension/modules/script/cachedresource.js
index 963e04c5..d215c046 100644
--- a/extension/modules/script/cachedresource.js
+++ b/extension/modules/script/cachedresource.js
@@ -18,12 +18,17 @@ CachedResource.prototype = {
   clearCachedTextContent: function() this._textContent = null,
   get textContent() {
     if (!useCache || !this._textContent) {
-      this._textContent = Scriptish_getContents(this._file);
+      this.clearCachedTextContent();
+      let content = Scriptish_getContents(this._file);
+      return useCache ? (this._textContent = content) : content;
     }
+
     return this._textContent;
   },
   _getTextContent_callback: function(aCallback, content) {
-    this._textContent = content;
+    if (useCache) {
+      this._textContent = content;
+    }
     aCallback(content);
   },
   getTextContent: function(aCallback) {

From 9a866f6ed10ca3d63c8207f206e60fb4f4b4ee71 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 19 Nov 2013 17:02:57 +0100
Subject: [PATCH 794/829] Add stack to error messages.

---
 extension/modules/logging.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/extension/modules/logging.js b/extension/modules/logging.js
index 15f1c354..1e1733aa 100644
--- a/extension/modules/logging.js
+++ b/extension/modules/logging.js
@@ -86,6 +86,20 @@ function Scriptish_logScriptError(aError, aWindow, aFileURL, aId) {
       }
     }
 
+    let stack = aError.stack || aError.location || aError;
+    if (!stack || !(stack instanceof Ci.nsIStackFrame)) {
+      stack = Components.stack;
+      if (stack) {
+        // Unwind one
+        stack = stack.caller;
+      }
+    }
+    let stackLimit = 0;
+    while (stack && (stackLimit++ < 50)) {
+      errorMessage += "\n" + stackLimit + "> " + stack;
+      stack = stack.caller;
+    }
+
     // dispatch
     se.initWithWindowID(
       "[" + (aId  || "Scriptish") + "] " + errorMessage,

From 9f162edd87bf57ee190d4f61b2d4740c2c254edd Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 19 Nov 2013 19:05:41 +0100
Subject: [PATCH 795/829] Fix browser.xul init in Australis

---
 extension/content/browser.xul   | 3 ++-
 extension/content/js/browser.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index 65150903..84111a2a 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -17,6 +17,7 @@
     <broadcaster id="scriptish-tb-new-us-brd"/>
     <broadcaster id="scriptish-tb-show-us-brd"/>
     <broadcaster id="scriptish-tb-enabled-brd"/>
+    <broadcaster id="scriptish-tb-report-issue-brd"/>
   </broadcasterset>
 
   <menupopup id="menu_ToolsPopup">
@@ -61,7 +62,7 @@
 
         <menuseparator/>
 
-        <menuitem id="scriptish-tb-report-issue"/>
+        <menuitem id="scriptish-tb-report-issue" observes="scriptish-tb-report-issue-brd"/>
 
         <menuseparator/>
 
diff --git a/extension/content/js/browser.js b/extension/content/js/browser.js
index 1f834692..f707384c 100644
--- a/extension/content/js/browser.js
+++ b/extension/content/js/browser.js
@@ -66,7 +66,7 @@ Scriptish_BrowserUI.tbBtnSetup = function() {
   sbShowUSEle.setAttribute("oncommand",
       "Scriptish_BrowserUIM.showUserscriptList()");
 
-  let sbReportIssue = $("scriptish-tb-report-issue");
+  let sbReportIssue = $("scriptish-tb-report-issue-brd");
   sbReportIssue.setAttribute("label", Scriptish_stringBundle("menu.report"));
   sbReportIssue.setAttribute("accesskey", Scriptish_stringBundle("menu.report.ak"));
   sbReportIssue.setAttribute("oncommand",

From 99b89aaa32914f3e7ca550c10d93a5f5304e4894 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 19 Nov 2013 19:06:25 +0100
Subject: [PATCH 796/829] Make button compatible with Australis panel

---
 extension/content/browser.xul           |   2 +-
 extension/skin/browser.css              |  14 +++++++++++++-
 extension/skin/scriptish32_disabled.png | Bin 0 -> 1759 bytes
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 extension/skin/scriptish32_disabled.png

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index 84111a2a..1f3c5a49 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -44,7 +44,7 @@
   <toolbarpalette id="BrowserToolbarPalette">
     <toolbarbutton id="scriptish-button"
         observes="scriptish-button-brd"
-        type="menu-button"
+        type="menu"
         class="toolbarbutton-1 chromeclass-toolbar-additional"
         label="Scriptish">
       <menupopup id="scriptish-tb-popup" observes="scriptish-tb-popup-brd">
diff --git a/extension/skin/browser.css b/extension/skin/browser.css
index 0511d4f8..96f25cf5 100644
--- a/extension/skin/browser.css
+++ b/extension/skin/browser.css
@@ -1,11 +1,14 @@
 #scriptish-button {
-  -moz-binding: url("chrome://scriptish/content/third-party/firebug/startButton.xml#scriptish-button");
   -moz-box-orient: horizontal;
   -moz-appearance: none;
   padding: 0;
   margin: 0;
 }
 
+toolbar #scriptish-button {
+  -moz-binding: url("chrome://scriptish/content/third-party/firebug/startButton.xml#scriptish-button");
+}
+
 /* Also set a default icon for the "outer" #scriptish-button.
    It will be disabled while the binding is still loading.
    See GH-108 */
@@ -18,6 +21,11 @@ toolbar[iconsize="small"] #scriptish-button,
 toolbar[iconsize="small"] #scriptish-button-inner {
   list-style-image: url("chrome://scriptish/skin/scriptish16.png");
 }
+toolbarpaletteitem[place="palette"] > #scriptish-button,
+#scriptish-button[cui-areatype="menu-panel"],
+#scriptish-button[cui-areatype="menu-panel"] > #scriptish-button-inner {
+  list-style-image: url("chrome://scriptish/skin/scriptish32.png");
+}
 
 #scriptish-button-inner[scriptish-disabled] {
   list-style-image: url("chrome://scriptish/skin/scriptish24_disabled.png");
@@ -25,6 +33,10 @@ toolbar[iconsize="small"] #scriptish-button-inner {
 toolbar[iconsize="small"] #scriptish-button-inner[scriptish-disabled] {
   list-style-image: url("chrome://scriptish/skin/scriptish16_disabled.png");
 }
+#scriptish-button[cui-areatype="menu-panel"][scriptish-disabled],
+#scriptish-button[cui-areatype="menu-panel"] > #scriptish-button-inner[scriptish-disabled] {
+  list-style-image: url("chrome://scriptish/skin/scriptish32_disabled.png");
+}
 
 #scriptish-notification-icon {
   list-style-image: url("chrome://scriptish/skin/scriptish16.png");
diff --git a/extension/skin/scriptish32_disabled.png b/extension/skin/scriptish32_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..61ce4ad64fc62f5b8da223be98991eef3530232c
GIT binary patch
literal 1759
zcmV<51|a!~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&fk{L`R9M5cmkCf)M;OO92|Uh(21vvv
z0b;_Dl7LA>DPy&$pyJ6mI`zT>O$$<P6yi})iYSgUVnMCc6SY{aPNyAPbwsUIt5s{k
z1JNqAmfFL5wpN>e_dP?30|~^LzM0=7lVktCm;LtJ4FNz{x_l{#Kr}=YugFs@mCTlW
z;*sXDn<S7#;^bw^bw<EF&V9HjLv&fVSO~tE4^lv$F^l|7#bp1lz$+w@q>(4K(6*#g
zl=S`1u3#c~ae;V}++jG&SaP`S;BBUh;fL}2x<$J!82x6_*M()~hp}T~E9qzX&I_oC
zFPTJ|+J$G5W@03M+-HJ_fY*a(5RVe)24)9-sxDUFi`o>0F>}XQ&R?nr%fYV>K@l4`
z^@VDH^dJ&u0yD>Rj^`trzyxxNyhbuTCwcCc<Vb#%m&u{otbuWtkwg2w7S**M*aTRn
z=1*Jiyg)GVrFR$WJ<!`EOcgfToeqksT4fUmDG9M0J#~x=ZoJ-vmfvrqV0qz6hXO7U
zE_&Z2-v!d?(hcI7;v?QB?-uu2?iRNKH@M7mu^Y^;jF(D%pxvgm3D9Y<oM||R+kgCu
z`;Q-T<do#5I}~8_%s5f82)sfb9NlRv%sUJel?wE%jj{!|5?&sTDfv^k)6lYwA8-2X
z$eAx&hE7lH=XeT~q`OzPm!-2{!CV34@5!P6NZ&5F6<xKCU82!#rjkdelGkYs_@wzb
zoM*4aUeEp1_At~MK$qf3ryG&vEy<=1!{-o)mx-aTrFZ?2(J@vD;UHnE(*pkE{oiJP
z;<mvoer0|z>@;*9-Ui78NpaT%ltf6;vYpB`(zPEmk9jU!R3dUZoJE!@+t8^1-Qjf7
zxzalxW)F}V<OB&JalCY%Eu5LpAZiD#@|{Mf3CauF->HBsS62Mo4wp_Wt>G-{YIUbU
zeYfb5m#@Okacb;JF=AJC9F{JN$7|+@E1e4XPxH@gx9+XsK1+NYhu0c0ZDA-HrEYl2
z4k?uaMk6q67?6^JKl5|&&%%Yd4h8t3e7Q%C$KP!Qcm>a<AbewZhoP;Mj(Zum=umek
zPuL;-`~bZkNKE7eP*@0*lmIJM)S<lG+inqx#*5Yn%+|^`k>hlO`Ove-(_wg4S}-ot
zVVWtGVkt_bGF+4f02&P*_kSJx5=UZD;wT)Pm4T<_<v?ZSPDiW2of*TdqdVL!(wi83
zC;6J>6*9ZwF<bRG;OmNdI?VT!1vETJW5kT$Fg%dUaV|oK7;QA-jeYTTdL}HaKvfkh
zF`!Gkp(sH#LRX`+D`3h{;usy`ETxH3@5*3`Ld{83bPq(HG7KvEd~5%Kc#@R`ELj4q
zS_M>8)O1OJAI|Ts->$bSP@E{mQ98saN+abL%6@MVURCQj36^=mp}5y42ADGCSuK>7
z0?U`*=-PQeNqR(9N7@xw6)WZhj#DmDey03IDe9)+!gZlN@r8ueLqr6Slmw)u0cJB$
zRP?y30&4AAt;L=|*#Lh|faN^pN6IaM3runqClE}j3XtQmN(IEn0~03#si{DA_HDZY
z>uT2*)tx?aZr;lIi(Nxq=SOacw7Uv&ljSynlh!&Y^AF&{GhS9=xKe|tu%0-iRKpTO
zr(x(&VC+~RIk~Pwfz0BptY7Z_cXDaEc@^t-S0i(6mSsrU5NL`t(3I0bH$=g(-GG6s
zwWxF9*(5f4(Y+!h648_kj2rfd#0U-7V^R+duB$_yHK+dl+5TW^C!mf~_dVZK|D-j%
zBmQ`F4-MBYVE>7O`1rsc>^Zm>N5>}F1QLS6xVvBK+YK$&#x%`39cG0JHx+?wJzPPb
zK1@4-qKZX_9fjNDE<Njg6Wz-uam-o|P1c(Djq<?SA^%~RhX@GJb=ZjBttx47Civc8
z4{Wd!mohVK5+^#4*ry=0N02w{?gfSshP>-7&FzBjJiN;trEmQ71Dcwz;o{ZHsBgT0
z?=CgqY{R!W_RVqBojk%lp50M{)58*RLN3E;R)itg5=<~TfwuO1iiX75KakLWy(3Md
zY8tLx#BcZSpt<EH7k2X8Db(!U_Ox>AnoFxTuHI8xwX`CyWOmMIQ&N&FM%GK95(Lxl
z2Jn<TnJ_}AHI6V2o}4o|b@q}u<-=!=_}qPv`;WA>TgXK253JJhiHM$919}IHODUMK
zZTjq#%?Zha&E65-gXrr%<VCMQ!lSYN6nRJ6@xNUe$I@lR^?LvS002ovPDHLkV1g~r
BSHS=P

literal 0
HcmV?d00001


From 584a9a5b7cb2fae8015f34815671dc53057cef95 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 19 Nov 2013 19:08:09 +0100
Subject: [PATCH 797/829] OptiPNG

---
 extension/skin/options.png     | Bin 6780 -> 6462 bytes
 extension/skin/scriptish32.png | Bin 1612 -> 1514 bytes
 extension/skin/scriptish64.png | Bin 3612 -> 3269 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 extension/skin/scriptish32.png
 mode change 100755 => 100644 extension/skin/scriptish64.png

diff --git a/extension/skin/options.png b/extension/skin/options.png
index bca1cf44ee218fa145e5261684459cced211a5fc..526b972851e6a083d31d50c8906cc80aa7ee962f 100644
GIT binary patch
delta 6396
zcmV<Y7z5}0G`=#BdVd(MNkl<Zc-rlo2UJvN+Q%=TSSU6$DmD}mlvprvv!)m~Yc?jE
z;wE3RF}B#n78L@bL{WkTq)IOWN^jCTg7m7?q4zE@4TkDG`@EMK0!UTzedp}??m5pH
zojcr_dw>6@-uF_}WH&iVO!_nFUCY&$-&y$U!oXRovwW#fsejL@DcsB!EKqdXx;4h>
zop<8Rmn`|olcL04=QyU)(%T+v+7xc5q-1MAQ7ftc-`;GSxpU?}rO!zhN!^qJQ7uuR
zG^u_&P4%EKWT)agj3gzM-2e8sik|j%=<Du=0$0~gTLp#C>l8I@GRLu9yVfLDORI(3
z+6v7jCGcqb_J0ZkNy+t7buGR>f5ZN=$wQ8|nG0v%uea>q<XFzm&ezajitXCe(qB()
zq*STi0qBG644NG7A8%VVwkI1%Nh!MR+*#4n(E)rupSG7TUqVenLN|&ac%qTOX6;(j
zEL&SvXJ;qycs$zJ&CT%W{r4v=f-jC=UiH-pEsbwZX@3t0{QF;Sh+ep3o9vsA4}mE~
zaM{E;`S4|ZQQ`g**Gyzpbxbu>Z<?)|pa5X-#wSM3oj!j)^x-w=?RyD5Xx+Vi(ACom
zo!z~_>+XS$t{%uME`i*_V#sC`K{LApnpy3%2&Ps5yQl*r!YB4WRNRPg<tTB{b)p~4
zcz4Ec-+!FglXh8Ot7H4O+b!_3qQgIGEG4zh{o{|ziRaVsJGk(&v6dD9v8uSZE(9Ai
zo(NDVrdf7&Y$5y(4jXt}E_9%%SVROLemEf!e11e@8p1z%`gf};Z3|D>r+&-jyK~oP
zkbOU1(3QGw<yjb!RRJ-%)o|C*zwqc)Ln*TF<bO4j8R`ahE^d)&VD1rKbynB%=y^TM
zX@8~wxSid=;dKMMqw7x;fIKyy+DDbX0{=W!O>LzX(4SdJiHWQhQJMGkyh|%CtO%CZ
zmFH}7+63QT`Ietkm<Pn7lb*ox?JEuqKJ+~)DTN{MS*-wjRG@FOB=n`lL0?}VZIw@+
zbbn!J55#mJI-=(*D40ESaG>E6d*ST@xl5))$&X(^JBtbJczkA46Sz!31PFiHzfS)a
zZR8OJE-}x+$RiT=Ui$qvvTvW7-dana7-n34JtP%1f^$d`^O&~LTC(rl@0P!Xq%feU
zsRI)8t3gfQE*eEJApyjtrca4A{V4(<+ka|mq4-{LjoBKrc>@C2OQlmEQs-yyo9(;s
z;=-0?`pZDcSqZlKY^6=vRvGL)9R>tI?2!7;b_4J!YPs8v9p&BVr8Imt6X4r-pihB<
zp0yNoZj^+c)Hvwv?WL_EI=T}hf&Xw3*eWXCf9~MG847<IJd>dya{&d6AHD!Cvw!Um
z5$xDeL5j_>P8Y-e4|kk{`@9nv;1!<-7Tz&jZF5(5ednOeAPoJfr7s|>vJGN$s=)Sf
zY^I58h<i|SK9|wZ4wY>^5RqQgcUITphl!*BzCZwd#N+$;c&_N}J?QP|>7D519q8d)
z^l&zp2Tb(xRwf5tw6dY;1rzF<T7RLou?4E@oBu=stfJ<lcW;;cMDn=QDXHR7(*fEV
z`!xdsSgW^|AD^B`gD<Wug~qmK&@{MgBs{DGR_L6Xntu2g>fpO=@KON3OP+#`H571_
zC7~-N7J7PmXe*11>_l((6N<oY{d%)(N5@y-KVOLOQ2^;EfRy<Z6dd>$aDP!~#9A8~
zz(H9#U<A(>5&jz^fQ-7KQ>JHJ4uoO256vutkhEfm&aQ%#l4f{T#f02i4&>Ey;dxaX
zWLLF9aZ@K$vtB|`V+UA!M`fPTHJ1?{@8mUOk<kP|!aafa$i?H0Y)S+$ZNs!J^Y_gE
zZPDRH59S@4_f+z@WaG@!Gk^IrG-trHtJ6jWPdbCSx95PetMY&VFb(jt@}FZ~Y5{I{
z2W=PiE}ap6m(%9W;oXAJPv`rctA@f~O#w@e0_J*2;9>e80_eu>pfoIuL;_#?4I9j}
zot(G>@O=>e(pTXp&7<Ji?hk4B91e#z$9Lb&90vc$9#!oK^!$G#{C|byy-NlT)?RVB
z5S3jGPjYL)KeYs0p5%aSNIIAYB!g9OD*gY^ta3;zZ-pvmFVt}Xa;uqO>>6TCj)4W?
zLM#mbt*T=dfwjVs5e4wFUjQJ?|9CC>USb63>ZH%PtE-FtH;>nW5rGFWF)`ra-~hI^
zwqRvt1?J}FU}|bQHGcvS-y;6Kw5~LWTo!?`JY8tw*TiAD#d6r}xoH5r&=ido;h_2<
zH-xV5=;svjG%KNT_u<b!8r-WVXlu6&2%sb%y53t1JOO+*!f#teLCZ=CniVCXBQb^+
z0J$Kg;o-b|clROi^91m-hQUvNM*-T(O9$X*IXdzzSFAWT2!FmD7JN0v9?@|3VF;k-
zXQ&xC*qM7p*M_8*KmdYw2+srquUIhji3bzE1i0^?1Xe+*U>lkNj*-vcQA{>O<y1o+
zDuAScfP}nS!-oNO#;(B`UQe<hFqr{*c0M%+HSfxeC4lhEYN&5!L2Jtk$S){>CQMlk
z7_r*g`cqgt7JtZoetvN4)-4*mnVA{r=;(mDx;lM~nilpOrT{r=iNpm7{&?WUu86@h
z^JTEbd&?`}h4!}n+oVN&cTg%3!BjFN6xt~&>gPB(Flp6evDaIi2kqMy{{bJZ2?fxw
zf`YnrlE6)f5qLxwj0Hb+6!--J0bSOZLhuR={0`FUX@6T_7{!9mJD~tP(d)gQ=0b2<
z3HT%y(y$49yRZxh!1qY;N5Vg&p#xI^3la(&ASk1Z{%m+wC7m8}s@af&pGzrjgp7(-
zNMO`s9T5fl)o*DG7XYdB2|VHm^fl<~MbGbs^z=0NKbaBCQJphpo|m{OF(lNFW-6X4
zfUV$H<9~ghy`rK)wu1wUK6xzmx{LCFg(4vEn}zU~Q&7E(f~vKWz(Enb7JPsIPMdY>
zya&S<6nx9}s@-~M=oXIP^Dv}WKs0(Y3Hda9&p2?$_u~<Ce0~iCCgt%xqS83tF`1l*
z^kRN?Wh)e5Es%h~gEPzFNnRafqX2SHB$*X$5Pz3n3(lb_aN@e@!=EncEgLQX(&iBX
zyu|ar<(msxg*8xCQV7BhVQ_0W&=z7#C~OOPSS*s3uwB>^^16W4(FtwsozRMfV+*GP
zYFjx_JJIN{@Z>_L5#ei4Fz@a>*y4#^@4a<w6No_S?^35G5_nJq_lO9D6@OP@F0{O}
zcz+1|N?8iZmQql<MiN-@(F5?a1@JQj@RLV^@8`#}UANA2IDFxTeg3o`ez~c6-z%CK
zg5DgHR}1!nu<sF<kDlBFj}vnFH>}(}RBztjjRoFPtn!y)pTAqr&f6m_y@;P%$AM%l
z5TD@Rrj(E_feG>G`455<nFlm(YhnvIZGWU1fb{i50Cc|ZCXtPYp}s$t^QW*yoN#)O
z`BCO93Gsu$6I-Ca093qG#)m)17VcfBJJIZe>A*0@(UC2z_<4*RXi#};2>g;I6cjGT
z)=o}h;_!WadA14)?xVpUyj?MKaVDXkct7!cyU=tx#QVqRU|VOdHQL{u``uD2Fn=k(
zFAF<@Bos?B3V;-b5!gLkvv6}Bs|_TcO8^o0r|&02dTu3@7Bl(<Am|XP+q<EH+XZEu
zE+}SqLIINpxosVg)zS`W&FzrX#D&;;Hbm62AQ+2KUyMrbWi8;0zr(h$X#xU}qomN3
z$)s-j#_1o4Ulkt$Us_Lk((sANo_~^kFqsm>ZrwU#6akAAd&GDJIZ(a%EhrbjFGBbQ
zZ&8r9h@#;?6TnXsz|R;4Ki|iPhi#+VSn$6;e?#QQ3%YYLJS!MD2W3S*uLRd8xmfT$
zrE@+B`#P5Hp5y)Y-^^V-W3wwE9l>W{=qImXD1f_;{#kf@1^k}5-<`cKGJjkEBy1Bv
zJoNky^n5Ot18fcp2DgZn2%i9ss$)YqLJp~6LLk-}ewA(Dh2P_bupc7q2gS`aaEpRQ
zFwJWK!`ueAlU+Zy0Hi;YetXfCMa)@Rvw%8ErBG|Bog!yM2H=Zpi^C>&tn$6KPTE$g
zt&E&(9g3maB*)2#Ev)$4^MA9UeB)aahA(XQ^1Qt}Fy}uS@5auBJGKcrR-T2HzA>zz
z)FQgiC!SBL{luas2u#fDJAKn^*Lc7CxVF(QkC@E9)Y2AsR?VU<0>$Kp#ihPW2us7r
zx$x8t^8~Cp><0^g<ZJ?{o!1V>F#@FImP2W20SvAWxb)b!2RH&_^M87Pg~DNVbORHu
z4Xw4ki?$XN%L{HNG;=zki5QzVwg6-=$?6Wd!*_<_3*i%!x0in{_{3IUUCnr%W`vA(
z3%tBI!fKzB_Z*587tru?1n@Hj@KZ?G-@JMV{Cqz@0^fN8A-~%%i2)JV%RkMp>!0wU
zXOTXi6o91K_lQjAV1M`@_l_s_`Lfo2PdEvMq)XsJKDL8oh!mJs3SQV<Jc@n>HbKd7
zM$f8yumDKGMnfi^&t(IP&4e~q8x4yTd-T3x@P*z_;CrC=yP)U@eEXtiux2#D3j}YB
z5x^j)9va6JfXvS_=U?gj1@PzGnlm<J&#_HjN1jWq7(e$8-harH4^x3(S!86Fu-b3I
zf-fI){wwg&5>Wt&vJ%h`9WfC4b3HuT?Uj|y#|_&S?%l-eV{)tL_AV1IDuHetlt%aY
zq^I|c$v^>Ejw^t}m-S^WyrVg>C?rM$4;YP|5SU&9eo2LxQgYxycm`NJPJoj)Er$qz
zRO<u~2gCk;!+%&v#xzpGD57C?3j{D2J~4l+HGHtWBm!_P?GOJ%03`fd7W50i2*bbr
zL<AtJAi8YU#aTUr1t6l?p8^ye6(<dyHjjQ&G*IMYT`_Mm@G%8EE)5GC0>3~2f21j2
z{9Fp+=1>s3L;~uf!hy|Z)Ar2CsoieF2D7ogZ~w2i?SHjQoD=jN{R^E!lUT7R1TxGa
z6F$4p47$%JbA7D#$4vnTHSg|n2ukdG%4me5<}S#uYp3T5HbF_CW9!R0ciXn`&=tdk
z-A6QrqyW;Y5kSQAndtd#%vSo9>?3WSPyj;s!$W`DpwK@g{A01$z~VtI7K`H+fzm%p
zTZw52Du4guRPyY7vpr_(%$_`akD<2FZX+26y***iS5)*bjfi*^{-Uwr$4FBUC585u
z1k^-^0gJ_=4Mo7UUBBLROwZNQ7s2p77jw9R-Q(CyGTRTqe*QsZ7LaiMys`!KY`w-U
z0x#aN^Yn_#ffP(5rL8@55$GI|1)8QVnO~jIQh)g3_~p5uAJKfJ2qb+v0W=ssi``!Y
z@&qlSFzgf0C-A+|`$_0;!|s4o`VJWSNv>B<t%9RZ%c0^07yc2-fDZ!mp}3Jfp)O#i
z__yLV)LyEd+D56&-#7pGGBeqU!}l1)+_u8>P18T0DEz@;ztz{3hMy~dKX}BOu~`n1
z*MG<ifgdhOL8t@;VGAXoDxzNmOePaD?Cm*rN=n8PT9W1->O%yOh8OoyOb!HPltV#1
z=JNEyzH@pOqqc!RU%snl;~(D_{;U#m>$y<D?1QMB8n6pVg)_Hoe8y@6$$k8h`gXF9
z40!11fL>2>zA)?)_*R(f>(RrH#h1g^5r0KAXaZaaeel00Jtmg^RQk)eUEUsF03KtQ
zd%w;9X8!SU!@i<oKv`5&_jvG0ub;663%=q)XiiUocsUsweuMyi@N5bKW>FBhKmsbl
zLTLezIeMCn4aY`F$#AsaaN@eL<i$HS2BE18UP*H&RIw0Xb`5wZ7D7BmfxJ2n1b-zJ
z@UNS@dSIm3jS*uh=KQ4?_IF>>xAU;|kLL$r%a~E#M#Cqm!!0fk?6I5Bv3tz>MpfJ3
zv%|kijwAqb1BbvFZi8n8!jMlwJqhd8t?f|S#G&C%#3n5OQAN>hTimvcEr1EYC${w1
z(wpOWen5Fl%%tE8tNq5bWO%YtW`79$$1^GLnL&Z?JP9Zd4WR`<EY;GIjorn);lJVJ
zbz{Y=rp`f;86{BI*g@aYC3p4mFo%a@6(538fK2$vkcZs=$5xMTgVnyJPc-L2P!iw!
zX$}z2&%lsh!R*Cj@E|y&jJ`=k?jPLuiwA9MU-<Uyji6lzFDXuDO`vc_K!0+(W?D6T
z7hOE2r%zb~z?86hqy5I$6M*|rTXAv4gHb(SNhz=*Hg*Vnh5-KXDPQI=_{2!D*N~C~
z5zA#DPypW-;d_Zw;4vL-js%pU2wGcPX-hFTXJLD&Klpd3>X=>giphkMCLUC@b^`-L
zcuqAF3b6wqo=j%@F=&a!&3`mx(kdnvH2|shpE4TgoKM73(bf;2h`}Z(1x&nS!N@BP
zO#KqT&?^?s=|6x^4qTY<g3ZA*f^y91lZF1K0+3g>R_0HI09IdFJ>oFPa^=c1`R?wW
z!d`ze@N-;U*^J=ec45U|mz)H_vNA*9yH2Cv5t@s%1eAmXLrY5wZGYhxFSeS@pTAxB
zJ5JxYzslSryyhu(0Kv)my=LxVarc}9%>3fBYqC)Q&#PH9WHR3;A)X9)NS{wyy<$uk
zr7b-Ozd!5~&nNJ&T6)zS(lRtVbj3JM&FE3DmZdlB*EFp8WdDU#lM#S$MljJ(|3)dm
z#?wwGHsk5@t47*4r++I<*WUPG<Jeum2=KQ!Z-H%Q+xUl^4)K)@Q9vjF`5W>h4uc$3
zRI<ASo=>b$PIAO4-*EVu_Vy%{n_0=pc@+c(b_gr}+N4AXSSkY^C;+$V{qUW|C~y?T
zl%S+IAb|Qx^w9O|V+Q{g!2(WieBFIU_ddPI^R|PJVG^T`o_`CFTfFI5c#+DUfX=V)
zp!<B{`Q$xv_mJd#6825Jp1?t^dvv|=>Cfs?81{F6a^Rvj!aq96CF27#f{A+iYYX7K
z?k~T*VE?glr?j>V?0oIvy!9{q&-6b7B^@PDGFF034>o~{n+mA7tH36QO`vp72|hCZ
zh=1Jq1m7&=K7T(UCyCGEaX|CIWj^Tuh$z<GUdI_}7-X-k9K>#F0^us&s?!I?hi_}k
zBBNqq3b9_j+M5v=$Roubu^JSC&tjP&@QEc~)}-OTc<}-%va-Nt?OLm`F21Ucsg!}E
ze|%D51HJYy5nstl;4o|t$#^%Ep750bSu^MynMqgs_J3h%bj~-%(0}NPQT(Te)TG|<
znSp^B!JjGs`JM6~<do+13gM4r1ZsYH0Ys)mgJ0BRcpU8y@mUE_*HZt=XY<P$ps1_J
z7e<8*W*f*bXzoZ)0lDtjQNczi^fGRQT&B8zV9J*@41R`<4IA^f@$fprYRwwof}o&I
zVZ~pSn12B7i)8+Qe?@Bmetmg4IBnlvY(!B@#=7_?u9@t1i%9QI$Iu^NPzMjgQh7J5
zy}a%?24uR$JcEF=Qt(YG0^6V@y3aqOXYF+zt9{HHbk4tI?9xp<|4juToDuw~DL}{U
zM%-BNCu=&6H~1t%&{4u=6DU|IkYSM0NGD0234eI>!3X6mj09x;J`q9bh2xO-<;O$e
zTU)a*>>G|&Op-N%jF6B{A^=kCRV2iN|6jI2>h)`Xz^|wP=fD27#9-#kmE*vlcJjJO
zsDEM}?fH))(%|S-qg#UK0@mt33SpAjzH4kQ=-Bu&zdE5sFAM+r)YV&8t$g4f7JOIm
zb${1EwNMQE)80e?qs<7WbUncDmU{V<0nF)YAFz@3e|&A{%bD6UK}=H&D0QmeHc>l9
zJ5j?KGvps`-(JRSZ0uk6*4{p_f|tNgx3Xf{jnKZmA_95&$BfX>E+PP7z8`>(dEa^a
z_7eS>Gv&s+@W-@`#IVmlrf26<W#t<KXMc1p9`94rlMviJl+rMISokpN89m!4<K2HA
zzf6bv&kn0g>^Y<J`0QN=*niou3gI6^6MGW@j5Z^9T^msVDqpIoRW???0+QLmrk8S8
zHPk?9bvZD~iXgAJ0CEfS;aPq*BxWW<Z0b|`HK!;K%4;j3zNHZ~tTp+RD)k3^Vt-21
z&aqCGfO+`ddnK)Pbp!B;A$+E-f`Y+BN6F;50Te;^VE7GHRRn%15!z$`9MrtKa=-fR
zt3Rpftr=K3boRRF$s6~Rtpk(59K-$3R}7PPAJG_iP654s4Yqn$5&RoJkov#(+@KsK
z_SNyPT}bY3<uakVv6hCN`aB(6{C{2hEFM`EnmXQpeB1JlnVR0O7r!~aXOHZAvhRqk
z5nF|SyI4d{L{@5pl=9XuxBg@Q#r>y#y`^FN&tqSP&;0w$I%+S)r+%UzARX89Zd23>
zr@#EAxCV<fB7`V4wbtQ1`vh+$1!OuobrSe>Wo6*}{`;l(X3S8Ss>dYA{dIg*T}#f%
z8|IwdM>OrJ|B7uDC9-(i;_r`W9(6tZ>k;Qq5Bx(*a)adG@%=fkeN0mM%TY3D%O?6K
zzf;s(=*7miii(k@vu163ov$S#uvotQwBy#TS!BdKmGJ+Yw*LTzxK96GzFxQh0000<
KMNUMnLSTZRmUZm_

delta 6717
zcmV-D8p7qiGW;}<dVd-0Nkl<ZcwX&WcUTnn)*gGI7!?y08;S@@G-Be-HPxG&+?acF
zlicJ>Zi>dl5?h)TQB>5R21EquML_9Ix_}@^uS)N|Bd`sYBJTOl85msJE*SGX-yh#T
z&+l2-nVp%P_dV}9=l%VLVaEGXV<suTul(-f!;3G?J323D#(%yUe$0E!2je}Ato_aB
z&ee3@up!#{<(K0u7A*MMi(w``&GF5Yl{a2rw=UdXOUurfVU|A4G5-HMQg>kb=IQ@Z
z{z<t=>6{Ww)SC#5F4H&mGd+wNqxvjv))hrXEswwbt)i#B9eTUFA>Yld(@sMp><q(9
z9?$XZR<67nqkpH@B5G}g=8_V)xoJ~{v7+MY@f<_ezMubm*5UZo8$x|^SK&8DFF5>>
z<GQ%GoW=pqc%1$t*EIaQtC_XTKIYK?=p6X;egKCWZkP93COeXim6SByH*c=!>F5B7
zM8b~8j~_!#e0(>OAY`mcV7qdqS*D#Gzq7Lw#9}c!1b@xVaPzg-#!Z5M?moWk-#_Rb
z`*^SZ0Kq^1<?O^?FWDve#pgj#auFQA>XP*RaifXc&;Q}{Rn>h4X2<rOGhZg}me6(r
zUiu}$f7sv7{(cGc;yrlO`xts~bU*5auAWEG+5HH_-96CJ)dRW3C6H5C3|R$5&@AYH
zW_~+Mrhl=Vd+htX%WNAFd?LXAFtN-?;HoiGC$5_K`m|T3o%;BPPg0K?>2+-Sbdx3S
zJ8-kO3ounuTIKQf+vODbEchKFc-&aa5`ackY-|?-8!V3mNEEY7dwT%~euq#1Vvz_s
zkW_pk!5eRki3A_)I5ru<-?{%c>neRqFZkxj1%KDiemXOauJ_Ad&num=_9~3Xtbpj8
zYWUqLpm66&6D8WV=k(QSM~v-V-6K=M!ZW<;$MaS@e>Sv|sa}7S0HV%r5Q@7&(9!iL
z5<s1q!+gV(4kN+OOf|ECnacvXl$kVP`2?NWAI(0r<kux3>gUyk>zvoYrzbv@WEbWF
zjen@byRdlElI_yWyR4+7F$jEqE5Ii@(EE}i^rpr_Z*MO<D(~LyLTL}ebTEuSbUa%P
z4fFesjx6{z9{RXK&VngW^5s9FozH`IBp0u#30%iO0tA2ZfA*h>y5e~UT%#Yr70*cc
z>d<ee=se#XHe6}t8_kQ&tB1s*MsNvD<bUnbzp|3H{q&pFsnFyCC~E3}guH4vY-AsW
zBp4F`VpG!KS&XJXMFHs7EobIU{c7s5na5^|2Z-<$lg7Nk{5<oUnSS#Q&TCm@v<S3Z
zv|xkp26kxMX@i58;{XAO1lx~%XU`GfGQ%u(f9tLCZj4ek@&!DAPhW;!4F-BvGJnvy
zRuOtqV&T!FN9?GGit0oq2pCENJ59}N4;&qZgTbE+_f;6kn9D%H7ykqiuk8s5-g>Ko
zicMJ(h_e61C6|z1pZEgsj>`p0pJ<W3g`0<wOK?UoN`Fe}L&&UbgP80pu)7tLan&u<
zBRDBfRM5~4m2Eu`kyh0E<9W+3<bTO5DFDenf!|A#-z&l2igMqBa*tBqi89}T5iY_A
z7l_2bLz!>o3E^R@0Gb~1puVXUY8zXiy1tn`#-BrgWy~Cm?oEpCDDGC;t5iH{I>3~$
z!ePY#0ahBWl*FYau+d*!SqhD9&7f<1{0etd9I-+d*3|TYk5UhxZG^}D;D2|iGtjYu
z0g<*MbS1|?Pfrg!$|55>G1~n(64<X^ZJy=iGz|O)^ALO_KpGMtc@6{l+x`P0BpQv@
zh6Zrd)(#vB4o3b2?lV*Xl_Mt38D6p3a2w@5ETarUQ;Q)gs|u1!n&EyG4{~aSkXtW;
z2UTs5Rn-c`O`TB9e+)&99e-fsb0_1#c?%WpczaHp4jfzhyhH%X_XOTeSI<8*o(Taa
zubI4l&L?wDJ^%gl*JtmVeNS<>V&nAv(<Re%r@`ctlb=-o(uE-YO`XAW7iWRCoAv+!
zFbzmD^B!Pf(gLFH4t5+gJamA&0nRVI6yDvR_t|{Ec^Mn|1K=-bfPb&X0B^M-h%tQ-
z0lKj}D7}4~l)%qn%^Hg=XJ^qs<olxRFPscR!B3pc!2K<6u;2@YLUuU4@=As@5D5N`
zPxk3YVC4T7!JkLl4jDVzc*o|zovdoOn^Ow`DJ9@~Hyi9i)4(Dy39Lg>*#E;a%OSPA
z6{>iTpiTskQ_TZYw|`I@ItCVm^RO`d?>+<b2&@%$3?&^)0E~PBk6v8y+xr+5psSPp
z&0Sqx?B8N>2P%RXqNAh1(a{m??CikW+8Qh@EWpgn?Aa*5)b&$8S3a){6OK<96>Mn*
zn0k6DEVf(>FL|vS0G>+$nx>lY?UC*72)dDzzjNrl%=pGF-+zDbCU+C4SC7}%Z{dFQ
z<B~k+dUZaCDe@6~0fOJQjDeP=3^Z#hLPtV0O8~kdrQzY?JP(gS;OF*(pD7jj1b*7f
z8qii=IsksAlattL$&y{%bs+d^Sn$=DdPc$TH$nj;KmD+=qrHW9RBdQl2?QeWj^P<#
z>>UFpzHxBXKYt#s1tfxXa0=LkrGr!CeYhE&1$VNmAr~1yX&^8@x7OrFpuMSENV@mk
zObALU07HA<ns0S~R~x1PQUnOksD}DxKD4$xguMKGXu`Us0TrvQtuKYOV}b1N?++I)
zTwsAWH#Y|Z0|Pj6<OoZEnijzy>;lx71q#0^NMy-8ZGW3|ViGK}SOn{R)(-=oBfyIe
zFH(#6%D@j^#!SFeGDr&TH8qX09UXb3095QfD$a%Wjq{&?j|6B!0yHdPpl+2Sh~lIB
zBch8f_Sk|CBY!CPDJc6RfuA23*kyw$1pB0c>!4Oo-xB2)3qGIteDK1k_r8|{A*m(c
zn^4GtO@H9q-%f`>{EUh}lK+B+4on4nh%an_;Pf(f-|);zHa%ol3m_TyOD=AN^omx9
zFQ~^l;tp&*a^cue0#K_*;87s3_n`L?Mt(P>rKLV=e}IlB-y@i{Z<fqFuW(LbkkoU4
z4}I71(gAD*|1GZ&a?sQ?&T@3*vp*h-z3!r1;C~|tS`hqZ4*bOoR4-znYNa9wkpxc#
zen3E{?W$Ei(%{pzq3kdE>hOgdChp+~d@f3Q1w>&qljO7Dd&PnWejbNF$K};PP-3pc
z^G>SJCptqIkyb3ps%(XPtOeo`@Q{phxSLxCSxA6vBuPd^8^q?-f=gI3{BXwX#@B}o
z7k>>U0QLDqfXDdzFZks^W?>DKl@zkzvuQ!f8yN5f&=cT%0WlVf<O#HMEupvz_#K_l
z*4_!NSU9!_JD|2z2(@EXhk1MEIgh9S#~7IX`)pY6g;DQ=mA<Ue-w7!FU1_g80?>9O
z!DS)=SMhfh=0MBK^ZO#dAN)#H2FeyPP=C5Y5%_UY1CgJF1s}<NIu?8s`AH+le!joI
z*lyJ-uc6>`*M@!m<S%|Xr+dviiWiE}9GzPW4*jz48JmZZ+yuAcb0lZ2Jv{fFyS4=j
zyoFfhFT_57i=n-b=k2s2Nlu**lCVI$i{DKyp)P?3aTxj6LlSt~j$PEn7IIiiNPi%c
zu|ou4^L;ldn;50O&(PsIglEwrjyXN3e5vvyN&El_5O@a1T%)<5<E<kfd?{kg`)c0#
zu@Hdv!E|7f?c^ljDt>W6HZ<tGz(zg?e#rs`3g=^Mr>4Nl{+Ph`^An><<S`of(${yw
z+|`AopQ4{4-##pjmH2?TY;5Z+^nXVCE$9L01tsS7W@1N>h-67Z0#IQXf!)JtOLv#i
zzDFQa<PyLH{{Cx8kd{*krNsq(1nBP&s@uDvLevFi!Y(KlbV5E)3^{EbklE4>sm<+>
z*d&6OdI3b#@*xC^P(M^9kFpkU!RxRqY#Kv-pvEX+zSbtEZpzvzZ%#cqwSSKQ{opGb
zDvuj{QV7+(s@KO#0G0%+R+%CR_*CrC5a(w@^-C{6IYvH#UxeW2zraB5^9&0<_4*X~
zsr`|kKBVBw^Ys;D+vqL}eDwAwpu_hZ%Cm;COK@i7gGz9_n}Y@4JvQf)>>F5lpb;ti
zb;`ocD<-QF(h&G`lzw`@jei6{w=ffruYu=z?z11y461<$WODL|0Ah^%4vc(}NC*NU
zpCtg-B32^!1n`|Y0fZySp*1`R!dk;0y$EkSk2`{W1Hryt+{^-QncoOzxeZ{F(*T#U
z>SYrEXZT)x{>1aV8G18-*~ug`E1As`4qzA15B^mBsj$uit9);i{eN+erH7YB%DZtx
zx1&^F&31Mca20=hUKW(EePPVtbM0QPk532Y{F}1QPZK-n?Z+FSy=&zc%@0l~V*7lG
ze5&>nikcuOA-8w`IrDer{f^!GSKjrE&ge}kZGrpMe0D@2ncT6sG;$5)AG_jGxc96@
zJk}fo6G#NI0CP4GpnqN54!cnSl5@(Tv^1Y309PM~Fvp8JdqCJf1mYgxBXRg0-N3`q
zhNHE;iybXUmWQHFXcl%t6Agh_HUU%*sh%G+!*_s@aNyIsx`X<-f#-;_{N(Zic{gsP
z?PTrddwUD1<)ea6nEL>VH0QFBpWPq%<nmGECsWRUX*t{Kaev_F`TG<2qe?G#PL%v^
z|HJ}_z+V1dUR|HVhml2nJ{5pe?R!S12~qy#&Uj*<uWI9eR~TPNU4jVmupJ~5DJZoR
zys^8u8Fe3QgOlKZp>;QRegc^aHX;BU`62=E(GhLqx3L81!D5fyHUxYw`U!kbjDA-n
z9f9vq)C@KSO@HtZfj313FwU-rMtKBK`A+5MVSRsp^v}95OE&mks0uQMx`DcgS@NXi
z8VecDpx=+Fz#m<|F0R^d!B#I1bN(>!kpKxufCN<qXo!j!==F0vJ=-0$wJqeG@06uS
zH${DPP8HkUWuT-I=r+NrY@bg(y;pQP62M9>0dQ7O)qm0_N*IGgDrgWxL1QNbp^xC7
zScoYl8?J|^gXOJw*mKTm5CN!KCy<3G`&&(7APLh*3C`{j0jSbvw@F1lMSlR+8ot<G
z5&_&0e3E}60Li~qejfp@p!^$+g#Z&ZCN7$Ba7K@G<v&5UF9m2iX$~iV9MD-pc=ioV
zV@(Ox6@Rnk0l{r2@G%A4Lbq=a`1$?dkL2>jJ;y-oECym0C_vqva1aOt?6~jj+-|>S
zjk&CIZ#{a^LGP+dyb;doIfo_kV~_}B=8(f@k0uZG`Q+<kwJ$dXpvm*DV{k(6y@Ez4
zYVLx(x^~uAunkTG13N$dPZ#Y9x1TVH-?HP_pnnuVtr~$$k<Y`(Z{s1b{R%+SzZ?Mw
z_>rW)O-lL)$v+m04SX@wVzDUKBvSrT*?N**f91cMNx}&p&zS}@#}9r#@Eifw+OH)u
z=*6)RfQ@`j&4AK~h~eO)^veQ2TA6`6N;qCnfSSnLz~}SXfg}*wtzK;=>-^vA8BIX>
zet!;gxQ0DW?2xw~iv9fc$V}`28sR}@3mDpY%Pj&AUb6S{#<_!JOe3YOJ!}!^5|IhI
zX091%Hff;a_}m9ObcYpz)Ta|b(%|z2eMKPk__U3HC)uaSr@Zfj(NEIfhTQ>G`i?05
zl<SYARKd=B<xufZ1pf#tfY*captw;WpML-d()6jHPPJveV(OWVjLw{I=ImZ%t~!_i
zvLb&7@Eid)xNm?d>!!$EHpYQ3E&Hv0Za|Tr(+|G1#hd<;8YHbyVI!XdKU|T4Fa-u~
z&r^V^h&~eVcsxjVa1i3sFw?P+(A*=;mk5xGH}__AHadLeX!2k#Pb=*G$<T7tHh=KD
z<G<_K2E_G-->-xmG=(a7y=V>BfPH8R9JpZXE2|Bpg&ZUG`9uIRcvyA7f{!YGPWB0W
zYs~fa7~#9(%HgAkA{J-@oC96@Z@CIE^a7RNQ~vNp*B9jzU^L+AbC13;=i@oMW!-#M
z_BAyF%kJFi=5qdM;FHmlz8(v{;(tPDPD_S3H5E4UBl^J)naM!l3<iScDnP~UFqQ!1
zqo>;13T?HtOh&toAI_L69=v309F|fbE@|$BDn0_3RRca~@5Z4D<f6$FoR}{;W8vnB
zO0fkMV<G1Jg(&-54jI{d+6BZ(g0W>xFK=VPr_|vdn+p!uO&HkU5`Vl;-+%c1?~f`D
zJwJg=Q@CW(3?0%Q0axu)o+nwaZf%FsCLs&@SjM;sFi~^j#`W&#_(`{YLls~Q;1dBB
z?pk<mv>V?a`GMup(c=Q2tM(gHli==B6*lrY@NZ3Lz;_x0ezO&zJS>zY0F4wYD*<*F
zxC~+NYtI=|&68#>!I9}DP=AP1xiqCqvwFFh!^5$P4@DIqhmTAin*YaEPhyMJzLjs3
z@Op5f#OGc%P~@kh<X7N~U}2*eLeNd5Ng|p*xaJ=R`Zj*>>5pfF-~IN`pmhlH)&z1M
z0p)hx)N1%Fs#s>EKQjful(2lQ!`i1KK!4<O3b5qhk`c`yHuAN!f`2MvVg`X<&@cN#
zUA~O|$d{hhrDCrkIT0cjt3VJ&K7sFt;CoMHz;g<YSqe~wBxuD2qBN2%Ecn<S8c9<C
zr)p1oM`u7ulNc&myP*IjJR9A#LhJx2lF8eT#*u&~3xQ0nVnR^^P_=)rpn=W#M3#!S
zKJbYQw!z78)h7n7cz?%&8Ttt(IGOa5(RFxd+pqE`WBM;n+9N2(oIV=3WBGjC3V;Mq
z*S67?Je2|rA;9tz%SSYWtd=f4fK$4iT(3{EKUVOw-P{BPAtCKt#b1|{2qCH}gTQy2
z%)m_?uF48f5*h+6EiLQ_KX|b9>YO>7I1=nXdu<u6;j6ia9e+SbQr;tTkK3`AT>{Ph
z<Fab9kN^+R&>@h?-zSMDgNOQjYW0dSU6i);AozW<PmxdHpS1F>*{)||zWs!0?BOdn
zAL&{7z*b$8ns>JTx@;`92<;>75sXFVW$iO20@!-l8^omFdvNlK{<$d{Q}owfAEE%1
z4y4n-2q|E_%YS;<XueUh-Fdr2+XM-OWKch=KB5`qq@$CC<^I6TUZI-eh!*eA$j@+a
zASpMuR#WrN4+`qwD*oEU1PENH0-hNC?il?9zRM&AoF-yQ(9#?rKz$`f=<3zc(m?bt
z;Pk<Foanj6F7mwS=xdT#P{;ZLG{u{Sg%?%!1aw|~2Y=h=Q{>ZUG<!%npJe~4_g(l_
z?=o9&y!YJ^C6xUw?`%8hgW&HREBG7%IFCS9fhVm1qme)^0e(LJ%P$WFPgd@f)|P?2
zp9B1C^NZwtqxV6}Knt`?wP4-#b)e&}13Df$u+DKEXkFHVH%;G^>~{G<Vjg-;5}%zY
z;fsZ!dw>17ggOA~23B2MB^=2NLZc>FfD0bDRlHUEw+-|6hk=hvzR4=48$>C@X8CfT
zf}kKV6?-&lkOaQ-RR)1i1V}or%M#$>!-r6jnF+X}$XXT{xROW7*eM_`5hsFZ?Oy`E
z(@Nmm*dCI-OH;-{SoG1FL6^u3w%T{Noyz8XQ-75H?I*6py|?`^OQffLkpgfY!JkS1
z_08(9XP4$a;+AcV^iH7WmFGibauoRAxdpeP0w69k9_m`^2bOzr-^(j60L}B760Q|o
zW4?yWpy!6(2wIrwh6^+W2nwy=@4zKnW&5_W3pvT+%^Z^R(`{`9n7>V>k3%G|Ua`V2
zKYuv5ldJfv65_$*c@;MDS@2Kj4S-)?UJlNiHWlN-#09c|!DU=q+#}Mu(@^^3^6TKn
z?G*7@8*lGRPJtQj(f4tZs1*DXi@**|9_sTC7}|KB!D=7#2AlH_nYwmU<UcL=oC0tj
z!JnD}49w5Q$^w79+YFq}N=PACm2h1L8h_RrWCm%CbTjCgfSa$sUd~4)p!NGig3@1i
zL+*!fv#lOi@TJ?>@KN?hY~zRov_`NXG_;edeJb`U;^QFTFB>7{%;_iKS5$z@U;kQS
zJbk*%N5v5Q$$QRR4GT!fWh4J)L@Mk&dF29KKhEl{G`bneBX8d=CI<{`{dj2duz$<K
zKiYfp!bxjixQqqg34DL|+rwcf`{R15N%|g<0*vMnJk9!mQP%_fW@VT+9*~7y?ZAzZ
zzW4U&&5x(+Plrjm=qw(=DP<b#n72lY29s&i)NgFsRK{y;>|6JSgImE%3pmrPt@-vN
zv~NR|z*b%TRzX-;7ZHFf_&C|8ynpYqX;X>O^y!1v<c)MqxXynP_W8ST4PTYDUo;#z
zZ+QzBb12ZhID4pc?8=S88+Y!r-ags8|Jr?=mHPL;Kceu-0fSpV{_Y4{kDF8>_`7gC
z)w7M90*vMnjN}`P<+Bl=8q)bt=Wu0X^)M;tbqLs{+*J)VP+DCM1!YC}D1TBuK8lnF
z_i>6gAtMQ5Qtq+u*|?0WytWeRTN>e*jjjYAC3^xs5kQOCEK3dvm>aLYTGCoqHvm47
z0Kw<sVh()1Q~s-82?CG=-5dcZ=QmVU5%{G<H2Ft)vIm+xOSc}mc=GGRhAX&FaXx?I
zp0n4IY=RQO0_Fa@6DCRM?SBtEtb$R$0$aV42>c&@AXT16@RZLJj?jkUQ@{V-{gEr>
z?p6^Gs`0Tb0z2hF8n_0y^;+JvE;MtxcI%?mCG*3EM-P6y`;$*pUsZj1(uzsTP}=8D
zP@ABtv_?sL!-pIGvGw5Ay+<z`GyT`D55uSbeR>^Q%M#{m_5o74k$-oQVU{@m<uAoG
zSfmjV?i@bcI<#k(2OyCEi^RYTXXj1=zpktdTwZ&v^zyW68uGq7*6lQ(zwf-2aL-u_
z;g%h`f9T=Rv7YnK-w#*p&fhry^BuZ7-M&A%!{xng|Ikxhqxg3$-ex`Z$!Qu`jZwid
zXd$Gm<Nd}kFJL}5MK)_V(rm_zjZbrKB7x=N#rvH$Y{(>w`B{ShG}rTg^*jFyhPY1u
TflPl(00000NkvXXu0mjfX-gG~

diff --git a/extension/skin/scriptish32.png b/extension/skin/scriptish32.png
old mode 100755
new mode 100644
index a3a9b57ddc1ea374ce7d7f9d8dd713ae3b0e149d..afeabf754b88a9cf12e0c3c25fb479976d1bf41e
GIT binary patch
delta 1364
zcmV-a1*`hZ4C)Jzr++R<L_t(o!@ZXaOjB1F$4^_hlt+s#lsH=uYK3-`c5NqFh+`u|
zbVgJ{W+Fp}59&}hlxKNq5QY!jB*Q5<kVl3*bck7IvM@5m_t+R?Adet%3>k53C=9dd
zcE6olph9SGxy`nl{6f-uxxfECkMEp=5Yx*CarkTat2~oEkAH|#MV~qDc5FalXf66b
zE^Y{S9sgZ^FE5t|><l&_1DawFdV+(A|6BX>NQHKzrzYua;xRt>zO~C6acmE;3T-tj
zr+5QhG5c~KM6mtXD;-ui?BBR6;_LK+jLD$Lpp*DnHuC^7Bt+4uf1W%64I&+KGd{Bv
zaadB8R<J>k<bSo#>vLJ2Y+PNbhRDoFvZJRHD4K741)f1(F}AgW6p4r^BF!ny>9Hw5
z6lz5;qXegDrv_1?XjD=l0Y#Mpbf4;sC_h$0S^XJP0E(EDZKcfR-bjeQF39CI7d<bI
z*JrUiFw4r8nF1`&Urt_ay>1lu-Rp;u-yVSBSo(2Vmw%nVokkcT-0!j7qg)UxXmQcI
zjBxjGNe6=i*k##S6jL)}(P39mo>iIx;BFw>y4vBv!%>*{bJ9p+eo{Pb0764-;^*;!
zmCgdXFP(unK!E2-Pk5nTZ4%EQFO<VuDKRxzT2OJJ@={CNwUO7iuMM_VY@T!8=S*4?
zb22#~`F}_Pn)8}@;u!+U0;nmvVpdnOa96UdcDd_rSK5Ad&UK#C)RxfJYXMKi^^C`y
z=xtG@S$P@)!BGKd>hV{f*U>W_f)~n*V;sPJv->+#6VDb?xD~j8_MFzbd={c8QQkrq
z8XiVTRVsUxeK3(l%#ri+`HbZh;y7`+RX1MY0)IR*J;od}90Bb_x6pDF!ir~^<U}?B
z>RLR?&*>PmG<j*0)d1ooao(I2E*_CHatc|Q%qBU7G)vlTz0bF~C(N7o({k5CuJn?6
zdSp4W3FL+7rykpvEpbeAd@?%#%P`di@(MX)sgb%V<j3SB9#;bE<6twtn3FL*^7ZH@
zUVmWfoN}C)%j@Q%DpgU%C}1J8fJ;OYr|}9mi~^BX7%kLGio^?-*IA%O2li@v=G!)Y
z7(YCqI>35>IvQ%H5N;Ie83$m?*@2oG4Sj$G$SIb@F3CkU?0}`JGL>xsYUkpW=v8h@
z0GYBxN&XuFq?yvD1vyXGm*!mlrlmdWcz<@Ty{~<?s$4}s3(UwhRT>B^3M6AHV@Tx(
z_yceN*+H50Vw8}#ckeHcp6y)vhwegYLm4EL>?PL}tN}%i0u+S`P?xJgTcZVStrpa0
z)S!4@0l|gAq`qnwS#;?Hd9C9H`S9^L7|PR0Y6eiD{0{q#(-tFHh-_s?f9KN~xqmsR
zmv#-@fu>u{aN)~FXl%X+SKF?^{n6oh&vp%TgFH`8&a{eukv~<87Fi6CQ*`hOot!B-
z6$eSGg^aCKtp?v>U#b`>ECzV*RDKr|!T2A)n=p6()dL}abF;a?G2qIYf~HWTS1bn5
zhHI1WjSS9v(b(i8<5v2|pMQe>!G8hhzS|3(eRtr8o-X*V>wCEV?M=9RyT$moqqh?V
zhVH@e=m?~h7)X4SdnTt)pb*+q?|S`)YO3#kofw0`ks+h(c6%#SUp)KQ$xn)VKCC#=
zc=*(jqU8M4#Etrh2=Pne7dgu~-uQnPvwT=$o<C2i3)ijQlDH)<^-x;jx=q;dFSw!H
z`?$1|=uP7R*2mi6gS9wt@unSyooBbF?x+gex;n$f-z60P?rQUyk{bCw$Q>gwcl#f+
W_aX1=I<{Q^0000<MNUMnLSTZ+1DFp0

delta 1463
zcmV;o1xWhp3(O3Vr+<)1L_t(oN1c~@OjB1J$4^_hlt*uErNr5av{q=Pv}-%bLL3_#
zQ)WaZWF|6o_^LzMP<&8c8ib)6Zj#}A4djs_iq6L$GufP(;(Kn+G4K^6j;SM#O+|c6
zxBJ^UrMF^f@AcZ`mqWPcobTuSUiVxP68h632^~YfE;q@OAAgD;j_K>`d;Fl|K{fgo
z9T2*e;Q7)d=_L9C`jV_v2I2xSASdd#Md%UIBDLTR1uYnZ%xEEc>=9+f$(W5zi=XrT
zqL74divQ<tqFFx03BcRv2=cYL7E$6D@wlL|K`W;&Nc$nbqTpUadcsCLS1cSvkCbQz
z>KFu(gSwC%4S#iQI1))jI+0B=MX@w;N#xi1GJUV5-U8``=}hazHXwHB#P={FAu>}q
z09m0!Dk_7@3&{()?*Yj`XV5DsCuBy*9#yWYM^m8zV}lXwU)fz|`oaV?&D%Tx1R`_!
z>}ufvQAmkTmk{<wm_wE&yX-d{I3%NLMtJ~6myc$So_{&+I{oFV9nk&vO>nNuU(X2;
z5F21srYToO%!#N~%vZF8Il{W7i=<4DGYA5T0-j|5z(mA<lgb#fRt~1^CJz7(19P_h
z9NfI!19$(q=d#@LrP-VSl$DxBm(d`~7x@(%=mBaK1tT_&fESxB9$_{FhDrmxyF9ZA
zi&oU_t$#nza`ssFTXQBRa)&^RUI<+h%5b@vJd+ekK=Zi<th=p)gjs;NnmAITV?BaV
zNQ6Tv;>`j1LOExgLrX)Say2XHJ=&UWfJ<>Qub}q?)qARXpB~6Vp!iq;)@FR_-8j>^
z%v}kxWLcJAfbi+z?-Lh$Ah0mPHnd_W*ml|Y#eWBYsWMb$&jz4HG8``x=~RK{z(lHu
z>IZO()8({aapEC$mb#V~fKH*~A_^mJ1s4PZnukuI(I`ojjjO;dP8CyN*@3fs7k0Zq
z8@X)cL0$m$Qgzu=Z@6s4u;OIY*XRWcv!J>n-34BN@Y&%xgX-RWdifeTw|F!53Ww=S
z^nZ6zB;qbTakN+yoE!XTVCIXQ{UI>a83qIJh`NAw_M2gyfx&sD;PnDMo!%@daA&>)
zoy0GgogpP5!o}UfEP%P%Oqx*~F94n-rP8UbC<EO<@yMo}p>$}f)K3F&o!m>91+X{S
zA<z;yksrWo20flmjcbhK2k<9M{=cK&lz&r|4#5CogE-#Wggf5Avh()9Gl&y_;q!-=
z3I@O-(V1(^&j;W>IqQMQ+(`arG>A}(^rkH)=D9rJ1)wX`@i!v^u(i3m<nWIz=Ze-B
zmj*@$7Mp9mJV3%RFbqCIU~RBMd{sP?S)a+6KE(&XF#6Sc{$`X@ws`TMcb?o_I)AQR
zf$BXqkh5hmlTwia#u6hKD~({OwScY32DTkGuxzt{@e?B?Rwgozh6PO3fep;D))UO_
z`@P_-&1XmjkZOoo8`I0#jPyzRajhL~kJ)RJuaRup-gzDlo;n13zuO1<4(*4dXOF@4
zo*SO)7Q3#!^8y&k3=CU}u~o688GjA&n}{V<tB-Jr3w>5nx0)dya(SuI0@0hJNi#C~
z1^94NdAksi-iLj_ny+=QtxEb&S}X;L6L;3-_?1q~f?o9tU`w?vyV~6~$d$M5-Em!|
zfBWNi=;-Q%3s){d+vW4{>&15Xx&0S7{?kb~e7eOowq9z3&TCiUMo%~7ZGUkx_*3qQ
zH~}!CB>%ktfAvmwOlc&s`|Iv4=<2@a5<7kF3^eZF{_n;wH(&g$Zo|H{n?9;qR=y&4
zsv|8;{j&Nc$tXz_cI_~cR-~52%1riD`-GXfGqYB#$*Y_+KlK}Fvh+G`?F@Ry^#QBp
zZbtaVIxK$Jw7JfC+vlv9+b}SG)`Wtv*sx@rJaXY(%)NrVhP5aho5t53{{yoZDBnKF
Rqxt{<002ovPDHLkV1f;=)A9fS

diff --git a/extension/skin/scriptish64.png b/extension/skin/scriptish64.png
old mode 100755
new mode 100644
index a6958be20f47a369d6ad28f989bf005f8535db86..5b6b4cb857c361d82fc0fb84da64b549ff8f542e
GIT binary patch
delta 3134
zcmV-E48il99K{)srhg0xNkl<Zc-q~Y3sh4_8pkIg0TKv#5J&(aAtd1uAt6|;wOu)@
zt}P<AwnZr_y2VPXV&x^EfII~i6`$2DK4`0;*jih+?Y5}Lx<0z6^+BywtF`#XA}F-B
zh0N^Cl~}-pM{<eQd(QuGlH7#*`_Ifb-+Xs20Jc74z#hm!Fn?3coXB~KlgfRXo5D~s
zM&b7yz+-#(0%yA*yEyR#@kc&MK23^63MgA8L((!S5)=y%JDH8Z^WY*-gYd@-Tn_m5
zq4rsxGd=5ND`ZGqDn|A>_6Vc{(|Q5aW3xn$ORI-FMLN}q@<fQ0#WD}wQEy=Rf|$pl
z<&|J0xXnms^nVWAsMje2-uUYq5DZp>WY9Nwq6q+E1EOeZ1PA<EtcPR3KfvKW!_UJS
z0)D_3?quPRW8&}n;lHo5RqQWiPs<x6gCtk+>r(u_vuzC+0Y2=r0Wsh<zSzNig!aIS
z#xu-%muFqh+6CCPj+#6Q?%DSVI{E##=$li=QSQoo$bSjs?8hc>Y-fNHj0TfHTd(0~
zgWo|Ii0lQh5GxYr5T(44ykpXM=^v^^DyZA4L$Wj(9G~zaI)3^j1>aG*WqD+171*{H
z_+zvfVCa<r<G^w=Ns}|a@DU6@MuBs<^C3x`<gPMT33U}Z6t*+$PgRE@ak$uU=<6d7
zz!M$+?tdiGM(7&Jv}{`w6yPPsXvTi-T<))q3mr|vC*!~u2;$lU7Z(Hn4Sz42`wVxV
zd#rnlB1-|ao3wCH^&m88=RI|T$I`6Tps~}VpecBx-pre8z`s50p~OU{im4XIh|lwj
z_zxP8ilqa`@etS#Mu8TGsSZ$_Cq^D+9!Ro6f`43>xFTK=4>=b&qtG3?2jGe1nQ}bV
z^SU)4XZgZbZ1CS6&aB`G7})(p_bhkwGe8f+M7UUp^gHz?4e)r)18v(~Y0`kx=g*+a
z^;gl-@=}Nm2<h(xh=C=*utTuo@YpSJ9PGG95GA<8pTdWn98TYJgLX;EBxVf|PZS#t
ze1CPY6ZpBh^QgY*XVm=rFO&+_7PjGQ6VtJpv!fv8K#L(?z)Hbg{4K{Jjx~Zv!DUg5
z$iR>1L*85-<md9Ku4^~n&SG$*JXd*`H{fM)+tK6yqrlJncn;mX-Ebe=sCkRiuUnTG
zDS;hJ!#cnp!@uDc>t^tp<psSny`fiu7k`p2!K=CwLH7$C3*@lSfoggGEowaeLruaH
zNv2BB7ysRhe!6xE-TAHM0eGUs{5c1#ZhX9U|C$6Rr+g>GTEL<e)+lBs6N#3Jkb1Kk
z>8tf-p*zZJrWeF>eOuOw?6z6Cv+u6hQU(v7I0A3AG~G8KHfhotI;OQ!aiO?hz<<dw
zAyGegTX3(SJIw+aa<Ygj!oyNd&Gm8+fM35HFfyQMc3$FVZ&#Ps2R|1wjgBSmIQL|C
zTEQ6^4606G3Aj<JA{EK>CU+B@*$f4PO-Ga$yH9m*CEb(`cy2xy`B(U32))JdL_uqU
zhyn9#GNtpM<DYacbhf(HJyuG)4S#HXk+wpM@RYm4CI;Y{V4ZZi)M9vc78|KHDQN-k
zxE8=G!YW&py5c<ZJ^QxKZx<(*g9g5*p)S}Wbz=gap$^)r+!g4V<O%x%PQ)wZA#J7B
za`+w$;YaX)w3PvNl4+8rZnL{C@cc!5q}#5e7ru)TuF<Y{fe+47ZE*;n7k?fg-MJ@l
zW6Sp|e7ij2J;-85ViN=K0%sKg>&XCO67AjIjC@jj5H>(hXIE$9fEP+77`|XURjg<~
z@RT#1o5}4Ko}|i}cg+O69ahMU0m=d;=>bu6!MlmZi}uSF$e=V=id<4%NYU~F7z9SQ
zfBq!%H6}C%Pwof!z3oR2aDOii30g%ZL-gEJ5R4UUR&G$D2Qt1HpbZ3ph1h@y5DTEW
zaW7de!55|PU+^x{y`w{Ttx`xw>vLpjvL=Td2lIDtCISOh$}(X9sr~7ybT);jv^@;5
zf>{-GBs!j6^SumxO>&G~U$s%y@1UL3;WMXjry4p8;7R64TKWo4B!4UxApH(K{gAzs
zaGdZAEipj!lIRO|HoI@Fj~6&W6@fMd?kcxe+*)ul#I(MQ?azEwus{I&()ywjQQumh
zCg`xLKjoR=X&^Hg9f8nA7$dAVo9<#@W(Kp<*bmt3Z#(cR(~{4VlUzVY%P_#p%Utn7
zF*MowlRz{33HDB2GJg+}*G_p(NWWd*zwlK(OI@rcrLnQJ?dx%gaH)09>r(tk0Dk}t
z&|;_UdDD2!!~pL#-u(w()q4$GH;@?cI-P5OIWLk|YnN<yuO}p74Fx;f?+-8plLcp)
z=}Z*--az`{tNO0c_d*dv$)NczFzyK;02G7a;3p6QJ|%gA@qZ(?ShsyHg)Th@zkUX%
zRC!OFCpi_sR);W3xK*}J_Q=2!@t@=GwV44<&p4HaYz?8u02<(l#L?ojHZy=Vkd+#`
zE!27gXo4q_PLsCa0BxJiQ8?gC3oZ|~&H$Rgjq;x3ZLnEoh|IY`tAidX1N^f6AXUh*
zkpaW}7yCnt4S%2+o+xlxAboocdttzn$^vCuw^bh-8=x)M+Hkk2FPNZOq%!na_M*#x
z%ATd)sz+=syNJF>AIM_-Gvn2QwOiMHH7xq+bPOF#6-@6LP#Cl-sOQ>We;BYW3<Z@1
zLEm)W)=ux^^PK<gOj9zX28_t~$h?c!>mb==aO;;Q^nd>69~h>j#QiAH3O6wP7`1_A
zf$)BDvOk9b2G*?9Ky|v>5LFlj^EVb4Hh-|i;Gg7g=m<|F8ZV+J8Pbf_B%L@{YcRFt
z<m#>Ku;Rma;N+AkQ1gNYx{h~+-gCWS;PODE-=?>^7w9(Ykh)Nf{O0(<h@3GnbIp9X
zd*4U!dVga*_5YiGy@N))F%pKp6WR%$NHRrYePxIf$a!(s-rcRH;7tkl5>)-4_hCk9
zCK@v%5(Z2NfbJ9Aq1Q|=q{vplfYJaIydfBp>Mb!yU#X`SFCqU5K><qxkZ*=B^iJ@G
zgA)hCNjZ~Y@rDxk#gQ6#^G<`w|F?8wDO4;_z<;jrL|zGAw}Fo}$&efbq!gz%^%mZo
za4$iJP8^2Y_Ef^sP0LZ{viWFsULu;2l>ig66X4v!Bv`Pv5N+920S_KKbiZ|b(xsbM
z(10-m3{+1uRTxQ?w_08q^2HhMvjY#_Xu654HK4z=q<krqrOKeW;iD>0k;;(9QUjvj
zs()M$A659<zcnL$blAPIZ^nT3yF{Zb;&;|K@4C`(?U8N$BPWj{=~QWZ>*H90MHXZs
z@8VdpDF7+n@<q}TDY;8D#j-WNPWWX*OXDMJz@qiVP>>>kuEnm%CEo=(W;r5OItww<
z822__r&2r65gq_(maXs<jMWFeIoN+)_<wG*NtxT>*;O-hXSISv06_|dG%D4E!a$Lw
zF<@}ao3FH43P?a2nj6veTlMJDjVtKF<%{UtPv@y!+o#T*Mzv>7Q8I37HopG$?03}X
z<UDfzg)0}S?~~slJ3fsDl~-?sAhsL$wD!LtmKvY{43>(usp^yMy$XblzuZRG8h>t}
zi&yKYjmqD4fa^}=(U!yC97UfWtbrfZe2jK}`T^SU?`rfu{`+yw9#nH^A0iu|Pn@o$
z&L`&lP<H`cyjF*%q{l(#I3@&hOu(nL7jKmy$Ey2-I2Ih;bKnz`&_Ca~MQu#}{=!+a
zfM3@hLwgVJhgBc%KxLa&8M2q<G=C;8oKqY7=A_*tVn?j>8}65a)9FcU6?-%uc0=1Y
zV~`!_p$uQfFnhKASdmT??>AhT6FxC~<I6Ln_s6GCzcjBTqjhz~8n}4<5*UdSE^Y)D
zf_OY6IvOyYdi-vNwJSXlH;DUL-s*hV(0q&P)^*n}qwjwBz7y!NQ^(P+&wqEr;&ml(
zdd6#aB3~VQSR0{TFA5dSwO2d5i09)WSW@btY3sM@GuyZ7KfzQm<M<)`#a=@P?7`Ps
zhwU?fF&KOz_4r)_K4$<Ox5!xd$7lM5E3c-Oq`}hiWoXgbVw7B%0;6Y5Xd62Isk5%3
zuJ7U&oQ2N~!x!lIP@YKfp*M^nkI<2x^gNai-CN@vv4-Oxj>US36hiQ8A-OpM{^G~~
Y0pnpLT^bwynE(I)07*qoM6N<$f~AHCqyPW_

delta 3480
zcmV;J4QKMj8JrxDrhg4!Nkl<ZcwWt030RcX8a^`&+rTgjBQt<F3otChGJv_<HlC|q
z3sK8TCHI>qrD+N(sDNw=Dk`q&&5g?4GRs@ta(T?_(tXN>%G5N&9YaAVE0}ZccYbDU
zgjs&(ALem<&NKeQ`Okme_gl_)zVrP&<nE6Oc_AK(;(PJ+-hXoMFdm;r?%%wBnzWF^
z=ra1l-P3W;^EAlcBi3V#e3<;BZqvKfYZqv-YK4j@E0si2CLx|#o&-Gy@O3EFJri=*
zQ`AW8mE@HdGAX21wM<3i6>{QL;6+dlvfiFYwMc_x?wVfbK1YL6{nGtvWJNL}$P?HG
zZAr%KK#T@ubbs!|+%dWuMWDW@ftSN$2i#1;YYYLeyJL!-`;2(B5@p#?b6e_9e;<Z0
z5HQFklT#ya7)#)iu{u1+KhQCoc5aJ+SwKKf^dnLuzYaf--k?EzxHlZWU-OLg{8IIV
z`mUn8;yPSc!0-M}jp_7Feb9#;CLjYfz+`)L=$RT641f0wg%xIPz%v2oJ)%9D`;F>{
z_Z|F%ocZBf^38XrNa6Bg>>J~I2uSel(Ab<hN1*;_Bx+$z!W*#ur=WC)&(t6(08Z!Y
z_!XkQqLa$;%0D9)L}J4h15wRX;USqXkW**RFyJj)VPz3DtrCahyR<_Tz|TNNRwN8Y
zORYXz1%IlmL4A1Pyb}LZ|D%dAiu)0T5!g^=ASt_3{%X5Yh&)wpJo@$VcHk)yr@lW!
z64MNKK?}q##prM_EqamHpLa+&P57J7JRj>TLKZl_7&L|%OO1p8_$j1C`NAiK2ZKfg
zHEHv-IB{bl?!K!#>At(QJp>+z(682$ffEMdwttehyneH2ni0l++~J%%qXR#ZuajrU
zFN)`j+mkQ@oSy-m0uwld`k^N8vEEo-Bqza@!9=l4K>`;A6487S@h|ZwNjuv}-lPTU
z*=n%$BD(|>ES=X31V7ao_#BTJ0@1$)O$o{ivaSVm1+cd~!r!C|r6hTGay#i$Z3uof
zn15{DyUi*AXD^;3S8K16#p^3D5Rl+_vRrzo0jL^D0BlcaW59OHeR}xplMIqv5swyQ
z-vVEUKy4ABs8rY_Kt5b<Jp9#>hwT4C%|%jM{|jmS<5#AYtS)VVxyiY}YrR*6JQ$E_
zln5Z7hn5X0{+3TqpZ$__$yHf~%qSi&#($z|A}lTxGpg$`$HQshW<o+%1luOyC3(w<
zQ~zTKIQP>9a=W4K0dO+`vliyu<Q5o3AP<3Fa9BJ*e5=cdF2>Nwp*U=I7!EB7CCWvx
zt1Fk--{?3{ach$Ip65-d<fAt0!2Xl0sy{UW#aIRT;=c#T&o{1+d%rie15ZhqQhz-4
zFlXrtpAddcos(a&9}&!DxxwimaQ<vQku8=H-6kDL-euk9+pYqklR`19^(}eJ@>?bs
zzHxuq=1P3*^l^Nrsr~^OBc_jB#hCzDo+{*}a?a{(P1@8<sMn9*8gEn5ZGoGw)wycA
ziJA{)N&ktVMZ@(=(S4)mzfm;hvwydDt*?!LHenoh0yJoFP?il(-a$#5N#N!3m^^_q
zz|90i&X1&#-YA;@)yR{l<#}=^0K90>*q~;rrjC{^Hh&iu3rSQ}6iA$%s@u|l*j2HV
zfLYuDvKT@9toV$7sXr$IsMLd(EA2WqTVSpIo>-MgV98y^V*1>>z)G-2xqnpYGy$G@
zo+NT(M2GF%E+McNfF0p>?&#Qz00B-&aR_??Xq0DazJ<Od?maz8feAa+EH^-H{tqkE
z5jNB3-bamMLZ*jchc<2joDv`^6_LbkiOvDHMVJK%;xzG3+`+LKL5(~V;}rFFqq{cX
z#S6s5umd(S&Pv|VeLzIu(0{=Ds2fD7?)XTblOCq(+)fMH05?m%Q^A|a2_7FzH#-V<
z;772*SwU6W5doAWm#e)EZRnQWjQ|13t|LGVNk$DyVgd{e8p0$iOdnWsCJ1K>A10uU
z^l7N9f7gb?+X+t4*=B=)h>{4Z0j|j?!$4hRLu7|kb5&Sbs3ZY10)Ggkw=SXXkn5u#
zHR{EGmH(F`Yy+O22ZX;J{+G==3zp4&CPHFYFu{;(&J-jAC7UAFMUZw8-$Y1s#-e#Z
zKpGkWsVo})TCsb@QU!pA=#C8l7xgi`V<50sDdlbgkUoYCYrS`YxAnE2p56?HWG78!
zSs{St{tVl}<GTnL>wj@}q!2;8po%*I8Wa*bCzM?_*NW;#Ziwt$@BlQ$vRM%Am+H6Q
z6$FSBQx#1e4Roj}Na3hEd8Z3hzb#0X*V4h#bKD7l5o9mQzVOV4Gkbem+_ut(4Nh!T
zjC0aw3GgAwTe+vp%Uzlv7~*p#fgi<xMKV`nJKVM6_+;g>j(<ttMW9o*gGrcLNM?wU
zu3(%AfI$MJ8PZyt;Vuxs&xM?Ti3qyvMQ?(AJsZd83g8x?EeTN1Qqx$#z?}dX0k)Tg
z@_F+1T0lXMM2()0dF~cvi7+L>ugH%i?_gp3T)^7^ZApNxOh;2=16@J@4CEh>7EtY9
z)F%0niT*@-NPmf|k(X$ksF4y7wkpiA^qmFI0=SukxHWN<fY)3@03Ahx)S`4zwMUjm
zt0qi`)*J0+9-u-z$tcNreh#0+zZYkp0B68=0Jxcer1z2tFM{XdQ(({p$g!58r_s-F
zu=FXA5@Kc;&Ib+#lm<9<ejOpe3E&I?+gh7%FJBh~Lw_uFNIFQmMYTrdI_Yx+PYHmW
z<pGw{=ibflNxzDOEeWn6zy;tb0rH{p^W2fK96=B#n31#<j;!o0e{9s>Mc^p`%5lmj
zaM124jsk}>E`B|n<ZvOt8So~1H`~4Cci7Z08VtE7Gep<i*p;!56anG+;WRIh#8Qbl
zc7u|WsDFh~*l7)LvGl1X#4L$%U9F)*dNimPq@r4wY_Badu;&9hfq=yIiEgYm)u3Te
zre?HD042s22^}TCj_sTMK=PJk;+g0<-=Xl>b`Zn}c>m0OrDXM%HD5hG^obm>uXu1W
zty@kFDurB}<J@0o5U@3c#8$>)O^&AdA!i7r`hWl3-$lWY4)M~*rx#tmS%Ybn#hqX4
z$@`ywU>u!2<|j#_bRA@et79r-T75ugn*jjUFV|yTj?Or!bPz7yP-5Kl!DeIB^eE#4
z0!$hO30>C&L;C*u>8CGL8_jh#mfzR!+{9HMzJo_)kH-4v^*C@yAP$=rhGUk-kmRja
zc7KK))B?jM1JRZ0NchxnoK`RZ&t5eL?>+btzInHnsrsn@?H=j#dS9IM4#XkUG%U<X
zF<QYrGX(XuFYGz6x7iwaYrlb(kX`?IALmxgCIcp><LF`0IA~Z9hVm7n&DY}Sif9tQ
zE*{hDEhQ*<TQZ@WmxO;Mkm$wHM3bw*VSkxnxW|+pcx1sST(+(pe{p<2zJ0HK!4rM{
z;tds8J6DU_f~Q1;W`;IEW{5*D1SKZfWi#s8g16NVw1gZzeGG5iw+&ZpTuNpynM0st
zg-p!L#F_b-cv|Un4CQNN^PVbv<mAx@(slIQE4Qzat^>Ln8BMd|NYyjcv?$Wa%zqHn
z*vCB+cjQ+6ZL8H*jwa`hzb{(97^`Neur=`Xx5yGGnNdU5!l@6GpTD(jE#vea#n$k9
zBS{{b(rWuQmQm9wQ9q~f`|JJpT&uhBNP?#VIez8@QI1ubqz}GiJNOdVkR`kezGP!G
z(Y~c2%5tb+(W22#5g;{4zpQJz`+vw1uwZQ&mSjtCU|ApuC=MV#c|JstBOtt)@O~0K
zt)h*-uA@gYogx6r$yOfz=18Xz&~U$zSZlT_JlmS#q{7L~XbPN5W&=obGXuB$PJy~X
zr#|r7O2(Tnw>WG66i8j;U2^kIExB^*8o6}!GP&^cMMA5#zq@djRG<5fX@BNge)ILW
z=f7wEPW#dRm#$rA?x*9>icd2^>vwIya4>5d{7jP;Bsfce7V!j;f{oih*}=*Y-u<<K
z+^D-nE?=)<3YEXL0B7$72Ks8tv2RY0&yVcKAMO8`?Edrvvh&}&$oug9@&0{e|Ivel
z7C@gqTg{L~$@#J761jY%hJTFC8H4$Q;dp+k39MQ26g+J-c^iQWoKgT&j4uLTaAM!#
zPpq24FZb>+g~>l$I&bwA6*}Rst51>x#}47`AMYfU8&??fmlWKcGH+`2h&M;>?K7g!
z^6;m_vmu-w32%7y2ea#KD#oA{=t(>c?{P1k*Fc#;Ha`66h=SDNsec<@nl$v#_?!t>
zW|ikQudG^y7p`4|(;?szrU@|`4<<oLFcUC=dHrsp^8~bRbY#L<;b%oFi*a4!9Y(Ed
zZeAtd|M<g0pijb^S$jU;i_6xO;|aO1-b;UF;IYKC#I>>{*)%Vm_Y1Hd_k^Z|G`bhJ
z2{Ea7`f404)qjky<$sS6Cx{n@_U^h5=2`<O5F;7@z=t!h-_=2%uAHC8<kmE3Qg~{_
z^%><eamD&2WWnk(l2w|GhfW^W(tF6?&Icw1z6%nZ41H5zf<D|I>cj~2Kvd1VLPs^}
zIcVLS7{$&lY5=B&lK~C59}RjDS}(Yk(!&wgKFIx}{U0gIED=*6^l3l<0000<MNUMn
GLSTZzI;GkG


From 9b32e2bb64b8003754f41365bf701437f01f7f90 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 27 Nov 2013 01:07:57 +0100
Subject: [PATCH 798/829] Update maxVersions

---
 extension/install.rdf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index d9c75da6..b7a49991 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -66,7 +66,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>23.0</em:minVersion>
-        <em:maxVersion>25.0</em:maxVersion>
+        <em:maxVersion>28.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 
@@ -74,8 +74,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.8</em:minVersion>
-        <em:maxVersion>2.8.*</em:maxVersion>
+        <em:minVersion>2.20</em:minVersion>
+        <em:maxVersion>2.25.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>

From 77d53ec30266675ff22824d1ef4485430c9fe4fd Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 27 Nov 2013 02:03:44 +0100
Subject: [PATCH 799/829] Fix about:scriptish script order

---
 extension/content/aboutScriptish.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/aboutScriptish.html b/extension/content/aboutScriptish.html
index 88e13dcb..523596dd 100644
--- a/extension/content/aboutScriptish.html
+++ b/extension/content/aboutScriptish.html
@@ -6,8 +6,8 @@
   <link rel="icon" href="../skin/scriptish16.png"/>
   <link rel="stylesheet" href="js/third-party/qunit/qunit.css" type="text/css" media="screen"/>
   <link rel="stylesheet" href="../skin/aboutScriptish.css" type="text/css" media="screen"/>
-  <script src="js/aboutScriptish.js"></script>
   <script src="js/third-party/html/html.js"></script>
+  <script src="js/aboutScriptish.js"></script>
 </head>
 
 <body>

From 1a36efef1be1e205aa2079462199048de0f1275f Mon Sep 17 00:00:00 2001
From: Tobias Bannert <to-ba@users.noreply.github.com>
Date: Mon, 30 Dec 2013 20:22:50 +0100
Subject: [PATCH 800/829] Update description.properties

translation update
---
 extension/locale/de/description.properties | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extension/locale/de/description.properties b/extension/locale/de/description.properties
index 6949d914..f3deeaef 100644
--- a/extension/locale/de/description.properties
+++ b/extension/locale/de/description.properties
@@ -1,13 +1,13 @@
 amo.description.line1=Scriptish ist eine unabhängige Weiterentwicklung von Greasemonkey und beinhaltet:
 amo.description.line2=Alles, was Greasemoneky kann (was tatsächlich nützlich ist)
-amo.description.line3=Updates: Benutzerskripte können von Scriptish mit @updateURL aktualisiert werden
+amo.description.line3=Aktualisierungen: Benutzerskripte können von Scriptish mit @updateURL aktualisiert werden
 amo.description.line4=Viele neue <a title="Scriptish Metadaten-Block Dokumentation - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-Metadata-Block">Metadaten @Schlüssel</a>
 amo.description.line5=Viele neue <a title="Scriptish Benutzerskript API - Scriptish Wiki" href="https://github.com/scriptish/scriptish/wiki/Manual%3A-API">Funktionen der GM_ API</a>
-amo.description.line6=Überlegene Leistung: Schnellerer, saubererer Code, der von allem, was aktuelle Firefox Versionen zu bieten haben, Gebrauch macht
+amo.description.line6=Überlegene Leistung: Schnellerer, saubererer Code, der von allem, was aktuelle Firefox-Versionen zu bieten haben, Gebrauch macht
 amo.description.line7=Überlegene Sicherheit: Scriptish beinhaltet Sicherheitsfunktionen, die Sie nirgendwo anders finden
 amo.description.line8=Tests: Die Entwickler benutzen viele Tests um eine korrekte Arbeitsweise sicherzustellen und Fehler schnell zu entdecken
-amo.developerComments.line1=Scriptish beinhaltet alles, was auch Greasemonkey kann, plus viele neue und verbesserte Funktionen. Erfahren Sie mehr im <a href="http://github.com/scriptish/scriptish/wiki">Scriptish Wiki</a>
-amo.developerComments.line2=Bitte schicken Sie alle Bugs oder Funktionsvorschläge zu: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
+amo.developerComments.line1=Scriptish beinhaltet alles, was auch Greasemonkey kann, plus viele neue und verbesserte Funktionen. Erfahren Sie mehr im <a href="http://github.com/scriptish/scriptish/wiki">Scriptish-Wiki</a>
+amo.developerComments.line2=Bitte senden Sie alle Fehler oder Funktionsvorschläge an: <a href="https://github.com/scriptish/scriptish/issues">https://github.com/scriptish/scriptish/issues</a>
 amo.developerComments.line3=Wenn sie weitere Fragen haben, dann senden Sie diese bitte auf Englisch an die Mailing-Liste: <a href="http://groups.google.com/group/scriptish">http://groups.google.com/group/scriptish</a>
-amo.summary=Der beste Benutzerskript Software im Internet
-extensions.scriptish@erikvold.com.description=Ein Benutzerskript-Erweiterungen-Manager für Firefox
+amo.summary=Die beste Benutzerskript-Anwendung im Internet
+extensions.scriptish@erikvold.com.description=Ein Skript-Erweiterungsmanager für Firefox

From b1bbf73dcde6edee2793ebd9a23baf570cfcc012 Mon Sep 17 00:00:00 2001
From: Tobias Bannert <to-ba@users.noreply.github.com>
Date: Mon, 30 Dec 2013 23:21:31 +0100
Subject: [PATCH 801/829] Update scriptish.properties

translation update
---
 extension/locale/de/scriptish.properties | 148 ++++++++++++-----------
 1 file changed, 78 insertions(+), 70 deletions(-)

diff --git a/extension/locale/de/scriptish.properties b/extension/locale/de/scriptish.properties
index 367b8bd8..4aab8852 100644
--- a/extension/locale/de/scriptish.properties
+++ b/extension/locale/de/scriptish.properties
@@ -1,78 +1,81 @@
 contributions.description=Der Entwickler dieses Benutzerskripts bittet um einen kleinen Beitrag zur Unterstützung der weiteren Entwicklung
-copyDownloadURL=Download URL kopieren
+copyDownloadURL=Adresse zum Herunterladen kopieren
 copyDownloadURL.ak=k
 edit=Bearbeiten
 edit.ak=B
 editor.couldNotLaunch=Konnte den Editor nicht starten.
 editor.pleasePickExecutable=Bitte wählen sie eine ausführbare Anwendung zum Bearbeiten von Benutzerskripten aus.
-editor.prompt=Bitte erst den bevorzugten Texteditor wählen
-editor.useScratchpad=
-editor.useScratchpad.no=
-editor.useScratchpad.yes=
-error.api.badArguments=
-error.api.noResourceWithName=Keine Resource mit dem Namen
-error.api.noSecondArgValue=Zweites Argument nicht spezifiziert: Value
-error.api.prefNotFound=
-error.api.reqURL=Ungültige URL
-error.api.reqURL.scheme=Verbotenes Schema (Protokoll) in URL
-error.api.safeHTMLParser.url=
+editor.prompt=Bitte zuerst den bevorzugten Texteditor wählen
+editor.useScratchpad=Wollen Sie Scratchpad zum bearbeiten benutzen?
+editor.useScratchpad.no=Nein (Ich will meinen eigenen nehmen)
+editor.useScratchpad.yes=Ja
+error.api.badArguments=Ungültige oder nicht ausreichende Argumente wurden zur GM_ Funktion übergeben
+error.api.noResourceWithName=Keine Quelle mit dem Namen
+error.api.noSecondArgValue=Zweites Argument nicht angegeben: Wert
+error.api.prefNotFound=Ein ungültiger oder nicht vorhandener vorgegebener Name wurde zu einer GM_ Funktion übergeben.
+error.api.reqURL=Ungültige Adresse
+error.api.reqURL.scheme=Verbotenes Schema (Protokoll) in der Adreese
+error.api.safeHTMLParser.url=Das Adressenargument der GM_safeHTMLParser konnte nicht analysiert werden
 error.api.unsafeAccess=Scriptish Zugriffsverletzung: unsafeWindow darf nicht aufrufen werden
 error.charset=Ungültige Zeichenkodierung angegeben.
-error.dependency.loading=Fehler beim Laden von Anhängigkeit
-error.dependency.local=SecurityException: Anfragen nach lokalen oder Chrome-URLs sind verboten
+error.dependency.loading=Fehler beim Laden der Anhängigkeit
+error.dependency.local=SecurityException: Anfragen nach lokalen oder Chrome-Adressen sind verboten
 error.dependency.serverReturned=Fehler! Server gab zurück
 error.hash.algorithm=Ungültiger Hash-Algorithmus angegeben.
-error.icon.dataURL=Ungültige data:-URL für @icon
+error.icon.dataURL=Ungültige Daten: Adreese für @icon
 error.icon.notImage=Fehler! @icon hat keinen Bild MIME-Typ
-error.icon.URL=Ungültige URL für @icon
-error.invalidCert=
+error.icon.URL=Ungültige Adresse für @icon
+error.invalidCert=Ungültiges SSL-Zertifikat.\nWenn gewünscht, erlauben Sie alle Zertifikate, indem Sie die Option in den Scriptish-Einstellungen ändern → Erweitert → Aktualisierungssicherheit
 error.isInvalidValue=ist ein ungültiger Wert
 error.matchPattern.rules=@match Muster hält sich nicht an die Regeln für Muster
-error.matchPattern.rules.file=File-Schema @match Muster hält sich nicht an die Regeln für Muster
-error.notSecure=
+error.matchPattern.rules.file=Dateischema @match Muster hält sich nicht an die Regeln für Muster
+error.notSecure=Unsichere Adresse.\nWenn gewünscht, erlauben Sie alle nicht-HTTPS Aktualisierungen, indem Sie die Option in den Scriptish-Einstellungen ändern → Erweitert → Aktualisierungssicherheit
 error.notSupported.Firefox=wird nicht in dieser Version von Firefox unterstützt
-error.openingFile=Konnte Datei nicht öffnen
+error.openingFile=Datei konnte nicht geöffnet werden
 error.pattern.parsing=Muster konnte nicht verarbeitet werden
-error.pref.type=Nicht unterstützter Einstellungstyp. Gültige Typen sind: string, bool und 32-bit int.
-error.remoteVersionOlder=
-error.resource.dupName=ist ein doppelter Resourcenname. Jede @resource muss einen eindeutigen Namen tragen.
+error.pref.type=Nicht unterstützter Einstellungstyp. Gültige Typen sind: string, bool und 32-bit Zahlen.
+error.remoteVersionOlder=Das Fernbedienungsskript hat keine neuere Versionsnummer als das aktuelle Skript.
+error.resource.dupName=ist ein doppelter Quellenname. Jede @resource muss einen eindeutigen Namen tragen.
 error.resource.syntax=Ungültige Syntax für @resource Deklaration
 error.retrieving=Fehler beim Abrufen
 error.script.installing=Fehler bei der Installation des Benutzerskripts
-error.script.loading=Fehler beim Laden des Benutzerskripts
+error.script.loading=Fehler beim Laden des Benutzerskriptes
 greeting.btn.ak=I
-greeting.msg=Dies ist ein Benutzerskript. „Installieren" klicken um es zu benutzen.
+greeting.msg=Dies ist ein Benutzerskript. »Installieren« klicken um es zu benutzen.
 install=Installieren
 install.domains=Seiten:
 install.excludes=Läuft nicht auf:
 install.includes=Läuft auf:
 install.matches=Passend zu:
 install.requires=Benötigt:
-install.resources=Resourcen:
+install.resources=Quellen:
+install.grants=Zuwendungen:
 install.showScriptSource=Quelltext anzeigen
 install.title=Benutzerskript Installation
-install.warning1=Bösartige Benutzerskripte können Ihre Daten auspähen oder ohne Ihre Genehmigung in ihren Namen handeln. Es handelt sich um echte kleine Programme.
+install.warning1=Bösartige Benutzerskripte können Ihre Daten ausspähen oder ohne Ihre Genehmigung in ihren Namen handeln. Es handelt sich um echte kleine Programme.
 install.warning2=Sie sollten nur Benutzerskripte aus Quellen installieren, denen Sie auch vertrauen.
-installFromFile=Benutzerskript aus Datei installieren...
+installFromFile=Benutzerskript aus Datei installieren …
 installFromFile.ak=D
-menu.commands=Benutzerskript Befehle...
+menu.commands=Benutzerskriptbefehle …
 menu.commands.ak=B
-menu.install=Benutzerskript installieren...
+menu.install=Benutzerskript installieren …
 menu.install.ak=I
-menu.manage=Benutzerskripte verwalten...
+menu.manage=Benutzerskripte verwalten …
 menu.manage.ak=v
-menu.new=Neues Benutzerskript...
+menu.report=Report An Issue
+menu.report.ak=R
+menu.new=Neues Benutzerskript …
 menu.new.ak=N
 menu.options.ak=O
-menu.show=Quelltext anzeigen...
+menu.show=Quelltext anzeigen …
 menu.show.ak=Q
 menu.title=Scriptish
 menu.title.ak=S
 menuitem.install=Dieses Benutzerskript installieren
 menuitem.manage=Benutzerskripte verwalten
 menuitem.new=Neues Benutzerskript
-moving.dependency=Verschiebe Abhängigkeitsdatei von
-moving.script=Verschiebe Benutzerskript von
+moving.dependency=Abhängigkeitsdatei verschieben von
+moving.script=Benutzerskript verschieben von
 newscript.author=Autor
 newscript.description=Beschreibung
 newscript.excludes=Ausnahmen (eine pro Zeile)
@@ -80,31 +83,33 @@ newscript.exists=Ein Benutzerskript mit diesem Namen existiert bereits.\nÜbersc
 newscript.id=ID
 newscript.includes=Einschlüsse (einer pro Zeile)
 newscript.missing.id=Bitte eine ID angeben.
-newscript.missing.name=Bitte einen Namen angeben. Der Name wird im Add-ons Manager angezeigt.
+newscript.missing.name=Bitte einen Namen angeben. Der Name wird in der Add-ons-Verwaltung angezeigt.
 newscript.name=Name
 newscript.namespace=Namensraum
 newscript.noID=Bitte gültige ID für Ihr Benutzerskript angeben.
 newscript.noName=Bitte Namen für Ihr Benutzerskript angeben.
 newscript.runat=Ausführen wenn
-newscript.runat.documentend=Document laden abschließt
-newscript.runat.documentidle=Document das erste mal unbeschäftigt ist
-newscript.runat.documentstart=Dokument anfängt zu laden
-newscript.runat.windowload=Das Fenster incl. aller Medien fertig geladen ist
+newscript.runat.documentstart=Dokument beginnt zu laden
+newscript.runat.documentend=Dokument fertig geladen (keine Quellen)
+newscript.runat.documentidle=Dokument ist zunächst im Leerlauf
+newscript.runat.documentcomplete=Dokument fertig geladen (einschließlich Quellen)
+newscript.runat.windowload=Das Fenster incl. aller Medien ist fertig geladen
 newscript.version=Version
 nothing.timedOut=Nichts (Zeitüberschreitung)
 openFolder=Ordner öffnen
 openFolder.ak=O
-openUserScriptsManager=Benutzerskript-Manager öffnen
+openUserScriptsManager=Benutzerskript-Verwaltung öffnen
 openUserScriptsManager.ak=B
 options=Optionen
-options.addonsManager=Add-ons-Manager
-options.alsoUninstallPrefs=Bei der Deinstallation eines Skripts auch seine Einstellungen entfernen
-options.cache=Cache
+options.addonsManager=Add-ons-Verwaltung
+options.alsoUninstallPrefs=Bei der Deinstallation eines Skriptes auch seine Einstellungen entfernen
+options.cache=Zwischenspeicher
 options.cache.enabled=Benutzerskripte zwischenspeichern
 options.changeEditor=Editor ändern
 options.editor=Editor
 options.editor.notset=Kein Editor ausgewählt
-options.enableCopyDownloadURL=Kopieren der Download-URL aktivieren
+options.enableCopyDownloadURL=Kopieren der Adresse zu herunterladen aktivieren
+options.enableInstallDetection=Installationserkennung aktivieren
 options.enabledSchemes.about=about Protokoll (intern)
 options.enabledSchemes.advanced=Zusätzliche Protokolle
 options.enabledSchemes.chrome=chrome Protokoll (intern)
@@ -114,57 +119,60 @@ options.enabledSchemes.ftp=ftp Protokoll
 options.enabledSchemes.http=http/https Protokoll
 options.enabledSchemes.main=Protokolle
 options.enabledSchemes.securityRemark=Die zusätzlichen Protokolle können vollen Systemzugriff haben.
-options.enabledSchemes.securityRemark2=Daher stellen sie ein beträchtliches Sicherheitsrisko mit nicht vertrautenswürdigen Benutzerskripten dar!
-options.enabledSchemes.unmht=unmht Protokoll (Mozilla Archive Format)
-options.excludes.desc=Globale Ausnahmen heben Benutzerskript oder Benutzer Regeln auf
+options.enabledSchemes.securityRemark2=Daher stellen sie ein beträchtliches Sicherheitsrisiko mit nicht vertrauenswürdigen Benutzerskripten dar!
+options.enabledSchemes.unmht=unmht Protokoll (Mozilla-Archivformat)
+options.excludes.desc=Globale Ausnahmen heben Benutzerskript oder Benutzerregeln auf
 options.excludes.empty=Keine globalen Ausnahmen spezifiziert
 options.excludes.remark=(Sie können eine Ausnahme pro Zeile spezifizieren)
-options.logChrome=Nicht-kritische Erweiterungsnachrichten in der Fehler-Konsole loggen
-options.logging=Loggen
+options.grant.sniffing=@grant schnüffeln aktivieren
+options.logChrome=Nicht kritische Erweiterungsnachrichten in der Fehlerkonsole protokollieren
+options.logging=Protokollieren
 options.logToErrorConsole=GM_log benutzt die Fehlerkonsole
 options.notifications=Benachrichtigungen
-options.notifications.popup.enable=
-options.notifications.sliding.enable=
-options.notifications.whenDisabled=
+options.notifications.popup.enable=Popup-Benachrichtigungen aktivieren 
+options.notifications.sliding.enable=gleitenden Benachrichtigungen aktivieren
+options.notifications.whenDisabled=Wenn es deaktiviert ist, wird jede Meldung in der Fehlerkonsole angezeigt.
+options.other=Weitere
 options.pane.advanced=Erweitert
 options.pane.excludes=Globale Ausnahmen
 options.pane.main=Allgemein
 options.pane.ui=Benutzeroberfläche
 options.requireBuiltInCerts=Sichere Aktualisierungen müssen eingebaute Zertifikate nutzen
 options.requireSecured=Benutzerskripte müssen über eine sichere Verbindung (https) aktualisiert werden
-options.sync.desc=
-options.sync.ScriptishPrefs=
-options.sync.ScriptishPrefs.common=
-options.sync.ScriptishPrefs.editor=
-options.title=Scriptish Einstellungen
-options.toolbarbutton=Toolbar Button
-options.toolbarbutton.showScripts=Anzahl aktiver Skripte zeigen
+options.sync.desc=Der Firefox-Sync-Service und seine »Einstellungs«-Option müssen aktiviert sein!
+options.sync.ScriptishPrefs=Scriptish Einstellungen
+options.sync.ScriptishPrefs.common=Einstellungen der gemeinsamen Scriptish-Erweiterungen synchronisieren
+options.sync.ScriptishPrefs.editor=Die Editor-Einstellungen synchronisieren
+options.title=Scriptish-Optionen
+options.toolbarbutton=Werkzeugleistenknopf
+options.toolbarbutton.showScripts=Anzahl aktiver Skripte anzeigen
 options.translation=Übersetzung
 options.translation.useEnglish=Immer Englisch benutzen
 options.update.security=Aktualisierungsicherheit
-options.useDownloadURL=Download-URL für Aktualisierungen benutzen, wenn es keine gesonderte Aktualisierungs-URL gibt
-reinstall=Neu installieren
+options.useDownloadURL=Adresse vom herunterladen für Aktualisierungen benutzen, wenn es keine gesonderte Aktualisierungsadresse gibt
+reinstall=Erneut installieren
 saving=Speichern
 scratchpad.saveAsUserScript=Als Benutzerskript speichern
 scratchpad.saveAsUserScript.ak=B
-scriptOptions.disableScriptIncludes=Die Einschlüsse dieses Benutzerskripts deaktivieren und nur Benutzereinschlüsse verwenden.
-scriptOptions.excludes=Benutzer-Ausnahmen:
-scriptOptions.includes=Benutzer-Einschlüsse:
+scriptOptions.disableScriptIncludes=Die Einschlüsse dieses Benutzerskriptes deaktivieren und nur Benutzereinschlüsse verwenden.
+scriptOptions.excludes=Benutzerausnahmen:
+scriptOptions.includes=Benutzereinschlüsse:
 statusbar.enabled=Aktiviert
 statusbar.enabled.ak=K
 statusbar.installed=erfolgreich installiert
 statusbar.modified=geändert
-statusbar.noScripts.excluded=Seite ist ausgenommen!
+statusbar.noScripts.excluded=Seite ist ausgeschlossen!
 statusbar.noScripts.notfound=Keine Benutzerskripte für diese Seite!
 statusbar.noScripts.scheme=Protokoll ist deaktiviert!
 statusbar.updated=erfolgreich aktualisiert
-sync=
-tooltip.loading=Lade...
+sync=Synchronisieren
+tooltip.loading=Wird geladen …
 Uninstall=Entfernen
-untitledScript=Unbenanntes Script
+Uninstall.ak=E
+untitledScript=Unbenanntes Skript
 Update=Aktualisieren
 userscript=Benutzerskript
 userscripts=Benutzerskripte
 userscripts.get=Benutzerskripte finden
 userscripts.noneInstalled=Sie haben keine Benutzerskripte installiert
-warning.returnfrommain="return" aus dem Haupt-Scope wird normalerweise nicht unterstützt. Sie sollten dies im Benutzerskript beheben.
+warning.returnfrommain=»return« aus dem Hauptbereich wird normalerweise nicht unterstützt. Sie sollten dieses im Benutzerskript beheben.

From 015aaa4689b720bebac56c04539c33a7a305f37c Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sun, 26 Jan 2014 07:17:55 -0600
Subject: [PATCH 802/829] Closes #198 - Switch from removed
 'sdk/deprecated/observer-service' to 'sdk/system/events' to fix missing
 module error.

(cherry picked from commit 49b2a5332454bf04a272250872dff5fce1b427ad)
---
 extension/modules/manager.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index 95a850f1..bb3084f6 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -17,7 +17,7 @@ lazyUtil(this, "windowEventTracker");
 lazyUtil(this, "windowUnloader");
 
 const { Class } = jetpack('sdk/core/heritage');
-const { add } = jetpack('sdk/deprecated/observer-service');
+const { on } = jetpack('sdk/system/events');
 const { getInnerId } = jetpack('sdk/window/utils');
 
 const windowsTracked = Object.create(null);
@@ -26,19 +26,17 @@ const Scriptish_manager = Class({
   initialize: function() {
     const self = this;
 
-    add("document-element-inserted", function(aDocument) {
-      let win = aDocument.defaultView;
-      if (!win) {
-        return;
-      }
-      self.docReady_start(win);
-    });
+    on("document-element-inserted", function(aEvent) {
+      let win = aEvent.subject.defaultView;
+      if (!win) return;
+      self.docReady_start.call(self, {subject: win});
+    }, true);
 
-    add("content-document-global-created", self.docReady_start.bind(self));
-    add("chrome-document-global-created", self.docReady_start.bind(self));
+    on("content-document-global-created", self.docReady_start.bind(self), true);
+    on("chrome-document-global-created", self.docReady_start.bind(self), true);
   },
 
-  docReady_start: function(safeWin) {
+  docReady_start: function({subject: safeWin}) {
     // TODO: disable observer that calls this when Scriptish is disabled
     if (!Scriptish.enabled)
       return;

From 39f4b718e0594d1184e9b21dce95adaf96843312 Mon Sep 17 00:00:00 2001
From: Simon Chan <cnsimonchan@gmail.com>
Date: Sat, 14 Dec 2013 02:58:53 +0800
Subject: [PATCH 803/829] revert button in Australis

---
 extension/content/browser.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/browser.xul b/extension/content/browser.xul
index 1f3c5a49..84111a2a 100644
--- a/extension/content/browser.xul
+++ b/extension/content/browser.xul
@@ -44,7 +44,7 @@
   <toolbarpalette id="BrowserToolbarPalette">
     <toolbarbutton id="scriptish-button"
         observes="scriptish-button-brd"
-        type="menu"
+        type="menu-button"
         class="toolbarbutton-1 chromeclass-toolbar-additional"
         label="Scriptish">
       <menupopup id="scriptish-tb-popup" observes="scriptish-tb-popup-brd">

From a41336794c94dfc6f673366b25ec937527ada525 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 16 Mar 2014 20:17:04 -0700
Subject: [PATCH 804/829] Closes #203 GM_* functions stpped working on Nightly

---
 extension/components/scriptish.js             |  3 ++-
 extension/modules/api.js                      | 12 +++++-------
 .../commonjs/security/api-check-filenames.js  | 19 +++++++++++++++++++
 extension/modules/manager.js                  |  2 ++
 .../modules/utils/Scriptish_evalInSandbox.js  |  7 ++-----
 .../modules/utils/Scriptish_injectScripts.js  |  6 +++---
 6 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 extension/modules/commonjs/security/api-check-filenames.js

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 490d34b5..966a4800 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -23,6 +23,8 @@ lazyUtil(this, "windowUnloader");
 
 const { getInnerId } = jetpack('sdk/window/utils');
 
+jetpack('scriptish/security/api-check-filenames').add(Components.stack.filename);
+
 const CP = Ci.nsIContentPolicy;
 
 // If the file was previously cached it might have been given a number after
@@ -55,7 +57,6 @@ ScriptishService.prototype = {
   }],
   QueryInterface: XPCOMUtils.generateQI([
       Ci.nsISupports, Ci.nsISupportsWeakReference, Ci.nsIContentPolicy]),
-
   observe: function(aSubject, aTopic, aData) {
     switch (aTopic) {
       case "content-document-global-created":
diff --git a/extension/modules/api.js b/extension/modules/api.js
index 4d30dec1..e9e1c627 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -4,8 +4,6 @@ const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
 
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_logError", "Scriptish_logScriptError", "Scriptish_log"]);
-lazyImport(this, "resource://scriptish/utils/Scriptish_evalInSandbox.js", ["Scriptish_evalInSandbox_filename"]);
-lazyImport(this, "resource://scriptish/utils/Scriptish_injectScripts.js", ["Scriptish_injectScripts_filename"]);
 
 const { Style } = jetpack("sdk/stylesheet/style");
 const { attach, detach } = jetpack("sdk/content/mod");
@@ -21,7 +19,9 @@ lazyImport(this, "resource://scriptish/api/GM_xmlhttpRequester.js", ["GM_xmlhttp
 lazyImport(this, "resource://scriptish/api/GM_Resources.js", ["GM_Resources"]);
 lazyImport(this, "resource://scriptish/api/GM_setClipboard.js", ["GM_setClipboard"]);
 
-const moduleFilename = Components.stack.filename;
+const { add, check } = jetpack('scriptish/security/api-check-filenames');
+add(Components.stack.filename);
+
 const NS_XHTML = "http://www.w3.org/1999/xhtml";
 const DOLITTLE = function(){};
 
@@ -34,12 +34,10 @@ function GM_apiLeakCheck(apiName) {
     // Valid stack frames for GM api calls are: native and js when coming from
     // chrome:// URLs and any file name listed in _apiAcceptedFiles.
     if (2 == stack.language && stack.filename &&
-        stack.filename != moduleFilename &&
-        stack.filename != Scriptish_evalInSandbox_filename &&
-        stack.filename != Scriptish_injectScripts_filename &&
+        !check(stack.filename) &&
         stack.filename.substr(0, 6) != "chrome") {
       Scriptish_logError(new Error(
-          Scriptish_stringBundle("error.api.unsafeAccess") + ": " + apiName));
+          Scriptish_stringBundle("error.api.unsafeAccess") + " - " + apiName + ' by ' + stack.filename));
       return false;
     }
   } while (stack = stack.caller);
diff --git a/extension/modules/commonjs/security/api-check-filenames.js b/extension/modules/commonjs/security/api-check-filenames.js
new file mode 100644
index 00000000..1fc4c581
--- /dev/null
+++ b/extension/modules/commonjs/security/api-check-filenames.js
@@ -0,0 +1,19 @@
+"use strict";
+
+let filenames = [];
+
+function add(filename) {
+  filenames.push(filename);
+  return;
+}
+exports.add = add;
+
+function check(filename) {
+  for (let i = filenames.length - 1; i >= 0; i--) {
+  	if (filenames[i] == filename) {
+  	  return true;
+  	}
+  }
+  return false;
+}
+exports.check = check;
diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index bb3084f6..5e603086 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -20,6 +20,8 @@ const { Class } = jetpack('sdk/core/heritage');
 const { on } = jetpack('sdk/system/events');
 const { getInnerId } = jetpack('sdk/window/utils');
 
+jetpack('scriptish/security/api-check-filenames').add(Components.stack.filename);
+
 const windowsTracked = Object.create(null);
 
 const Scriptish_manager = Class({
diff --git a/extension/modules/utils/Scriptish_evalInSandbox.js b/extension/modules/utils/Scriptish_evalInSandbox.js
index e6c11601..6f75cd56 100644
--- a/extension/modules/utils/Scriptish_evalInSandbox.js
+++ b/extension/modules/utils/Scriptish_evalInSandbox.js
@@ -1,7 +1,4 @@
-var EXPORTED_SYMBOLS = [
-  "Scriptish_evalInSandbox",
-  "Scriptish_evalInSandbox_filename"
-];
+var EXPORTED_SYMBOLS = [ "Scriptish_evalInSandbox" ];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
@@ -12,7 +9,7 @@ const { Style } = jetpack("sdk/stylesheet/style");
 const { attach, detach } = jetpack("sdk/content/mod");
 
 const fileURLPrefix = "chrome://scriptish/content/scriptish.js -> ";
-const Scriptish_evalInSandbox_filename = Components.stack.filename;
+jetpack('scriptish/security/api-check-filenames').add(Components.stack.filename);
 
 function Scriptish_evalInSandbox(aScript, aSandbox, aWindow, options) {
   const jsVer = aScript.jsversion;
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 3edc39c6..0814d107 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -1,6 +1,5 @@
 var EXPORTED_SYMBOLS = [
-  "Scriptish_injectScripts",
-  "Scriptish_injectScripts_filename"
+  "Scriptish_injectScripts"
 ];
 
 const Cu = Components.utils;
@@ -18,7 +17,8 @@ lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForConten
 lazyUtil(this, "evalInSandbox");
 lazyUtil(this, "windowUnloader");
 
-const Scriptish_injectScripts_filename = Components.stack.filename;
+jetpack('scriptish/security/api-check-filenames').add(Components.stack.filename);
+
 const gTimer = jetpack('sdk/timers');
 const { getInnerId } = jetpack('sdk/window/utils');
 

From f7648cfaa13e253e4f55add7af08a9e73f564523 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Sun, 16 Mar 2014 20:17:40 -0700
Subject: [PATCH 805/829] <em:maxVersion>30.*</em:maxVersion> for Fx

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index b7a49991..56d9792a 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -66,7 +66,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>23.0</em:minVersion>
-        <em:maxVersion>28.*</em:maxVersion>
+        <em:maxVersion>30.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

From 62103e6247f9ae3f339a05f126ddd58e8a7bc965 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Mon, 31 Mar 2014 22:42:50 -0700
Subject: [PATCH 806/829] blocking uso script 169552

---
 blocklist.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blocklist.json b/blocklist.json
index c00ff1d7..7c89b839 100644
--- a/blocklist.json
+++ b/blocklist.json
@@ -1,3 +1,3 @@
 {
-  "uso": [20145, 26062, 35611, 38017, 59744, 68219, 92054, 114457, 128437, 130770, 167885]
+  "uso": [20145, 26062, 35611, 38017, 59744, 68219, 92054, 114457, 128437, 130770, 167885, 169552]
 }

From 0f767fa4c11b03501432ff49c63b99b12dffc103 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Wed, 30 Apr 2014 12:43:55 -0700
Subject: [PATCH 807/829] Making @grant enabled by default, but possible to
 opt-out of, and removing the grant sniffing

---
 extension/content/options.xul                 |  4 ++--
 extension/defaults/preferences/scriptish.js   |  2 +-
 extension/locale/en-US/scriptish.properties   |  2 +-
 extension/modules/script/script.js            |  8 +-------
 .../modules/utils/Scriptish_injectScripts.js  | 20 ++++++++++++-------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index 97f02ea9..21396d33 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -105,7 +105,7 @@
       <preference id="pref-enabledSchemes-about" name="extensions.scriptish.enabledSchemes.about" type="bool"/>
       <preference id="pref-logChrome" name="extensions.scriptish.logChrome" type="bool"/>
       <preference id="pref-logToErrorConsole" name="extensions.scriptish.logToErrorConsole" type="bool"/>
-      <preference id="pref-enableScriptGrantSniffing" name="extensions.scriptish.enableScriptGrantSniffing" type="bool"/>
+      <preference id="pref-enableScriptGrant" name="extensions.scriptish.enableScriptGrant" type="bool"/>
       <preference id="pref-enableInstallDetection" name="extensions.scriptish.enableInstallDetection" type="bool"/>
       <preference id="pref-update-requireSecured" name="extensions.scriptish.update.requireSecured" type="bool"/>
       <preference id="pref-update-requireBuiltInCerts" name="extensions.scriptish.update.requireBuiltInCerts" type="bool"/>
@@ -130,7 +130,7 @@
           </groupbox>
           <groupbox>
           <caption label="options.other" localize="label" />
-            <checkbox preference="pref-enableScriptGrantSniffing" label="options.grant.sniffing" localize="label"/>
+            <checkbox preference="pref-enableScriptGrant" label="options.grant.enabled" localize="label"/>
             <checkbox preference="pref-enableInstallDetection" label="options.enableInstallDetection" localize="label"/>
           </groupbox>
         </tabpanel>
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index 76c80beb..d174d9b9 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -17,7 +17,7 @@ pref("extensions.scriptish.enableCopyDownloadURL", false);
 pref("extensions.scriptish.enabledNotifications.popup", true);
 pref("extensions.scriptish.enabledNotifications.sliding", true);
 pref("extensions.scriptish.enableScriptRefreshing", true);
-pref("extensions.scriptish.enableScriptGrantSniffing", true);
+pref("extensions.scriptish.enableScriptGrant", true);
 pref("extensions.scriptish.enableInstallDetection", true);
 pref("extensions.scriptish.logChrome", false);
 pref("extensions.scriptish.logToErrorConsole", true);
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 1e90b882..82d2fc43 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -124,7 +124,7 @@ options.enabledSchemes.unmht=unmht protocol (Mozilla Archive format)
 options.excludes.desc=Global excludes will override any script or user specified rules
 options.excludes.empty=No global excludes specified
 options.excludes.remark=(You may specify one exclude per line)
-options.grant.sniffing=Enable @grant sniffing
+options.grant.enabled=Enable @grant
 options.logChrome=Log non-critical extension messages to the Error Console
 options.logging=Logging
 options.logToErrorConsole=GM_log uses the Error Console
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 62e56cf0..671ef640 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1,7 +1,6 @@
 var EXPORTED_SYMBOLS = ["Script"];
 
 const valueSplitter = /(\S+)(?:\s+([^\r\f\n]+))?/;
-const GRANT_REGEX = /(?:unsafeWindow|GM_[a-z]+)/gi;
 
 const Cu = Components.utils;
 Cu.import("resource://gre/modules/CertUtils.jsm");
@@ -921,11 +920,6 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
   if (aURI && aPrivate === false)
     script._downloadURL = aURI.spec;
 
-  // sniff @grant ?
-  if (Scriptish_prefRoot.getValue("enableScriptGrantSniffing")) {
-    (aSource.match(GRANT_REGEX) || []).forEach(function(i) script.grant[i] = true);
-  }
-
   // read one line at a time looking for start meta delimiter or EOF
   var lines = aSource.match(metaRegExp);
   var i = 0;
@@ -1066,7 +1060,7 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
           continue;
         case "grant":
           var splitValue = value.split(/[ \t]+/);
-          splitValue.forEach(function(i) script.grant[i] = true);
+          splitValue.forEach(i => script.grant[i] = true);
           continue;
         case "include":
           script.addInclude(value);
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 0814d107..701650e1 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -24,9 +24,14 @@ const { getInnerId } = jetpack('sdk/window/utils');
 
 const {nsIDOMXPathResult: XPATH_RESULT} = Ci;
 
+let useGrants = Scriptish_prefRoot.getValue("enableScriptGrant");
+Scriptish_prefRoot.watch("enableScriptGrant", _ => {
+  useGrants = Scriptish_prefRoot.getValue("enableScriptGrant");
+});
+
 function Scriptish_injectScripts(options) {
-  var {scripts, url, safeWin} = options;
-  var chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
+  const { scripts, url, safeWin } = options;
+  const chromeWin = Scriptish_getBrowserForContentWindow(safeWin).wrappedJSObject;
   if (!chromeWin || !chromeWin.Scriptish_BrowserUI) return;
 
   if (0 >= scripts.length) return;
@@ -61,7 +66,8 @@ function Scriptish_injectScripts(options) {
 
     Cu.evalInSandbox(GM_updatingEnabled, sandbox);
 
-    if (script.grant['GM_xpath']) {
+    Scriptish_log('granting: ' + Object.keys(script.grant).join(', '))
+    if (!useGrants || script.grant['GM_xpath']) {
       Cu.evalInSandbox(GM_xpath, sandbox);
     }
 
@@ -74,8 +80,8 @@ function Scriptish_injectScripts(options) {
       unsafeWin: unsafeContentWin,
       chromeWin: chromeWin
     }))) {
-      for (var funcName in GM_api) {
-        if (script.grant[funcName]) {
+      for (let funcName in GM_api) {
+        if (!useGrants || script.grant[funcName]) {
           sandbox[funcName] = GM_api[funcName];
         }
         else {
@@ -88,10 +94,10 @@ function Scriptish_injectScripts(options) {
       return GM_console(script, safeWin, chromeWin);
     });
 
-    if (script.grant['GM_log']) {
+    if (!useGrants || script.grant['GM_log']) {
       lazy(sandbox, "GM_log", function() {
         if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
-          var logger = new GM_ScriptLogger(script);
+          let logger = new GM_ScriptLogger(script);
           return function() {
             const args = Array.slice(arguments);
             logger.log(args.join(" "));

From 668265243ce7f822037b7e91523935ea8d4715fd Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Wed, 30 Apr 2014 12:58:24 -0700
Subject: [PATCH 808/829] <em:version>0.1.12</em:version>

---
 extension/install.rdf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 56d9792a..c4318585 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.12pre</em:version>
+    <em:version>0.1.12</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>
@@ -65,8 +65,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>23.0</em:minVersion>
-        <em:maxVersion>30.*</em:maxVersion>
+        <em:minVersion>29.0</em:minVersion>
+        <em:maxVersion>31.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

From 99fb059bd8bdb0feab3f461ef0cc28dc2967c9cc Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Wed, 30 Apr 2014 13:18:47 -0700
Subject: [PATCH 809/829] <em:version>0.1.13pre</em:version>

---
 extension/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index c4318585..8b3b5ac6 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -6,7 +6,7 @@
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
     <em:description>A Script Extension Manager for Firefox</em:description>
-    <em:version>0.1.12</em:version>
+    <em:version>0.1.13pre</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
     <em:optionsURL>chrome://scriptish/content/options.xul</em:optionsURL>

From 9ef7499ab11c135fd97a81e73a760735d0f69dde Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Fri, 9 May 2014 14:52:38 -0700
Subject: [PATCH 810/829] description changes in install.rdf

---
 extension/install.rdf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 8b3b5ac6..19d3d0b3 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -5,7 +5,7 @@
     <em:type>2</em:type>
     <em:id>scriptish@erikvold.com</em:id>
     <em:name>Scriptish</em:name>
-    <em:description>A Script Extension Manager for Firefox</em:description>
+    <em:description>A User Script Extension Manager for Firefox</em:description>
     <em:version>0.1.13pre</em:version>
     <em:aboutURL>chrome://scriptish/content/aboutStub.xul</em:aboutURL>
     <em:homepageURL>http://scriptish.org</em:homepageURL>
@@ -13,7 +13,7 @@
     <em:iconURL>chrome://scriptish/skin/scriptish32.png</em:iconURL>
     <em:icon64URL>chrome://scriptish/skin/scriptish64.png</em:icon64URL>
 
-    <em:creator>Erik Vold; http://erikvold.com/</em:creator>
+    <em:creator>Erik Vold</em:creator>
 
     <em:developer>Greg Parris; http://phob.net/</em:developer>
     <em:developer>Nils Maier; https://tn123.org/</em:developer>
@@ -66,7 +66,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>29.0</em:minVersion>
-        <em:maxVersion>31.*</em:maxVersion>
+        <em:maxVersion>32.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

From d6784716ecbe07f10b5f853103d609f6f8f5c216 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Wed, 9 Jul 2014 09:14:21 -0700
Subject: [PATCH 811/829] adding glitter chat badge to the readme

---
 README.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 6c1c85a6..ca69d4de 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,23 @@
-# About
+# Scriptish
+
+[![Gitter chat](https://badges.gitter.im/scriptish/scriptish.png)](https://gitter.im/scriptish/scriptish)
+
+## About
 
 Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 
-# Browsers Supported
+## Browsers Supported
 
 * Firefox 21+
 * Seamonkey 2.8+
 
 
-# Download
+## Download
 
 * [Addons.Mozilla.Org (AMO)](https://addons.mozilla.org/firefox/addon/scriptish)
 * [Source Code](https://github.com/scriptish/scriptish)
 
-# Help
+## Help
 
 * [Wiki](https://github.com/scriptish/scriptish/wiki)
 * [Issues](https://github.com/scriptish/scriptish/issues)
@@ -22,6 +26,6 @@ Scriptish is a userscript manager for Firefox, forked from Greasemonkey.
 * irc.mozilla.org #scriptish (for Scriptish development)
 * [StackOverflow](http://stackoverflow.com/questions/tagged/userscripts)
 
-# UserScripts
+## UserScripts
 
 * [Userscripts](http://userscripts.org)

From 275535e16c7464767b9a3e7d1c2efe2f7e87a886 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 13 Feb 2014 14:49:19 +0100
Subject: [PATCH 812/829] Fix SDK loading in Nightly.

Fixes GH-200
---
 extension/modules/constants.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index 889f0a77..f0ec6c6c 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -135,8 +135,12 @@ function descriptor(object) {
 const { Loader } = Components.utils.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
 
 const loader = Loader.Loader({
+  id: "scriptish@erikvold.com",
+  name: "Scriptish",
+  preferencesBranch: "scriptish",
   modules: {
-    "toolkit/loader": Loader
+    "toolkit/loader": Loader,
+    '@test/options': {}
   },
   paths: {
     "devtools": "resource:///modules/devtools/",

From 64cd1484e12615d4c0130d92d576a2233eb7a7e5 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 24 Apr 2014 04:51:40 +0200
Subject: [PATCH 813/829] Prevent scriptish from early-initializing
 documentElement.

This prevented some "load" listeners in windows from firing.
---
 extension/modules/manager.js                            | 2 +-
 extension/modules/utils/Scriptish_windowEventTracker.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/modules/manager.js b/extension/modules/manager.js
index 5e603086..4eb9359c 100644
--- a/extension/modules/manager.js
+++ b/extension/modules/manager.js
@@ -43,7 +43,7 @@ const Scriptish_manager = Class({
     if (!Scriptish.enabled)
       return;
 
-    if (!('document' in safeWin && safeWin.document.documentElement)) {
+    if (!('document' in safeWin && "documentElement" in safeWin.document)) {
       return;
     }
 
diff --git a/extension/modules/utils/Scriptish_windowEventTracker.js b/extension/modules/utils/Scriptish_windowEventTracker.js
index 3e7a045d..3b5bb402 100644
--- a/extension/modules/utils/Scriptish_windowEventTracker.js
+++ b/extension/modules/utils/Scriptish_windowEventTracker.js
@@ -13,6 +13,7 @@ const events = ["DOMContentLoaded", "load"];
 const trackers = Object.create(null);
 
 function Scriptish_windowEventTracker(aWin) {
+  return;
   const winID = getInnerId(aWin);
   if (winID in trackers)
     return trackers[winID];

From fccb53d23b5310df0a93ad6dd18296a1912637ed Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 15 Jul 2014 11:31:52 +0200
Subject: [PATCH 814/829] Fix GM_xmlhttpRequest in Firefox 32+

See discussion in https://bugzilla.mozilla.org/show_bug.cgi?id=1031336

Closes GH-246
Closes GH-247
---
 .../content/tests/testGM_xmlhttpRequester.js  |  2 +-
 extension/modules/api.js                      | 49 +++++++++++++++++--
 extension/modules/api/GM_xmlhttpRequester.js  | 17 +++++--
 .../modules/utils/Scriptish_injectScripts.js  |  3 +-
 4 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/extension/content/tests/testGM_xmlhttpRequester.js b/extension/content/tests/testGM_xmlhttpRequester.js
index 45e516ee..fb57ceea 100644
--- a/extension/content/tests/testGM_xmlhttpRequester.js
+++ b/extension/content/tests/testGM_xmlhttpRequester.js
@@ -14,7 +14,7 @@ test("exports", function() {
     fileURL: "file:///test.js",
     matchesDomain: function() true
   };
-  const xhrp = new GM_xmlhttpRequester(window, window, "http://example.org", script);
+  const xhrp = new GM_xmlhttpRequester(window, window, "http://example.org", script, window);
   const xhr = xhrp.contentStartRequest.bind(xhrp);
 
   asyncTest("plain GET", function() {
diff --git a/extension/modules/api.js b/extension/modules/api.js
index e9e1c627..17bace75 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -1,4 +1,4 @@
-var EXPORTED_SYMBOLS = ["GM_API", "GM_apiSafeCallback"];
+var EXPORTED_SYMBOLS = ["GM_API", "GM_apiSafeCallback", "GM_waiveXrays", "GM_checkedPrincipal"];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
@@ -58,6 +58,48 @@ function GM_apiSafeCallback(aWindow, aScript, aThis, aCb, aArgs) {
   }, 0);
 }
 
+// Waive Xrays on an object
+const GM_waiveXrays = (function() {
+  if (Components.utils.waiveXrays) {
+    return function GM_waiveXrays(obj) {
+      return Components.utils.waiveXrays(obj);
+    };
+  }
+  return function GM_waiveXrays(obj) {
+    return obj;
+  };
+})();
+
+// Check that o2 has the same principal as o1 and return o2.
+// Otherwise return null.
+const GM_checkedPrincipal = (function() {
+  if (Components.utils.getObjectPrincipal) {
+    return function GM_checkedPrincipal(o1, o2) {
+      try {
+        if (!o2) {
+          return null;
+        }
+        var op1 = Components.utils.getObjectPrincipal(o1);
+        var op2 = Components.utils.getObjectPrincipal(o2);
+        if (!op1.equals(op2)) {
+          Scriptish_logError(new Error("Principal mismatch"));
+          return null;
+        }
+        return o2;
+      }
+      catch (ex) {
+        Scriptish_logError(new Error("Principal mismatch"));
+        return null;
+      }
+    };
+  }
+
+  return function GM_checkedPrincipal(o1, o2) {
+    return o2;
+  }
+})();
+
+
 // note: must not depend on aChromeWin below, it should always be optional!
 function GM_API(options) {
   var {
@@ -66,7 +108,8 @@ function GM_API(options) {
     winID: aWinID,
     safeWin: aSafeWin,
     unsafeWin: aUnsafeContentWin,
-    chromeWin: aChromeWin
+    chromeWin: aChromeWin,
+    sandbox: sandbox
   } = options;
 
   var document = aSafeWin.document;
@@ -76,7 +119,7 @@ function GM_API(options) {
 
   var lazyLoaders = {};
   lazy(lazyLoaders, "xhr", function() {
-    return new GM_xmlhttpRequester(aUnsafeContentWin, aSafeWin, aURL, aScript);
+    return new GM_xmlhttpRequester(aUnsafeContentWin, aSafeWin, aURL, aScript, sandbox);
   });
   lazy(lazyLoaders, "storage", function() {
     return new GM_ScriptStorage(aScript, aSafeWin);
diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 0d449339..56c36fbe 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -1,10 +1,13 @@
 "use strict";
 var EXPORTED_SYMBOLS = ["GM_xmlhttpRequester"];
 
+const Cu = Components.utils;
+
 Components.utils.import("resource://scriptish/constants.js");
 Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 
-lazyImport(this, "resource://scriptish/api.js", ["GM_apiSafeCallback"]);
+lazyImport(this, "resource://scriptish/api.js",
+           ["GM_apiSafeCallback", "GM_waiveXrays", "GM_checkedPrincipal"]);
 lazyUtil(this, "stringBundle");
 
 const MIME_JSON = /^(application|text)\/(?:x-)?json/i;
@@ -78,11 +81,13 @@ IgnoreRedirect.prototype = {
 };
 
 
-function GM_xmlhttpRequester(unsafeContentWin, safeWin, originUrl, aScript) {
+function GM_xmlhttpRequester(unsafeContentWin, safeWin, originUrl, aScript,
+                             sandbox) {
   this.unsafeContentWin = unsafeContentWin;
   this.safeWin = safeWin;
   this.originUrl = originUrl;
   this.script = aScript;
+  this.sandbox = sandbox;
 }
 
 // this function gets called by user scripts in content security scope to
@@ -141,6 +146,7 @@ GM_xmlhttpRequester.prototype.contentStartRequest = function(details) {
 GM_xmlhttpRequester.prototype.chromeStartRequest =
     function(safeUrl, details, req) {
   this.setupRequestEvent(this.unsafeContentWin, req, "onload", details);
+  this.setupRequestEvent(this.unsafeContentWin, req, "onloadend", details);
   this.setupRequestEvent(this.unsafeContentWin, req, "onerror", details);
   this.setupRequestEvent(this.unsafeContentWin, req, "onprogress", details);
   this.setupRequestEvent(this.unsafeContentWin, req, "onreadystatechange", details);
@@ -210,7 +216,10 @@ GM_xmlhttpRequester.prototype.setupRequestEvent =
   var origMimeType = details.overrideMimeType;
   var script = this.script;
 
-  if (details[event]) {
+  var realDetails = GM_waiveXrays(details);
+  var realEvent = GM_checkedPrincipal(this.sandbox, realDetails[event]);
+
+  if (realEvent) {
     req[event] = function(ev) {
       var responseState = {
         // can't support responseXML because security won't
@@ -256,7 +265,7 @@ GM_xmlhttpRequester.prototype.setupRequestEvent =
       }
 
       GM_apiSafeCallback(
-          unsafeContentWin, script, details, details[event], [responseState]);
+          unsafeContentWin, script, realDetails, realEvent, [responseState]);
     }
   }
 }
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 701650e1..2636d1d3 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -78,7 +78,8 @@ function Scriptish_injectScripts(options) {
       winID: winID,
       safeWin: safeWin,
       unsafeWin: unsafeContentWin,
-      chromeWin: chromeWin
+      chromeWin: chromeWin,
+      sandbox: sandbox
     }))) {
       for (let funcName in GM_api) {
         if (!useGrants || script.grant[funcName]) {

From d8deecfaa1ddcd702fe7637e10fa0071f6651299 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 15 Jul 2014 11:37:03 +0200
Subject: [PATCH 815/829] Don't use __proto__

Closes GH-236
---
 extension/modules/api/GM_xmlhttpRequester.js |  5 ++---
 extension/modules/constants.js               | 17 ++++++++++++-----
 extension/modules/script/script.js           |  5 ++---
 extension/modules/script/scriptdependency.js |  5 ++---
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/extension/modules/api/GM_xmlhttpRequester.js b/extension/modules/api/GM_xmlhttpRequester.js
index 56c36fbe..6393247e 100644
--- a/extension/modules/api/GM_xmlhttpRequester.js
+++ b/extension/modules/api/GM_xmlhttpRequester.js
@@ -57,8 +57,7 @@ function IgnoreRedirect(req, ignoreFlags) {
   this.init(req);
   this.ignoreFlags = ignoreFlags;
 }
-IgnoreRedirect.prototype = {
-  __proto__: NotificationCallbacks.prototype,
+IgnoreRedirect.prototype = subclass(NotificationCallbacks.prototype, {
   query: XPCOMUtils.generateQI([Ci.nsIChannelEventSink]),
   asyncOnChannelRedirect: function(oldChannel, newChannel, flags, callback) {
     if (this.ignoreFlags & flags) {
@@ -78,7 +77,7 @@ IgnoreRedirect.prototype = {
 
     callback.onRedirectVerifyCallback(Cr.NS_OK);
   }
-};
+});
 
 
 function GM_xmlhttpRequester(unsafeContentWin, safeWin, originUrl, aScript,
diff --git a/extension/modules/constants.js b/extension/modules/constants.js
index f0ec6c6c..1c6737cd 100644
--- a/extension/modules/constants.js
+++ b/extension/modules/constants.js
@@ -1,5 +1,5 @@
 var EXPORTED_SYMBOLS = [
-    "Cc", "Ci", "Cr", "NetUtil", "XPCOMUtils", "extend", "jetpack",
+    "Cc", "Ci", "Cr", "NetUtil", "XPCOMUtils", "extend", "subclass", "jetpack",
     "Services", "Instances", "lazy", "lazyImport", "lazyUtil", "timeout"];
 
 const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu, Constructor: CC} = Components;
@@ -11,10 +11,9 @@ var Services = {};
 (function(inc, tools){
   inc("resource://gre/modules/XPCOMUtils.jsm");
   inc("resource://gre/modules/NetUtil.jsm");
-  inc("resource://gre/modules/Services.jsm", tools);
-
-  Services.__proto__ = tools.Services;
-})(Components.utils.import, {})
+  inc("resource://gre/modules/Services.jsm" );
+  Services = Object.create(Services);
+})(Components.utils.import, {});
 
 var Instances = {
   get bis() Cc["@mozilla.org/binaryinputstream;1"]
@@ -124,6 +123,14 @@ function extend(a, o) {
   return o;
 }
 
+function subclass(clazz, prototype) {
+  let rv = Object.create(clazz);
+  for (let x of Object.getOwnPropertyNames(prototype)) {
+    Object.defineProperty(rv , x, Object.getOwnPropertyDescriptor(prototype, x));
+  }
+  return rv;
+}
+
 function descriptor(object) {
   let value = {};
   Object.getOwnPropertyNames(object).forEach(function(name) {
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index 671ef640..a727122b 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -114,8 +114,7 @@ function Script(config) {
   this._jsversion = null;
   this["_run-at"] = null;
 }
-Script.prototype = {
-  __proto__: CachedResource.prototype,
+Script.prototype = subclass(CachedResource.prototype, {
   includesDisabled: false,
   isCompatible: true,
   blocklistState: Ci.nsIBlocklistService.STATE_NOT_BLOCKED,
@@ -892,7 +891,7 @@ Script.prototype = {
     this._dependhash = tools.Scriptish_cryptoHash(this._rawMeta);
     return this;
   }
-};
+});
 
 Script.prototype.addScreenShot = function(aURL, aThumbURL) {
   if (!AddonManagerPrivate.AddonScreenshot) return;
diff --git a/extension/modules/script/scriptdependency.js b/extension/modules/script/scriptdependency.js
index 94e9fef4..e696caa1 100644
--- a/extension/modules/script/scriptdependency.js
+++ b/extension/modules/script/scriptdependency.js
@@ -19,8 +19,7 @@ function ScriptDependency(aScript) {
   this.updateScript = false;
 }
 
-ScriptDependency.prototype = {
-  __proto__: CachedResource.prototype,
+ScriptDependency.prototype = subclass(CachedResource.prototype, {
   get _file() {
     var file = this._script._basedirFile;
     file.append(this._filename);
@@ -58,4 +57,4 @@ ScriptDependency.prototype = {
     this._tempFile.moveTo(file.parent, file.leafName);
     this._tempFile = null;
   }
-}
+});

From 358ff754964d0b82e0326df1d34164fa00e59d35 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 15 Jul 2014 12:35:36 +0200
Subject: [PATCH 816/829] Make GM_apiLeakCheck exit after encoutering main
 script injector

Closes GH-231
Closes GH-238
Closes GH-237
---
 extension/modules/api.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 17bace75..30e8b12a 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -40,6 +40,11 @@ function GM_apiLeakCheck(apiName) {
           Scriptish_stringBundle("error.api.unsafeAccess") + " - " + apiName + ' by ' + stack.filename));
       return false;
     }
+    if (stack.filename && stack.filename === 'resource://scriptish/utils/Scriptish_injectScripts.js') {
+      // No point in checking beyond this point.
+      // Also fixed at least https://github.com/scriptish/scriptish/issues/231
+      break;
+    }
   } while (stack = stack.caller);
   return true;
 }

From 2559adeb39e6daff73abc11a28a3894d9523841d Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 15 Jul 2014 13:07:29 +0200
Subject: [PATCH 817/829] Fix first run code (Australis)

Was a prelim review note of 0.1.12
---
 extension/content/js/updatecheck.js | 43 +++++++++++++++--------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/extension/content/js/updatecheck.js b/extension/content/js/updatecheck.js
index 94391543..a36f0d3e 100644
--- a/extension/content/js/updatecheck.js
+++ b/extension/content/js/updatecheck.js
@@ -12,27 +12,28 @@
   });
 
   // FIRST RUN STUFF!
-  if (0 >= Services.vc.compare(currentVer, "0.1b5")) {
-    let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
-    let { document, gBrowser } = chromeWin;
+  if (0 < Services.vc.compare(currentVer, "0.1b5")) {
+    return;
+  }
+  let window = Services.wm.getMostRecentWindow("navigator:browser");
+  let { document, gBrowser } = window;
+
+  // Open about:scriptish in a tab
+  gBrowser.addTab("about:scriptish");
 
-    // Open about:scriptish in a tab
-    gBrowser.addTab("about:scriptish");
+  // Add toolbaritem to add-on bar
+  if (!window.CustomizableUI) {
+    return;
+  }
 
-    // Add toolbaritem to add-on bar
-    let addToBar = document.getElementById("nav-bar");
-    let scriptishBtn = document.getElementById("scriptish-button");
-    if (addToBar && !scriptishBtn) {
-      var addonSet = (addToBar.getAttribute("currentset") || addToBar.getAttribute("defaultset")).split(",");
-      var addonPos = addonSet.indexOf("status-bar");
-      if (addonPos == -1) addonPos = addonSet.length;
-      addonSet.splice(addonPos, 0, "scriptish-button");
-      addonSet = addonSet.join(",");
-      addToBar.setAttribute("currentset", addonSet);
-      addToBar.currentSet = addonSet;
-      chromeWin.BrowserToolboxCustomizeDone(true);
-      document.persist(addToBar.getAttribute("id"), "currentset");
-      if ("addon-bar" == addToBar.getAttribute("id")) addToBar.collapsed = false;
-    }
+  const button = "scriptish-button";
+  let placement = window.CustomizableUI.getPlacementOfWidget(button);
+  if (!placement) {
+    // New and not placed yet
+    placement = {area: 'nav-bar', position: undefined};
+    window.CustomizableUI.addWidgetToArea(button,
+                                          placement.area,
+                                          placement.position);
+    window.CustomizableUI.ensureWidgetPlacedInWindow(button, window);
   }
-})(Components.utils.import)
+})(Components.utils.import);

From f67ecf1e409cd9e6de5831375a740c1675ce223d Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 15 Jul 2014 13:17:10 +0200
Subject: [PATCH 818/829] Fix aboutScriptish.js loading too early

---
 extension/content/js/aboutScriptish.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/content/js/aboutScriptish.js b/extension/content/js/aboutScriptish.js
index d326f732..9bb6e998 100644
--- a/extension/content/js/aboutScriptish.js
+++ b/extension/content/js/aboutScriptish.js
@@ -14,7 +14,7 @@ function include(aSrc) {
 Cu.import("resource://scriptish/constants.js");
 lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "AddonManagerPrivate"]);
 
-(function() {
+addEventListener("DOMContentLoaded", function() {
   "use strict";
 
   // Show about:scriptish?test
@@ -57,4 +57,4 @@ lazyImport(this, "resource://gre/modules/AddonManager.jsm", ["AddonManager", "Ad
     addPersons($("contlist"), aAddon.contributors);
     addPersons($("translist"), aAddon.translators);
   });
-})();
+});

From de365fa15d52f8e3e624f37b3f56a2a3bdd3f997 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 15 Jul 2014 13:17:46 +0200
Subject: [PATCH 819/829] Fix logger tests

---
 extension/content/tests/testScriptishLogger.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extension/content/tests/testScriptishLogger.js b/extension/content/tests/testScriptishLogger.js
index 9b11788e..36b1d035 100644
--- a/extension/content/tests/testScriptishLogger.js
+++ b/extension/content/tests/testScriptishLogger.js
@@ -113,7 +113,7 @@ asyncTest("logScriptError: js error", 7, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
-    equal(message.errorMessage, "[baz] Error: foo");
+    ok(message.errorMessage.contains("[baz] Error: foo"));
     equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
     equal(message.sourceLine, "");
     ok(message.lineNumber > 10);
@@ -127,7 +127,7 @@ asyncTest("logScriptError: nsIScriptError", 8, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
-    equal(message.errorMessage, "[baz] foo");
+    ok(message.errorMessage.contains("[baz] foo"));
     equal(message.sourceName, "source");
     equal(message.sourceLine, "line");
     equal(message.lineNumber, 0xaa);
@@ -144,7 +144,7 @@ asyncTest("logScriptError: nsIScriptError; omit id", 8, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
-    equal(message.errorMessage, "[Scriptish] foo");
+    ok(message.errorMessage.contains("[Scriptish] foo"));
     equal(message.sourceName, "source");
     equal(message.sourceLine, "line");
     equal(message.lineNumber, 0xaa);
@@ -161,7 +161,7 @@ asyncTest("test nsIScriptError; omit optionals", 8, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
-    equal(message.errorMessage, "[Scriptish] foo");
+    ok(message.errorMessage.contains("[Scriptish] foo"));
     equal(message.sourceName, "[user.js]");
     equal(message.sourceLine, "line");
     equal(message.lineNumber, 0xaa);
@@ -178,7 +178,7 @@ asyncTest("test nsIException", 7, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
-    equal(message.errorMessage, "[baz] foo");
+    ok(message.errorMessage.contains("[baz] foo"));
     equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
     equal(message.sourceLine, "");
     ok(message.lineNumber > 10);
@@ -193,7 +193,7 @@ asyncTest("test TypeError", 7, function() {
   runListener(function(message) {
     ok(message instanceof Ci.nsIScriptError);
 
-    equal(message.errorMessage, "[baz] TypeError: f is undefined");
+    ok(message.errorMessage.contains("[baz] TypeError: f is undefined"));
     equal(message.sourceName, "chrome://scriptish/content/tests/testScriptishLogger.js");
     equal(message.sourceLine, "");
     ok(message.lineNumber > 10);

From cb9f54cb70bab8af3499b0e440cb8dc3b49f0894 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 15 Jul 2014 13:22:07 +0200
Subject: [PATCH 820/829] Check that a gBrowser actually has a selectedBrowser

Came up in prelim. of 0.1.12
---
 extension/components/scriptish.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/components/scriptish.js b/extension/components/scriptish.js
index 966a4800..3704b6ef 100644
--- a/extension/components/scriptish.js
+++ b/extension/components/scriptish.js
@@ -81,7 +81,8 @@ ScriptishService.prototype = {
 
         let currentInnerWindowID = getInnerId(safeWin);
         // if the focused tab's window is the one loading, then attach menuCommander
-        if (safeWin === gBrowser.selectedBrowser.contentWindow) {
+        if (gBrowser && gBrowser.selectedBrowser &&
+            safeWin === gBrowser.selectedBrowser.contentWindow) {
           if (gmBrowserUI.currentMenuCommander)
             gmBrowserUI.currentMenuCommander.detach();
 

From a3a7b3977739c0baf8b2a725e0857b6cd78be8c0 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 15 Jul 2014 13:23:33 +0200
Subject: [PATCH 821/829] Bump min/maxVersions

---
 extension/install.rdf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extension/install.rdf b/extension/install.rdf
index 19d3d0b3..79a1cd0b 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -65,8 +65,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>29.0</em:minVersion>
-        <em:maxVersion>32.*</em:maxVersion>
+        <em:minVersion>30.0</em:minVersion>
+        <em:maxVersion>33.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 
@@ -74,8 +74,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.20</em:minVersion>
-        <em:maxVersion>2.25.*</em:maxVersion>
+        <em:minVersion>2.27</em:minVersion>
+        <em:maxVersion>2.30.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>

From 63a4ad6844bd288ea75072df7ab0ce632f7d9676 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 15 Jul 2014 13:31:20 +0200
Subject: [PATCH 822/829] Re-enable grant sniffing!

The world (meaning I) is not ready get for @grant :p
Closes GH-226 (and probably numerous others)
Reverts part of 0f767fa4c11b03501432ff49c63b99b12dffc103
---
 extension/content/options.xul               | 2 ++
 extension/defaults/preferences/scriptish.js | 1 +
 extension/locale/en-US/scriptish.properties | 1 +
 extension/modules/script/script.js          | 6 ++++++
 4 files changed, 10 insertions(+)

diff --git a/extension/content/options.xul b/extension/content/options.xul
index 21396d33..3c6d00f8 100644
--- a/extension/content/options.xul
+++ b/extension/content/options.xul
@@ -106,6 +106,7 @@
       <preference id="pref-logChrome" name="extensions.scriptish.logChrome" type="bool"/>
       <preference id="pref-logToErrorConsole" name="extensions.scriptish.logToErrorConsole" type="bool"/>
       <preference id="pref-enableScriptGrant" name="extensions.scriptish.enableScriptGrant" type="bool"/>
+      <preference id="pref-enableScriptGrantSniffing" name="extensions.scriptish.enableScriptGrantSniffing" type="bool"/>
       <preference id="pref-enableInstallDetection" name="extensions.scriptish.enableInstallDetection" type="bool"/>
       <preference id="pref-update-requireSecured" name="extensions.scriptish.update.requireSecured" type="bool"/>
       <preference id="pref-update-requireBuiltInCerts" name="extensions.scriptish.update.requireBuiltInCerts" type="bool"/>
@@ -131,6 +132,7 @@
           <groupbox>
           <caption label="options.other" localize="label" />
             <checkbox preference="pref-enableScriptGrant" label="options.grant.enabled" localize="label"/>
+            <checkbox preference="pref-enableScriptGrantSniffing" label="options.grant.sniffing" localize="label"/>
             <checkbox preference="pref-enableInstallDetection" label="options.enableInstallDetection" localize="label"/>
           </groupbox>
         </tabpanel>
diff --git a/extension/defaults/preferences/scriptish.js b/extension/defaults/preferences/scriptish.js
index d174d9b9..d3e334a7 100644
--- a/extension/defaults/preferences/scriptish.js
+++ b/extension/defaults/preferences/scriptish.js
@@ -18,6 +18,7 @@ pref("extensions.scriptish.enabledNotifications.popup", true);
 pref("extensions.scriptish.enabledNotifications.sliding", true);
 pref("extensions.scriptish.enableScriptRefreshing", true);
 pref("extensions.scriptish.enableScriptGrant", true);
+pref("extensions.scriptish.enableScriptGrantSniffing", true);
 pref("extensions.scriptish.enableInstallDetection", true);
 pref("extensions.scriptish.logChrome", false);
 pref("extensions.scriptish.logToErrorConsole", true);
diff --git a/extension/locale/en-US/scriptish.properties b/extension/locale/en-US/scriptish.properties
index 82d2fc43..d69a11f3 100644
--- a/extension/locale/en-US/scriptish.properties
+++ b/extension/locale/en-US/scriptish.properties
@@ -125,6 +125,7 @@ options.excludes.desc=Global excludes will override any script or user specified
 options.excludes.empty=No global excludes specified
 options.excludes.remark=(You may specify one exclude per line)
 options.grant.enabled=Enable @grant
+options.grant.sniffing=Enable @grant sniffing
 options.logChrome=Log non-critical extension messages to the Error Console
 options.logging=Logging
 options.logToErrorConsole=GM_log uses the Error Console
diff --git a/extension/modules/script/script.js b/extension/modules/script/script.js
index a727122b..34c57768 100644
--- a/extension/modules/script/script.js
+++ b/extension/modules/script/script.js
@@ -1,6 +1,7 @@
 var EXPORTED_SYMBOLS = ["Script"];
 
 const valueSplitter = /(\S+)(?:\s+([^\r\f\n]+))?/;
+const GRANT_REGEX = /(?:unsafeWindow|GM_[a-z]+)/gi;
 
 const Cu = Components.utils;
 Cu.import("resource://gre/modules/CertUtils.jsm");
@@ -919,6 +920,11 @@ Script.parse = function Script_parse(aConfig, aSource, aURI, aUpdateScript, aPri
   if (aURI && aPrivate === false)
     script._downloadURL = aURI.spec;
 
+  // sniff @grant ?
+  if (Scriptish_prefRoot.getValue("enableScriptGrantSniffing")) {
+    (aSource.match(GRANT_REGEX) || []).forEach(function(i) script.grant[i] = true);
+  }
+
   // read one line at a time looking for start meta delimiter or EOF
   var lines = aSource.match(metaRegExp);
   var i = 0;

From 58a2ae4cbefa219dcede0c63c01a324fb23d21ca Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 15 Jul 2014 13:53:05 +0200
Subject: [PATCH 823/829] GM_xpath is a sandbox function and should be always
 available

---
 extension/modules/utils/Scriptish_injectScripts.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 2636d1d3..eec55479 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -67,9 +67,8 @@ function Scriptish_injectScripts(options) {
     Cu.evalInSandbox(GM_updatingEnabled, sandbox);
 
     Scriptish_log('granting: ' + Object.keys(script.grant).join(', '))
-    if (!useGrants || script.grant['GM_xpath']) {
-      Cu.evalInSandbox(GM_xpath, sandbox);
-    }
+    Cu.evalInSandbox(GM_xpath, sandbox);
+
 
     // add GM_* API to sandbox
     let (GM_api = new GM_API(extend(options, {

From fb7ac40a3d87907fc05494060d96143f1ab3fc60 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 15 Jul 2014 14:50:29 +0200
Subject: [PATCH 824/829] Merge sandboxScripts again.

---
 extension/modules/api/GM_sandboxScripts.js    | 19 +++++-------
 .../modules/api/sandbox/GM_updatingEnabled.js |  2 --
 .../GM_xpath.js => sandboxScripts.js}         |  2 ++
 .../modules/utils/Scriptish_injectScripts.js  | 31 +++++++++----------
 4 files changed, 23 insertions(+), 31 deletions(-)
 delete mode 100644 extension/modules/api/sandbox/GM_updatingEnabled.js
 rename extension/modules/api/{sandbox/GM_xpath.js => sandboxScripts.js} (98%)

diff --git a/extension/modules/api/GM_sandboxScripts.js b/extension/modules/api/GM_sandboxScripts.js
index deefd213..3e02be12 100644
--- a/extension/modules/api/GM_sandboxScripts.js
+++ b/extension/modules/api/GM_sandboxScripts.js
@@ -1,20 +1,15 @@
 "use strict";
-const EXPORTED_SYMBOLS = ["GM_updatingEnabled", "GM_xpath"];
+const EXPORTED_SYMBOLS = ["GM_SandboxScripts"];
 
-if (!('XMLHttpRequest' in this))
+if (!('XMLHttpRequest' in this)) {
   this.XMLHttpRequest = Components.Constructor(
       "@mozilla.org/xmlextras/xmlhttprequest;1", "nsIXMLHttpRequest");
+}
 
-const GM_updatingEnabled = (function(r) {
+const GM_SandboxScripts = (function(r) {
+  r = new XMLHttpRequest();
   r.overrideMimeType('text/javascript'); // don't try to parse as XML
-  r.open('GET', 'resource://scriptish/api/sandbox/GM_updatingEnabled.js', false);
+  r.open('GET', 'resource://scriptish/api/sandboxScripts.js', false);
   r.send(null);
   return r.responseText;
-})(new XMLHttpRequest());
-
-const GM_xpath = (function(r) {
-  r.overrideMimeType('text/javascript'); // don't try to parse as XML
-  r.open('GET', 'resource://scriptish/api/sandbox/GM_xpath.js', false);
-  r.send(null);
-  return r.responseText;
-})(new XMLHttpRequest());
+})();
diff --git a/extension/modules/api/sandbox/GM_updatingEnabled.js b/extension/modules/api/sandbox/GM_updatingEnabled.js
deleted file mode 100644
index 8b7a71d6..00000000
--- a/extension/modules/api/sandbox/GM_updatingEnabled.js
+++ /dev/null
@@ -1,2 +0,0 @@
-
-const GM_updatingEnabled = true;
diff --git a/extension/modules/api/sandbox/GM_xpath.js b/extension/modules/api/sandboxScripts.js
similarity index 98%
rename from extension/modules/api/sandbox/GM_xpath.js
rename to extension/modules/api/sandboxScripts.js
index aca65407..2971109e 100644
--- a/extension/modules/api/sandbox/GM_xpath.js
+++ b/extension/modules/api/sandboxScripts.js
@@ -1,4 +1,6 @@
 
+var GM_updatingEnabled = true;
+
 function GM_xpath(details) {
   var contextNode, contextDocument, paths, resolver, namespace, result;
 
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index eec55479..7aa5fc57 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -1,14 +1,12 @@
-var EXPORTED_SYMBOLS = [
-  "Scriptish_injectScripts"
-];
+var EXPORTED_SYMBOLS = [ "Scriptish_injectScripts" ];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/constants.js");
+Cu.import("resource://scriptish/api/GM_sandboxScripts.js");
 
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish_logError"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
-lazyImport(this, "resource://scriptish/api/GM_sandboxScripts.js", ["GM_updatingEnabled", "GM_xpath"]);
 lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
 lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
 
@@ -64,22 +62,21 @@ function Scriptish_injectScripts(options) {
     // hack XPathResult since that is so commonly used
     sandbox.XPathResult = XPATH_RESULT;
 
-    Cu.evalInSandbox(GM_updatingEnabled, sandbox);
+    Cu.evalInSandbox(GM_SandboxScripts, sandbox, "latest", "@initializer", 1);
 
+    // add GM_* API to sandbox
     Scriptish_log('granting: ' + Object.keys(script.grant).join(', '))
-    Cu.evalInSandbox(GM_xpath, sandbox);
-
+    {
+      let GM_api = new GM_API(extend(options, {
+        script: script,
+        url: url,
+        winID: winID,
+        safeWin: safeWin,
+        unsafeWin: unsafeContentWin,
+        chromeWin: chromeWin,
+        sandbox: sandbox
+      }));
 
-    // add GM_* API to sandbox
-    let (GM_api = new GM_API(extend(options, {
-      script: script,
-      url: url,
-      winID: winID,
-      safeWin: safeWin,
-      unsafeWin: unsafeContentWin,
-      chromeWin: chromeWin,
-      sandbox: sandbox
-    }))) {
       for (let funcName in GM_api) {
         if (!useGrants || script.grant[funcName]) {
           sandbox[funcName] = GM_api[funcName];

From 76dbc5b7eb76e5e0e94ec507e94987ee61bd790f Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 29 Sep 2014 11:39:25 +0200
Subject: [PATCH 825/829] Fix newscript localization issue in Nightly

---
 extension/content/js/newscript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/content/js/newscript.js b/extension/content/js/newscript.js
index 2b8ccdc8..52428ddb 100644
--- a/extension/content/js/newscript.js
+++ b/extension/content/js/newscript.js
@@ -14,7 +14,7 @@ var $ = function(aID) document.getElementById(aID);
 var $$ = function(q) document.querySelector(q);
 var $$$ = function(q) document.querySelectorAll(q);
 
-Scriptish_localizeOnLoad(this);
+Scriptish_localizeOnLoad(window);
 
 var scriptContent = "";
 try {

From 7fdca508e6e1ee146d700c93c46c706dad112134 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Mon, 29 Sep 2014 11:52:35 +0200
Subject: [PATCH 826/829] Fix other localization issues in Nightly

---
 extension/content/js/install.js        | 2 +-
 extension/content/js/options.js        | 2 +-
 extension/content/js/script-options.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/content/js/install.js b/extension/content/js/install.js
index 8ac1dc50..7cfc01aa 100644
--- a/extension/content/js/install.js
+++ b/extension/content/js/install.js
@@ -10,7 +10,7 @@ lazyImport(this, "resource://scriptish/utils/Scriptish_localizeDOM.js", ["Script
 lazyUtil(this, "getScriptHeader");
 lazyUtil(this, "stringBundle");
 
-Scriptish_localizeOnLoad(this);
+Scriptish_localizeOnLoad(window);
 
 function $(id) document.getElementById(id);
 function $t(text) document.createTextNode(text);
diff --git a/extension/content/js/options.js b/extension/content/js/options.js
index d7521920..9a9ea2e4 100644
--- a/extension/content/js/options.js
+++ b/extension/content/js/options.js
@@ -86,7 +86,7 @@ function checkSync() {
   syncOp("editor");
 }
 
-Scriptish_localizeOnLoad(this);
+Scriptish_localizeOnLoad(window);
 
 addEventListener("load", function init() {
   removeEventListener("load", init, false);
diff --git a/extension/content/js/script-options.js b/extension/content/js/script-options.js
index 63e9e413..18b39ecb 100644
--- a/extension/content/js/script-options.js
+++ b/extension/content/js/script-options.js
@@ -9,7 +9,7 @@ lazyUtil(this, "stringBundle");
 var $ = function(aID) document.getElementById(aID);
 var script;
 
-Scriptish_localizeOnLoad(this);
+Scriptish_localizeOnLoad(window);
 
 window.addEventListener("DOMContentLoaded", function() {
   var scriptID = window.location.search.match(/[\?&]id=([^&,]+)/i);

From 7f7c7b1650d80537140774e16773b67d4e5e297f Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 21 Oct 2014 01:15:03 +0200
Subject: [PATCH 827/829] Fix |console| in Nightly

---
 extension/modules/api/GM_console.js           | 68 ++++++++++++++++++-
 .../modules/utils/Scriptish_injectScripts.js  |  2 +-
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index 67b64d84..044aa645 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -32,7 +32,7 @@ function getConsoleFor(contentWindow, chromeWindow) {
   };
 }
 
-function GM_console(script, contentWindow, chromeWindow) {
+function GM_console_legacy(script, contentWindow, chromeWindow) {
   const _console = getConsoleFor(contentWindow, chromeWindow);
   const console = { __exposedProps__: {__noSuchMethod__: "r"} };
   const prefix = "[" + (script.id || "Scriptish") + "]";
@@ -86,3 +86,69 @@ function GM_console(script, contentWindow, chromeWindow) {
 
   return console;
 }
+
+function GM_console(sandbox, script, contentWindow, chromeWindow) {
+  if (!("createObjectIn" in Cu) || !("exportFunction" in Cu)) {
+    return GM_console_legacy(script, contentWindow, chromeWindow);
+  }
+
+  const _console = getConsoleFor(contentWindow, chromeWindow);
+  const console = Cu.createObjectIn(sandbox, {defineAs: "console"});
+  const prefix = "[" + (script.id || "Scriptish") + "]";
+
+  // Wrap log functions
+  // Redirect any missing log function to .log
+  for (let i = 0, e = log_functions.length; i < e; ++i) {
+    let fn = log_functions[i];
+    if (fn in _console) {
+      Cu.exportFunction(_console[fn].bind(_console, prefix), console, {
+        defineAs: fn
+      });
+    }
+    else if (fn == "trace") {
+      let trace = function() {
+        let args = Array.slice(arguments);
+        let msg = "";
+
+        // Skip the top two frames
+        let stack = Components.stack.caller;
+        if (stack && (stack = stack.caller)) {
+          for (let i = 0; i < 10 && stack; ++i, stack = stack.caller) {
+            msg += "\n[@" + stack.filename + ":" + stack.lineNumber + "]";
+          }
+          args.push(msg);
+        }
+        console.log.apply(console, args);
+      };
+      Cu.exportFunction(trace, console, {defineAs: "trace"});
+    }
+    else {
+      Cu.exportFunction(_console.log.bind(_console, prefix), console, {
+        defineAs: fn
+      });
+    }
+  }
+
+  // Wrap aux functions
+  for (let i = 0, e = aux_functions.length; i < e; ++i) {
+    let fn = aux_functions[i];
+    if (fn in _console) {
+      Cu.exportFunction(_console[fn].bind(_console, prefix), console, {
+        defineAs: fn
+      });
+    }
+  }
+
+  const nsm = function(id, args) {
+    if (aux_functions.indexOf(id) != -1) {
+      let fn = _console[id] || (function() {});
+      return fn.apply(_console, args);
+    }
+    console.log("No such method in console", id);
+  };
+  Cu.exportFunction(nsm, console, {
+    defineAs: "__noSuchMethod__"
+  });
+
+  return console;
+}
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 7aa5fc57..4ac8501e 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -88,7 +88,7 @@ function Scriptish_injectScripts(options) {
     }
 
     lazy(sandbox, "console", function() {
-      return GM_console(script, safeWin, chromeWin);
+      return GM_console(sandbox, script, safeWin, chromeWin);
     });
 
     if (!useGrants || script.grant['GM_log']) {

From 3fcb12c28f3b89a1ec17da3675f8a7ec41221604 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Fri, 24 Oct 2014 16:30:39 +0200
Subject: [PATCH 828/829] Fix GM_log (because XRay wrappers literally hate me!)

Closes GH-258
---
 extension/modules/api/GM_console.js                | 8 ++++----
 extension/modules/utils/Scriptish_injectScripts.js | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/extension/modules/api/GM_console.js b/extension/modules/api/GM_console.js
index 044aa645..020e2107 100644
--- a/extension/modules/api/GM_console.js
+++ b/extension/modules/api/GM_console.js
@@ -1,5 +1,5 @@
 "use strict";
-var EXPORTED_SYMBOLS = ["GM_console"];
+var EXPORTED_SYMBOLS = ["GM_console", "GM_getConsoleFor"];
 
 const Cu = Components.utils;
 Cu.import("resource://scriptish/logging.js");
@@ -15,7 +15,7 @@ const aux_functions = ["assert", "dir", "dirxml", "group", "groupEnd", "time",
                         "timeEnd", "count", "profile", "profileEnd"
                         ];
 
-function getConsoleFor(contentWindow, chromeWindow) {
+function GM_getConsoleFor(contentWindow, chromeWindow) {
   // we dont have a chromeWindow for e10s atm, see Scriptish_injectScripts impl
   if (chromeWindow) {
     let (rv = Scriptish_getFirebugConsole(contentWindow, chromeWindow)) {
@@ -33,7 +33,7 @@ function getConsoleFor(contentWindow, chromeWindow) {
 }
 
 function GM_console_legacy(script, contentWindow, chromeWindow) {
-  const _console = getConsoleFor(contentWindow, chromeWindow);
+  const _console = GM_getConsoleFor(contentWindow, chromeWindow);
   const console = { __exposedProps__: {__noSuchMethod__: "r"} };
   const prefix = "[" + (script.id || "Scriptish") + "]";
 
@@ -92,7 +92,7 @@ function GM_console(sandbox, script, contentWindow, chromeWindow) {
     return GM_console_legacy(script, contentWindow, chromeWindow);
   }
 
-  const _console = getConsoleFor(contentWindow, chromeWindow);
+  const _console = GM_getConsoleFor(contentWindow, chromeWindow);
   const console = Cu.createObjectIn(sandbox, {defineAs: "console"});
   const prefix = "[" + (script.id || "Scriptish") + "]";
 
diff --git a/extension/modules/utils/Scriptish_injectScripts.js b/extension/modules/utils/Scriptish_injectScripts.js
index 4ac8501e..59a4baca 100644
--- a/extension/modules/utils/Scriptish_injectScripts.js
+++ b/extension/modules/utils/Scriptish_injectScripts.js
@@ -7,7 +7,7 @@ Cu.import("resource://scriptish/api/GM_sandboxScripts.js");
 lazyImport(this, "resource://scriptish/logging.js", ["Scriptish_log", "Scriptish_logError"]);
 lazyImport(this, "resource://scriptish/prefmanager.js", ["Scriptish_prefRoot"]);
 lazyImport(this, "resource://scriptish/api.js", ["GM_API"]);
-lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console"]);
+lazyImport(this, "resource://scriptish/api/GM_console.js", ["GM_console", "GM_getConsoleFor"]);
 lazyImport(this, "resource://scriptish/api/GM_ScriptLogger.js", ["GM_ScriptLogger"]);
 
 lazyImport(this, "resource://scriptish/third-party/Scriptish_getBrowserForContentWindow.js", ["Scriptish_getBrowserForContentWindow"]);
@@ -93,15 +93,16 @@ function Scriptish_injectScripts(options) {
 
     if (!useGrants || script.grant['GM_log']) {
       lazy(sandbox, "GM_log", function() {
+        const _console = GM_getConsoleFor(safeWisafeWin, chromeWin);
         if (Scriptish_prefRoot.getValue("logToErrorConsole")) {
           let logger = new GM_ScriptLogger(script);
           return function() {
             const args = Array.slice(arguments);
             logger.log(args.join(" "));
-            sandbox.console.log.apply(sandbox.console, args);
+            _console.log.apply(_console, args);
           }
         }
-        return sandbox.console.log.bind(sandbox.console);
+        return _console.log.bind(_console);
       });
     }
 

From 0118d671769109dbbdfbbe9e27ce0da3dc07887a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 20 Nov 2014 08:43:10 +0100
Subject: [PATCH 829/829] Refine api leak check whitelist

---
 extension/modules/api.js                      |  4 ++-
 .../commonjs/security/api-check-filenames.js  | 27 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/extension/modules/api.js b/extension/modules/api.js
index 30e8b12a..ce286aba 100644
--- a/extension/modules/api.js
+++ b/extension/modules/api.js
@@ -19,8 +19,10 @@ lazyImport(this, "resource://scriptish/api/GM_xmlhttpRequester.js", ["GM_xmlhttp
 lazyImport(this, "resource://scriptish/api/GM_Resources.js", ["GM_Resources"]);
 lazyImport(this, "resource://scriptish/api/GM_setClipboard.js", ["GM_setClipboard"]);
 
-const { add, check } = jetpack('scriptish/security/api-check-filenames');
+const { add, addPrefix, check } = jetpack('scriptish/security/api-check-filenames');
 add(Components.stack.filename);
+addPrefix("resource://gre/modules/");
+addPrefix("resource://gre/components/");
 
 const NS_XHTML = "http://www.w3.org/1999/xhtml";
 const DOLITTLE = function(){};
diff --git a/extension/modules/commonjs/security/api-check-filenames.js b/extension/modules/commonjs/security/api-check-filenames.js
index 1fc4c581..b0ebcfb1 100644
--- a/extension/modules/commonjs/security/api-check-filenames.js
+++ b/extension/modules/commonjs/security/api-check-filenames.js
@@ -1,19 +1,32 @@
 "use strict";
 
+let compiled = null;
 let filenames = [];
+let prefixes = [];
+
+const escapeRegex = string => string.replace(/([.*+?^${}()|\[\]\/\\])/g, "\\$1");
+
+function compile() {
+  let rv = filenames.map(e => "^" + escapeRegex(e) + "$").
+           concat(prefixes.map(e => "^" + escapeRegex(e))).
+           join("|");
+  compiled = new RegExp(rv);
+}
 
 function add(filename) {
   filenames.push(filename);
-  return;
+  compile();
 }
 exports.add = add;
 
+let prefixes = [];
+function addPrefix(prefix) {
+  prefixes.push(prefix);
+  compile();
+}
+exports.addPrefix = addPrefix;
+
 function check(filename) {
-  for (let i = filenames.length - 1; i >= 0; i--) {
-  	if (filenames[i] == filename) {
-  	  return true;
-  	}
-  }
-  return false;
+  return compiled.test(filename);
 }
 exports.check = check;