diff options
| author | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
| commit | 081f17954c735fc8b946d72a25b0ee60d370ef9b (patch) | |
| tree | de7b50f2d02365df897ef4356f953d3833c9cabd /js/components/treeview/ninja-branch.reel/ninja-branch.html | |
| parent | 47df0aff81c25334b129047bb227ea5015357eda (diff) | |
| parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
| download | ninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz | |
Merge branch 'refs/heads/master' into components
Conflicts:
js/components/treeview/ninja-leaf.reel/ninja-leaf.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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 | ||