diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/components/controllers | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/components/controllers')
-rw-r--r-- | js/components/controllers/tree-controller.js | 11 |
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 : { |