diff options
| author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
| commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
| tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/components/treeview/ninja-branch.reel/ninja-branch.html | |
| parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
| parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
| download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/components/treeview/ninja-branch.reel/ninja-branch.html')
| -rw-r--r-- | js/components/treeview/ninja-branch.reel/ninja-branch.html | 3 |
1 files changed, 2 insertions, 1 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 | ||