aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/ninja-branch.reel
diff options
context:
space:
mode:
authorJohn Mayhew2012-02-14 09:26:31 -0800
committerJohn Mayhew2012-02-14 09:26:31 -0800
commit65cb57d19c7ff0a8b143c40caa4a227b9e7fd87b (patch)
tree6113587f513fe191fb3538bdce1dc4874e583c93 /js/components/treeview/ninja-branch.reel
parentbe18a677863925963551ce3e88a4a4d254f3870c (diff)
parent1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff)
downloadninja-65cb57d19c7ff0a8b143c40caa4a227b9e7fd87b.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'js/components/treeview/ninja-branch.reel')
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html3
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.js1
2 files changed, 2 insertions, 2 deletions
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html
index 4d557a94..13f1c575 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.html
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html
@@ -110,7 +110,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
110 "name": "Repetition", 110 "name": "Repetition",
111 "properties": { 111 "properties": {
112 "element": { "#": "branchList" }, 112 "element": { "#": "branchList" },
113 "contentController": {"@": "arrayController" } 113 "contentController": {"@": "arrayController" },
114 "selectionEnabled": true
114 } 115 }
115 }, 116 },
116 117
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.js b/js/components/treeview/ninja-branch.reel/ninja-branch.js
index 6b9ebb10..0d1a1d0e 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.js
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.js
@@ -5,7 +5,6 @@
5 </copyright> */ 5 </copyright> */
6 6
7var Montage = require("montage").Montage, 7var Montage = require("montage").Montage,
8 Component = require("montage/ui/component").Component,
9 TreeNode = require("js/components/treeview/tree-node").TreeNode; 8 TreeNode = require("js/components/treeview/tree-node").TreeNode;
10 9
11var Branch = exports.Branch = Montage.create(TreeNode, { 10var Branch = exports.Branch = Montage.create(TreeNode, {