aboutsummaryrefslogtreecommitdiff
path: root/js/components/controllers
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/controllers
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-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/controllers')
-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 : {