mirror of
https://github.com/jquery/jquery.git
synced 2026-02-03 16:24:56 -05:00
Fix #7986. $.support.boxModel shan't be fooled by page-level CSS.
This commit is contained in:
committed by
Dave Methvin
parent
1c35f3816a
commit
a52391aa1d
4
src/effects.js
vendored
4
src/effects.js
vendored
@@ -157,7 +157,7 @@ jQuery.fn.extend({
|
||||
prop[ name ] = prop[ p ];
|
||||
delete prop[ p ];
|
||||
}
|
||||
|
||||
|
||||
if ( ( hooks = jQuery.cssHooks[ name ] ) && "expand" in hooks ) {
|
||||
replace = hooks.expand( prop[ name ] );
|
||||
delete prop[ name ];
|
||||
@@ -676,7 +676,7 @@ function defaultDisplay( nodeName ) {
|
||||
// document to it; WebKit & Firefox won't allow reusing the iframe document.
|
||||
if ( !iframeDoc || !iframe.createElement ) {
|
||||
iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
|
||||
iframeDoc.write( ( document.compatMode === "CSS1Compat" ? "<!doctype html>" : "" ) + "<html><body>" );
|
||||
iframeDoc.write( ( jQuery.support.boxModel ? "<!doctype html>" : "" ) + "<html><body>" );
|
||||
iframeDoc.close();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user