git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that calling .width(num) or .height(num) on an empty set returns the empty...
[jquery.git]
/
src
/
css.js
diff --git
a/src/css.js
b/src/css.js
index
6abcc95
..
5b6b7b9
100644
(file)
--- a/
src/css.js
+++ b/
src/css.js
@@
-5,8
+5,8
@@
var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
rfloat = /float/i,
rdashAlpha = /-([a-z])/ig,
rupper = /([A-Z])/g,
rfloat = /float/i,
rdashAlpha = /-([a-z])/ig,
rupper = /([A-Z])/g,
- rnumpx = /^\d+(?:px)?$/i,
- rnum = /^\d/,
+ rnumpx = /^-?\d+(?:px)?$/i,
+ rnum = /^-?\d/,
// cache check for defaultView.getComputedStyle
getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
// cache check for defaultView.getComputedStyle
getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
@@
-18,8
+18,8
@@
var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
jQuery.fn.css = function( name, value ) {
return access( this, name, value, true, function( elem, name, value ) {
jQuery.fn.css = function( name, value ) {
return access( this, name, value, true, function( elem, name, value ) {
- if (value === undefined) {
- return jQuery.css( elem, name );
+ if ( value === undefined ) {
+ return jQuery.curCSS( elem, name );
}
if ( typeof value === "number" && !rexclude.test(name) ) {
}
if ( typeof value === "number" && !rexclude.test(name) ) {
@@
-52,8
+52,9
@@
jQuery.extend({
style.zoom = 1;
// Set the alpha filter to set the opacity
style.zoom = 1;
// Set the alpha filter to set the opacity
- style.filter = (style.filter || "").replace( ralpha, "" ) +
- (parseInt( value ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+ var opacity = parseInt( value, 10 ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
+ var filter = style.filter || jQuery.curCSS( elem, 'filter' ) || "";
+ style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
}
return style.filter && style.filter.indexOf("opacity=") >= 0 ?
}
return style.filter && style.filter.indexOf("opacity=") >= 0 ?
@@
-140,7
+141,13
@@
jQuery.extend({
name = name.replace( rupper, "-$1" ).toLowerCase();
name = name.replace( rupper, "-$1" ).toLowerCase();
- var computedStyle = elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+ var defaultView = elem.ownerDocument.defaultView;
+
+ if ( !defaultView ) {
+ return null;
+ }
+
+ var computedStyle = defaultView.getComputedStyle( elem, null );
if ( computedStyle ) {
ret = computedStyle.getPropertyValue( name );
if ( computedStyle ) {
ret = computedStyle.getPropertyValue( name );
@@
-167,7
+174,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
@@
-199,17
+206,18
@@
jQuery.extend({
});
if ( jQuery.expr && jQuery.expr.filters ) {
});
if ( jQuery.expr && jQuery.expr.filters ) {
- jQuery.expr.filters.hidden = function(elem){
+ jQuery.expr.filters.hidden = function( elem ) {
var width = elem.offsetWidth, height = elem.offsetHeight,
var width = elem.offsetWidth, height = elem.offsetHeight,
- force = /^tr$/i.test( elem.nodeName ); // ticket #4512
- return ( width === 0 && height === 0 && !force ) ?
+ skip = elem.nodeName.toLowerCase() === "tr";
+
+ return width === 0 && height === 0 && !skip ?
true :
true :
- ( width !== 0 && height !== 0 && !force ) ?
- false :
- !!( jQuery.curCSS(elem, "display") === "none" );
+ width > 0 && height > 0 && !skip ?
+ false :
+ jQuery.curCSS(elem, "display") === "none";
};
};
- 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
+}