Fixes #605 target: mouse issue with missing pageX/pageY coords. Remov…

…e errant console.log
qTip2 · Oct 8, 2013 · 06b3d79 · 06b3d79
1 parent 1d8ddbe
commit 06b3d79
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/core/position.js b/src/core/position.js
@@ -46,15 +46,15 @@ PROTOTYPE.reposition = function(event, effect) {
 
 		// If the passed event has no coordinates (such as a scroll event)
 		else if(!event || !event.pageX) {
-			// Use cached event for resize/scroll events
-			if(event && (event.type === 'resize' || event.type === 'scroll')) {
-				event = cache.event;
-			}
-
 			// Use the mouse origin that caused the show event, if distance hiding is enabled
-			else if((!adjust.mouse || this.options.show.distance) && cache.origin && cache.origin.pageX) {
+			if((!adjust.mouse || this.options.show.distance) && cache.origin && cache.origin.pageX) {
 				event =  cache.origin;
 			}
+
+			// Use cached event for resize/scroll events
+			else if(!event || (event && (event.type === 'resize' || event.type === 'scroll'))) {
+				event = cache.event;
+			}
 		}
 
 		// Calculate body and container offset and take them into account below

diff --git a/src/position/viewport.js b/src/position/viewport.js
@@ -44,8 +44,6 @@ PLUGINS.viewport = function(api, position, posOptions, targetWidth, targetHeight
 			overflow2 = initialPos + elemLength - (lengthName === WIDTH ? viewportWidth : viewportHeight) - sideOffset,
 			offset = myLength - (my.precedance === side || mySide === my[otherSide] ? atLength : 0) - (atSide === CENTER ? targetLength / 2 : 0);
 
-		console.log(initialPos, mySide, atSide, isShift, myLength, atLength, sideOffset, overflow1, overflow2, offset);
-
 		// shift
 		if(isShift) {
 			offset = (mySide === side1 ? 1 : -1) * myLength;