Commit ee69e9c8 authored by Timmy Willison's avatar Timmy Willison

Revert "Offset: allow offset setter to throw for disconnected elements"

This reverts commit 0d11c1182f2012cd6eb06ce1e3fa5a495af9bee3.
parent d8037c6d
...@@ -39,7 +39,7 @@ jQuery.offset = { ...@@ -39,7 +39,7 @@ jQuery.offset = {
elem.style.position = "relative"; elem.style.position = "relative";
} }
curOffset = curElem.offset(); curOffset = curElem.offset() || { top: 0, left: 0 };
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" ) &&
......
...@@ -36,6 +36,10 @@ test("jQuery()", function() { ...@@ -36,6 +36,10 @@ test("jQuery()", function() {
expected++; expected++;
attrObj["width"] = 10; attrObj["width"] = 10;
} }
if ( jQuery.fn.offset ) {
expected++;
attrObj["offset"] = { "top": 1, "left": 1 };
}
if ( jQuery.fn.css ) { if ( jQuery.fn.css ) {
expected += 2; expected += 2;
attrObj["css"] = { "paddingLeft": 1, "paddingRight": 1 }; attrObj["css"] = { "paddingLeft": 1, "paddingRight": 1 };
...@@ -101,12 +105,16 @@ test("jQuery()", function() { ...@@ -101,12 +105,16 @@ test("jQuery()", function() {
elem = jQuery("\n\n<em>world</em>")[0]; elem = jQuery("\n\n<em>world</em>")[0];
equal( elem.nodeName.toLowerCase(), "em", "leading newlines" ); equal( elem.nodeName.toLowerCase(), "em", "leading newlines" );
elem = jQuery( "<div/>", attrObj ); elem = jQuery("<div/>", attrObj );
if ( jQuery.fn.width ) { if ( jQuery.fn.width ) {
equal( elem[0].style.width, "10px", "jQuery() quick setter width"); equal( elem[0].style.width, "10px", "jQuery() quick setter width");
} }
if ( jQuery.fn.offset ) {
equal( elem[0].style.top, "1px", "jQuery() quick setter offset");
}
if ( jQuery.fn.css ) { if ( jQuery.fn.css ) {
equal( elem[0].style.paddingLeft, "1px", "jQuery quick setter css"); equal( elem[0].style.paddingLeft, "1px", "jQuery quick setter css");
equal( elem[0].style.paddingRight, "1px", "jQuery quick setter css"); equal( elem[0].style.paddingRight, "1px", "jQuery quick setter css");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment