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:
e377621
)
Make sure that accessing computed CSS for elements returns 'auto' instead of '' consi...
author
jeresig
<jeresig@gmail.com>
Mon, 1 Nov 2010 23:04:59 +0000
(19:04 -0400)
committer
jeresig
<jeresig@gmail.com>
Mon, 1 Nov 2010 23:04:59 +0000
(19:04 -0400)
src/css.js
patch
|
blob
|
history
test/unit/css.js
patch
|
blob
|
history
diff --git
a/src/css.js
b/src/css.js
index
30cecf3
..
0998657
100644
(file)
--- a/
src/css.js
+++ b/
src/css.js
@@
-173,12
+173,13
@@
jQuery.each(["height", "width"], function( i, name ) {
val = curCSS( elem, name, name );
if ( val != null ) {
val = curCSS( elem, name, name );
if ( val != null ) {
- return val === "auto" ? "" : val;
+ return val;
}
}
if ( val < 0 || val == null ) {
}
}
if ( val < 0 || val == null ) {
- return elem.style[ name ];
+ val = elem.style[ name ];
+ return val === "" ? "auto" : val;
}
return typeof val === "string" ? val : val + "px";
}
return typeof val === "string" ? val : val + "px";
@@
-247,7
+248,7
@@
if ( getComputedStyle ) {
}
}
}
}
- return ret;
+ return ret === "" ? "auto" : ret;
};
} else if ( document.documentElement.currentStyle ) {
};
} else if ( document.documentElement.currentStyle ) {
@@
-274,7
+275,7
@@
if ( getComputedStyle ) {
elem.runtimeStyle.left = rsLeft;
}
elem.runtimeStyle.left = rsLeft;
}
- return ret;
+ return ret === "" ? "auto" : ret;
};
}
};
}
diff --git
a/test/unit/css.js
b/test/unit/css.js
index
4ec7c60
..
71f8835
100644
(file)
--- a/
test/unit/css.js
+++ b/
test/unit/css.js
@@
-13,8
+13,8
@@
test("css(String|Hash)", function() {
var div = jQuery( "<div>" );
var div = jQuery( "<div>" );
- equals( div.css("width"), "", "Width on disconnected node." );
- equals( div.css("height"), "", "Height on disconnected node." );
+ equals( div.css("width"), "auto", "Width on disconnected node." );
+ equals( div.css("height"), "auto", "Height on disconnected node." );
div.css({ width: 4, height: 4 });
div.css({ width: 4, height: 4 });