aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/ninja-branch.reel
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/components/treeview/ninja-branch.reel
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/treeview/ninja-branch.reel')
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html2
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.js33
2 files changed, 32 insertions, 3 deletions
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html
index 60894fbc..8b808488 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.html
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html
@@ -105,7 +105,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
105 "properties": { 105 "properties": {
106 "element": { "#": "branchList" }, 106 "element": { "#": "branchList" },
107 "contentController": {"@": "arrayController" }, 107 "contentController": {"@": "arrayController" },
108 "selectionEnabled": true 108 "isSelectionEnabled": true
109 } 109 }
110 }, 110 },
111 111
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.js b/js/components/treeview/ninja-branch.reel/ninja-branch.js
index 0d1a1d0e..72ef3ccd 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.js
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.js
@@ -8,12 +8,41 @@ var Montage = require("montage").Montage,
8 TreeNode = require("js/components/treeview/tree-node").TreeNode; 8 TreeNode = require("js/components/treeview/tree-node").TreeNode;
9 9
10var Branch = exports.Branch = Montage.create(TreeNode, { 10var Branch = exports.Branch = Montage.create(TreeNode, {
11 hasTemplate:{ 11 label: {
12 value:true 12 value: null
13// serializable: true
13 }, 14 },
15
16 branchList: {
17 value: null
18// serializable: true
19 },
20
21 arrayController: {
22 value: null
23// serializable: true
24 },
25
14 repetition:{ 26 repetition:{
15 value: null 27 value: null
28// serializable: true
29 },
30
31 leafComponent: {
32 value: null
33// serializable: true
34 },
35
36 branchComponent: {
37 value: null
38// serializable: true
16 }, 39 },
40
41 collapser: {
42 value: null
43// serializable: true
44 },
45
17 prepareForDraw : { 46 prepareForDraw : {
18 value: function() { 47 value: function() {
19 this.collapser.removeAttribute('id'); 48 this.collapser.removeAttribute('id');