Merge branch 'staging' into production

scriptish · Sep 23, 2012 · aa6ab4d · aa6ab4d · radar08 · Nov 3, 2013
2 parents fea6dd5 + 0d1e534
commit aa6ab4d
Show file tree

Hide file tree

Showing 65 changed files with 1,029 additions and 710 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,24 @@
+# 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)
diff --git 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+
 
 
@@ -17,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)
diff --git a/blocklist.json b/blocklist.json
@@ -1,3 +1,3 @@
 {
-  "uso": [20145, 26062, 35611, 38017, 68219]
+  "uso": [20145, 26062, 35611, 38017, 59744, 68219, 92054, 114457, 128437, 130770]
 }
diff --git 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/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,11 +30,12 @@ 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/
+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/

diff --git 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}");
@@ -32,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);
-    Scriptish_manager.setup.call(this);
+  Services.obs.addObserver(this, "install-userscript", false);
-    Services.obs.addObserver(this, "install-userscript", false);
+  Services.obs.addObserver(this, "scriptish-enabled", false);
-    Services.obs.addObserver(this, "scriptish-enabled", false);
+  Services.obs.addObserver(this, "content-document-global-created", false);
-    Services.obs.addObserver(this, "content-document-global-created", false);
+  Services.obs.addObserver(this, "chrome-document-global-created", false);
-    Services.obs.addObserver(this, "chrome-document-global-created", false);
-  } else {
-    //Services.mm.
-  }
 }
 
 ScriptishService.prototype = {
@@ -190,7 +187,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/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="https://github.com/scriptish/scriptish/issues/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">Request a feature</a></li>
          <li>Like coding?  <a href="https://github.com/scriptish/scriptish">Collaborate!</a></li>
        </ul>
      </section>

diff --git a/extension/content/e10s/browser-content.js b/extension/content/e10s/browser-content.js
diff --git a/extension/content/e10s/browser.js b/extension/content/e10s/browser.js
diff --git a/extension/content/e10s/browser.xul b/extension/content/e10s/browser.xul
diff --git a/extension/content/fennec-options.xul b/extension/content/fennec-options.xul
diff --git 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/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);
+  var converter = Instances.cos;
-  foStream.close();
+	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);