aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-13 14:00:31 -0700
committerPushkar Joshi2012-06-13 14:00:31 -0700
commit596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch)
tree480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/treeview
parent75df16b937bb420e7d93a411e73f7b59578b1b7e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/treeview')
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html2
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.js33
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.js7
-rw-r--r--js/components/treeview/treeview.reel/treeview.html2
-rw-r--r--js/components/treeview/treeview.reel/treeview.js39
5 files changed, 71 insertions, 12 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');
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
10exports.Leaf = Montage.create(TreeNode, { 10exports.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;
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: {