github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-04-20 03:01:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update document.defaultView.getComputedStyle. Fixes #10373

Browse Source
This commit is contained in:
Rick Waldron
2012-06-18 13:26:46 -04:00
parent ab542c11ca
commit f7ee1f6e59
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/css.js
View File

@@ -274,15 +274,17 @@ jQuery.extend({
}
});
if ( document.defaultView && document.defaultView.getComputedStyle ) {
// NOTE: To any future maintainer, we've used both window.getComputedStyle
// and window.getComputedStyle here to produce a better gzip size
if ( window.getComputedStyle ) {
curCSS = function( elem, name ) {
var ret, defaultView, computedStyle, width,
var ret, width,
computed = getComputedStyle( elem, null ),
style = elem.style;
if ( (defaultView = elem.ownerDocument.defaultView) &&
(computedStyle = defaultView.getComputedStyle( elem, null )) ) {
if ( computed ) {
ret = computedStyle[ name ];
ret = computed[ name ];
if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
ret = jQuery.style( elem, name );
}
@@ -293,7 +295,7 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) {
if ( !jQuery.support.pixelMargin && rmargin.test( name ) && rnumnonpx.test( ret ) ) {
width = style.width;
style.width = ret;
ret = computedStyle.width;
ret = computed.width;
style.width = width;
}
}