diff options
| author | hwc487 | 2012-05-31 17:11:08 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-31 17:11:08 -0700 |
| commit | 1c445cf5d905f79937998cf2f1115594ea8c1074 (patch) | |
| tree | 35271ad7ffec86fde9102af3dd954fa3a2974582 /node_modules/montage/ui/tabs.reel/tabs.html | |
| parent | 335ce503996e3ccbd2909086328d0a31fbd03370 (diff) | |
| parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
| download | ninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/io/system/ninjalibrary.json
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 |