aboutsummaryrefslogtreecommitdiff
path: root/js/components/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-16 11:39:42 -0800
committerValerio Virgillito2012-02-16 11:39:42 -0800
commiteaee73ccaf271f5c82fdf67b35c71510f308fb6e (patch)
tree798eb17a926cd8fd16bd025ecd392d3e2f63226e /js/components/controllers
parentb12b167116b757e1a945c05f45991d0ed385aed3 (diff)
parent71619045b692015b0889a4f5c381c1dee9c056cd (diff)
downloadninja-eaee73ccaf271f5c82fdf67b35c71510f308fb6e.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/components/controllers')
-rw-r--r--js/components/controllers/tree-controller.js5
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 : {