frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

update validator arguments not to use optional object

Browse Source
This commit is contained in:
Hiroyasu Nishiyama
2022-04-12 08:09:46 +09:00
parent ace5f81a17
commit accbf6ecfc
16 changed files with 56 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
packages/node_modules/@node-red/editor-client/src/js/validators.js vendored
View File

@@ -19,10 +19,10 @@ RED.validators = {
if ((blankAllowed&&(v===''||v===undefined)) || (v!=='' && !isNaN(v))) {
return true;
}
if (mopt && mopt.label) {
return opt ? RED._("validator.errors.invalid-num-prop", {
prop: mopt.label
}) : false;
if (opt && opt.label) {
return RED._("validator.errors.invalid-num-prop", {
prop: opt.label
});
}
return opt ? RED._("validator.errors.invalid-num") : false;
};
@@ -32,10 +32,10 @@ RED.validators = {
if (re.test(v)) {
return true;
}
if (mopt && mopt.label) {
return opt ? RED._("validator.errors.invalid-regex-prop", {
prop: mopt.label
}) : false;
if (opt && opt.label) {
return RED._("validator.errors.invalid-regex-prop", {
prop: opt.label
});
}
return opt ? RED._("validator.errors.invalid-regexp") : false;
};
@@ -48,11 +48,11 @@ RED.validators = {
JSON.parse(v);
return true;
} catch(err) {
if (mopt && mopt.label) {
return opt ? RED._("validator.errors.invalid-json-prop", {
if (opt && opt.label) {
return RED._("validator.errors.invalid-json-prop", {
error: err.message,
prop: mopt.label,
}) : false;
prop: opt.label,
});
}
return opt ? RED._("validator.errors.invalid-json", {
error: err.message
@@ -62,20 +62,20 @@ RED.validators = {
if (RED.utils.validatePropertyExpression(v)) {
return true;
}
if (mopt && mopt.label) {
return opt ? RED._("validator.errors.invalid-prop-prop", {
prop: mopt.label
}) : false;
if (opt && opt.label) {
return RED._("validator.errors.invalid-prop-prop", {
prop: opt.label
});
}
return opt ? RED._("validator.errors.invalid-prop") : false;
} else if (ptype === 'num') {
if (/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/.test(v)) {
return true;
}
if (mopt && mopt.label) {
return opt ? RED._("validator.errors.invalid-num-prop", {
prop: mopt.label
}) : false;
if (opt && opt.label) {
return RED._("validator.errors.invalid-num-prop", {
prop: opt.label
});
}
return opt ? RED._("validator.errors.invalid-num") : false;
}