Merge pull request #62 from shadow-identity/bugfix/hasOwnPropertyFix

idelvall · web-flow · commit 120fd7665f9e · 2017-02-09T10:59:44.000+01:00
Fixed two small bugs
diff --git a/src/js/brutusin-json-forms.js b/src/js/brutusin-json-forms.js
@@ -614,7 +614,7 @@ if (typeof brutusin === "undefined") {
                         appendChild(patdiv, addButton, s);
                         if (value) {
                             for (var p in value) {
-                                if (s.properties.hasOwnProperty(p)) {
+                                if (s.properties && s.properties.hasOwnProperty(p)) {
                                     continue;
                                 }
                                 var r = RegExp(pattern);
@@ -803,7 +803,6 @@ if (typeof brutusin === "undefined") {
             } else {
                 render(null, form, "$", null, null);
             }
-            rendered = true;
             if (dependencyMap.hasOwnProperty("$")) {
                 onDependencyChanged("$");
             }

Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ if (typeof brutusin === "undefined") {`
`614`	`614`	`appendChild(patdiv, addButton, s);`
`615`	`615`	`if (value) {`
`616`	`616`	`for (var p in value) {`
`617`		`- if (s.properties.hasOwnProperty(p)) {`
	`617`	`+ if (s.properties && s.properties.hasOwnProperty(p)) {`
`618`	`618`	`continue;`
`619`	`619`	`}`
`620`	`620`	`var r = RegExp(pattern);`
`@@ -803,7 +803,6 @@ if (typeof brutusin === "undefined") {`
`803`	`803`	`} else {`
`804`	`804`	`render(null, form, "$", null, null);`
`805`	`805`	`}`
`806`		`- rendered = true;`
`807`	`806`	`if (dependencyMap.hasOwnProperty("$")) {`
`808`	`807`	`onDependencyChanged("$");`
`809`	`808`	`}`