library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 5ce4b06c28)

Conflicts:

	src/css/curCSS.js
This commit is contained in:
George Kats 2013-10-06 19:53:26 +03:00 committed by Richard Gibson
parent 62900a9edb
commit 32d61d75e5
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/css/curCSS.js
View File

@ -51,7 +51,9 @@ if ( window.getComputedStyle ) {
}
}
return ret;
// Support: IE
// IE returns zIndex value as an integer.
return ret === undefined ? ret : ret + "";
};
} else if ( document.documentElement.currentStyle ) {
getStyles = function( elem ) {
@ -99,7 +101,11 @@ if ( window.getComputedStyle ) {
}
}
return ret === "" ? "auto" : ret;
return ret === "" ? "auto" :
// Support: IE
// IE returns zIndex value as an integer.
ret === undefined ? ret :
ret + "";
};
}

18
test/unit/css.js
View File

@ -200,6 +200,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;
@ -393,6 +403,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);