From: jamiejag <git@jamiegegerson.com>
Date: Tue, 16 Nov 2010 01:45:19 +0000 (-0800)
Subject: Dialog: Ensure dialogs have a z-index when calculating the max z-index. Fixex #5955... 
X-Git-Tag: 1.8.7~29
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8bb412dd4a09d66d0f4a5456410a647e3db38bcc;p=jquery-ui.git

Dialog: Ensure dialogs have a z-index when calculating the max z-index. Fixex #5955 - Dialog: Closing UI dialog when z-index is not defined in any .ui-dialog class, causes NaN to be used as Z-index, throwing an error. Fixes #4652 - Dialog: Event loss in subsequent dialog calls (FF3).
---

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index ad9c183ce..c2d5d3e16 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -228,7 +228,7 @@ $.widget("ui.dialog", {
 
 	close: function(event) {
 		var self = this,
-			maxZ;
+			maxZ, thisZ;
 		
 		if (false === self._trigger('beforeClose', event)) {
 			return;
@@ -257,7 +257,10 @@ $.widget("ui.dialog", {
 			maxZ = 0;
 			$('.ui-dialog').each(function() {
 				if (this !== self.uiDialog[0]) {
-					maxZ = Math.max(maxZ, $(this).css('z-index'));
+					thisZ = $(this).css('z-index');
+					if(!isNaN(thisZ)) {
+						maxZ = Math.max(maxZ, thisZ);
+					}
 				}
 			});
 			$.ui.dialog.maxZ = maxZ;