aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/document-bar.reel/document-bar.html
diff options
context:
space:
mode:
authorAnanya Sen2012-05-01 13:39:30 -0700
committerAnanya Sen2012-05-01 13:39:30 -0700
commitc360d1a5cfe894591ae65f892ead11d0ca537b18 (patch)
tree13964f810d3516dbc02e27ab5bb576fe62366f26 /js/components/layout/document-bar.reel/document-bar.html
parent3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff)
parente3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff)
downloadninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/components/layout/document-bar.reel/document-bar.html')
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html8
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"},