Skip to content
Permalink
Browse files

Fix #14432: Always return string from .css("z-index"). Close gh-1395.

  • Loading branch information...
George Kats authored and gibson042 committed Oct 6, 2013
1 parent b24a3d5 commit 5ce4b06c285bd8cf52eaff0f39e0b9192a927873
Showing with 21 additions and 1 deletion.
  1. +3 −1 src/css/curCSS.js
  2. +18 −0 test/unit/css.js
@@ -44,7 +44,9 @@ function curCSS( elem, name, computed ) {
}
}

return ret;
// Support: IE
// IE returns zIndex value as an integer.
return ret === undefined ? ret : ret + "";
}

return curCSS;
@@ -197,6 +197,16 @@ test( "css() explicit and relative values", 29, function() {
equal( $elem.css("opacity"), "1", "'+=0.5' on opacity (params)" );
});

test("css(String) where values are z-index", function() {
expect(1);

var $elem = jQuery( "<div>" ).appendTo( "#qunit-fixture" );

$elem.css({ "position": "absolute", "z-index": "1000" });
strictEqual( $elem.css( "z-index" ), "1000" );
});


test("css(String, Object)", function() {
expect( 19 );
var j, div, display, ret, success;
@@ -353,6 +363,14 @@ test("css(Object) where values are Functions", function() {
jQuery("#cssFunctionTest").remove();
});

test("css(String) where values are undefined", function() {
expect(1);

var $elem = jQuery( "#nothiddendiv" );

strictEqual( $elem.css( "test" ), undefined );
});

test("css(Object) where values are Functions with incoming values", function() {
expect(3);

0 comments on commit 5ce4b06

Please sign in to comment.
You can’t perform that action at this time.