aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Merino <jasonmerino@gmail.com>2013-06-28 16:08:16 -0700
committerMichał Gołębiowski <m.goleb@gmail.com>2013-07-01 19:58:39 +0200
commitec6eb38c64aadd6860c402cc0894c77b82b1a65d (patch)
treecce1ab375af4cb3f18ef58fc110a0a711d230ed3
parentd139732a166f2c9b4ca3cafd9ee2974fe0c4f283 (diff)
downloadjquery-ec6eb38c64aadd6860c402cc0894c77b82b1a65d.tar.gz
jquery-ec6eb38c64aadd6860c402cc0894c77b82b1a65d.zip
Fixes #14049: don't append px to CSS order value. Close gh-1300.
-rw-r--r--src/css.js1
-rw-r--r--test/unit/css.js5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/css.js b/src/css.js
index 106d13ecb..34b4d1203 100644
--- a/src/css.js
+++ b/src/css.js
@@ -173,6 +173,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 b48b52982..297fbeca0 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -111,7 +111,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 });
@@ -196,6 +196,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() {