Fixed positioning animation bug

qTip2 · Apr 12, 2011 · 5e34916 · 5e34916
1 parent 67fc37a
commit 5e34916
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/dist/jquery.qtip.basic.js b/dist/jquery.qtip.basic.js
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Tue Apr 12 00:17:35 2011 +0100
+* Date: Tue Apr 12 00:30:03 2011 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -1118,7 +1118,6 @@ function QTip(target, options, id, attr)
 						return position.top - posTop;
 					}
 				};
-				effect = effect === undefined || !!effect;
 
 			// Cache our viewport details
 			viewport = !viewport ? FALSE : {
@@ -1220,8 +1219,8 @@ function QTip(target, options, id, attr)
 			if(callback.isDefaultPrevented()){ return self; }
 			delete position.adjusted;
 
-			// If effect is disabled or positioning gives NaN out, set CSS directly
-			if(!effect || !isNaN(position.left) || !isNaN(position.top)) {
+			// If effect is disabled, no animation is defined or positioning gives NaN out, set CSS directly
+			if(effect === FALSE || isNaN(position.left) || isNaN(position.top) || !$.isFunction(posOptions.effect)) {
 				tooltip.css(position);
 			}
 

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: Tue Apr 12 00:17:35 2011 +0100
+* Date: Tue Apr 12 00:30:03 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: Tue Apr 12 00:17:35 2011 +0100
+* Date: Tue Apr 12 00:30:03 2011 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -1118,7 +1118,6 @@ function QTip(target, options, id, attr)
 						return position.top - posTop;
 					}
 				};
-				effect = effect === undefined || !!effect;
 
 			// Cache our viewport details
 			viewport = !viewport ? FALSE : {
@@ -1220,8 +1219,8 @@ function QTip(target, options, id, attr)
 			if(callback.isDefaultPrevented()){ return self; }
 			delete position.adjusted;
 
-			// If effect is disabled or positioning gives NaN out, set CSS directly
-			if(!effect || !isNaN(position.left) || !isNaN(position.top)) {
+			// If effect is disabled, no animation is defined or positioning gives NaN out, set CSS directly
+			if(effect === FALSE || isNaN(position.left) || isNaN(position.top) || !$.isFunction(posOptions.effect)) {
 				tooltip.css(position);
 			}
 

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
@@ -1076,7 +1076,6 @@ function QTip(target, options, id, attr)
 						return position.top - posTop;
 					}
 				};
-				effect = effect === undefined || !!effect;
 
 			// Cache our viewport details
 			viewport = !viewport ? FALSE : {
@@ -1178,8 +1177,8 @@ function QTip(target, options, id, attr)
 			if(callback.isDefaultPrevented()){ return self; }
 			delete position.adjusted;
 
-			// If effect is disabled or positioning gives NaN out, set CSS directly
-			if(!effect || !isNaN(position.left) || !isNaN(position.top)) {
+			// If effect is disabled, no animation is defined or positioning gives NaN out, set CSS directly
+			if(effect === FALSE || isNaN(position.left) || isNaN(position.top) || !$.isFunction(posOptions.effect)) {
 				tooltip.css(position);
 			}