aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.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/panels/Timeline/Tween.reel/Tween.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/panels/Timeline/Tween.reel/Tween.html')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html17
1 files changed, 7 insertions, 10 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html
index ce51cb70..aba42436 100644
--- a/js/panels/Timeline/Tween.reel/Tween.html
+++ b/js/panels/Timeline/Tween.reel/Tween.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/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module": "js/panels/Timeline/Tween.reel", 14 "prototype": "js/panels/Timeline/Tween.reel",
15 "name": "Tween",
16 "properties": { 15 "properties": {
17 "element": {"#": "tweenspace"}, 16 "element": {"#": "tweenspace"},
18 "keyframe": {"@": "keyframe"}, 17 "keyframe": {"@": "keyframe"},
@@ -21,16 +20,14 @@
21 }, 20 },
22 21
23 "span": { 22 "span": {
24 "module": "js/panels/Timeline/Span.reel", 23 "prototype": "js/panels/Timeline/Span.reel",
25 "name": "Span",
26 "properties": { 24 "properties": {
27 "element": {"#": "span_container"} 25 "element": {"#": "span_container"}
28 } 26 }
29 }, 27 },
30 28
31 "keyframe": { 29 "keyframe": {
32 "module": "js/panels/Timeline/Keyframe.reel", 30 "prototype": "js/panels/Timeline/Keyframe.reel",
33 "name": "Keyframe",
34 "properties": { 31 "properties": {
35 "element": {"#": "keyframe_container"} 32 "element": {"#": "keyframe_container"}
36 } 33 }
@@ -40,9 +37,9 @@
40 </head> 37 </head>
41 <body> 38 <body>
42 39
43 <div id="tweenspace" class="tween_container"> 40 <div data-montage-id="tweenspace" class="tween_container">
44 <div id="span_container"></div> 41 <div data-montage-id="span_container"></div>
45 <div id="keyframe_container"></div> 42 <div data-montage-id="keyframe_container"></div>
46 </div> 43 </div>
47 44
48 </body> 45 </body>