Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
rjs_json_form
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
rjs_json_form
Commits
125d6972
Commit
125d6972
authored
Oct 10, 2018
by
Boris Kocherov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
take in account schema may be boolean so i can not inline change schema
i can only assign value
parent
0fbb5f70
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
jsonform.gadget.js
jsonform.gadget.js
+3
-3
No files found.
jsonform.gadget.js
View file @
125d6972
...
@@ -385,11 +385,11 @@
...
@@ -385,11 +385,11 @@
case
"
additionalItems
"
:
case
"
additionalItems
"
:
case
"
contains
"
:
case
"
contains
"
:
case
"
propertyNames
"
:
case
"
propertyNames
"
:
mergeSchemas
(
x
[
key
],
y
[
key
],
true
);
x
[
key
]
=
mergeSchemas
(
x
[
key
],
y
[
key
],
true
);
break
;
break
;
case
"
items
"
:
case
"
items
"
:
// XXX items can be array
// XXX items can be array
mergeSchemas
(
x
[
key
],
y
[
key
],
true
);
x
[
key
]
=
mergeSchemas
(
x
[
key
],
y
[
key
],
true
);
break
;
break
;
case
"
contentEncoding
"
:
case
"
contentEncoding
"
:
case
"
contentMediaType
"
:
case
"
contentMediaType
"
:
...
@@ -427,7 +427,7 @@
...
@@ -427,7 +427,7 @@
for
(
p
in
y
[
key
])
{
for
(
p
in
y
[
key
])
{
if
(
y
[
key
].
hasOwnProperty
(
p
))
{
if
(
y
[
key
].
hasOwnProperty
(
p
))
{
if
(
x
[
key
].
hasOwnProperty
(
p
))
{
if
(
x
[
key
].
hasOwnProperty
(
p
))
{
mergeSchemas
(
x
[
key
][
p
],
y
[
key
][
p
],
true
);
x
[
key
][
p
]
=
mergeSchemas
(
x
[
key
][
p
],
y
[
key
][
p
],
true
);
}
else
{
}
else
{
x
[
key
][
p
]
=
y
[
key
][
p
];
x
[
key
][
p
]
=
y
[
key
][
p
];
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment