library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

jquery core: SHOULD fix #2802. Caching document.defaultView, instead of defaultView.getComputedStyle as it fails on Safari 2.

Browse Source
This commit is contained in:
Ariel Flesler 2008-05-15 14:45:29 +00:00
parent 54867a9803
commit 9a7652260b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core.js
View File

@ -596,11 +596,10 @@ jQuery.extend = jQuery.fn.extend = function() {
}; };
var expando = "jQuery" + now(), uuid = 0, windowData = {}, 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, exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
// cache getComputedStyle // cache defaultView
getComputedStyle = document.defaultView && document.defaultView.getComputedStyle; defaultView = document.defaultView || {};
jQuery.extend({ jQuery.extend({
noConflict: function( deep ) { noConflict: function( deep ) {
@ -830,8 +829,8 @@ jQuery.extend({
if ( !jQuery.browser.safari ) if ( !jQuery.browser.safari )
return false; return false;
// getComputedStyle is cached // defaultView is cached
var ret = getComputedStyle( elem, null ); var ret = defaultView.getComputedStyle( elem, null );
return !ret || ret.getPropertyValue("color") == ""; return !ret || ret.getPropertyValue("color") == "";
} }
@ -857,7 +856,7 @@ jQuery.extend({
if ( !force && style && style[ name ] ) if ( !force && style && style[ name ] )
ret = style[ name ]; ret = style[ name ];
else if ( getComputedStyle ) { else if ( defaultView.getComputedStyle ) {
// Only "float" is needed here // Only "float" is needed here
if ( name.match( /float/i ) ) if ( name.match( /float/i ) )
@ -865,7 +864,7 @@ jQuery.extend({
name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
var computedStyle = getComputedStyle( elem, null ); var computedStyle = defaultView.getComputedStyle( elem, null );
if ( computedStyle && !color( elem ) ) if ( computedStyle && !color( elem ) )
ret = computedStyle.getPropertyValue( name ); ret = computedStyle.getPropertyValue( name );