From b7402018659cf8058d5646c08b2a916492269e33 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Thu, 23 Feb 2012 07:37:17 -0800 Subject: Timeline Reset to clean Master branch. Code scrub. Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran --- js/panels/Timeline/Tween.reel/Tween.html | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'js/panels/Timeline/Tween.reel/Tween.html') 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 @@ "properties": { "element": {"#": "tweenspace"}, "keyframe": {"@": "keyframe"}, - "span": {"@": "span"}, - "tweencontainer": {"#": "tweencontainer"} + "tweenspan": {"@": "span"} } }, @@ -28,8 +27,7 @@ "module": "js/panels/Timeline/Keyframe.reel", "name": "Keyframe", "properties": { - "element": {"#": "keyframe_container"}, - "containingSpan": {"@": "span"} + "element": {"#": "keyframe_container"} } } } @@ -37,12 +35,10 @@ -

\ No newline at end of file -- cgit v1.2.3