diff options
author | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
commit | 89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch) | |
tree | 4d29118f35df77ca6b423119a4ff61694a442cbf /js/components/treeview/ninja-branch.reel | |
parent | 9d2c2a80483415d7560b00cda5519153db23e241 (diff) | |
parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
download | ninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/components/treeview/ninja-branch.reel')
-rw-r--r-- | js/components/treeview/ninja-branch.reel/ninja-branch.html | 3 | ||||
-rw-r--r-- | js/components/treeview/ninja-branch.reel/ninja-branch.js | 1 |
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 | ||
7 | var Montage = require("montage").Montage, | 7 | var 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 | ||
11 | var Branch = exports.Branch = Montage.create(TreeNode, { | 10 | var Branch = exports.Branch = Montage.create(TreeNode, { |