diff options
| author | Jose Antonio Marquez | 2012-02-23 15:11:51 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-23 15:11:51 -0800 |
| commit | bdc39718cacad2eab10a7d031ea10fda13c92a03 (patch) | |
| tree | 5fa2ae85a15d8a5067fa6f608c2b285869264ead /js/panels/Timeline/Keyframe.reel/Keyframe.html | |
| parent | 23b4bbd13345ecd5c00fda60b995a7fb2aab317c (diff) | |
| parent | 41b69af7c0be3dd5fe4f772668862696af8b917a (diff) | |
| download | ninja-bdc39718cacad2eab10a7d031ea10fda13c92a03.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/controllers/document-controller.js
Diffstat (limited to 'js/panels/Timeline/Keyframe.reel/Keyframe.html')
| -rw-r--r-- | js/panels/Timeline/Keyframe.reel/Keyframe.html | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html index bf21994b..72da49d5 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.html +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.html | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | "module": "js/panels/Timeline/Keyframe.reel", | 9 | "module": "js/panels/Timeline/Keyframe.reel", |
| 10 | "name": "Keyframe", | 10 | "name": "Keyframe", |
| 11 | "properties": { | 11 | "properties": { |
| 12 | "element": {"#": "keyframespace"}, | 12 | "element": {"#": "keyframespace"} |
| 13 | "tweenkeyframe": {"#": "tweenkeyframe"} | ||
| 14 | } | 13 | } |
| 15 | } | 14 | } |
| 16 | 15 | ||
| @@ -19,8 +18,7 @@ | |||
| 19 | </head> | 18 | </head> |
| 20 | <body> | 19 | <body> |
| 21 | 20 | ||
| 22 | <div id="keyframespace"> | 21 | <div id="keyframespace" class="tween_keyframe"> |
| 23 | <div id="tweenkeyframe" class="tween_keyframe"></div> | ||
| 24 | </div> | 22 | </div> |
| 25 | 23 | ||
| 26 | </body> | 24 | </body> |