Fixed problem with position.effect not being called

qTip2 · Apr 6, 2011 · 1538c5b · 1538c5b
1 parent 6ed8f67
commit 1538c5b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 24 deletions.
diff --git a/dist/jquery.qtip.css b/dist/jquery.qtip.css
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Mon Apr 4 17:51:01 2011 +0100
+* Date: Mon Apr 4 18:39:49 2011 +0100
 */
 
 /* Fluid class for determining actual width in IE */

diff --git a/dist/jquery.qtip.js b/dist/jquery.qtip.js
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Mon Apr 4 17:51:01 2011 +0100
+* Date: Mon Apr 4 18:39:49 2011 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -885,8 +885,8 @@ function QTip(target, options, id, attr)
 				// Focus the tooltip
 				self.focus(event);
 
-				// Update tooltip position (without animation)
-				self.reposition(event, 0);
+				// Update tooltip position
+				self.reposition(event);
 
 				// Hide other tooltips if tooltip is solo, using it as the context
 				if(opts.solo) { $(selector, opts.solo).not(tooltip).qtip('hide', callback); }
@@ -1072,7 +1072,7 @@ function QTip(target, options, id, attr)
 						return position.top - posTop;
 					}
 				};
-				effect = effect === undefined || !!effect || FALSE;
+				effect = effect === undefined || !!effect;
 
 			// Cache our viewport details
 			viewport = !viewport ? FALSE : {
@@ -1175,18 +1175,17 @@ function QTip(target, options, id, attr)
 			delete position.adjusted;
 
 			// If effect is disabled or positioning gives NaN out, set CSS directly
-			if(!effect || !isNaN(position.left, position.top)) {
+			if(!effect || isNaN(position.left) || isNaN(position.top)) {
 				tooltip.css(position);
 			}
 
 			// Use custom function if provided
-			else if(tooltip.is(':visible') && $.isFunction(posOptions.effect)) {
-				posOptions.effect.call(tooltip, self, position);
+			else if($.isFunction(posOptions.effect)) {
+				posOptions.effect.call(tooltip, self, $.extend({}, position));
 				tooltip.queue(function(next) {
-					var elem = $(this);
 					// Reset attributes to avoid cross-browser rendering bugs
-					elem.css({ opacity: '', height: '' });
-					if($.browser.msie && this.style) { this.style.removeAttribute('filter'); }
+					$(this).css({ opacity: '', height: '' });
+					if($.browser.msie) { this.style.removeAttribute('filter'); }
 
 					next();
 				});

diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js
diff --git a/dist/jquery.qtip.pack.js b/dist/jquery.qtip.pack.js
diff --git a/src/core.js b/src/core.js
@@ -843,8 +843,8 @@ function QTip(target, options, id, attr)
 				// Focus the tooltip
 				self.focus(event);
 
-				// Update tooltip position (without animation)
-				self.reposition(event, 0);
+				// Update tooltip position
+				self.reposition(event);
 
 				// Hide other tooltips if tooltip is solo, using it as the context
 				if(opts.solo) { $(selector, opts.solo).not(tooltip).qtip('hide', callback); }
@@ -1030,7 +1030,7 @@ function QTip(target, options, id, attr)
 						return position.top - posTop;
 					}
 				};
-				effect = effect === undefined || !!effect || FALSE;
+				effect = effect === undefined || !!effect;
 
 			// Cache our viewport details
 			viewport = !viewport ? FALSE : {
@@ -1133,18 +1133,17 @@ function QTip(target, options, id, attr)
 			delete position.adjusted;
 
 			// If effect is disabled or positioning gives NaN out, set CSS directly
-			if(!effect || !isNaN(position.left, position.top)) {
+			if(!effect || isNaN(position.left) || isNaN(position.top)) {
 				tooltip.css(position);
 			}
 
 			// Use custom function if provided
-			else if(tooltip.is(':visible') && $.isFunction(posOptions.effect)) {
-				posOptions.effect.call(tooltip, self, position);
+			else if($.isFunction(posOptions.effect)) {
+				posOptions.effect.call(tooltip, self, $.extend({}, position));
 				tooltip.queue(function(next) {
-					var elem = $(this);
 					// Reset attributes to avoid cross-browser rendering bugs
-					elem.css({ opacity: '', height: '' });
-					if($.browser.msie && this.style) { this.style.removeAttribute('filter'); }
+					$(this).css({ opacity: '', height: '' });
+					if($.browser.msie) { this.style.removeAttribute('filter'); }
 
 					next();
 				});