offset function now correctly takes into account non-static body

qTip2 · May 31, 2011 · 7afc126 · 7afc126
1 parent ec19a26
commit 7afc126
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 19 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 May 31 11:49:21 2011 +0100
+* Date: Tue May 31 17:48:21 2011 +0100
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -1658,14 +1658,17 @@ PLUGINS = QTIP.plugins = {
 		if(parent) {
 			// Compensate for non-static containers offset
 			do {
-				if(parent[0] === docBody) { break; }
-				else if(parent.css('position') !== 'static') {
-					coffset = parent.position();
+				if(parent.css('position') !== 'static') {
+					coffset = parent[0] === docBody ?
+						{ left: parseInt(parent.css('left'), 10) || 0, top: parseInt(parent.css('top'), 10) || 0 } :
+						parent.position();
+
 					pos.left -= coffset.left + (parseInt(parent.css('borderLeftWidth'), 10) || 0);
 					pos.top -= coffset.top + (parseInt(parent.css('borderTopWidth'), 10) || 0);
-					
+
 					deep++;
 				}
+				if(parent[0] === docBody) { break; }
 			}
 			while(parent = parent.offsetParent());
 

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 May 31 11:49:21 2011 +0100
+* Date: Tue May 31 17:48:21 2011 +0100
 */
 
 /* Core qTip styles */

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 May 31 11:49:21 2011 +0100
+* Date: Tue May 31 17:48:21 2011 +0100
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -1658,14 +1658,17 @@ PLUGINS = QTIP.plugins = {
 		if(parent) {
 			// Compensate for non-static containers offset
 			do {
-				if(parent[0] === docBody) { break; }
-				else if(parent.css('position') !== 'static') {
-					coffset = parent.position();
+				if(parent.css('position') !== 'static') {
+					coffset = parent[0] === docBody ?
+						{ left: parseInt(parent.css('left'), 10) || 0, top: parseInt(parent.css('top'), 10) || 0 } :
+						parent.position();
+
 					pos.left -= coffset.left + (parseInt(parent.css('borderLeftWidth'), 10) || 0);
 					pos.top -= coffset.top + (parseInt(parent.css('borderTopWidth'), 10) || 0);
-					
+
 					deep++;
 				}
+				if(parent[0] === docBody) { break; }
 			}
 			while(parent = parent.offsetParent());
 

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
@@ -1617,14 +1617,17 @@ PLUGINS = QTIP.plugins = {
 		if(parent) {
 			// Compensate for non-static containers offset
 			do {
-				if(parent[0] === docBody) { break; }
-				else if(parent.css('position') !== 'static') {
-					coffset = parent.position();
+				if(parent.css('position') !== 'static') {
+					coffset = parent[0] === docBody ?
+						{ left: parseInt(parent.css('left'), 10) || 0, top: parseInt(parent.css('top'), 10) || 0 } :
+						parent.position();
+
 					pos.left -= coffset.left + (parseInt(parent.css('borderLeftWidth'), 10) || 0);
 					pos.top -= coffset.top + (parseInt(parent.css('borderTopWidth'), 10) || 0);
-					
+
 					deep++;
 				}
+				if(parent[0] === docBody) { break; }
 			}
 			while(parent = parent.offsetParent());