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

Make sure the currentStyle property exists before attempting to access it.

Browse source
This commit is contained in:
jeresig 2010-09-27 10:38:13 -04:00
parent 88fc523c59
commit 6dd2dc4270
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/css.js
View file

@ -174,7 +174,7 @@ if ( !jQuery.support.opacity ) {
jQuery.cssHooks.opacity = { jQuery.cssHooks.opacity = {
get: function( elem, computed ) { get: function( elem, computed ) {
// IE uses filters for opacity // IE uses filters for opacity
return ropacity.test((computed ? elem.currentStyle.filter : elem.style.filter) || "") ? return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ?
(parseFloat(RegExp.$1) / 100) + "" : (parseFloat(RegExp.$1) / 100) + "" :
"1"; "1";
}, },
@ -191,7 +191,7 @@ if ( !jQuery.support.opacity ) {
"" : "" :
"alpha(opacity=" + value * 100 + ")"; "alpha(opacity=" + value * 100 + ")";
var filter = style.filter || elem.currentStyle.filter || ""; var filter = style.filter || elem.currentStyle && elem.currentStyle.filter || "";
style.filter = ralpha.test(filter) ? style.filter = ralpha.test(filter) ?
filter.replace(ralpha, opacity) : filter.replace(ralpha, opacity) :
@ -219,7 +219,7 @@ if ( getComputedStyle ) {
} else if ( document.documentElement.currentStyle ) { } else if ( document.documentElement.currentStyle ) {
curCSS = function( elem, name ) { curCSS = function( elem, name ) {
var left, rsLeft, ret = elem.currentStyle[ name ], style = elem.style; var left, rsLeft, ret = elem.currentStyle && elem.currentStyle[ name ], style = elem.style;
// From the awesome hack by Dean Edwards // From the awesome hack by Dean Edwards
// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291