summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-01 13:57:10 +0100
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-01 13:57:10 +0100
commit0535b0bb38dacf7dab31fd757a91ca9928292693 (patch)
treed1a41ca6d45d40c8ccaded4a2868b527fe029895
parentcaebf13372415e59bd36c49fbee934e25ec46a32 (diff)
downloadUXP-0535b0bb38dacf7dab31fd757a91ca9928292693.tar
UXP-0535b0bb38dacf7dab31fd757a91ca9928292693.tar.gz
UXP-0535b0bb38dacf7dab31fd757a91ca9928292693.tar.lz
UXP-0535b0bb38dacf7dab31fd757a91ca9928292693.tar.xz
UXP-0535b0bb38dacf7dab31fd757a91ca9928292693.zip
Fix "help cmd" and "cmd refresh" in the Developer Toolbar
https://github.com/MoonchildProductions/moebius/pull/348
-rw-r--r--devtools/shared/gcli/commands/cmd.js4
-rw-r--r--devtools/shared/gcli/source/lib/gcli/commands/help.js4
-rw-r--r--devtools/shared/locales/en-US/gcli.properties9
3 files changed, 9 insertions, 8 deletions
diff --git a/devtools/shared/gcli/commands/cmd.js b/devtools/shared/gcli/commands/cmd.js
index 1777ed960..1b3cb2ecb 100644
--- a/devtools/shared/gcli/commands/cmd.js
+++ b/devtools/shared/gcli/commands/cmd.js
@@ -137,8 +137,6 @@ exports.items = [
return !prefBranch.prefHasUserValue(PREF_DIR);
},
exec: function(args, context) {
- gcli.load();
-
let dirName = prefBranch.getComplexValue(PREF_DIR,
Ci.nsISupportsString).data.trim();
return l10n.lookupFormat("cmdStatus3", [ dirName ]);
@@ -170,8 +168,6 @@ exports.items = [
supportsString.data = args.directory;
prefBranch.setComplexValue(PREF_DIR, Ci.nsISupportsString, supportsString);
- gcli.load();
-
return l10n.lookupFormat("cmdStatus3", [ args.directory ]);
}
}
diff --git a/devtools/shared/gcli/source/lib/gcli/commands/help.js b/devtools/shared/gcli/source/lib/gcli/commands/help.js
index 7d1cc9087..365c53380 100644
--- a/devtools/shared/gcli/source/lib/gcli/commands/help.js
+++ b/devtools/shared/gcli/source/lib/gcli/commands/help.js
@@ -275,7 +275,7 @@ exports.items = [
' <div if="${command.isParent}">\n' +
' <p class="gcli-help-header">${l10n.subCommands}:</p>\n' +
' <ul class="gcli-help-${subcommands}">\n' +
- ' <li if="${subcommands.length === 0}">${l10n.subcommandsNone}</li>\n' +
+ ' <li if="${subcommands.length === 0}">${l10n.subCommandsNone}</li>\n' +
' <li foreach="subcommand in ${subcommands}">\n' +
' ${subcommand.name}: ${subcommand.description}\n' +
' <span class="gcli-out-shortcut" data-command="help ${subcommand.name}"\n' +
@@ -321,7 +321,7 @@ exports.items = [
'\n' +
'<span if="${command.isParent}"># ${l10n.subCommands}:</span>\n' +
'\n' +
- '<span if="${subcommands.length === 0}">${l10n.subcommandsNone}</span>\n' +
+ '<span if="${subcommands.length === 0}">${l10n.subCommandsNone}</span>\n' +
'<loop foreach="subcommand in ${subcommands}">* ${subcommand.name}: ${subcommand.description}\n' +
'</loop>\n' +
'</div>\n',
diff --git a/devtools/shared/locales/en-US/gcli.properties b/devtools/shared/locales/en-US/gcli.properties
index e5231e44a..59c344832 100644
--- a/devtools/shared/locales/en-US/gcli.properties
+++ b/devtools/shared/locales/en-US/gcli.properties
@@ -141,9 +141,10 @@ helpManual=Provide help either on a specific command (if a search string is prov
helpSearchDesc=Search string
helpSearchManual3=search string to use in narrowing down the displayed commands. Regular expressions not supported.
-# LOCALIZATION NOTE: These strings are displayed in the help page for a
-# command in the console.
+# LOCALIZATION NOTE (helpManSynopsis, helpManDescription): These strings are
+# displayed in the help page for a command in the console.
helpManSynopsis=Synopsis
+helpManDescription=Description
# LOCALIZATION NOTE: This message is displayed in the help page if the command
# has no parameters.
@@ -177,6 +178,10 @@ helpIntro=GCLI is an experiment to create a highly usable command line for web d
# sub-commands.
subCommands=Sub-Commands
+# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
+# when the command in question should have sub-commands but in fact has none.
+subCommandsNone=None
+
# LOCALIZATION NOTE: This error message is displayed when the command line is
# cannot find a match for the parse types.
commandParseError=Command line parsing error