diff options
| author | Mike Sherov <mike.sherov@gmail.com> | 2012-02-24 00:14:15 -0500 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2012-02-24 00:14:15 -0500 |
| commit | a52391aa1dcf3f28306e274e1b2d7f0affc4e725 (patch) | |
| tree | 161193e695bc1f4b9f034aafeb968c7e7b4c9b16 /src/effects.js | |
| parent | 1c35f3816a3b1be0855dcea8ab212af506e91f83 (diff) | |
| download | jquery-a52391aa1dcf3f28306e274e1b2d7f0affc4e725.tar.gz jquery-a52391aa1dcf3f28306e274e1b2d7f0affc4e725.zip | |
Fix #7986. $.support.boxModel shan't be fooled by page-level CSS.
Diffstat (limited to 'src/effects.js')
| -rw-r--r-- | src/effects.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/effects.js b/src/effects.js index 7d0c2a8ab..1536d2d8e 100644 --- a/src/effects.js +++ b/src/effects.js @@ -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(); } |