From f2fe1f55308dff97d9cc2d4604fcc286cdfbc505 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Sun, 1 Apr 2018 15:40:17 +0200
Subject: [PATCH] Reset JSON treeviews when editing is cancelled

And don't add all the event handlers by default.
---
 app/components/file-preview/component.js | 38 +++++++++++++++---------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/components/file-preview/component.js b/app/components/file-preview/component.js
index 9e7d396..a765e5c 100644
--- a/app/components/file-preview/component.js
+++ b/app/components/file-preview/component.js
@@ -60,8 +60,23 @@ export default Component.extend({
     let value = JSON.parse(this.get('fileContent'));
 
     let view = new JSONTreeView('content', value);
+    // this.attachJsonTreeEventHandlers(view);
 
-    // Listen for change events
+    const containerElement = document.getElementById('json-tree-view');
+    containerElement.innerHTML = ''; // Throw away any existing treeviews
+    containerElement.appendChild(view.dom);
+
+    window.jsonview = view;
+
+    view.expand(true);
+
+    view.withRootName = false;
+    view.readonly = this.get('hideEditor');
+
+    this.set('jsonTreeView', view);
+  },
+
+  attachJsonTreeEventHandlers (view) {
     view.on('change', function(self, key, oldValue, newValue){
       console.log('change', key, oldValue, '=>', newValue);
     });
@@ -86,23 +101,18 @@ export default Component.extend({
     view.on('refresh', function(self, key, value) {
       console.log('refresh', key, '=', value);
     });
-
-    document.getElementById('json-tree-view')
-            .appendChild(view.dom);
-
-    window.jsonview = view;
-
-    view.expand(true);
-
-    view.withRootName = false;
-    view.readonly = this.get('hideEditor');
-
-    this.set('jsonTreeView', view);
   },
 
   onShowEditor: observer('showEditor', function(){
     if (this.get('fileLoaded') && this.get('isJSON') && this.get('jsonShowTree')) {
-      this.set('jsonTreeView.readonly', !this.get('showEditor'));
+      const showEditor = this.get('showEditor');
+
+      if (showEditor) {
+        this.set('jsonTreeView.readonly', false);
+      } else {
+        this.set('jsonTreeView.readonly', true);
+        this.renderJsonTree();
+      }
     }
   }),