diff options
| author | Jason Merino <jasonmerino@gmail.com> | 2013-06-28 16:08:16 -0700 |
|---|---|---|
| committer | Michał Gołębiowski <m.goleb@gmail.com> | 2013-07-01 20:03:16 +0200 |
| commit | 1c6641f0c8276e1f2f47409501be89b9952c880b (patch) | |
| tree | f4149b46685616eaabdccbcd2d00caa7e4556c4f | |
| parent | 2933c30b676ced6fa77760bceb01a41be6e8cea7 (diff) | |
| download | jquery-1c6641f0c8276e1f2f47409501be89b9952c880b.tar.gz jquery-1c6641f0c8276e1f2f47409501be89b9952c880b.zip | |
Fixes #14049: don't append px to CSS order value. Close gh-1300. (cherry picked from ec6eb38c64aadd6860c402cc0894c77b82b1a65d)
| -rw-r--r-- | src/css.js | 1 | ||||
| -rw-r--r-- | test/unit/css.js | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/css.js b/src/css.js index 12fc8e6e6..2e8c22e77 100644 --- a/src/css.js +++ b/src/css.js @@ -170,6 +170,7 @@ jQuery.extend({ "fontWeight": true, "lineHeight": true, "opacity": true, + "order": true, "orphans": true, "widows": true, "zIndex": true, diff --git a/test/unit/css.js b/test/unit/css.js index f59c5e724..30082155c 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -114,7 +114,7 @@ test("css(String|Hash)", function() { }); test("css() explicit and relative values", function() { - expect(29); + expect( 30 ); var $elem = jQuery("#nothiddendiv"); $elem.css({ "width": 1, "height": 1, "paddingLeft": "1px", "opacity": 1 }); @@ -199,6 +199,9 @@ test("css() explicit and relative values", function() { $elem.css( "opacity", "+=0.5" ); equal( $elem.css("opacity"), "1", "'+=0.5' on opacity (params)" ); + + $elem.css( "order", 2 ); + equal( $elem.css("order"), "2", "2 on order" ); }); test("css(String, Object)", function() { |