Merge branch 'pr/512' Closes jdorn#512

moraleslevi · Sep 27, 2015 · 4471e12 · 4471e12
2 parents 3a6e6ae + 9678499
commit 4471e12
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 49 deletions.
diff --git a/dist/jsoneditor.js b/dist/jsoneditor.js
diff --git a/dist/jsoneditor.js.map b/dist/jsoneditor.js.map
diff --git a/dist/jsoneditor.min.js b/dist/jsoneditor.min.js
diff --git a/src/defaults.js b/src/defaults.js
@@ -185,6 +185,11 @@ for(var i in JSONEditor.defaults.editors) {
 JSONEditor.defaults.resolvers.unshift(function(schema) {
   if(typeof schema.type !== "string") return "multiple";
 });
+// If the type is not set but properties are defined, we can infer the type is actually object
+JSONEditor.defaults.resolvers.unshift(function(schema) {
+  // If the schema is a simple type
+  if(!schema.type && schema.properties ) return "object";
+});
 // If the type is set and it's a basic type, use the primitive editor
 JSONEditor.defaults.resolvers.unshift(function(schema) {
   // If the schema is a simple type