git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1970154
)
Some more minor formatting tweaks.
author
John Resig
<jeresig@gmail.com>
Sun, 5 Sep 2010 03:34:52 +0000
(23:34 -0400)
committer
John Resig
<jeresig@gmail.com>
Sun, 5 Sep 2010 03:34:52 +0000
(23:34 -0400)
src/css.js
patch
|
blob
|
history
diff --git
a/src/css.js
b/src/css.js
index
6f26fd0
..
dab3783
100644
(file)
--- a/
src/css.js
+++ b/
src/css.js
@@
-39,14
+39,15
@@
jQuery.extend({
opacity: {
get: function( elem, force ) {
var style = elem.style;
opacity: {
get: function( elem, force ) {
var style = elem.style;
+
if ( jQuery.support.opacity && !style.filter ) {
return false; // move along, nothing to see here
}
// IE uses filters for opacity
var ret = ropacity.test(elem.currentStyle.filter || "") ?
if ( jQuery.support.opacity && !style.filter ) {
return false; // move along, nothing to see here
}
// IE uses filters for opacity
var ret = ropacity.test(elem.currentStyle.filter || "") ?
- (parseFloat(RegExp.$1) / 100) + "" :
- "";
+ (parseFloat(RegExp.$1) / 100) + "" :
+ "";
return ret === "" ?
"1" :
return ret === "" ?
"1" :
@@
-55,6
+56,7
@@
jQuery.extend({
set: function( elem, value ) {
var style = elem.style;
set: function( elem, value ) {
var style = elem.style;
+
if ( jQuery.support.opacity && !style.filter ) {
return false; // move along, nothing to see here
}
if ( jQuery.support.opacity && !style.filter ) {
return false; // move along, nothing to see here
}
@@
-64,9
+66,15
@@
jQuery.extend({
style.zoom = 1;
// Set the alpha filter to set the opacity
style.zoom = 1;
// Set the alpha filter to set the opacity
- var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
+ var opacity = parseInt( value, 10 ) + "" === "NaN" ?
+ "" :
+ "alpha(opacity=" + value * 100 + ")";
+
var filter = style.filter || jQuery.curCSS( elem, "filter" ) || "";
var filter = style.filter || jQuery.curCSS( elem, "filter" ) || "";
- style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
+
+ style.filter = ralpha.test(filter) ?
+ filter.replace(ralpha, opacity) :
+ opacity;
}
}
},
}
}
},