aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAriel Flesler <aflesler@gmail.com>2008-05-15 14:45:29 +0000
committerAriel Flesler <aflesler@gmail.com>2008-05-15 14:45:29 +0000
commit9a7652260b7addcf8874bd46926ff92182b500ea (patch)
tree735e6b5c4d30908f307ba7989097c8d1c85a8d90 /src
parent54867a98033d7c1d2811308861ea5a92ef80ad4b (diff)
downloadjquery-9a7652260b7addcf8874bd46926ff92182b500ea.tar.gz
jquery-9a7652260b7addcf8874bd46926ff92182b500ea.zip
jquery core: SHOULD fix #2802. Caching document.defaultView, instead of defaultView.getComputedStyle as it fails on Safari 2.
Diffstat (limited to 'src')
-rw-r--r--src/core.js15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core.js b/src/core.js
index fedd29275..511180a08 100644
--- a/src/core.js
+++ b/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,7 +856,7 @@ 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 ) )
@@ -865,7 +864,7 @@ jQuery.extend({
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 );