diff --git a/common/content/dactyl.js b/common/content/dactyl.js index 1bb6a68a..6b567acd 100644 --- a/common/content/dactyl.js +++ b/common/content/dactyl.js @@ -1296,7 +1296,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), { return urls.map(function (url) { url = url.trim(); - if (/^(\.{0,2}|~)(\/|$)/.test(url)) { + if (/^(\.{0,2}|~)(\/|$)/.test(url) || util.OS.isWindows && /^[a-z]:/i.test(url)) { try { // Try to find a matching file. let file = io.File(url); diff --git a/common/content/mappings.js b/common/content/mappings.js index e7badaa8..5ed26659 100644 --- a/common/content/mappings.js +++ b/common/content/mappings.js @@ -689,7 +689,7 @@ var Mappings = Module("mappings", { iterate: function (args, mainOnly) { let modes = [this.getMode(args)]; if (!mainOnly) - modes = modes.concat(modes[0].bases); + modes = modes.concat(modes[0].allBases); let seen = {}; // Bloody hell. --Kris diff --git a/common/modules/io.jsm b/common/modules/io.jsm index f5af1188..c2cc45ea 100644 --- a/common/modules/io.jsm +++ b/common/modules/io.jsm @@ -992,7 +992,10 @@ unlet s:cpo_save } } if (!match || match.scheme === "resource" && match.path) - if (/^(\.{0,2}|~)\/|^file:/.test(context.filter) || util.getFile(context.filter) || io.isJarURL(context.filter)) + if (/^(\.{0,2}|~)\/|^file:/.test(context.filter) + || util.OS.isWindows && /^[a-z]:/i.test(url) + || util.getFile(context.filter) + || io.isJarURL(context.filter)) completion.file(context, full); }); }, diff --git a/common/modules/styles.jsm b/common/modules/styles.jsm index d267565f..69d7476a 100644 --- a/common/modules/styles.jsm +++ b/common/modules/styles.jsm @@ -609,9 +609,8 @@ var Styles = Module("Styles", { command: "style", arguments: [style.sites.join(",")], literalArg: style.css, - options: update({ - "-group": hive.name, - }, + options: update( + hive.name == "user" ? {} : { "-group": hive.name }, style.name ? { "-name": style.name } : {}) }))) .flatten().array