diff options
| author | Valerio Virgillito | 2012-02-16 22:08:04 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-16 22:08:04 -0800 |
| commit | 0175cb67e426a27a3ecfb7b81317caa383c8a5a5 (patch) | |
| tree | b4fbfcaabaadff508ad5463e8f71fd643995aacb /js/components/controllers/tree-controller.js | |
| parent | fe71cb9aa1700199c0089166ad54fc56eb760644 (diff) | |
| parent | 9f0c4efe2ed9a00f2c5d85c9d88a8040fedb5d8f (diff) | |
| download | ninja-0175cb67e426a27a3ecfb7b81317caa383c8a5a5.tar.gz | |
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/components/controllers/tree-controller.js')
| -rw-r--r-- | js/components/controllers/tree-controller.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js index 03ef7b9e..1e9222fd 100644 --- a/js/components/controllers/tree-controller.js +++ b/js/components/controllers/tree-controller.js | |||
| @@ -28,7 +28,7 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, / | |||
| 28 | }, | 28 | }, |
| 29 | 29 | ||
| 30 | branchKey : { | 30 | branchKey : { |
| 31 | value: 'children' | 31 | value: null |
| 32 | }, | 32 | }, |
| 33 | 33 | ||
| 34 | _root : { | 34 | _root : { |
| @@ -98,7 +98,8 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, / | |||
| 98 | }, | 98 | }, |
| 99 | 99 | ||
| 100 | branchControllers: { | 100 | branchControllers: { |
| 101 | value: [] | 101 | value: [], |
| 102 | distinct: true | ||
| 102 | }, | 103 | }, |
| 103 | 104 | ||
| 104 | addBranchController : { | 105 | addBranchController : { |