diff options
author | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
commit | 7fdeb9feac4d2da9f86646cda4548ea60e5effa9 (patch) | |
tree | 6b43b7b2375fad6804ae88287906e3b77b4539b9 /js/components/layout/document-bar.reel/document-bar.html | |
parent | d988dead643ff4f9bfa417286a6b5f88be0e7c82 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-7fdeb9feac4d2da9f86646cda4548ea60e5effa9.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/layout/document-bar.reel/document-bar.html')
-rwxr-xr-x | js/components/layout/document-bar.reel/document-bar.html | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index bd13f231..8dcaf178 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -13,8 +13,7 @@ | |||
13 | <script type="text/montage-serialization"> | 13 | <script type="text/montage-serialization"> |
14 | { | 14 | { |
15 | "hottext1": { | 15 | "hottext1": { |
16 | "module": "js/components/hottextunit.reel", | 16 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
17 | "name": "HotTextUnit", | ||
18 | "properties": { | 17 | "properties": { |
19 | "element": {"#": "zoomControlHT"}, | 18 | "element": {"#": "zoomControlHT"}, |
20 | "minValue":25, | 19 | "minValue":25, |
@@ -47,8 +46,7 @@ | |||
47 | }, | 46 | }, |
48 | 47 | ||
49 | "owner": { | 48 | "owner": { |
50 | "module": "js/components/layout/document-bar.reel", | 49 | "prototype": "js/components/layout/document-bar.reel", |
51 | "name": "DocumentBar", | ||
52 | "properties": { | 50 | "properties": { |
53 | "element": {"#": "documentBar"}, | 51 | "element": {"#": "documentBar"}, |
54 | "designView": {"#": "design"}, | 52 | "designView": {"#": "design"}, |