diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /node_modules/montage/ui/tabs.reel/tabs.html | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/tabs.reel/tabs.html')
| -rwxr-xr-x | node_modules/montage/ui/tabs.reel/tabs.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/node_modules/montage/ui/tabs.reel/tabs.html b/node_modules/montage/ui/tabs.reel/tabs.html index 5ceedf13..7ea9a438 100755 --- a/node_modules/montage/ui/tabs.reel/tabs.html +++ b/node_modules/montage/ui/tabs.reel/tabs.html | |||
| @@ -11,8 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization">{ | 11 | <script type="text/montage-serialization">{ |
| 12 | 12 | ||
| 13 | "navController": { | 13 | "navController": { |
| 14 | "name": "ArrayController", | 14 | "prototype": "montage/ui/controller/array-controller", |
| 15 | "module": "montage/ui/controller/array-controller", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "selectObjectsOnAddition": true, | 16 | "selectObjectsOnAddition": true, |
| 18 | "automaticallyOrganizeObjects": true | 17 | "automaticallyOrganizeObjects": true |