Merge branch 'master' of github.com:jquery/jquery

diff --combined test/unit/offset.js
index 3b6af50,284562e..ed3d962
--- 1/test/unit/offset.js
--- 2/test/unit/offset.js
+++ b/test/unit/offset.js
@@@ -1,5 -1,7 +1,7 @@@
  module("offset");
  
+ var supportsScroll = false;
+ 
  testoffset("absolute"/* in iframe */, function($, iframe) {
        expect(4);
        
@@@ -10,6 -12,12 +12,12 @@@
        // if the offset method is using the scroll offset
        // of the parent window
        var forceScroll = jQuery('<div>', { width: 2000, height: 2000 }).appendTo('body');
+       window.scrollTo(200, 200);
+ 
+       if ( document.documentElement.scrollTop || document.body.scrollTop ) {
+               supportsScroll = true;
+       }
+ 
        window.scrollTo(1, 1);
        
        // get offset
@@@ -35,7 -43,7 +43,7 @@@
  });
  
  testoffset("absolute", function( jQuery ) {
 -      expect(144);
 +      expect(178);
        
        // get offset tests
        var tests = [
@@@ -62,11 -70,6 +70,11 @@@
                equals( jQuery( this.id ).position().left, this.left, "jQuery('" + this.id + "').position().left" );
        });
        
 +      // test #5781
 +      var offset = jQuery( '#positionTest' ).offset({ top: 10, left: 10 }).offset();
 +      equals( offset.top,  10, "Setting offset on element with position absolute but 'auto' values." )
 +      equals( offset.left, 10, "Setting offset on element with position absolute but 'auto' values." )
 +      
        
        // set offset
        tests = [
@@@ -99,14 -102,8 +107,14 @@@
                        equals( val.left, left, "Verify incoming top position." );
                        return { top: top + 1, left: left + 1 };
                });
 -              equals( jQuery( this.id ).offset().top,  this.top + 1,  "jQuery('" + this.id + "').offset({ top: "  + this.top  + " })" );
 -              equals( jQuery( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );
 +              equals( jQuery( this.id ).offset().top,  this.top  + 1, "jQuery('" + this.id + "').offset({ top: "  + (this.top  + 1) + " })" );
 +              equals( jQuery( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + (this.left + 1) + " })" );
 +              
 +              jQuery( this.id )
 +                      .offset({ left: this.left + 2 })
 +                      .offset({ top:  this.top  + 2 });
 +              equals( jQuery( this.id ).offset().top,  this.top  + 2, "Setting one property at a time." );
 +              equals( jQuery( this.id ).offset().left, this.left + 2, "Setting one property at a time." );
                
                jQuery( this.id ).offset({ top: this.top, left: this.left, using: function( props ) {
                        jQuery( this ).css({
@@@ -123,7 -120,7 +131,7 @@@ testoffset("relative", function( jQuer
        expect(60);
        
        // IE is collapsing the top margin of 1px
 -      var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8;
 +      var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
        
        // get offset
        var tests = [
@@@ -184,7 -181,7 +192,7 @@@ testoffset("static", function( jQuery 
        expect(80);
        
        // IE is collapsing the top margin of 1px
 -      var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8;
 +      var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
        
        // get offset
        var tests = [
@@@ -256,8 -253,13 +264,13 @@@ testoffset("fixed", function( jQuery ) 
                { id: '#fixed-1', top: 1001, left: 1001 },
                { id: '#fixed-2', top: 1021, left: 1021 }
        ];
+ 
        jQuery.each( tests, function() {
-               if ( jQuery.offset.supportsFixedPosition ) {
+               if ( !supportsScroll ) {
+                       ok( true, "Browser doesn't support scroll position." );
+                       ok( true, "Browser doesn't support scroll position." );
+ 
+               } else if ( jQuery.offset.supportsFixedPosition ) {
                        equals( jQuery( this.id ).offset().top,  this.top,  "jQuery('" + this.id + "').offset().top" );
                        equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
                } else {
@@@ -313,7 -315,7 +326,7 @@@ testoffset("table", function( jQuery ) 
  testoffset("scroll", function( jQuery, win ) {
        expect(16);
        
 -      var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8;
 +      var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
        
        // IE is collapsing the top margin of 1px
        equals( jQuery('#scroll-1').offset().top, ie ? 6 : 7, "jQuery('#scroll-1').offset().top" );
@@@ -335,12 -337,20 +348,20 @@@
        // equals( jQuery('body').scrollLeft(), 0, "jQuery('body').scrollTop()" );
        
        win.name = "test";
-       
-       equals( jQuery(win).scrollTop(), 1000, "jQuery(window).scrollTop()" );
-       equals( jQuery(win).scrollLeft(), 1000, "jQuery(window).scrollLeft()" );
-       
-       equals( jQuery(win.document).scrollTop(), 1000, "jQuery(document).scrollTop()" );
-       equals( jQuery(win.document).scrollLeft(), 1000, "jQuery(document).scrollLeft()" );
+ 
+       if ( !supportsScroll ) {
+               ok( true, "Browser doesn't support scroll position." );
+               ok( true, "Browser doesn't support scroll position." );
+ 
+               ok( true, "Browser doesn't support scroll position." );
+               ok( true, "Browser doesn't support scroll position." );
+       } else {
+               equals( jQuery(win).scrollTop(), 1000, "jQuery(window).scrollTop()" );
+               equals( jQuery(win).scrollLeft(), 1000, "jQuery(window).scrollLeft()" );
+       
+               equals( jQuery(win.document).scrollTop(), 1000, "jQuery(document).scrollTop()" );
+               equals( jQuery(win.document).scrollLeft(), 1000, "jQuery(document).scrollLeft()" );
+       }
        
        // test jQuery using parent window/document
        // jQuery reference here is in the iframe
@@@ -415,7 -425,7 +436,7 @@@ function testoffset(name, fn) 
        });
        
        function loadFixture() {
 -              var src = './data/offset/' + name + '.html?' + parseInt( Math.random()*1000 ),
 +              var src = './data/offset/' + name + '.html?' + parseInt( Math.random()*1000, 10 ),
                        iframe = jQuery('<iframe />').css({
                                width: 500, height: 500, position: 'absolute', top: -600, left: -600, visiblity: 'hidden'
                        }).appendTo('body')[0];