gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-03 12:24:19 +01:00
Code Issues Projects Releases Wiki Activity

Bang on the tests a bit more.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-29 22:10:51 -05:00
parent 9128fcc51a
commit c50ddf6bb6
5 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/content/dactyl.js
View File

@@ -2036,13 +2036,11 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
dactyl.log("All modules loaded", 3);
try {
if (services.fuel)
var args = services.fuel.storage.get("dactyl.commandlineArgs", null);
if (!args) {
let commandline = services.commandLineHandler.optionValue;
if (commandline)
args = dactyl.parseCommandLine(commandline);
}
var args = services.fuel && services.fuel.storage.get("dactyl.commandlineArgs", null)
|| services.commandLineHandler.optionValue;
if (isString(args))
args = dactyl.parseCommandLine(args);
if (args) {
dactyl.commandLineOptions.rcFile = args["+u"];
dactyl.commandLineOptions.noPlugins = "++noplugin" in args;
@@ -2112,7 +2110,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
}
if (dactyl.commandLineOptions.rcFile == "NONE" || dactyl.commandLineOptions.noPlugins)
options["loadplugins"] = false;
options["loadplugins"] = [];
if (options["loadplugins"])
dactyl.loadPlugins();