Refactored editor viewmodel; Fixes #27.

doughsay · Jun 6, 2013 · e5d2d4d · e5d2d4d
1 parent e6881e7
commit e5d2d4d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 70 deletions.
diff --git a/assets/css/editor.less b/assets/css/editor.less
@@ -124,17 +124,9 @@ ul.nav-list {
       margin-top: 3px;
     }
   }
-}
-
-ul.level1 {
-  a {
-    margin-left: -30px;
-    margin-right: -30px;
-  }
-  ul.level2 {
-    a {
-      margin-left: -45px;
-      margin-right: -45px;
+  &.objects {
+    li a {
+      margin-left: -1000px;
     }
   }
 }

diff --git a/assets/js/view_models/editor.coffee b/assets/js/view_models/editor.coffee
@@ -206,56 +206,27 @@ class EditorView
     found
 
   removeFromTree: (id) ->
-    removeChild = (id, p) =>
-      [match] = (child for child in p.children() when child.id is id)
-      if match?
-        p.children.remove match
-        match
-      else
-        removed = null
-        for child in p.children()
-          removed = removeChild(id, child)
-          break if removed?
-        removed
-
-    removed = null
-    for o in @objects()
-      if o.id is id
-        @objects.remove o
-        removed = true
-        break
-      removed = removeChild id, o
-      break if removed?
-
-    removed
-
-  insertIntoTree: (obj) ->
-    insertChild = (o, p) =>
-      if p.id == o.parent_id
-        if o instanceof TreeNode
-          p.children.push o
-        else
-          p.children.push new TreeNode o, @, p.level+1
-        p.children.sort (l, r) -> l.id - r.id
-        true
-      else
-        added = false
-        for child in p.children()
-          added = insertChild(o, child)
-          break if added
-        added
-
-    added = false
-    if obj.parent_id is null
-      @objects.push new TreeNode obj, @
-      @objects.sort (l, r) -> l.id - r.id
-      return true
+    node = @findInTree id
+    if not node? then return null
+    if node.parent?
+      node.parent.children.remove node
+      node.parent = null
     else
-      for o in @objects()
-        added = insertChild obj, o
-        break if added
-
-    added
+      @objects.remove node
+    node
+
+  insertIntoTree: (node, parent_id) ->
+    if parent_id?
+      parentNode = @findInTree parent_id
+      if not parentNode?
+        #toastr.error "couldn't find parent node"
+        return null
+      node.parent = parentNode
+      parentNode.children.push node
+      parentNode.children.sort (l, r) -> l.id - r.id
+    else
+      @objects.push node
+      @objects.sort (l, r) -> l.id - r.id
 
   findInTabs: (id) ->
     os = @tabs().map (tab) ->
@@ -353,7 +324,10 @@ class EditorView
 
   object_created: (obj) =>
     obj.children = []
-    @insertIntoTree obj
+    parent_id = obj.parent_id
+    delete obj.parent_id
+    obj = new TreeNode obj, @
+    @insertIntoTree obj, parent_id
 
   object_deleted: (id) =>
     @removeFromTree id
@@ -363,8 +337,7 @@ class EditorView
 
   object_parent_changed: (spec) =>
     o = @removeFromTree spec.id
-    o.parent_id = spec.parent_id
-    @insertIntoTree o
+    @insertIntoTree o, spec.parent_id
 
   object_name_changed: (spec) =>
     o = @findInTree spec.id

diff --git a/assets/js/view_models/editor/tree_node.coffee b/assets/js/view_models/editor/tree_node.coffee
@@ -1,14 +1,14 @@
 # View model for object browser tree node
 class TreeNode
 
-  constructor: (o, @view, @level = 1) ->
+  constructor: (o, @view, @parent) ->
 
     # attributes
     @id = o.id
     @name = ko.observable o.name
     @player = ko.observable o.player
     @alias = ko.observable o.alias
-    @children = ko.observableArray o.children.map (p) => new TreeNode p, @view, @level+1
+    @children = ko.observableArray o.children.map (p) => new TreeNode p, @view, @
 
     # presenters
     @idPresenter = ko.computed =>
@@ -49,8 +49,6 @@ class TreeNode
       else
         if @player() then 'icon-user' else 'icon-file'
 
-    @levelClass = ko.computed => "level#{@level}"
-
     # subscriptions
     @view.filter.subscribe (filter) =>
       if filter isnt '' and @visible()

diff --git a/views/editor.jade b/views/editor.jade
@@ -13,7 +13,7 @@ html
           span.label.label-inverse(data-bind='html: idPresenter')
           span.label(data-bind='html: aliasPresenter')
           span(data-bind='html: namePresenter')
-        ul.nav.nav-list(data-bind='visible: expanded, template: {name: "TreeNodeTemplate", foreach: children}, css: levelClass')
+        ul.nav.nav-list(data-bind='visible: expanded, template: {name: "TreeNodeTemplate", foreach: children}')
 
     .noconnection(data-bind='visible: !connected()')
       .alert.alert-error.alert-error
@@ -29,7 +29,7 @@ html
           .control-group
             label.control-label(for='username') Username
             .controls
-              input(type='text', id='username', placeholder='Username', data-bind='value: username')
+              input(type='text', autofocus=true, id='username', placeholder='Username', data-bind='value: username')
           .control-group
             label.control-label(for='password') Password
             .controls
@@ -102,7 +102,7 @@ html
             hr
             .row-fluid
               .overflow-container
-                ul.nav.nav-list(data-bind='template: {name: "TreeNodeTemplate", foreach: objects}')
+                ul.nav.nav-list.objects(data-bind='template: {name: "TreeNodeTemplate", foreach: objects}')
 
           .ui-layout-west-south(data-bind='context: attributeMenu')
             .overflow-container