clean up editor a bit

2 files changed, 26 insertions, 23 deletions

diff --git a/mmm/mmmfs/browser.moon b/mmm/mmmfs/browser.moon
index 80b47c4..2cef8a4 100644
--- a/mmm/mmmfs/browser.moon
+++ b/mmm/mmmfs/browser.moon
@@ -211,12 +211,25 @@ class Browser
       key
 
     @inspect_err = ReactiveVar!
+    @editor = ReactiveVar!
 
     with div class: 'view inspector'
       -- nav
       \append nav {
         span 'inspector'
 
+        button 'close', onclick: (_, e) -> @inspect\set false
+      }
+
+      \append div {
+        class: 'subnav'
+
+        ondrop: ->
+          print "dropped"
+
+        onpaste: ->
+          print "pasted"
+
         @inspect_prop\map (current) ->
           current = current and current\tostring!
           fileder = @fileder\get!
@@ -246,7 +259,9 @@ class Browser
           @inspect_prop\set Key facet
           @refresh!
 
-        button 'close', onclick: (_, e) -> @inspect\set false
+        div style: flex: '1'
+
+        @editor\map (e) -> e and e.saveBtn
       }
 
       -- error / content
@@ -255,13 +270,14 @@ class Browser
         \append @inspect_err
       \append with pre class: 'content'
         \append keep @inspect_prop\map (prop, old) ->
-          @get_content prop, @inspect_err, (prop) =>
-            value, key = @get prop
+          @get_content prop, @inspect_err, (fileder, prop) ->
+            value, key = fileder\get prop
             assert key, "couldn't @get #{prop}"
 
             conversions = get_conversions 'mmm/dom', key.type, get_casts!
             assert conversions, "cannot cast '#{key.type}'"
-            apply_conversions conversions, value, @, prop
+            with res = apply_conversions conversions, value, fileder, prop
+              @editor\set if res.EDITOR then res
 
       -- children
       \append nav {
diff --git a/mmm/mmmfs/plugins/code.moon b/mmm/mmmfs/plugins/code.moon
index 5a437b4..9cea0a3 100644
--- a/mmm/mmmfs/plugins/code.moon
+++ b/mmm/mmmfs/plugins/code.moon
@@ -9,28 +9,15 @@ class Editor
         for k,v in pairs(tbl)
           obj[k] = v
 
+  EDITOR: true
+
   new: (value, mode, @fileder, @key) =>
-    @node = div {
-      class: 'editor'
-      style:
-        display: 'flex'
-        'flex-direction': 'column'
-        'justify-content': 'space-around'
+    @node = div class: 'editor'
 
-      div {
-        style:
-          display: 'flex'
-          flex: '0'
-          'justify-content': 'flex-end'
-          'border-bottom': '2px solid var(--gray-dark)'
-          'padding-bottom': '0.5em'
-          'margin': '-0.5em 0 0.5em'
+    @saveBtn = with button 'save'
+      .disabled = true
+      .onclick = (_, e) -> @save e
 
-        with @saveBtn = button 'save changes'
-          .disabled = true
-          .onclick = (_, e) -> @save e
-      }
-    }
     @cm = window\CodeMirror @node, o {
       :value
       :mode