diff options
author | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
commit | cdd36ed6c789886657c967e72ec2dcd49c6c5a76 (patch) | |
tree | b044208c38770c0c4edce03379071dbf2eb29b83 /js/components/treeview | |
parent | c7ef6951baff283266df7567e30c8074dda4ad01 (diff) | |
parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
download | ninja-cdd36ed6c789886657c967e72ec2dcd49c6c5a76.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/document/html-document.js
Diffstat (limited to 'js/components/treeview')
-rw-r--r-- | js/components/treeview/ninja-leaf.reel/ninja-leaf.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js index 0b7a171e..c6416693 100644 --- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js | |||
@@ -36,14 +36,14 @@ exports.Leaf = Montage.create(TreeNode, { | |||
36 | handleEvent : { | 36 | handleEvent : { |
37 | value: function(e) { | 37 | value: function(e) { |
38 | var delegateMethod = this.delegateEventMap[e._event.type]; | 38 | var delegateMethod = this.delegateEventMap[e._event.type]; |
39 | this.callDelegateMethod(delegateMethod); | 39 | this.callDelegateMethod(delegateMethod, e); |
40 | } | 40 | } |
41 | }, | 41 | }, |
42 | callDelegateMethod : { | 42 | callDelegateMethod : { |
43 | value: function(methodName) { | 43 | value: function(methodName, evt) { |
44 | var delegate = this.treeView.contentController.delegate; | 44 | var delegate = this.treeView.contentController.delegate; |
45 | if(delegate && typeof delegate[methodName] === 'function') { | 45 | if(delegate && typeof delegate[methodName] === 'function') { |
46 | delegate[methodName](this.sourceObject); | 46 | delegate[methodName](this.sourceObject, evt); |
47 | } | 47 | } |
48 | } | 48 | } |
49 | }, | 49 | }, |
@@ -60,6 +60,7 @@ exports.Leaf = Montage.create(TreeNode, { | |||
60 | delegateEventMap : { | 60 | delegateEventMap : { |
61 | value: { | 61 | value: { |
62 | 'click' : 'handleNodeActivation', | 62 | 'click' : 'handleNodeActivation', |
63 | 'dblclick' : 'handleDblclick', | ||
63 | 'dragstart' : 'handleDragStart', | 64 | 'dragstart' : 'handleDragStart', |
64 | 'dragend' : 'handleDragEnd' | 65 | 'dragend' : 'handleDragEnd' |
65 | } | 66 | } |