Fixed issue with position: fixed; tooltip positioning

qTip2 · Apr 26, 2011 · 4430dfa · 4430dfa
1 parent 96fb6a0
commit 4430dfa
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 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 25 19:59:02 2011 +0100
+* Date: Tue Apr 26 01:43:27 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 25 19:59:02 2011 +0100
+* Date: Tue Apr 26 01:43:27 2011 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -1225,7 +1225,7 @@ function QTip(target, options, id, attr)
 					targetWidth = target.outerWidth();
 					targetHeight = target.outerHeight();
 
-					position = PLUGINS.offset(target, posOptions.container);
+					position = PLUGINS.offset(target, posOptions.container, fixed);
 				}
 
 				// Parse returned plugin values into proper variables
@@ -1615,7 +1615,7 @@ PLUGINS = QTIP.plugins = {
 	},
 
 	// Custom (more correct for qTip!) offset calculator
-	offset: function(elem, container) {
+	offset: function(elem, container, fixed) {
 		var pos = elem.offset(),
 			parent = container,
 			deep = 0,
@@ -1643,7 +1643,9 @@ PLUGINS = QTIP.plugins = {
 
 			// Compensate for containers scroll if it also has an offsetParent
 			if(container[0] !== docBody || deep > 1) { scroll( container, 1 ); }
-			if(PLUGINS.iOS < 4.1 && PLUGINS.iOS > 3.1) { scroll( $(window), -1 ); }
+
+			// Adjust for position.fixed tooltips (and also iOS scroll bug in v3.2 - v4.0)
+			if((PLUGINS.iOS < 4.1 && PLUGINS.iOS > 3.1) || (!PLUGINS.iOS && fixed)) { scroll( $(window), -1 ); }
 		}
 
 		return pos;

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
@@ -1182,7 +1182,7 @@ function QTip(target, options, id, attr)
 					targetWidth = target.outerWidth();
 					targetHeight = target.outerHeight();
 
-					position = PLUGINS.offset(target, posOptions.container);
+					position = PLUGINS.offset(target, posOptions.container, fixed);
 				}
 
 				// Parse returned plugin values into proper variables
@@ -1572,7 +1572,7 @@ PLUGINS = QTIP.plugins = {
 	},
 
 	// Custom (more correct for qTip!) offset calculator
-	offset: function(elem, container) {
+	offset: function(elem, container, fixed) {
 		var pos = elem.offset(),
 			parent = container,
 			deep = 0,
@@ -1600,7 +1600,9 @@ PLUGINS = QTIP.plugins = {
 
 			// Compensate for containers scroll if it also has an offsetParent
 			if(container[0] !== docBody || deep > 1) { scroll( container, 1 ); }
-			if(PLUGINS.iOS < 4.1 && PLUGINS.iOS > 3.1) { scroll( $(window), -1 ); }
+
+			// Adjust for position.fixed tooltips (and also iOS scroll bug in v3.2 - v4.0)
+			if((PLUGINS.iOS < 4.1 && PLUGINS.iOS > 3.1) || (!PLUGINS.iOS && fixed)) { scroll( $(window), -1 ); }
 		}
 
 		return pos;