aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/ninja-branch.reel
diff options
context:
space:
mode:
authorEric Guzman2012-02-13 10:30:44 -0800
committerEric Guzman2012-02-13 10:30:44 -0800
commite46ab1a8e19f66de6eca68225d9e8b4cba8f90e8 (patch)
tree8904c82119819bfe4b6698ad40cbc33c903bcf12 /js/components/treeview/ninja-branch.reel
parent672e6f61647b1b8a5f6f5831284fa44bcb7be883 (diff)
parente4893f7d3c3b9bd7967973197c3ffb5d3a075c91 (diff)
downloadninja-e46ab1a8e19f66de6eca68225d9e8b4cba8f90e8.tar.gz
Merge branch 'refs/heads/TreeComponents' into PresetsPanel
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, {