Skip to content
Permalink
Browse files

Update document.defaultView.getComputedStyle. Fixes #10373

  • Loading branch information...
rwaldron committed Jun 18, 2012
1 parent ab542c1 commit f7ee1f6e59f0b465f5f64bf6ac52108e445efaac
Showing with 13 additions and 6 deletions.
  1. +8 −6 src/css.js
  2. +5 −0 src/support.js
@@ -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

This comment has been minimized.

Copy link
@staabm

staabm Jun 18, 2012

Contributor

Typo here.. Should read just getComputedStyle instead of window.getComputedStyle at 2nd occurance

This comment has been minimized.

Copy link
@rwaldron

rwaldron Jun 18, 2012

Author Member

you're right.

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;
}
}
@@ -210,6 +210,11 @@ jQuery.support = (function() {
div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
support.boxSizing = ( div.offsetWidth === 4 );
support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );

// NOTE: To any future maintainer, window.getComputedStyle was used here
// instead of getComputedStyle because it gave a better gzip size.
// The difference between window.getComputedStyle and getComputedStyle is
// 7 bytes
if ( window.getComputedStyle ) {
support.pixelMargin = ( window.getComputedStyle( div, null ) || {} ).marginTop !== "1%";
support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";

0 comments on commit f7ee1f6

Please sign in to comment.
You can’t perform that action at this time.