').addClass(name).css({position:'absolute', top:'-5000px', left:'-5000px', display:'block'}).appendTo('body'); - - //if (!$.browser.safari) - //tmp.appendTo('body'); - - //Opera and Safari set width and height to 0px instead of auto - //Safari returns rgba(0,0,0,0) when bgcolor is not set - $.ui.cssCache[name] = !!( - (!(/auto|default/).test(tmp.css('cursor')) || (/^[1-9]/).test(tmp.css('height')) || (/^[1-9]/).test(tmp.css('width')) || - !(/none/).test(tmp.css('backgroundImage')) || !(/transparent|rgba$0, 0, 0, 0$/).test(tmp.css('backgroundColor'))) - ); - try { $('body').get(0).removeChild(tmp.get(0)); } catch(e){} - return $.ui.cssCache[name]; + return document.compareDocumentPosition + ? a.compareDocumentPosition(b) & 16 + : a !== b && a.contains(b); }, hasScroll: function(el, a) { @@ -125,7 +100,6 @@ TAB: 9, UP: 38 } - }; // WAI-ARIA normalization @@ -161,7 +135,6 @@ //jQuery plugins $.fn.extend({ - remove: function() { // Safari has a native remove event which actually removes DOM elements, // so we have to use triggerHandler instead of trigger (#3037). @@ -186,7 +159,6 @@ }, scrollParent: function() { - var scrollParent; if(($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) { scrollParent = this.parents().filter(function() { @@ -199,48 +171,33 @@ } return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent; - - } - }); //Additional selectors $.extend($.expr[':'], { - - data: function(a, i, m) { - return $.data(a, m[3]); + data: function(elem, i, match) { + return !!$.data(elem, match[3]); }, - // TODO: add support for object, area - tabbable: function(a, i, m) { - - var nodeName = a.nodeName.toLowerCase(); - function isVisible(element) { - return !($(element).is(':hidden') || $(element).parents(':hidden').length); - } - - return ( - // in tab order - a.tabIndex >= 0 && - - ( // filter node types that participate in the tab order + focusable: function(element) { + var nodeName = element.nodeName.toLowerCase(), + tabIndex = $.attr(element, 'tabindex'); + return (/input|select|textarea|button|object/.test(nodeName) + ? !element.disabled + : 'a' == nodeName || 'area' == nodeName + ? element.href || !isNaN(tabIndex) + : !isNaN(tabIndex)) + // the element and all of its ancestors must be visible + // the browser may report that the area is hidden + && !$(element)['area' == nodeName ? 'parents' : 'closest'](':hidden').length; + }, - // anchor tag - ('a' == nodeName && a.href) || - - // enabled form element - (/input|select|textarea|button/.test(nodeName) && - 'hidden' != a.type && !a.disabled) - ) && - - // visible on page - isVisible(a) - ); - + tabbable: function(element) { + var tabIndex = $.attr(element, 'tabindex'); + return (isNaN(tabIndex) || tabIndex >= 0) && $(element).is(':focusable'); } - }); @@ -286,7 +243,7 @@ // constructor (!instance && !isMethodCall && - $.data(this, name, new $[namespace][name](this, options))); + $.data(this, name, new $[namespace][name](this, options))._init()); // method call (instance && isMethodCall && $.isFunction(instance[options]) && @@ -299,6 +256,7 @@ $[namespace][name] = function(element, options) { var self = this; + this.namespace = namespace; this.widgetName = name; this.widgetEventPrefix = $[namespace][name].eventPrefix || name; this.widgetBaseClass = namespace + '-' + name; @@ -311,16 +269,18 @@ this.element = $(element) .bind('setData.' + name, function(event, key, value) { - return self._setData(key, value); + if (event.target == element) { + return self._setData(key, value); + } }) .bind('getData.' + name, function(event, key) { - return self._getData(key); + if (event.target == element) { + return self._getData(key); + } }) .bind('remove', function() { return self.destroy(); }); - - this._init(); }; // add widget prototype @@ -334,7 +294,9 @@ $.widget.prototype = { _init: function() {}, destroy: function() { - this.element.removeData(this.widgetName); + this.element.removeData(this.widgetName) + .removeClass(this.widgetBaseClass + '-disabled' + ' ' + this.namespace + '-state-disabled') + .removeAttr('aria-disabled'); }, option: function(key, value) { @@ -360,8 +322,11 @@ this.options[key] = value; if (key == 'disabled') { - this.element[value ? 'addClass' : 'removeClass']( - this.widgetBaseClass + '-disabled'); + this.element + [value ? 'addClass' : 'removeClass']( + this.widgetBaseClass + '-disabled' + ' ' + + this.namespace + '-state-disabled') + .attr("aria-disabled", value); } }, @@ -373,10 +338,27 @@ }, _trigger: function(type, event, data) { - var eventName = (type == this.widgetEventPrefix - ? type : this.widgetEventPrefix + type); - event = event || $.event.fix({ type: eventName, target: this.element[0] }); - return this.element.triggerHandler(eventName, [event, data], this.options[type]); + var callback = this.options[type], + eventName = (type == this.widgetEventPrefix + ? type : this.widgetEventPrefix + type); + + event = $.Event(event); + event.type = eventName; + + // copy original event properties over to the new event + // this would happen if we could call $.event.fix instead of $.Event + // but we don't have a way to force an event to be fixed multiple times + if (event.originalEvent) { + for (var i = $.event.props.length, prop; i;) { + prop = $.event.props[--i]; + event[prop] = event.originalEvent[prop]; + } + } + + this.element.trigger(event, data); + + return !($.isFunction(callback) && callback.call(this.element[0], event, data) === false + || event.isDefaultPrevented()); } }; @@ -398,6 +380,7 @@ .bind('click.'+this.widgetName, function(event) { if(self._preventClickEvent) { self._preventClickEvent = false; + event.stopImmediatePropagation(); return false; } }); @@ -422,6 +405,11 @@ }, _mouseDown: function(event) { + // don't let more than one widget handle mouseStart + // TODO: figure out why we have to use originalEvent + event.originalEvent = event.originalEvent || {}; + if (event.originalEvent.mouseHandled) { return; } + // we may have missed mouseup (out of window) (this._mouseStarted && this._mouseUp(event)); @@ -463,7 +451,9 @@ // preventDefault() is used to prevent the selection of text here - // however, in Safari, this causes select boxes not to be selectable // anymore, so this fix is needed - if(!$.browser.safari) event.preventDefault(); + ($.browser.safari || event.preventDefault()); + + event.originalEvent.mouseHandled = true; return true; }, @@ -494,7 +484,7 @@ if (this._mouseStarted) { this._mouseStarted = false; - this._preventClickEvent = true; + this._preventClickEvent = (event.target == this._mouseDownEvent.target); this._mouseStop(event); } diff -r 7fbc98f3adde -r 4e2789b8e86d app/jquery/jquery-ui.dialog.js --- a/app/jquery/jquery-ui.dialog.js Mon Aug 10 16:58:51 2009 -0700 +++ b/app/jquery/jquery-ui.dialog.js Tue Aug 11 18:06:57 2009 +0100 @@ -1,7 +1,7 @@ /* - * jQuery UI Dialog 1.6 + * jQuery UI Dialog 1.7.2 * - * Copyright (c) 2008 AUTHORS.txt (http://ui.jquery.com/about) + * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT (MIT-LICENSE.txt) * and GPL (GPL-LICENSE.txt) licenses. * @@ -15,115 +15,117 @@ (function($) { var setDataSwitch = { - dragStart: "start.draggable", - drag: "drag.draggable", - dragStop: "stop.draggable", - maxHeight: "maxHeight.resizable", - minHeight: "minHeight.resizable", - maxWidth: "maxWidth.resizable", - minWidth: "minWidth.resizable", - resizeStart: "start.resizable", - resize: "drag.resizable", - resizeStop: "stop.resizable" -}; + dragStart: "start.draggable", + drag: "drag.draggable", + dragStop: "stop.draggable", + maxHeight: "maxHeight.resizable", + minHeight: "minHeight.resizable", + maxWidth: "maxWidth.resizable", + minWidth: "minWidth.resizable", + resizeStart: "start.resizable", + resize: "drag.resizable", + resizeStop: "stop.resizable" + }, + + uiDialogClasses = + 'ui-dialog ' + + 'ui-widget ' + + 'ui-widget-content ' + + 'ui-corner-all '; $.widget("ui.dialog", { _init: function() { this.originalTitle = this.element.attr('title'); - this.options.title = this.options.title || this.originalTitle; var self = this, options = this.options, - uiDialogContent = this.element - .removeAttr('title') - .addClass('ui-dialog-content') - .wrap('

') - .wrap('

'), - - uiDialogContainer = (this.uiDialogContainer = uiDialogContent.parent()) - .addClass('ui-dialog-container') - .css({ - position: 'relative', - width: '100%', - height: '100%' - }), + title = options.title || this.originalTitle || ' ', + titleId = $.ui.dialog.getTitleId(this.element), - uiDialogTitlebar = (this.uiDialogTitlebar = $('

')) - .addClass('ui-dialog-titlebar') - .mousedown(function() { - self.moveToTop(); - }) - .prependTo(uiDialogContainer), - - uiDialogTitlebarClose = $('') - .addClass('ui-dialog-titlebar-close') - .attr('role', 'button') - .appendTo(uiDialogTitlebar), - - uiDialogTitlebarCloseText = (this.uiDialogTitlebarCloseText = $('')) - .text(options.closeText) - .appendTo(uiDialogTitlebarClose), - - title = options.title || ' ', - titleId = $.ui.dialog.getTitleId(this.element), - uiDialogTitle = $('') - .addClass('ui-dialog-title') - .attr('id', titleId) - .html(title) - .prependTo(uiDialogTitlebar), - - uiDialog = (this.uiDialog = uiDialogContainer.parent()) + uiDialog = (this.uiDialog = $('

')) .appendTo(document.body) .hide() - .addClass('ui-dialog') - .addClass(options.dialogClass) + .addClass(uiDialogClasses + options.dialogClass) .css({ position: 'absolute', - width: options.width, - height: options.height, overflow: 'hidden', zIndex: options.zIndex }) // setting tabIndex makes the div focusable // setting outline to 0 prevents a border on focus in Mozilla - .attr('tabIndex', -1).css('outline', 0).keydown(function(ev) { - (options.closeOnEscape && ev.keyCode - && ev.keyCode == $.ui.keyCode.ESCAPE && self.close()); + .attr('tabIndex', -1).css('outline', 0).keydown(function(event) { + (options.closeOnEscape && event.keyCode + && event.keyCode == $.ui.keyCode.ESCAPE && self.close(event)); }) .attr({ role: 'dialog', 'aria-labelledby': titleId }) - .mouseup(function() { - self.moveToTop(); + .mousedown(function(event) { + self.moveToTop(false, event); }), - uiDialogButtonPane = (this.uiDialogButtonPane = $('

')) - .addClass('ui-dialog-buttonpane') - .css({ - position: 'absolute', - bottom: 0 - }) + uiDialogContent = this.element + .show() + .removeAttr('title') + .addClass( + 'ui-dialog-content ' + + 'ui-widget-content') .appendTo(uiDialog), - uiDialogTitlebarClose = $('.ui-dialog-titlebar-close', uiDialogTitlebar) + uiDialogTitlebar = (this.uiDialogTitlebar = $('

')) + .addClass( + 'ui-dialog-titlebar ' + + 'ui-widget-header ' + + 'ui-corner-all ' + + 'ui-helper-clearfix' + ) + .prependTo(uiDialog), + + uiDialogTitlebarClose = $('') + .addClass( + 'ui-dialog-titlebar-close ' + + 'ui-corner-all' + ) + .attr('role', 'button') .hover( function() { - $(this).addClass('ui-dialog-titlebar-close-hover'); + uiDialogTitlebarClose.addClass('ui-state-hover'); }, function() { - $(this).removeClass('ui-dialog-titlebar-close-hover'); + uiDialogTitlebarClose.removeClass('ui-state-hover'); } ) + .focus(function() { + uiDialogTitlebarClose.addClass('ui-state-focus'); + }) + .blur(function() { + uiDialogTitlebarClose.removeClass('ui-state-focus'); + }) .mousedown(function(ev) { ev.stopPropagation(); }) - .click(function() { - self.close(); + .click(function(event) { + self.close(event); return false; - }); + }) + .appendTo(uiDialogTitlebar), + + uiDialogTitlebarCloseText = (this.uiDialogTitlebarCloseText = $('')) + .addClass( + 'ui-icon ' + + 'ui-icon-closethick' + ) + .text(options.closeText) + .appendTo(uiDialogTitlebarClose), + + uiDialogTitle = $('') + .addClass('ui-dialog-title') + .attr('id', titleId) + .html(title) + .prependTo(uiDialogTitlebar); uiDialogTitlebar.find("*").add(uiDialogTitlebar).disableSelection(); @@ -135,6 +137,7 @@ (options.bgiframe && $.fn.bgiframe && uiDialog.bgiframe()); (options.autoOpen && this.open()); + }, destroy: function() { @@ -143,27 +146,43 @@ this.element .unbind('.dialog') .removeData('dialog') - .removeClass('ui-dialog-content') + .removeClass('ui-dialog-content ui-widget-content') .hide().appendTo('body'); this.uiDialog.remove(); (this.originalTitle && this.element.attr('title', this.originalTitle)); }, - close: function() { - if (false === this._trigger('beforeclose', null, { options: this.options })) { + close: function(event) { + var self = this; + + if (false === self._trigger('beforeclose', event)) { return; } - (this.overlay && this.overlay.destroy()); - this.uiDialog - .hide(this.options.hide) - .unbind('keypress.ui-dialog'); + (self.overlay && self.overlay.destroy()); + self.uiDialog.unbind('keypress.ui-dialog'); - this._trigger('close', null, { options: this.options }); + (self.options.hide + ? self.uiDialog.hide(self.options.hide, function() { + self._trigger('close', event); + }) + : self.uiDialog.hide() && self._trigger('close', event)); + $.ui.dialog.overlay.resize(); - this._isOpen = false; + self._isOpen = false; + + // adjust the maxZ to allow other modal dialogs to continue to work (see #4309) + if (self.options.modal) { + var maxZ = 0; + $('.ui-dialog').each(function() { + if (this != self.uiDialog[0]) { + maxZ = Math.max(maxZ, $(this).css('z-index')); + } + }); + $.ui.dialog.maxZ = maxZ; + } }, isOpen: function() { @@ -172,39 +191,41 @@ // the force parameter allows us to move modal dialogs to their correct // position on open - moveToTop: function(force) { + moveToTop: function(force, event) { if ((this.options.modal && !force) || (!this.options.stack && !this.options.modal)) { - return this._trigger('focus', null, { options: this.options }); + return this._trigger('focus', event); } - - var maxZ = this.options.zIndex, options = this.options; - $('.ui-dialog:visible').each(function() { - maxZ = Math.max(maxZ, parseInt($(this).css('z-index'), 10) || options.zIndex); - }); - (this.overlay && this.overlay.$el.css('z-index', ++maxZ)); + + if (this.options.zIndex > $.ui.dialog.maxZ) { + $.ui.dialog.maxZ = this.options.zIndex; + } + (this.overlay && this.overlay.$el.css('z-index', $.ui.dialog.overlay.maxZ = ++$.ui.dialog.maxZ)); //Save and then restore scroll since Opera 9.5+ resets when parent z-Index is changed. // http://ui.jquery.com/bugs/ticket/3193 var saveScroll = { scrollTop: this.element.attr('scrollTop'), scrollLeft: this.element.attr('scrollLeft') }; - this.uiDialog.css('z-index', ++maxZ); + this.uiDialog.css('z-index', ++$.ui.dialog.maxZ); this.element.attr(saveScroll); - this._trigger('focus', null, { options: this.options }); + this._trigger('focus', event); }, open: function() { if (this._isOpen) { return; } - this.overlay = this.options.modal ? new $.ui.dialog.overlay(this) : null; - (this.uiDialog.next().length && this.uiDialog.appendTo('body')); - this._position(this.options.position); - this.uiDialog.show(this.options.show); - (this.options.autoResize && this._size()); + var options = this.options, + uiDialog = this.uiDialog; + + this.overlay = options.modal ? new $.ui.dialog.overlay(this) : null; + (uiDialog.next().length && uiDialog.appendTo('body')); + this._size(); + this._position(options.position); + uiDialog.show(options.show); this.moveToTop(true); // prevent tabbing out of modal dialogs - (this.options.modal && this.uiDialog.bind('keypress.ui-dialog', function(event) { + (options.modal && uiDialog.bind('keypress.ui-dialog', function(event) { if (event.keyCode != $.ui.keyCode.TAB) { return; } @@ -224,47 +245,82 @@ } })); - this.uiDialog.find(':tabbable:first').focus(); - this._trigger('open', null, { options: this.options }); + // set focus to the first tabbable element in the content area or the first button + // if there are no tabbable elements, set focus on the dialog itself + $([]) + .add(uiDialog.find('.ui-dialog-content :tabbable:first')) + .add(uiDialog.find('.ui-dialog-buttonpane :tabbable:first')) + .add(uiDialog) + .filter(':first') + .focus(); + + this._trigger('open'); this._isOpen = true; }, _createButtons: function(buttons) { var self = this, hasButtons = false, - uiDialogButtonPane = this.uiDialogButtonPane; + uiDialogButtonPane = $('

') + .addClass( + 'ui-dialog-buttonpane ' + + 'ui-widget-content ' + + 'ui-helper-clearfix' + ); - // remove any existing buttons - uiDialogButtonPane.empty().hide(); + // if we already have a button pane, remove it + this.uiDialog.find('.ui-dialog-buttonpane').remove(); - $.each(buttons, function() { return !(hasButtons = true); }); + (typeof buttons == 'object' && buttons !== null && + $.each(buttons, function() { return !(hasButtons = true); })); if (hasButtons) { - uiDialogButtonPane.show(); $.each(buttons, function(name, fn) { $('') + .addClass( + 'ui-state-default ' + + 'ui-corner-all' + ) .text(name) .click(function() { fn.apply(self.element[0], arguments); }) + .hover( + function() { + $(this).addClass('ui-state-hover'); + }, + function() { + $(this).removeClass('ui-state-hover'); + } + ) + .focus(function() { + $(this).addClass('ui-state-focus'); + }) + .blur(function() { + $(this).removeClass('ui-state-focus'); + }) .appendTo(uiDialogButtonPane); }); + uiDialogButtonPane.appendTo(this.uiDialog); } }, _makeDraggable: function() { var self = this, - options = this.options; + options = this.options, + heightBeforeDrag; this.uiDialog.draggable({ cancel: '.ui-dialog-content', - helper: options.dragHelper, handle: '.ui-dialog-titlebar', + containment: 'document', start: function() { - self.moveToTop(); + heightBeforeDrag = options.height; + $(this).height($(this).height()).addClass("ui-dialog-dragging"); (options.dragStart && options.dragStart.apply(self.element[0], arguments)); }, drag: function() { (options.drag && options.drag.apply(self.element[0], arguments)); }, stop: function() { + $(this).removeClass("ui-dialog-dragging").height(heightBeforeDrag); (options.dragStop && options.dragStop.apply(self.element[0], arguments)); $.ui.dialog.overlay.resize(); } @@ -281,25 +337,28 @@ this.uiDialog.resizable({ cancel: '.ui-dialog-content', - helper: options.resizeHelper, + alsoResize: this.element, maxWidth: options.maxWidth, maxHeight: options.maxHeight, minWidth: options.minWidth, minHeight: options.minHeight, start: function() { + $(this).addClass("ui-dialog-resizing"); (options.resizeStart && options.resizeStart.apply(self.element[0], arguments)); }, resize: function() { - (options.autoResize && self._size.apply(self)); (options.resize && options.resize.apply(self.element[0], arguments)); }, handles: resizeHandles, stop: function() { - (options.autoResize && self._size.apply(self)); + $(this).removeClass("ui-dialog-resizing"); + options.height = $(this).height(); + options.width = $(this).width(); (options.resizeStop && options.resizeStop.apply(self.element[0], arguments)); $.ui.dialog.overlay.resize(); } - }); + }) + .find('.ui-resizable-se').addClass('ui-icon ui-icon-grip-diagonal-se'); }, _position: function(pos) { @@ -339,13 +398,11 @@ pTop += 0; break; case 'bottom': - // Opera check fixes #3564, can go away with jQuery 1.3 - pTop += ($.browser.opera ? window.innerHeight : wnd.height()) - this.uiDialog.outerHeight(); + pTop += wnd.height() - this.uiDialog.outerHeight(); break; default: case 'middle': - // Opera check fixes #3564, can go away with jQuery 1.3 - pTop += (($.browser.opera ? window.innerHeight : wnd.height()) - this.uiDialog.outerHeight()) / 2; + pTop += (wnd.height() - this.uiDialog.outerHeight()) / 2; } } @@ -364,6 +421,11 @@ case "closeText": this.uiDialogTitlebarCloseText.text(value); break; + case "dialogClass": + this.uiDialog + .removeClass(this.options.dialogClass) + .addClass(uiDialogClasses + value); + break; case "draggable": (value ? this._makeDraggable() @@ -388,7 +450,6 @@ // currently non-resizable, becoming resizable (isResizable || this._makeResizable(value)); - break; case "title": $(".ui-dialog-title", this.uiDialogTitlebar).html(value || ' '); @@ -402,37 +463,58 @@ }, _size: function() { - var container = this.uiDialogContainer, - titlebar = this.uiDialogTitlebar, - content = this.element, - tbMargin = (parseInt(content.css('margin-top'), 10) || 0) - + (parseInt(content.css('margin-bottom'), 10) || 0), - lrMargin = (parseInt(content.css('margin-left'), 10) || 0) - + (parseInt(content.css('margin-right'), 10) || 0); - content.height(container.height() - titlebar.outerHeight() - tbMargin); - content.width(container.width() - lrMargin); + /* If the user has resized the dialog, the .ui-dialog and .ui-dialog-content + * divs will both have width and height set, so we need to reset them + */ + var options = this.options; + + // reset content sizing + this.element.css({ + height: 0, + minHeight: 0, + width: 'auto' + }); + + // reset wrapper sizing + // determine the height of all the non-content elements + var nonContentHeight = this.uiDialog.css({ + height: 'auto', + width: options.width + }) + .height(); + + this.element + .css({ + minHeight: Math.max(options.minHeight - nonContentHeight, 0), + height: options.height == 'auto' + ? 'auto' + : Math.max(options.height - nonContentHeight, 0) + }); } - }); $.extend($.ui.dialog, { - version: "1.6", + version: "1.7.2", defaults: { autoOpen: true, - autoResize: true, bgiframe: false, buttons: {}, closeOnEscape: true, closeText: 'close', + dialogClass: '', draggable: true, - height: 200, - minHeight: 100, + hide: null, + height: 'auto', + maxHeight: false, + maxWidth: false, + minHeight: 150, minWidth: 150, modal: false, - overlay: {}, position: 'center', resizable: true, + show: null, stack: true, + title: '', width: 300, zIndex: 1000 }, @@ -440,6 +522,7 @@ getter: 'isOpen', uuid: 0, + maxZ: 0, getTitleId: function($el) { return 'ui-dialog-title-' + ($el.attr('id') || ++this.uuid); @@ -452,6 +535,7 @@ $.extend($.ui.dialog.overlay, { instances: [], + maxZ: 0, events: $.map('focus,mousedown,mouseup,keydown,keypress,click'.split(','), function(event) { return event + '.dialog-overlay'; }).join(' '), create: function(dialog) { @@ -460,32 +544,19 @@ // we use a setTimeout in case the overlay is created from an // event that we're going to be cancelling (see #2804) setTimeout(function() { - $('a, :input').bind($.ui.dialog.overlay.events, function() { - // allow use of the element if inside a dialog and - // - there are no modal dialogs - // - there are modal dialogs, but we are in front of the topmost modal - var allow = false; - var $dialog = $(this).parents('.ui-dialog'); - if ($dialog.length) { - var $overlays = $('.ui-dialog-overlay'); - if ($overlays.length) { - var maxZ = parseInt($overlays.css('z-index'), 10); - $overlays.each(function() { - maxZ = Math.max(maxZ, parseInt($(this).css('z-index'), 10)); - }); - allow = parseInt($dialog.css('z-index'), 10) > maxZ; - } else { - allow = true; - } - } - return allow; - }); + // handle $(el).dialog().dialog('close') (see #4065) + if ($.ui.dialog.overlay.instances.length) { + $(document).bind($.ui.dialog.overlay.events, function(event) { + var dialogZ = $(event.target).parents('.ui-dialog').css('zIndex') || 0; + return (dialogZ > $.ui.dialog.overlay.maxZ); + }); + } }, 1); // allow closing by pressing the escape key $(document).bind('keydown.dialog-overlay', function(event) { (dialog.options.closeOnEscape && event.keyCode - && event.keyCode == $.ui.keyCode.ESCAPE && dialog.close()); + && event.keyCode == $.ui.keyCode.ESCAPE && dialog.close(event)); }); // handle window resize @@ -493,12 +564,10 @@ } var $el = $('