diff options
author | Ananya Sen | 2012-02-13 16:19:21 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-13 16:19:21 -0800 |
commit | b58dafe332fb57210f3d059a518a3d183c222631 (patch) | |
tree | 09fd958b0f7f3f51dc88e613e7764bdfc642b742 /js/components/treeview/ninja-branch.reel | |
parent | f3dc624fa464a79fd8e8cec1ddd16ed2109bda23 (diff) | |
parent | f70701db069a10dc5195605fc378a022125b434f (diff) | |
download | ninja-b58dafe332fb57210f3d059a518a3d183c222631.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
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, { |