Skip to content
Permalink
Browse files

Dialog: Refactored moveToTop, greatly improving performance for openi…

…ng dialogs in IE. Partial fix for #2807 - dialog UI + modal mode = slow.
  • Loading branch information...
scottgonzalez committed Feb 19, 2009
1 parent 967074f commit 06a513b753f4964d79d81995a0040dd0677e103d
Showing with 11 additions and 8 deletions.
  1. +11 −8 ui/ui.dialog.js
@@ -177,21 +177,22 @@ $.widget("ui.dialog", {
// position on open
moveToTop: function(force, event) {

if ((this.options.modal && !force)
if ($.ui.dialog.topMostDialog == this
|| (this.options.modal && !force)
|| (!this.options.stack && !this.options.modal)) {
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;
}
$.ui.dialog.topMostDialog = this;
(this.overlay && this.overlay.$el.css('z-index', ++$.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', event);
},
@@ -501,6 +502,8 @@ $.extend($.ui.dialog, {
getter: 'isOpen',

uuid: 0,
maxZ: 0,
topMostDialog: null,

getTitleId: function($el) {
return 'ui-dialog-title-' + ($el.attr('id') || ++this.uuid);

0 comments on commit 06a513b

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