library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Offset: return zeros for disconnected/hidden elements

Browse Source 
Fixes gh-2310
Close gh-2396
This commit is contained in:
Timmy Willison 2015-06-15 11:02:08 -04:00
parent ee69e9c8b8
commit 63f19a95b9
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/offset.js
View File

@ -39,7 +39,7 @@ jQuery.offset = {
elem.style.position = "relative"; elem.style.position = "relative";
} }
curOffset = curElem.offset() || { top: 0, left: 0 }; curOffset = curElem.offset();
curCSSTop = jQuery.css( elem, "top" ); curCSSTop = jQuery.css( elem, "top" );
curCSSLeft = jQuery.css( elem, "left" ); curCSSLeft = jQuery.css( elem, "left" );
calculatePosition = ( position === "absolute" || position === "fixed" ) && calculatePosition = ( position === "absolute" || position === "fixed" ) &&
@ -110,6 +110,9 @@ jQuery.fn.extend({
( docElem.clientLeft || 0 ) ( docElem.clientLeft || 0 )
}; };
} }
// Return zeros for disconnected and hidden elements (gh-2310)
return rect;
}, },
position: function() { position: function() {

22
test/unit/offset.js
View File

@ -49,30 +49,24 @@ test("empty set", function() {
}); });
test("disconnected element", function() { test("disconnected element", function() {
expect(1); expect( 2 );
var result; var result = jQuery( document.createElement( "div" ) ).offset();
try { equal( result.top, 0, "Retrieving offset on disconnected elements returns zeros (gh-2310)" );
result = jQuery( document.createElement("div") ).offset(); equal( result.left, 0, "Retrieving offset on disconnected elements returns zeros (gh-2310)" );
} catch ( e ) {}
ok( !result, "no position for disconnected element" );
}); });
test("hidden (display: none) element", function() { test("hidden (display: none) element", function() {
expect(1); expect( 2 );
var result, var node = jQuery("<div style='display: none' />").appendTo("#qunit-fixture"),
node = jQuery("<div style='display: none' />").appendTo("#qunit-fixture");
try {
result = node.offset(); result = node.offset();
} catch ( e ) {}
node.remove(); node.remove();
ok( !result, "no position for hidden (display: none) element" ); equal( result.top, 0, "Retrieving offset on hidden elements returns zeros (gh-2310)" );
equal( result.left, 0, "Retrieving offset on hidden elements returns zeros (gh-2310)" );
}); });
testIframe("offset/absolute", "absolute", function($, iframe) { testIframe("offset/absolute", "absolute", function($, iframe) {