diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/controllers | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-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/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 : { |