aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/treeview.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 01:03:59 -0700
committerArmen Kesablyan2012-06-19 01:03:59 -0700
commit2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
treed352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/treeview/treeview.reel
parent244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
downloadninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/treeview/treeview.reel')
-rw-r--r--js/components/treeview/treeview.reel/treeview.html2
-rw-r--r--js/components/treeview/treeview.reel/treeview.js39
2 files changed, 34 insertions, 7 deletions
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html
index 1bed0f0b..9ab575c6 100644
--- a/js/components/treeview/treeview.reel/treeview.html
+++ b/js/components/treeview/treeview.reel/treeview.html
@@ -27,7 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
27 "prototype" : "js/components/treeview/leaf.reel" 27 "prototype" : "js/components/treeview/leaf.reel"
28 }, 28 },
29 "scrollview": { 29 "scrollview": {
30 "prototype": "montage/ui/scrollview.reel[Scrollview]", 30 "prototype": "montage/ui/scroller.reel",
31 "properties": { 31 "properties": {
32 "element": {"#": "treeView"}, 32 "element": {"#": "treeView"},
33 "axis": "vertical" 33 "axis": "vertical"
diff --git a/js/components/treeview/treeview.reel/treeview.js b/js/components/treeview/treeview.reel/treeview.js
index 9f78d36d..81dacbca 100644
--- a/js/components/treeview/treeview.reel/treeview.js
+++ b/js/components/treeview/treeview.reel/treeview.js
@@ -13,18 +13,43 @@ exports.Treeview = Montage.create(Component, {
13 data : { value : null }, 13 data : { value : null },
14 rootBranch : { value : null }, 14 rootBranch : { value : null },
15 15
16 activationEvent: {
17 value: null
18// serializable: true
19 },
20
16 _hasBeenDeserialized: { 21 _hasBeenDeserialized: {
17 value: false, 22 value: false
18 enumerable: false 23// enumerable: false
19 }, 24 },
20 25
21 branchComponent : { 26 branchComponent : {
22 value: null, 27 value: null
23 serializable: true 28// serializable: true
24 }, 29 },
25 leafComponent : { 30 leafComponent : {
26 value: null, 31 value: null
27 serializable: true 32// serializable: true
33 },
34
35 defaultBranchComponent: {
36 value: null
37// serializable: true
38 },
39
40 defaultLeafComponent: {
41 value: null
42// serializable: true
43 },
44
45 scrollview: {
46 value: null
47// serializable: true
48 },
49
50 slot: {
51 value: null
52// serializable: true
28 }, 53 },
29 54
30 hasTemplate: { 55 hasTemplate: {
@@ -63,6 +88,7 @@ exports.Treeview = Montage.create(Component, {
63 }, 88 },
64 showRoot : { 89 showRoot : {
65 value: null 90 value: null
91// serializable: true
66 }, 92 },
67 93
68 _contentController: { 94 _contentController: {
@@ -110,6 +136,7 @@ exports.Treeview = Montage.create(Component, {
110 } 136 }
111 137
112 } 138 }
139// serializable: true
113 }, 140 },
114 141
115 deserializedFromTemplate: { 142 deserializedFromTemplate: {