git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:jquery/jquery
[jquery.git]
/
src
/
css.js
diff --git
a/src/css.js
b/src/css.js
index
6abcc95
..
38007b7
100644
(file)
--- a/
src/css.js
+++ b/
src/css.js
@@
-53,7
+53,7
@@
jQuery.extend({
// Set the alpha filter to set the opacity
style.filter = (style.filter || "").replace( ralpha, "" ) +
// Set the alpha filter to set the opacity
style.filter = (style.filter || "").replace( ralpha, "" ) +
- (parseInt( value ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+ (parseInt( value, 10 ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
}
return style.filter && style.filter.indexOf("opacity=") >= 0 ?
}
return style.filter && style.filter.indexOf("opacity=") >= 0 ?
@@
-167,7
+167,7
@@
jQuery.extend({
// Put in the new values to get a computed value out
elem.runtimeStyle.left = elem.currentStyle.left;
// Put in the new values to get a computed value out
elem.runtimeStyle.left = elem.currentStyle.left;
- style.left = ret || 0;
+ style.left = camelCase === "fontSize" ? "1em" : (ret || 0);
ret = style.pixelLeft + "px";
// Revert the changed values
ret = style.pixelLeft + "px";
// Revert the changed values
@@
-212,4
+212,4
@@
if ( jQuery.expr && jQuery.expr.filters ) {
jQuery.expr.filters.visible = function(elem){
return !jQuery.expr.filters.hidden(elem);
};
jQuery.expr.filters.visible = function(elem){
return !jQuery.expr.filters.hidden(elem);
};
-}
\ No newline at end of file
+}