aboutsummaryrefslogtreecommitdiff
path: root/js/components/controllers/tree-controller.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-13 14:03:00 -0700
committerJose Antonio Marquez2012-06-13 14:03:00 -0700
commitefbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch)
tree50565e097fe4a9db59e554af179f66938fa59f1c /js/components/controllers/tree-controller.js
parentae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/components/controllers/tree-controller.js')
-rw-r--r--js/components/controllers/tree-controller.js11
1 files changed, 9 insertions, 2 deletions
diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js
index cb95ca1d..bc3d0860 100644
--- a/js/components/controllers/tree-controller.js
+++ b/js/components/controllers/tree-controller.js
@@ -30,7 +30,8 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
30 }, 30 },
31 set: function(value) { 31 set: function(value) {
32 this._delegate = value; 32 this._delegate = value;
33 } 33 },
34 serializable: true
34 }, 35 },
35 36
36 rootKey : { 37 rootKey : {
@@ -38,7 +39,13 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
38 }, 39 },
39 40
40 branchKey : { 41 branchKey : {
41 value: null 42 value: null,
43 serializable: true
44 },
45
46 labelKey: {
47 value: null,
48 serializable: true
42 }, 49 },
43 50
44 _root : { 51 _root : {