From 53bb51a38edc6fe7cc80c43d34027590a22a1d32 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 14 Jun 2012 14:29:37 -0700
Subject: Timeline: New easing menu.

---
 js/panels/Timeline/Span.reel/Span.js | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 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 44316469..7347ef51 100644
--- a/js/panels/Timeline/Span.reel/Span.js
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -152,9 +152,25 @@ var Span = exports.Span = Montage.create(Component, {
     		//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;
+
+    		function findPos(obj) {
+    			var objReturn = {};
+    			objReturn.top = 0;
+    			objReturn.left = 0;
+
+				if (obj.offsetParent) {
+
+					do {
+						objReturn.left += obj.offsetLeft;
+						objReturn.top += obj.offsetTop;
+	
+					} while (obj = obj.offsetParent);
+				}
+				return objReturn;
+			}
+			var objPos = findPos(event.target);
+    		this.application.ninja.timeline.easingMenu.top = objPos.top +38 - (this.application.ninja.timeline.layout_tracks.scrollTop);
+    		this.application.ninja.timeline.easingMenu.left = objPos.left+18 - (this.application.ninja.timeline.layout_tracks.scrollLeft);
     		this.application.ninja.timeline.easingMenu.show();
     		this.application.ninja.timeline.easingMenu.callingComponent = this;
     	}
@@ -162,8 +178,6 @@ var Span = exports.Span = Montage.create(Component, {
     handleEasingChoicesClick: {
     	value: function(event) {
     		event.stopPropagation();
-    		
-    		console.log("span.handleEasingChoicesClick")
 			
 			// Remove the pointer to ourselves
 			//this.application.ninja.timeline.currentOpenSpanMenu = false;
-- 
cgit v1.2.3