X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Foffset.js;h=a35fed5613e6c723a01be4231f47d416b3d0be33;hb=69f72761faa6878e361711b70f1d27c467d256e4;hp=1add61c9d2cc37fac6840493bc7f861832514246;hpb=ac324c97e319c8a107036e7ce98dff6e5f78a8ba;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 1add61c..a35fed5 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -140,7 +140,9 @@ jQuery.fn.extend({
 
 // Create scrollLeft and scrollTop methods
 jQuery.each( ['Left', 'Top'], function(i, name) {
-	jQuery.fn[ 'scroll' + name ] = function(val) {
+	var method = 'scroll' + name;
+	
+	jQuery.fn[ method ] = function(val) {
 		if (!this[0]) return;
 
 		return val != undefined ?
@@ -149,17 +151,17 @@ jQuery.each( ['Left', 'Top'], function(i, name) {
 			this.each(function() {
 				this == window || this == document ?
 					window.scrollTo(
-						name == 'Left' ? val : jQuery(window)[ 'scrollLeft' ](),
-						name == 'Top'  ? val : jQuery(window)[ 'scrollTop'  ]()
+						!i ? val : jQuery(window).scrollLeft(),
+						 i ? val : jQuery(window).scrollTop()
 					) :
-					this[ 'scroll' + name ] = val;
+					this[ method ] = val;
 			}) :
 
 			// Return the scroll offset
 			this[0] == window || this[0] == document ?
-				self[ (name == 'Left' ? 'pageXOffset' : 'pageYOffset') ] ||
-					jQuery.boxModel && document.documentElement[ 'scroll' + name ] ||
-					document.body[ 'scroll' + name ] :
-				this[0][ 'scroll' + name ];
+				self[ i ? 'pageYOffset' : 'pageXOffset' ] ||
+					jQuery.boxModel && document.documentElement[ method ] ||
+					document.body[ method ] :
+				this[0][ method ];
 	};
 });