From f97e4b6ab1db9fb7de18b2e44c1b0edcf2ba072d Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 12 Jun 2012 16:47:15 -0700
Subject: Timeline: New popup menu for easing choices.

---
 js/panels/Timeline/Span.reel/Span.html | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'js/panels/Timeline/Span.reel/Span.html')

diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html
index a1f3afeb..6e643daa 100644
--- a/js/panels/Timeline/Span.reel/Span.html
+++ b/js/panels/Timeline/Span.reel/Span.html
@@ -15,8 +15,7 @@
                             "properties": {
                                 "element": {"#": "spanspace"},
                                 "container_easing" : {"#" : "container_easing"},
-                                "easing_choice" : {"#": "easing_choice"},
-                                "easing_choices" : {"#" : "easing_choices"}
+                                "easing_choice" : {"#": "easing_choice"}
                             }
                         }
 
@@ -27,17 +26,10 @@
 
     	<div data-montage-id="spanspace" class="tween_span">
     		<div class="tween_span_bar"></div>
-    		<div data-montage-id="container_easing" class="container-easing">
+    		<div data-montage-id="container_easing" class="container-easing-choice">
     			<div data-montage-id="easing_choice" class="easing-choice">
     				ease-out
     			</div>
-    			<ul data-montage-id="easing_choices" class="easing-choices">
-    				<li data-ninja-ease="ease">ease</li>
-    				<li data-ninja-ease="ease-out" class="easing-selected">ease-out</li>
-    				<li data-ninja-ease="ease-in">ease-in</li>
-    				<li data-ninja-ease="ease-in-out">ease-in-out</li>
-    				<li data-ninja-ease="linear">linear</li>
-    			</ul>
     		</div>
     	</div>
 
-- 
cgit v1.2.3