diff options
| author | hwc487 | 2012-02-23 15:21:56 -0800 |
|---|---|---|
| committer | hwc487 | 2012-02-23 15:21:56 -0800 |
| commit | 26bb2894c29d4608e843de01829d352dd3d00823 (patch) | |
| tree | c5a9d10976304fe5b3dec59f40977d8c72df57de /js/panels/Timeline/Tween.reel/Tween.html | |
| parent | 64280907f31e6f6e5659acb0893df3e0da5bb044 (diff) | |
| parent | 81ce79819ba574b03b46e91e9a153dab82b550cd (diff) | |
| download | ninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.js
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 |