]> source.dussan.org Git - jquery.git/commitdiff
Fixes #14049: don't append px to CSS order value. Close gh-1300. (cherry picked from...
authorJason Merino <jasonmerino@gmail.com>
Fri, 28 Jun 2013 23:08:16 +0000 (16:08 -0700)
committerMichał Gołębiowski <m.goleb@gmail.com>
Mon, 1 Jul 2013 18:03:16 +0000 (20:03 +0200)
src/css.js
test/unit/css.js

index 12fc8e6e6be1a4b908a946d88f8acffc74f5ef70..2e8c22e7785bdd4c22ec6b644ba1267707cb0df1 100644 (file)
@@ -170,6 +170,7 @@ jQuery.extend({
                "fontWeight": true,
                "lineHeight": true,
                "opacity": true,
+               "order": true,
                "orphans": true,
                "widows": true,
                "zIndex": true,
index f59c5e724634309054bd16cf6dc0ac60c38e9d34..30082155c9ed0f5a3e6527feb7e9600adaf07abb 100644 (file)
@@ -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() {