Optimize offset() calculation

qTip2 · Feb 27, 2012 · 27f6e16 · 27f6e16
1 parent 667a7b6
commit 27f6e16
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 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 Feb 21 17:23:25 2012 +0000
+* Date: Thu Feb 23 18:28:16 2012 +0000
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -1792,7 +1792,7 @@ PLUGINS = QTIP.plugins = {
 	// Custom (more correct for qTip!) offset calculator
 	offset: function(elem, container) {
 		var pos = elem.offset(),
-			docBody = document.body,
+			docBody = elem.closest('body')[0],
 			parent = container, scrolled,
 			coffset, overflow;
 
@@ -1814,9 +1814,8 @@ PLUGINS = QTIP.plugins = {
 					// If this is the first parent element with an overflow of "scroll" or "auto", store it
 					if(!scrolled && (overflow = parent.css('overflow')) !== 'hidden' && overflow !== 'visible') { scrolled = parent; }
 				}
-				if(parent[0] === docBody) { break; }
 			}
-			while(parent = parent.offsetParent());
+			while((parent = $(parent[0].offsetParent)).length);
 
 			// Compensate for containers scroll if it also has an offsetParent
 			if(scrolled && scrolled[0] !== docBody) { scroll( scrolled, 1 ); }

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 Feb 21 17:23:25 2012 +0000
+* Date: Thu Feb 23 18:28:16 2012 +0000
 */
 
 /* 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 Feb 21 17:23:25 2012 +0000
+* Date: Thu Feb 23 18:28:16 2012 +0000
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -1792,7 +1792,7 @@ PLUGINS = QTIP.plugins = {
 	// Custom (more correct for qTip!) offset calculator
 	offset: function(elem, container) {
 		var pos = elem.offset(),
-			docBody = document.body,
+			docBody = elem.closest('body')[0],
 			parent = container, scrolled,
 			coffset, overflow;
 
@@ -1814,9 +1814,8 @@ PLUGINS = QTIP.plugins = {
 					// If this is the first parent element with an overflow of "scroll" or "auto", store it
 					if(!scrolled && (overflow = parent.css('overflow')) !== 'hidden' && overflow !== 'visible') { scrolled = parent; }
 				}
-				if(parent[0] === docBody) { break; }
 			}
-			while(parent = parent.offsetParent());
+			while((parent = $(parent[0].offsetParent)).length);
 
 			// Compensate for containers scroll if it also has an offsetParent
 			if(scrolled && scrolled[0] !== docBody) { scroll( scrolled, 1 ); }

diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js
diff --git a/src/core.js b/src/core.js
@@ -1720,7 +1720,7 @@ PLUGINS = QTIP.plugins = {
 	// Custom (more correct for qTip!) offset calculator
 	offset: function(elem, container) {
 		var pos = elem.offset(),
-			docBody = document.body,
+			docBody = elem.closest('body')[0],
 			parent = container, scrolled,
 			coffset, overflow;
 
@@ -1742,9 +1742,8 @@ PLUGINS = QTIP.plugins = {
 					// If this is the first parent element with an overflow of "scroll" or "auto", store it
 					if(!scrolled && (overflow = parent.css('overflow')) !== 'hidden' && overflow !== 'visible') { scrolled = parent; }
 				}
-				if(parent[0] === docBody) { break; }
 			}
-			while(parent = parent.offsetParent());
+			while((parent = $(parent[0].offsetParent)).length);
 
 			// Compensate for containers scroll if it also has an offsetParent
 			if(scrolled && scrolled[0] !== docBody) { scroll( scrolled, 1 ); }