Fixed scroll offset problem when using container property

qTip2 · Feb 23, 2011 · d26dc19 · d26dc19
1 parent e5942fd
commit d26dc19
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 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: Wed Feb 23 00:35:04 2011 +0000
+* Date: Wed Feb 23 18:53:51 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: Wed Feb 23 00:35:04 2011 +0000
+* Date: Wed Feb 23 18:53:51 2011 +0000
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -1510,9 +1510,9 @@ PLUGINS = QTIP.plugins = {
 			docBody = document.body,
 			coffset;
 
-		function scroll(e) {
-			pos.left -= e.scrollLeft();
-			pos.top -= e.scrollTop();
+		function scroll(e, i) {
+			pos.left += i * e.scrollLeft();
+			pos.top += i * e.scrollTop();
 		}
 
 		if(parent) {
@@ -1530,8 +1530,8 @@ PLUGINS = QTIP.plugins = {
 			while(parent = parent.offsetParent());
 
 			// Compensate for containers scroll if it also has an offsetParent
-			if(container[0] !== docBody) { scroll( container ); }
-			if(PLUGINS.iOS) { scroll( $(window) ); }
+			if(container[0] !== docBody || deep > 1) { scroll( container, 1 ); }
+			if(PLUGINS.iOS) { 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
@@ -1468,9 +1468,9 @@ PLUGINS = QTIP.plugins = {
 			docBody = document.body,
 			coffset;
 
-		function scroll(e) {
-			pos.left -= e.scrollLeft();
-			pos.top -= e.scrollTop();
+		function scroll(e, i) {
+			pos.left += i * e.scrollLeft();
+			pos.top += i * e.scrollTop();
 		}
 
 		if(parent) {
@@ -1488,8 +1488,8 @@ PLUGINS = QTIP.plugins = {
 			while(parent = parent.offsetParent());
 
 			// Compensate for containers scroll if it also has an offsetParent
-			if(container[0] !== docBody) { scroll( container ); }
-			if(PLUGINS.iOS) { scroll( $(window) ); }
+			if(container[0] !== docBody || deep > 1) { scroll( container, 1 ); }
+			if(PLUGINS.iOS) { scroll( $(window), -1 ); }
 		}
 
 		return pos;