aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorlouisremi <louisremi@louisremi-laptop.(none)>2011-02-17 17:26:23 +0100
committerAnton M <obhvsbypqghgc@gmail.com>2011-02-17 17:26:23 +0100
commit85d9343271da85fc945bf37a604873eaf247a3a7 (patch)
tree302ce8461a3ed1096a4a396189ec3a87dcaedeb0 /test
parentb9f5e2b97458f89cbcac3a333ba95b0eac568d49 (diff)
downloadjquery-85d9343271da85fc945bf37a604873eaf247a3a7.tar.gz
jquery-85d9343271da85fc945bf37a604873eaf247a3a7.zip
Fixes #7912. Make sure .cur() only returns 0 as fallback value when it needs to ("", auto, undefined, null).
This change makes .cur() more .cssHooks friendly. .cur() now returns the unmodified value by .css() if it isn't a number, number-alike or a value that needs a fallback to 0. This way fx.start doesn't need to be recalculated for complex values.
Diffstat (limited to 'test')
-rw-r--r--test/unit/effects.js53
1 files changed, 38 insertions, 15 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js
index a07c076d7..4bb92fc00 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -558,21 +558,44 @@ jQuery.checkOverflowDisplay = function(){
start();
}
-test("support negative values < -10000 (bug #7193)", function () {
- expect(1);
- stop();
-
- jQuery.extend(jQuery.fx.step, {
- "marginBottom": function(fx) {
- equals( fx.cur(), -11000, "Element has margin-bottom of -11000" );
- delete jQuery.fx.step.marginBottom;
- }
- });
-
- jQuery("#main").css("marginBottom", "-11000px").animate({ marginBottom: "-11001px" }, {
- duration: 1,
- complete: start
- });
+test("jQuery.fx.prototype.cur()", function() {
+ expect(5);
+ var nothiddendiv = jQuery('#nothiddendiv').css({
+ color: '#ABC',
+ border: '5px solid black',
+ left: 'auto',
+ marginBottom: '11000px'
+ })[0];
+
+ equals(
+ (new jQuery.fx( nothiddendiv, {}, 'color' )).cur(),
+ jQuery.css( nothiddendiv,'color' ),
+ "Return the same value as jQuery.css for complex properties (bug #7912)"
+ );
+
+ strictEqual(
+ (new jQuery.fx( nothiddendiv, {}, 'borderLeftWidth' )).cur(),
+ 5,
+ "Return simple values parsed as Float"
+ );
+
+ strictEqual(
+ (new jQuery.fx( nothiddendiv, {}, 'backgroundPosition' )).cur(),
+ 0,
+ 'Return 0 when jQuery.css returns an empty string'
+ );
+
+ strictEqual(
+ (new jQuery.fx( nothiddendiv, {}, 'left' )).cur(),
+ 0,
+ 'Return 0 when jQuery.css returns "auto"'
+ );
+
+ equals(
+ (new jQuery.fx( nothiddendiv, {}, 'marginBottom' )).cur(),
+ 11000,
+ "support negative values < -10000 (bug #7193)"
+ );
});
test("JS Overflow and Display", function() {