diff options
author | Valerio Virgillito | 2012-02-23 13:42:03 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-23 13:42:03 -0800 |
commit | 1144007ba899e87de73a372b45262f41f8e3e450 (patch) | |
tree | db1e0789c5918076ebae180f48c06d33f2562d98 /js/panels/Timeline/Tween.reel/Tween.html | |
parent | cc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff) | |
parent | a8c153cc4f6a4f4f3367b0b2a763fa86b442c201 (diff) | |
download | ninja-1144007ba899e87de73a372b45262f41f8e3e450.tar.gz |
Merge pull request #64 from imix23ways/Timeline
Timeline
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.html')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.html | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html index 307dcd02..b5353b1b 100644 --- a/js/panels/Timeline/Tween.reel/Tween.html +++ b/js/panels/Timeline/Tween.reel/Tween.html | |||
@@ -11,8 +11,7 @@ | |||
11 | "properties": { | 11 | "properties": { |
12 | "element": {"#": "tweenspace"}, | 12 | "element": {"#": "tweenspace"}, |
13 | "keyframe": {"@": "keyframe"}, | 13 | "keyframe": {"@": "keyframe"}, |
14 | "span": {"@": "span"}, | 14 | "tweenspan": {"@": "span"} |
15 | "tweencontainer": {"#": "tweencontainer"} | ||
16 | } | 15 | } |
17 | }, | 16 | }, |
18 | 17 | ||
@@ -28,8 +27,7 @@ | |||
28 | "module": "js/panels/Timeline/Keyframe.reel", | 27 | "module": "js/panels/Timeline/Keyframe.reel", |
29 | "name": "Keyframe", | 28 | "name": "Keyframe", |
30 | "properties": { | 29 | "properties": { |
31 | "element": {"#": "keyframe_container"}, | 30 | "element": {"#": "keyframe_container"} |
32 | "containingSpan": {"@": "span"} | ||
33 | } | 31 | } |
34 | } | 32 | } |
35 | } | 33 | } |
@@ -37,12 +35,10 @@ | |||
37 | </head> | 35 | </head> |
38 | <body> | 36 | <body> |
39 | 37 | ||
40 | <div id="tweenspace"> | 38 | <div id="tweenspace" class="tween_container"> |
41 | <div id="tweencontainer" class="tween_container"> | 39 | <div id="span_container"></div> |
42 | <div id="span_container"></div> | 40 | <div id="keyframe_container"></div> |
43 | <div id="keyframe_container"></div> | 41 | </div> |
44 | </div> | ||
45 | </div> | ||
46 | 42 | ||
47 | </body> | 43 | </body> |
48 | </html> \ No newline at end of file | 44 | </html> \ No newline at end of file |