Skip to content

Making prefixes optional #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ydogus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Making prefixes optional #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Common/Node/expandJObject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export function recursiveProcessing(obj: any, prefix: string, isSecret: boolean)
if (obj instanceof Array) {
for (var index = 0; index < obj.length; index++) {
var element = obj[index];
recursiveProcessing(element, prefix + "_" + index.toString(), isSecret);
recursiveProcessing(element, (prefix ? prefix + "_" : "") + index.toString(), isSecret);
}
} else if (typeArray.indexOf(typeof obj) > -1) {
var objValue = typeArray.indexOf(typeof obj)>0 ? obj.toString() : obj;
Expand All @@ -15,7 +15,7 @@ export function recursiveProcessing(obj: any, prefix: string, isSecret: boolean)
for (var key in obj) {
if (obj.hasOwnProperty(key)) {
var element = obj[key];
recursiveProcessing(element, prefix + "_" + key, isSecret);
recursiveProcessing(element, (prefix ? prefix + "_" : "") + key, isSecret);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Tasks/LoadJsonVariables/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"type": "string",
"label": "Prefix to use for loaded variables",
"defaultValue": "",
"required": true,
"required": false,
"helpMarkDown": "Loaded variables will be named PREFIX_VariableName"
Copy link
Member

@sandorfr sandorfr Oct 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the help text need to be amended to reflect the change in behavior

},
{
Expand Down
2 changes: 1 addition & 1 deletion Tasks/LoadPlistVariables/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"type": "string",
"label": "Prefix to use for loaded Variables",
"defaultValue": "",
"required": true,
"required": false,
"helpMarkDown": "variable will be named PREFIX_VariableName"
},
{
Expand Down
2 changes: 1 addition & 1 deletion Tasks/LoadXmlVariables/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"type": "string",
"label": "Prefix to use for loaded Variables",
"defaultValue": "",
"required": true,
"required": false,
"helpMarkDown": "variable will be named PREFIX_VariableName"
},
{
Expand Down
2 changes: 1 addition & 1 deletion Tasks/LoadYamlVariables/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"type": "string",
"label": "Prefix to use for loaded Variables",
"defaultValue": "",
"required": true,
"required": false,
"helpMarkDown": "variable will be named PREFIX_VariableName"
},
{
Expand Down