aboutsummaryrefslogtreecommitdiff
path: root/js/components/hottextunit.reel/hottextunit.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/hottextunit.reel/hottextunit.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/hottextunit.reel/hottextunit.html')
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/js/components/hottextunit.reel/hottextunit.html b/js/components/hottextunit.reel/hottextunit.html
index cc0835fb..ec10f975 100755
--- a/js/components/hottextunit.reel/hottextunit.html
+++ b/js/components/hottextunit.reel/hottextunit.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/>
@@ -12,8 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "module": "js/components/hottextunit.reel", 15 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
16 "name": "HotTextUnit",
17 "properties": { 16 "properties": {
18 "element": {"#": "hottextunit"} 17 "element": {"#": "hottextunit"}
19 } 18 }
@@ -23,6 +22,6 @@
23 22
24</head> 23</head>
25<body> 24<body>
26 <div id="hottextunit" class="hottextunit"></div> 25 <div data-montage-id="hottextunit" class="hottextunit"></div>
27</body> 26</body>
28</html> \ No newline at end of file 27</html> \ No newline at end of file