Ver up to 1.3.1

mooz · Jan 11, 2010 · ec022a3 · ec022a3
1 parent cd427d8
commit ec022a3
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+update.rdf.bak
diff --git a/chrome/keysnail.jar b/chrome/keysnail.jar
diff --git a/content/modules/userscript.js b/content/modules/userscript.js
@@ -72,17 +72,13 @@ KeySnail.UserScript = {
         this.modules.key.inExternalFile = false;
         try
         {
-            var start = new Date();
+            var start = Date.now();
             this.jsFileLoader(aInitFilePath, true);
-            var end = new Date();
+            var end = Date.now();
         }
         catch (e)
         {
-            if (!e.fileName || e.fileName == "chrome://keysnail/content/modules/userscript.js")
-            {
-                e.fileName = aInitFilePath;
-                e.lineNumber -= (this.userScriptOffset - 1);
-            }
+            e.fileName = aInitFilePath;
 
             this.modules.key.inExternalFile = savedStatus;
             throw e;
@@ -801,17 +797,23 @@ KeySnail.UserScript = {
         try
         {
             let code = this.modules.util.readTextFile(filePath);
-            this.modules.util.evalInContext(code, context);
-            // this.loadSubScript(filePath, context);
+            // this.modules.util.evalInContext(code, context);
+            this.loadSubScript(filePath, context);
             context.__ksLoaded__ = true;
         }
         catch (e)
         {
             context.__ksLoaded__ = false;
-            // delete KeySnail.modules.plugins.context[filePath];
-            var msgstr = this.modules.util
+
+            // e.stack = e.stack.replace('@chrome://keysnail/content/modules/userscript.js -> ', "@");
+            // e.fileName = this.modules.util.pathToURL(filePath);
+
+            let msgstr = this.modules.util
                 .getLocaleString("userScriptError", [e.fileName || "Unknown", e.lineNumber || "Unknown"]);
+
             this.message(msgstr + e + " (in " + filePath + ")");
+
+            // Components.utils.reportError(e);
         }
 
         this.modules.key.inExternalFile = false;

diff --git a/install.rdf b/install.rdf
@@ -6,7 +6,7 @@
     <Description about="urn:mozilla:install-manifest">
         <em:id>keysnail@mooz.github.com</em:id>
         <em:type>2</em:type> <!-- type of the addon, 2 means the extension -->
-        <em:version>1.3.0</em:version>
+        <em:version>1.3.1</em:version>
         <em:name>KeySnail</em:name>
         <em:creator>mooz</em:creator>
         <em:developer>mooz</em:developer>

diff --git a/keysnail.xpi b/keysnail.xpi
diff --git a/update.rdf b/update.rdf
@@ -2,10 +2,6 @@
 <RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
          xmlns:NC="http://home.netscape.com/NC-rdf#"
          xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="rdf:#$ntJrB"
-                   em:version="1.3.0">
-    <em:targetApplication RDF:resource="rdf:#$qtJrB"/>
-  </RDF:Description>
   <RDF:Seq RDF:about="rdf:#$mtJrB">
     <RDF:li RDF:resource="rdf:#$ntJrB"/>
   </RDF:Seq>
@@ -14,10 +10,14 @@
                    em:minVersion="3.0"
                    em:maxVersion="3.7a1pre"
                    em:updateLink="http://github.com/mooz/keysnail/raw/master/keysnail.xpi"
-                   em:updateInfoURL="http://github.com/mooz/keysnail/raw/master/updateinfo/updateinfo2.2.xhtml"
-                   em:updateHash="sha1:1f15104760bde88178a5ce81e9399644d05b3ac4" />
+                   em:updateInfoURL="http://github.com/mooz/keysnail/raw/master/updateinfo/1.3.1.xhtml"
+                   em:updateHash="sha1:acc4ea711af504f4900b59e3b84cc6968479082c" />
+  <RDF:Description RDF:about="rdf:#$ntJrB"
+                   em:version="1.3.1">
+    <em:targetApplication RDF:resource="rdf:#$qtJrB"/>
+  </RDF:Description>
   <RDF:Description RDF:about="urn:mozilla:extension:keysnail@mooz.github.com"
-                   em:signature="MIGTMA0GCSqGSIb3DQEBDQUAA4GBAH6gT4lPFMlxjQa9jP+wLK+IXRtymTaqOmfPTy8WwuAta9iewBD7M3lGJ25wVIAJ+sdvfqD7F1fHJspmbXnXD5V+TmV1VKlhBEL7DhNGa2SaTuTdIC86dr2t/QAZmborOIKSBNyK35CiRCVQe8HDba3ButsINC4spezZ6EZ2MVi6">
+                   em:signature="MIGTMA0GCSqGSIb3DQEBDQUAA4GBAAO0JJAUBaPy9RmEb21AP1AhVGtSkBvnG+HCbTVS6RJ0fgFYEr2wqnpZaCKG9bwYZuJxKkoiETNCGgcsgyk4pLtK8EkQITqYgXfM21hBJLw7U5V7yjjEh5P/UqVx+VxrckLq9yBDM+uT+28Y7gyUP5jdqMsdHlInbRBzMnhw/w5W">
     <em:updates RDF:resource="rdf:#$mtJrB"/>
   </RDF:Description>
 </RDF:RDF>
diff --git a/updateinfo/1.3.1.xhtml b/updateinfo/1.3.1.xhtml
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <title>KeySnail - Changelog</title>
+    </head>
+    <body>
+        <h1>KeySnail - Changelog</h1>
+        <h2>Version 1.3.1</h2>
+        <ul>
+            <li>Plugin loader backed from util.evalInContext and now use mozJSSubScriptLoader again.</li>
+            <li>Automatic update test. Sorry :)</li>
+        </ul>
+    </body>
+</html>