Skip to content

Commit c3b7f07

Browse files
authored
Merge branch 'master' into ft/big-spec-performance
2 parents bfe2667 + 9020ee1 commit c3b7f07

File tree

3 files changed

+26
-12
lines changed

3 files changed

+26
-12
lines changed

src/core/utils.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,8 @@ export const validateParam = (param, isXml, isOAS3 = false) => {
494494
let listCheck = type === "array" && Im.List.isList(value) && value.count()
495495
let fileCheck = type === "file" && value instanceof win.File
496496
let booleanCheck = type === "boolean" && (value || value === false)
497-
let numberCheck = type === "number" && value
498-
let integerCheck = type === "integer" && value
497+
let numberCheck = type === "number" && (value || value === 0)
498+
let integerCheck = type === "integer" && (value || value === 0)
499499

500500
if ( required && !(stringCheck || arrayCheck || listCheck || fileCheck || booleanCheck || numberCheck || integerCheck) ) {
501501
errors.push("Required field is not provided")

src/style/_models.scss

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
font-size: 12px;
44
font-weight: 300;
55

6+
@include text_code();
7+
68
.deprecated
79
{
8-
span, td {
9-
color: $model-deprecated-font-color !important;
10-
}
10+
span,
11+
td
12+
{
13+
color: $model-deprecated-font-color !important;
14+
}
1115
}
12-
13-
@include text_code();
1416
&-toggle
1517
{
1618
font-size: 10px;
@@ -87,7 +89,8 @@
8789
background: rgba($model-hint-background-color,.7);
8890
}
8991

90-
p {
92+
p
93+
{
9194
margin: 0 0 1em 0;
9295
}
9396
}
@@ -106,6 +109,7 @@ section.models
106109
h4
107110
{
108111
margin: 0 0 5px 0;
112+
109113
border-bottom: 1px solid rgba($section-models-isopen-h4-border-bottom-color, .3);
110114
}
111115
}
@@ -114,6 +118,7 @@ section.models
114118
font-size: 16px;
115119

116120
display: flex;
121+
align-items: center;
117122

118123
margin: 0;
119124
padding: 10px 20px 10px 10px;
@@ -122,7 +127,6 @@ section.models
122127
transition: all .2s;
123128

124129
@include text_headline($section-models-h4-font-color);
125-
align-items: center;
126130

127131
svg
128132
{
@@ -202,7 +206,7 @@ section.models
202206

203207
&.deprecated
204208
{
205-
opacity: .5;
209+
opacity: .5;
206210
}
207211
}
208212

@@ -218,14 +222,16 @@ section.models
218222
{
219223
font-size: 16px;
220224
font-weight: 600;
225+
221226
margin-right: 1em;
227+
222228
@include text_headline($_color-delete);
223229
}
224230

225231

226232
span
227233
{
228-
> span.model
234+
> span.model
229235
{
230236
.brace-close
231237
{
@@ -237,8 +243,8 @@ span
237243
.prop-name
238244
{
239245
display: inline-block;
246+
240247
margin-right: 1em;
241-
width: 8em;
242248
}
243249

244250
.prop-type

test/core/utils.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,14 @@ describe("utils", function() {
700700
}
701701
assertValidateParam(param, ["Required field is not provided"])
702702

703+
// valid integer, but 0 is falsy in JS
704+
param = {
705+
required: true,
706+
type: "integer",
707+
value: 0
708+
}
709+
assertValidateParam(param, [])
710+
703711
// valid integer
704712
param = {
705713
required: true,

0 commit comments

Comments
 (0)