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
3ab82e9c
Commit
3ab82e9c
authored
Oct 10, 2018
by
Boris Kocherov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix recursive merging, if next recursion level contain schema with unresolved reference
parent
125d6972
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
0 deletions
+16
-0
jsonform.gadget.js
jsonform.gadget.js
+16
-0
No files found.
jsonform.gadget.js
View file @
3ab82e9c
...
@@ -342,6 +342,22 @@
...
@@ -342,6 +342,22 @@
}
}
var
key
,
var
key
,
p
;
p
;
if
(
x
.
hasOwnProperty
(
"
$ref
"
)
||
y
.
hasOwnProperty
(
"
$ref
"
))
{
if
(
doesntcopy
)
{
// we need reference resolve before merging
// so allOf schema returned and array item or object field
// run merging on next iteration.
return
{
allOf
:
[
x
,
y
]
};
}
else
{
throw
new
Error
(
"
all reference must be resolved before merge run on first recursion level
"
);
}
}
if
(
x
===
true
)
{
if
(
x
===
true
)
{
x
=
{};
x
=
{};
}
else
if
(
!
doesntcopy
)
{
}
else
if
(
!
doesntcopy
)
{
...
...
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