Changeset 5274

Timestamp:

04/21/08 22:54:25 (8 months ago)

Author:

brandon.aaron

Message:

Small optimization to jQuery.curCSS (thanks Ariel Flesler)

Files:

• trunk/jquery/src/core.js (modified) (5 diffs)

trunk/jquery/src/core.js

@@ -612 +612 @@
 // exclude the following css properties to add px
 var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
+// cache getComputedStyle
+var getComputedStyle = document.defaultView && document.defaultView.getComputedStyle;
 
 jQuery.extend({
@@ -838 +840 @@
             if ( !jQuery.browser.safari )
                 return false;
-
-            var ret = document.defaultView.getComputedStyle( elem, null );
+            
+            // getComputedStyle is cached
+            var ret = getComputedStyle( elem, null );
             return !ret || ret.getPropertyValue("color") == "";
         }
@@ -865 +868 @@
             ret = elem.style[ name ];
 
-        else if ( document.defaultView && document.defaultView.getComputedStyle ) {
+        else if ( getComputedStyle ) {
 
             // Only "float" is needed here
@@ -873 +876 @@
             name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
 
-            var getComputedStyle = document.defaultView.getComputedStyle( elem, null );
-
-            if ( getComputedStyle && !color( elem ) )
-                ret = getComputedStyle.getPropertyValue( name );
+            var computedStyle = getComputedStyle( elem, null );
+
+            if ( computedStyle && !color( elem ) )
+                ret = computedStyle.getPropertyValue( name );
 
             // If the element isn't reporting its values properly in Safari
@@ -899 +902 @@
                 ret = name == "display" && swap[ stack.length - 1 ] != null ?
                     "none" :
-                    ( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || "";
+                    ( computedStyle && computedStyle.getPropertyValue( name ) ) || "";
 
                 // Finally, revert the display styles back