Skip to content

empty array case added to validations. #151 #353

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

Merged
jisoldi merged 4 commits into from
Oct 26, 2016
Merged

empty array case added to validations. #151 #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b99bd8
empty array case added to validations. #151
Oct 15, 2016
3fcf625
Merge branch 'master' into bugs/repeatable-headers-optional
jisoldi Oct 25, 2016
4f8fb66
Merge branch 'master' into bugs/repeatable-headers-optional
jisoldi Oct 25, 2016
7c7b51a
Merge branch 'master' into bugs/repeatable-headers-optional
jisoldi Oct 26, 2016
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
9 changes: 5 additions & 4 deletions dist/scripts/api-console.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6311,14 +6311,15 @@ RAML.Inspector = (function() {
* @return {Object}
*/
return function (value, key, object) {
// Short-circuit validation if the value is `null`.
if (value == null) {
return toValidationObject(isOptional, 'required', value, key);
}

// Switch validation type depending on if the value is an array or not.
var isArray = Array.isArray(value);

// Short-circuit validation if empty value
if (value == null || (isArray && value.length === 0)) {
return toValidationObject(isOptional, 'required', value, key);
}

// Select the validation stack to use based on the (repeated) value.
var values = isArray ? value : [value];
var validations = isArray ? repeatValidations : simpleValidations;
Expand Down
9 changes: 5 additions & 4 deletions src/vendor/raml-validate/raml-validate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,15 @@
* @return {Object}
*/
return function (value, key, object) {
// Short-circuit validation if the value is `null`.
if (value == null) {
return toValidationObject(isOptional, 'required', value, key);
}

// Switch validation type depending on if the value is an array or not.
var isArray = Array.isArray(value);

// Short-circuit validation if empty value
if (value == null || (isArray && value.length === 0)) {
return toValidationObject(isOptional, 'required', value, key);
}

// Select the validation stack to use based on the (repeated) value.
var values = isArray ? value : [value];
var validations = isArray ? repeatValidations : simpleValidations;
Expand Down