diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/treeview/ninja-leaf.reel/ninja-leaf.js | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/components/treeview/ninja-leaf.reel/ninja-leaf.js')
-rw-r--r-- | js/components/treeview/ninja-leaf.reel/ninja-leaf.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js index 1bfe66a4..652d3bc0 100644 --- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js | |||
@@ -8,9 +8,12 @@ var Montage = require("montage/core/core").Montage, | |||
8 | TreeNode = require("js/components/treeview/tree-node").TreeNode; | 8 | TreeNode = require("js/components/treeview/tree-node").TreeNode; |
9 | 9 | ||
10 | exports.Leaf = Montage.create(TreeNode, { | 10 | exports.Leaf = Montage.create(TreeNode, { |
11 | hasTemplate: { | 11 | |
12 | value: true | 12 | label: { |
13 | value: null, | ||
14 | serializable: true | ||
13 | }, | 15 | }, |
16 | |||
14 | templateDidLoad : { | 17 | templateDidLoad : { |
15 | value: function() { | 18 | value: function() { |
16 | var event = this.treeView.activationEvent; | 19 | var event = this.treeView.activationEvent; |