Merge pull request #15 from s-mage/master

Improve displaying of objects and arrays

lib/types/json-array.vue

@@ -69,13 +69,11 @@ export default {
       }
     }))
 
-    for (let key in this.ordered) {
+    this.ordered.forEach((value, key) => {
-      let value = this.ordered[key]
-
       elements.push(h(JsonBox, {
         key,
         style: {
-          display: !this.expand ? 'none' : undefined
+          display: this.expand ? undefined : 'none'
         },
         props: {
           sort: this.sort,
@@ -84,12 +82,12 @@ export default {
           value,
         }
       }))
-    }
+    })
 
-    if (!this.expand) {
+    if (!this.expand && this.jsonValue.length) {
       elements.push(h('span', {
         style: {
-          display: this.expand ? 'none' : undefined
+          display: undefined
         },
         class: {
           'jv-ellipsis': true,

lib/types/json-object.vue

@@ -90,7 +90,7 @@ export default {
       }
     }
 
-    if (!this.expand) {
+    if (!this.expand && Object.keys(this.jsonValue).length) {
       elements.push(h('span', {
         style: {
           display: this.expand ? 'none' : undefined