diff options
| author | Eric Guzman | 2012-02-27 11:13:35 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-27 11:13:35 -0800 |
| commit | 1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch) | |
| tree | bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c /js/panels/Timeline/Tween.reel/Tween.html | |
| parent | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff) | |
| parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
| download | ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.html')
| -rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.html | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html index 307dcd02..ce51cb70 100644 --- a/js/panels/Timeline/Tween.reel/Tween.html +++ b/js/panels/Timeline/Tween.reel/Tween.html | |||
| @@ -1,4 +1,9 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | ||
| 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/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 2 | <html lang="en"> | 7 | <html lang="en"> |
| 3 | <head> | 8 | <head> |
| 4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| @@ -11,8 +16,7 @@ | |||
| 11 | "properties": { | 16 | "properties": { |
| 12 | "element": {"#": "tweenspace"}, | 17 | "element": {"#": "tweenspace"}, |
| 13 | "keyframe": {"@": "keyframe"}, | 18 | "keyframe": {"@": "keyframe"}, |
| 14 | "span": {"@": "span"}, | 19 | "tweenspan": {"@": "span"} |
| 15 | "tweencontainer": {"#": "tweencontainer"} | ||
| 16 | } | 20 | } |
| 17 | }, | 21 | }, |
| 18 | 22 | ||
| @@ -28,8 +32,7 @@ | |||
| 28 | "module": "js/panels/Timeline/Keyframe.reel", | 32 | "module": "js/panels/Timeline/Keyframe.reel", |
| 29 | "name": "Keyframe", | 33 | "name": "Keyframe", |
| 30 | "properties": { | 34 | "properties": { |
| 31 | "element": {"#": "keyframe_container"}, | 35 | "element": {"#": "keyframe_container"} |
| 32 | "containingSpan": {"@": "span"} | ||
| 33 | } | 36 | } |
| 34 | } | 37 | } |
| 35 | } | 38 | } |
| @@ -37,12 +40,10 @@ | |||
| 37 | </head> | 40 | </head> |
| 38 | <body> | 41 | <body> |
| 39 | 42 | ||
| 40 | <div id="tweenspace"> | 43 | <div id="tweenspace" class="tween_container"> |
| 41 | <div id="tweencontainer" class="tween_container"> | 44 | <div id="span_container"></div> |
| 42 | <div id="span_container"></div> | 45 | <div id="keyframe_container"></div> |
| 43 | <div id="keyframe_container"></div> | 46 | </div> |
| 44 | </div> | ||
| 45 | </div> | ||
| 46 | 47 | ||
| 47 | </body> | 48 | </body> |
| 48 | </html> \ No newline at end of file | 49 | </html> \ No newline at end of file |