Fixed problem with offset() scroll-fix

qTip2 · Feb 16, 2011 · 418be2a · 418be2a
1 parent b34c4ca
commit 418be2a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 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: Sun Feb 13 15:53:13 2011 +0000
+* Date: Tue Feb 15 21:05:28 2011 +0000
 */
 
 /* 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: Sun Feb 13 15:53:13 2011 +0000
+* Date: Tue Feb 15 21:05:28 2011 +0000
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -1506,13 +1506,13 @@ PLUGINS = QTIP.plugins = {
 		var pos = elem.offset(),
 			parent = container,
 			deep = 0,
-			addScroll = !PLUGINS.iOS,
+			docBody = document.body,
 			coffset;
 
 		if(parent) {
 			// Compensate for non-static containers offset
 			do {
-				if(parent[0] === document.body) { break; }
+				if(parent[0] === docBody) { break; }
 				else if(parent.css('position') !== 'static') {
 					coffset = parent.position();
 					pos.left -= coffset.left;
@@ -1524,8 +1524,8 @@ PLUGINS = QTIP.plugins = {
 			while(parent = parent.offsetParent());
 
 			// Compensate for containers scroll if it also has an offsetParent
-			if(addScroll || deep > 1) {
-				coffset = addScroll ? 1 : -1;
+			if(container[0] !== docBody || PLUGINS.iOS) {
+				coffset = PLUGINS.iOS ? -1 : 1;
 				pos.left += coffset * container.scrollLeft();
 				pos.top += coffset * container.scrollTop();
 			}

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
@@ -1464,13 +1464,13 @@ PLUGINS = QTIP.plugins = {
 		var pos = elem.offset(),
 			parent = container,
 			deep = 0,
-			addScroll = !PLUGINS.iOS,
+			docBody = document.body,
 			coffset;
 
 		if(parent) {
 			// Compensate for non-static containers offset
 			do {
-				if(parent[0] === document.body) { break; }
+				if(parent[0] === docBody) { break; }
 				else if(parent.css('position') !== 'static') {
 					coffset = parent.position();
 					pos.left -= coffset.left;
@@ -1482,8 +1482,8 @@ PLUGINS = QTIP.plugins = {
 			while(parent = parent.offsetParent());
 
 			// Compensate for containers scroll if it also has an offsetParent
-			if(addScroll || deep > 1) {
-				coffset = addScroll ? 1 : -1;
+			if(container[0] !== docBody || PLUGINS.iOS) {
+				coffset = PLUGINS.iOS ? -1 : 1;
 				pos.left += coffset * container.scrollLeft();
 				pos.top += coffset * container.scrollTop();
 			}