aboutsummaryrefslogtreecommitdiffstats
path: root/src/css.js
diff options
context:
space:
mode:
authorBrandon Aaron <brandon.aaron@gmail.com>2009-05-14 18:46:58 +0000
committerBrandon Aaron <brandon.aaron@gmail.com>2009-05-14 18:46:58 +0000
commited087197cef89ce79cbd6b4ab49f184f3b259602 (patch)
tree232f1697b984e55bda563998141f3b5dd31cd2fa /src/css.js
parentec3ebd3e8a7dfda15d227ea3dd21361e534beac3 (diff)
downloadjquery-ed087197cef89ce79cbd6b4ab49f184f3b259602.tar.gz
jquery-ed087197cef89ce79cbd6b4ab49f184f3b259602.zip
tidy up fix for #3981, thanks matt kruse
Diffstat (limited to 'src/css.js')
-rw-r--r--src/css.js12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/css.js b/src/css.js
index 12f9d514e..973462b62 100644
--- a/src/css.js
+++ b/src/css.js
@@ -123,15 +123,9 @@ jQuery.extend({
var ret, style = elem.style, filter;
// IE uses filters for opacity
- if ( !jQuery.support.opacity && name == "opacity" ) {
- filter = (filter = style.filter) && filter.indexOf("opacity=") >= 0 ?
- filter :
- (filter = elem.currentStyle[ 'filter' ]) && filter.indexOf("opacity=") >= 0 ?
- filter :
- null;
-
- ret = filter && filter.indexOf("opacity=") >= 0 ?
- (parseFloat( filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
+ if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
+ ret = (elem.currentStyle.filter || "").match(/opacity=([^)]*)/) ?
+ (parseFloat(RegExp.$1) / 100) + "" :
"";
return ret === "" ?