From 80d1074a5e4a10da8d36c14b8d4f4e9fae47a5ec Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Wed, 13 Jun 2012 16:00:32 -0700
Subject: Timeline: More work on new easing menu.

---
 js/panels/Timeline/Span.reel/Span.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

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

diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js
index bb8fdf03..44316469 100644
--- a/js/panels/Timeline/Span.reel/Span.js
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -150,31 +150,42 @@ var Span = exports.Span = Montage.create(Component, {
     	value: function(event) {
     		event.stopPropagation();
     		//this.areChoicesVisible = true;
+    		this.application.ninja.timeline.easingMenu.anchor = this.easing_choice;
+    		this.application.ninja.timeline.easingMenu.currentChoice = event.currentTarget.innerText;
+    		console.log(event);
+    		this.application.ninja.timeline.easingMenu.top = 100;
+    		this.application.ninja.timeline.easingMenu.left = 100;
     		this.application.ninja.timeline.easingMenu.show();
-
+    		this.application.ninja.timeline.easingMenu.callingComponent = this;
     	}
     },
     handleEasingChoicesClick: {
     	value: function(event) {
     		event.stopPropagation();
+    		
+    		console.log("span.handleEasingChoicesClick")
 			
 			// Remove the pointer to ourselves
-			this.application.ninja.timeline.currentOpenSpanMenu = false;
+			//this.application.ninja.timeline.currentOpenSpanMenu = false;
 			
 			// Un-highlight the old choice and highlight the new choice
-    		this.easing_choices.querySelector(".easing-selected").classList.remove("easing-selected");
+    		this.application.ninja.timeline.easingMenu.popup.contentEl.querySelector(".easing-selected").classList.remove("easing-selected");
     		event.target.classList.add("easing-selected");
     		
     		// Set the easing 
     		this.easing = event.target.dataset.ninjaEase;
     		
+    		// Unbind the event handler
+    		this.application.ninja.timeline.easingMenu.popup.contentEl.removeEventListener("click");
+    		
     		// Hide the menu.
     		this.hideEasingMenu();	
     	}
     },
     hideEasingMenu: {
     	value: function() {
-    		this.areChoicesVisible = false;
+    		//this.areChoicesVisible = false;
+    		this.application.ninja.timeline.easingMenu.hide();
     	}
     }
 });
-- 
cgit v1.2.3