From 44bdb6e6661c941423456445052c5bcc65d80452 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Tue, 25 Jan 2011 19:03:35 -0500 Subject: [PATCH 1/3] Add missing em:type flags to install.rdf files. --- common/content/commands.js | 7 ++++--- melodactyl/install.rdf | 20 ++++++++++---------- pentadactyl/install.rdf | 17 +++++++++-------- teledactyl/install.rdf | 19 ++++++++++--------- 4 files changed, 33 insertions(+), 30 deletions(-) diff --git a/common/content/commands.js b/common/content/commands.js index 44164529..8abb7531 100644 --- a/common/content/commands.js +++ b/common/content/commands.js @@ -1213,9 +1213,10 @@ var Commands = Module("commands", { return [len - str.length, arg, quote]; }, - quote: function quote(str) Commands.quoteArg[/[\s"'\\]|^$|^-/.test(str) - ? (/[\b\f\n\r\t]/.test(str) ? '"' : "'") - : ""](str) + quote: function quote(str) Commands.quoteArg[ + /[\b\f\n\r\t]/.test(str) ? "'" : + /[\s"'\\]|^$|^-/.test(str) ? "'" + : ""](str) }, { completion: function () { completion.command = function command(context) { diff --git a/melodactyl/install.rdf b/melodactyl/install.rdf index ac3a7361..f0b625d8 100644 --- a/melodactyl/install.rdf +++ b/melodactyl/install.rdf @@ -2,16 +2,16 @@ - - melodactyl@dactyl.googlecode.com - 2 - Melodactyl - 0.1a1pre - Songbird for Vim and CMus junkies. - Prathyush Thota - http://dactyl.sourceforge.net/ - chrome://melodactyl/skin/icon.png - chrome://dactyl/content/preferences.xul + songbird@songbirdnest.com diff --git a/pentadactyl/install.rdf b/pentadactyl/install.rdf index 6800274a..13a28110 100644 --- a/pentadactyl/install.rdf +++ b/pentadactyl/install.rdf @@ -1,14 +1,15 @@ - - pentadactyl@dactyl.googlecode.com - Pentadactyl - 1.0b6pre - Firefox for Vim and Links addicts - http://dactyl.sourceforge.net/pentadactyl - resource://dactyl-local-skin/icon.png - true + Kris Maglione, Doug Kearns Kris Maglione diff --git a/teledactyl/install.rdf b/teledactyl/install.rdf index 0ee64eac..d68eb62e 100644 --- a/teledactyl/install.rdf +++ b/teledactyl/install.rdf @@ -1,15 +1,16 @@ - - teledactyl@dactyl.googlecode.com - Teledactyl - 0.5b1pre - Thunderbird for Mutt and Vim addicts - Kris Maglione - http://dactyl.sf.net/Teledactyl - chrome://teledactyl/skin/icon.png - chrome://dactyl/content/preferences.xul + {3550f703-e582-4d05-9a08-453d09bdfdc6} From b81f4be8fdcc21fca4d418f35d6c86e5c2bb3c91 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Tue, 25 Jan 2011 21:02:41 -0500 Subject: [PATCH 2/3] Fix buffer.URL on FF4. --- common/content/buffer.js | 2 +- common/modules/io.jsm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/content/buffer.js b/common/content/buffer.js index 5a902d79..999e1710 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -425,7 +425,7 @@ var Buffer = Module("buffer", { /** * @property {string} The current top-level document's URL. */ - get URL() update(content.location.href, util.newURI(content.location.href)), + get URL() update(new String(content.location.href), util.newURI(content.location.href)), /** * @property {number} The buffer's height in pixels. diff --git a/common/modules/io.jsm b/common/modules/io.jsm index a60c4ea5..f98c363f 100644 --- a/common/modules/io.jsm +++ b/common/modules/io.jsm @@ -921,7 +921,7 @@ unlet s:cpo_save isDirectory: function () s.substr(-1) == "/", leafName: /([^\/]*)\/?$/.exec(s)[1] } - for (s in io.listJar(getDir(uri.JARFile, uri.JAREntry)))] + for (s in io.listJar(uri.JARFile, getDir(uri.JAREntry)))] }; else context.generate = function generate_file() { From d9300049b0d16e1e8d108bf03eb6d57bc723d5cd Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Tue, 25 Jan 2011 21:05:01 -0500 Subject: [PATCH 3/3] Fix Commands.quote. --- common/content/commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/content/commands.js b/common/content/commands.js index 8abb7531..1efb5723 100644 --- a/common/content/commands.js +++ b/common/content/commands.js @@ -1214,7 +1214,7 @@ var Commands = Module("commands", { }, quote: function quote(str) Commands.quoteArg[ - /[\b\f\n\r\t]/.test(str) ? "'" : + /[\b\f\n\r\t]/.test(str) ? '"' : /[\s"'\\]|^$|^-/.test(str) ? "'" : ""](str) }, {