mirror of https://github.com/node-red/node-red.git
Merge pull request #4471 from node-red/relax-validation
Relax some node validators to allow undefined valuepull/4470/head^2
commit
f3dd5770d9
|
@ -56,6 +56,9 @@ RED.validators = {
|
||||||
if (options.allowBlank && v === '') {
|
if (options.allowBlank && v === '') {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
if (options.allowUndefined && v === undefined) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
const result = RED.utils.validateTypedProperty(v, ptype, opt)
|
const result = RED.utils.validateTypedProperty(v, ptype, opt)
|
||||||
if (result === true || opt) {
|
if (result === true || opt) {
|
||||||
// Valid, or opt provided - return result as-is
|
// Valid, or opt provided - return result as-is
|
||||||
|
|
|
@ -58,11 +58,8 @@
|
||||||
round: {value:false},
|
round: {value:false},
|
||||||
property: {value:"payload",required:true,
|
property: {value:"payload",required:true,
|
||||||
label:RED._("node-red:common.label.property"),
|
label:RED._("node-red:common.label.property"),
|
||||||
validate: RED.validators.typedInput({ type: 'msg' })
|
validate: RED.validators.typedInput({ type: 'msg', allowBlank: true })
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
// RED.validators.typedInput("propertyType", false)},
|
|
||||||
name: {value:""}
|
name: {value:""}
|
||||||
},
|
},
|
||||||
inputs: 1,
|
inputs: 1,
|
||||||
|
|
|
@ -57,10 +57,10 @@
|
||||||
septopics: {value:true},
|
septopics: {value:true},
|
||||||
property: {value:"payload", required:true,
|
property: {value:"payload", required:true,
|
||||||
label:RED._("node-red:rbe.label.property"),
|
label:RED._("node-red:rbe.label.property"),
|
||||||
validate: RED.validators.typedInput({ type: 'msg' })},
|
validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })},
|
||||||
topi: {value:"topic", required:true,
|
topi: {value:"topic", required:true,
|
||||||
label:RED._("node-red:rbe.label.topic"),
|
label:RED._("node-red:rbe.label.topic"),
|
||||||
validate: RED.validators.typedInput({ type: 'msg' })}
|
validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })}
|
||||||
},
|
},
|
||||||
inputs:1,
|
inputs:1,
|
||||||
outputs:1,
|
outputs:1,
|
||||||
|
|
|
@ -41,8 +41,8 @@
|
||||||
color:"#DEBD5C",
|
color:"#DEBD5C",
|
||||||
defaults: {
|
defaults: {
|
||||||
name: {value:""},
|
name: {value:""},
|
||||||
property: {value:"payload", validate: RED.validators.typedInput({ type: 'msg' }) },
|
property: {value:"payload", validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true }) },
|
||||||
outproperty: {value:"payload", validate: RED.validators.typedInput({ type: 'msg' }) },
|
outproperty: {value:"payload", validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true }) },
|
||||||
tag: {value:""},
|
tag: {value:""},
|
||||||
ret: {value:"html"},
|
ret: {value:"html"},
|
||||||
as: {value:"single"}
|
as: {value:"single"}
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
defaults: {
|
defaults: {
|
||||||
name: {value:""},
|
name: {value:""},
|
||||||
property: {value:"payload",required:true,
|
property: {value:"payload",required:true,
|
||||||
validate: RED.validators.typedInput({ type: 'msg' }),
|
validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true}),
|
||||||
label:RED._("node-red:json.label.property")},
|
label:RED._("node-red:json.label.property")},
|
||||||
action: {value:""},
|
action: {value:""},
|
||||||
pretty: {value:false}
|
pretty: {value:false}
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
name: {value:""},
|
name: {value:""},
|
||||||
property: {value:"payload",required:true,
|
property: {value:"payload",required:true,
|
||||||
label:RED._("node-red:common.label.property"),
|
label:RED._("node-red:common.label.property"),
|
||||||
validate: RED.validators.typedInput({ type: 'msg' })},
|
validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })},
|
||||||
attr: {value:""},
|
attr: {value:""},
|
||||||
chr: {value:""}
|
chr: {value:""}
|
||||||
},
|
},
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
color:"#DEBD5C",
|
color:"#DEBD5C",
|
||||||
defaults: {
|
defaults: {
|
||||||
property: {value:"payload",required:true,
|
property: {value:"payload",required:true,
|
||||||
validate: RED.validators.typedInput({ type: 'msg' }),
|
validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true }),
|
||||||
label:RED._("node-red:common.label.property")},
|
label:RED._("node-red:common.label.property")},
|
||||||
name: {value:""}
|
name: {value:""}
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue