diff options
| author | Eric Guzman | 2012-05-17 17:43:05 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-17 17:43:05 -0700 |
| commit | 458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch) | |
| tree | ee329e409fe28ae54c894b9e27e82e1f85aefc85 /node_modules/montage/ui/tabs.reel/tabs.html | |
| parent | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff) | |
| parent | 52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff) | |
| download | ninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz | |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
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 |