summaryrefslogtreecommitdiffstats
path: root/devtools/shared/gcli/source
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2017-06-28 10:10:53 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-02-04 12:02:19 +0100
commit56bd82c6fce2bce285baeec700a1eb3ecee2c7c6 (patch)
tree3327e232129e91b7a79476ca67ae4e8540abdb09 /devtools/shared/gcli/source
parente5f30602af585997caf796249d1464a4637b8d4c (diff)
downloadUXP-56bd82c6fce2bce285baeec700a1eb3ecee2c7c6.tar
UXP-56bd82c6fce2bce285baeec700a1eb3ecee2c7c6.tar.gz
UXP-56bd82c6fce2bce285baeec700a1eb3ecee2c7c6.tar.lz
UXP-56bd82c6fce2bce285baeec700a1eb3ecee2c7c6.tar.xz
UXP-56bd82c6fce2bce285baeec700a1eb3ecee2c7c6.zip
Devtools gcli commands - fix the help.
Diffstat (limited to 'devtools/shared/gcli/source')
-rw-r--r--devtools/shared/gcli/source/lib/gcli/commands/commands.js6
-rw-r--r--devtools/shared/gcli/source/lib/gcli/commands/help.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/devtools/shared/gcli/source/lib/gcli/commands/commands.js b/devtools/shared/gcli/source/lib/gcli/commands/commands.js
index 67793b2dc..0af4be620 100644
--- a/devtools/shared/gcli/source/lib/gcli/commands/commands.js
+++ b/devtools/shared/gcli/source/lib/gcli/commands/commands.js
@@ -335,10 +335,10 @@ Parameter.prototype.toJson = function() {
};
// Values do not need to be serializable, so we don't try. For the client
- // side (which doesn't do any executing) we don't actually care what the
- // default value is, just that it exists
+ // side (which doesn't do any executing) we only care whether default value is
+ // undefined, null, or something else.
if (this.paramSpec.defaultValue !== undefined) {
- json.defaultValue = {};
+ json.defaultValue = (this.paramSpec.defaultValue === null) ? null : {};
}
if (this.paramSpec.description != null) {
json.description = this.paramSpec.description;
diff --git a/devtools/shared/gcli/source/lib/gcli/commands/help.js b/devtools/shared/gcli/source/lib/gcli/commands/help.js
index 317f80240..7d1cc9087 100644
--- a/devtools/shared/gcli/source/lib/gcli/commands/help.js
+++ b/devtools/shared/gcli/source/lib/gcli/commands/help.js
@@ -69,7 +69,7 @@ function getHelpManData(commandData, context) {
}
else {
// We need defaultText to work the text version of defaultValue
- input = l10n.lookupFormat('helpManOptional');
+ input = l10n.lookup('helpManOptional');
/*
var val = param.type.stringify(param.defaultValue);
input = Promise.resolve(val).then(function(defaultValue) {