From 32d61d75e575465bca2b4aa721ed39dd147e21c7 Mon Sep 17 00:00:00 2001
From: George Kats <katsgeorgeek@gmail.com>
Date: Sun, 6 Oct 2013 19:53:26 +0300
Subject: Fix #14432: Always return string from .css("z-index"). Close gh-1395.
 (cherry picked from commit 5ce4b06c285bd8cf52eaff0f39e0b9192a927873)

Conflicts:

	src/css/curCSS.js
---
 src/css/curCSS.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/css')

diff --git a/src/css/curCSS.js b/src/css/curCSS.js
index e09574530..1af1812cd 100644
--- a/src/css/curCSS.js
+++ b/src/css/curCSS.js
@@ -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 + "";
 	};
 }
 
-- 
cgit v1.2.3