Merge branch 'refs/heads/TreeComponents' into PresetsPanel

1 files changed, 36 insertions, 7 deletions

diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
index bd566b26..749df3cd 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
@@ -5,7 +5,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var Montage   = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
     TreeNode = require("js/components/treeview/tree-node").TreeNode;
 
 exports.Leaf = Montage.create(TreeNode, {
@@ -14,19 +13,39 @@ exports.Leaf = Montage.create(TreeNode, {
     },
     templateDidLoad : {
         value: function() {
-            this.needsDraw = true;
+            var event = this.treeView.activationEvent;
+
+            ///// Re-set the activation event
+            if(event && event !== this.activationEvent) {
+                this.delegateEventMap[event] = this.delegateEventMap[this.activationEvent];
+                delete this.delegateEventMap[this.activationEvent];
+                this.activationEvent = this.treeView.activationEvent;
+            }
         }
     },
     prepareForDraw: {
         value : function() {
-            this.activationEvent = this.activationEvent || 'click';
-            this.label._element.addEventListener(this.activationEvent, this.handleNodeActivation.bind(this), false);
+            var el = this.label._element;
+
+            Object.keys(this.delegateEventMap).forEach(function(event) {
+                el.addEventListener(event, this, false);
+            }, this);
+
         }
     },
-    handleNodeActivation: {
+    handleEvent : {
         value: function(e) {
-            console.log(this.sourceObject);
-            this.treeView.contentController.delegate.applyPresetSelection(this.sourceObject);
+            var delegateMethod = this.delegateEventMap[e._event.type];
+            this.callDelegateMethod(delegateMethod);
+        }
+    },
+    callDelegateMethod : {
+        value: function(methodName) {
+            console.log("Delegate method name: ", methodName);
+            var delegate = this.treeView.contentController.delegate;
+            if(delegate && typeof delegate[methodName] === 'function') {
+                delegate[methodName](this.sourceObject);
+            }
         }
     },
     draw : {
@@ -35,6 +54,16 @@ exports.Leaf = Montage.create(TreeNode, {
                 this._labelText = this.sourceObject[this.labelKey];
             }
         }
+    },
+    activationEvent : {
+        value : 'click'
+    },
+    delegateEventMap : {
+        value: {
+            'click'     : 'handleNodeActivation',
+            'dragstart' : 'handleDragStart',
+            'dragend'   : 'handleDragEnd'
+        }
     }