deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Small optimization to jQuery.curCSS (thanks Ariel Flesler)

Browse source
This commit is contained in:
Brandon Aaron 2008-04-21 22:54:25 +00:00
parent 5d033dba02
commit 3e285bd60d
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core.js
View file

@ -611,6 +611,8 @@ var expando = "jQuery" + (new Date()).getTime(), uuid = 0, windowData = {};
// exclude the following css properties to add px // exclude the following css properties to add px
var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i; var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
// cache getComputedStyle
var getComputedStyle = document.defaultView && document.defaultView.getComputedStyle;
jQuery.extend({ jQuery.extend({
noConflict: function( deep ) { noConflict: function( deep ) {
@ -838,7 +840,8 @@ jQuery.extend({
if ( !jQuery.browser.safari ) if ( !jQuery.browser.safari )
return false; return false;
var ret = document.defaultView.getComputedStyle( elem, null ); // getComputedStyle is cached
var ret = getComputedStyle( elem, null );
return !ret || ret.getPropertyValue("color") == ""; return !ret || ret.getPropertyValue("color") == "";
} }
@ -864,7 +867,7 @@ jQuery.extend({
if ( !force && elem.style && elem.style[ name ] ) if ( !force && elem.style && elem.style[ name ] )
ret = elem.style[ name ]; ret = elem.style[ name ];
else if ( document.defaultView && document.defaultView.getComputedStyle ) { else if ( getComputedStyle ) {
// Only "float" is needed here // Only "float" is needed here
if ( name.match( /float/i ) ) if ( name.match( /float/i ) )
@ -872,10 +875,10 @@ jQuery.extend({
name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
var getComputedStyle = document.defaultView.getComputedStyle( elem, null ); var computedStyle = getComputedStyle( elem, null );
if ( getComputedStyle && !color( elem ) ) if ( computedStyle && !color( elem ) )
ret = getComputedStyle.getPropertyValue( name ); ret = computedStyle.getPropertyValue( name );
// If the element isn't reporting its values properly in Safari // If the element isn't reporting its values properly in Safari
// then some display: none elements are involved // then some display: none elements are involved
@ -898,7 +901,7 @@ jQuery.extend({
// one special, otherwise get the value // one special, otherwise get the value
ret = name == "display" && swap[ stack.length - 1 ] != null ? ret = name == "display" && swap[ stack.length - 1 ] != null ?
"none" : "none" :
( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || ""; ( computedStyle && computedStyle.getPropertyValue( name ) ) || "";
// Finally, revert the display styles back // Finally, revert the display styles back
for ( var i = 0; i < swap.length; i++ ) for ( var i = 0; i < swap.length; i++ )