diff options
| author | Kris Borchers <kris.borchers@gmail.com> | 2013-01-30 12:30:37 -0600 |
|---|---|---|
| committer | Kris Borchers <kris.borchers@gmail.com> | 2013-01-30 12:30:37 -0600 |
| commit | d1505e3434ef99e0068347a5e8179a0ffd737676 (patch) | |
| tree | 4ed70ffa8a563fd06cfa6168045a7f6c74616851 /ui | |
| parent | ceebe07e2c99190030c16b031813ae660d9283d1 (diff) | |
| download | jquery-ui-d1505e3434ef99e0068347a5e8179a0ffd737676.tar.gz jquery-ui-d1505e3434ef99e0068347a5e8179a0ffd737676.zip | |
Dialog: Move call to _focusTabbable and triggering of open and focus events into the _show callback. Fixes #6756 - Dialog: show: "blind" with link in content doesn't animate properly. Fixes #8051 - Dialog: 'Explode' dialog animation causes crash in IE 6, 7 and 8. Fixes #4421 - Dialog: Focus lost from dialog which uses show-effect
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/jquery.ui.dialog.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index ec4032ff3..77bf68dd1 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -207,6 +207,7 @@ $.widget( "ui.dialog", { }, open: function() { + var that = this; if ( this._isOpen ) { if ( this._moveToTop() ) { this._focusTabbable(); @@ -220,13 +221,13 @@ $.widget( "ui.dialog", { this._position(); this._createOverlay(); this._moveToTop( null, true ); - this._show( this.uiDialog, this.options.show ); - - this._focusTabbable(); + this._show( this.uiDialog, this.options.show, function() { + that._focusTabbable(); + that._trigger("focus"); + }); this._isOpen = true; this._trigger("open"); - this._trigger("focus"); }, _focusTabbable: function() { |