]> source.dussan.org Git - jquery.git/commitdiff
Update document.defaultView.getComputedStyle. Fixes #10373
authorRick Waldron <waldron.rick@gmail.com>
Mon, 18 Jun 2012 17:26:46 +0000 (13:26 -0400)
committerRick Waldron <waldron.rick@gmail.com>
Mon, 18 Jun 2012 17:27:04 +0000 (13:27 -0400)
src/css.js
src/support.js

index d23284a1c676ffaba0ac0c663325e5cc3f96c2d1..ac70a98d09b0cd4b85f19a3d5a404fcb1fa8652a 100644 (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;
                        }
                }
index 06170a39bcbc153594945fe6f291c02357c58186..334175ff6abb7ac55543ae087f7b93bcf988eb95 100644 (file)
@@ -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%";