Skip to content
Permalink
Browse files

jquery core: SHOULD fix #2802. Caching document.defaultView, instead …

…of defaultView.getComputedStyle as it fails on Safari 2.
  • Loading branch information
flesler committed May 15, 2008
1 parent 54867a9 commit 9a7652260b7addcf8874bd46926ff92182b500ea
Showing with 7 additions and 8 deletions.
  1. +7 −8 src/core.js
@@ -596,11 +596,10 @@ jQuery.extend = jQuery.fn.extend = function() {
};

var expando = "jQuery" + now(), uuid = 0, windowData = {},

// exclude the following css properties to add px
// exclude the following css properties to add px
exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
// cache getComputedStyle
getComputedStyle = document.defaultView && document.defaultView.getComputedStyle;
// cache defaultView
defaultView = document.defaultView || {};

jQuery.extend({
noConflict: function( deep ) {
@@ -830,8 +829,8 @@ jQuery.extend({
if ( !jQuery.browser.safari )
return false;

// getComputedStyle is cached
var ret = getComputedStyle( elem, null );
// defaultView is cached
var ret = defaultView.getComputedStyle( elem, null );
return !ret || ret.getPropertyValue("color") == "";
}

@@ -857,15 +856,15 @@ jQuery.extend({
if ( !force && style && style[ name ] )
ret = style[ name ];

else if ( getComputedStyle ) {
else if ( defaultView.getComputedStyle ) {

// Only "float" is needed here
if ( name.match( /float/i ) )
name = "float";

name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();

var computedStyle = getComputedStyle( elem, null );
var computedStyle = defaultView.getComputedStyle( elem, null );

if ( computedStyle && !color( elem ) )
ret = computedStyle.getPropertyValue( name );

0 comments on commit 9a76522

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