Permalink
Browse files

Dialog: Track the instance as soon as the dialog is opened

Fixes #10152
  • Loading branch information...
scottgonzalez committed Jul 23, 2014
1 parent 1071346 commit 69f25dbff71d9864ce7ce46c47003413f8b7deb2
Showing with 12 additions and 3 deletions.
  1. +12 −3 ui/dialog.js
View
@@ -273,6 +273,11 @@ return $.widget( "ui.dialog", {
that._trigger( "focus" );
});
+ // Track the dialog immediately upon openening in case a focus event
+ // somehow occurs outside of the dialog before an element inside the
+ // dialog is focused (#10152)
+ this._makeFocusTarget();
+
this._trigger( "open" );
},
@@ -584,14 +589,18 @@ return $.widget( "ui.dialog", {
_trackFocus: function() {
this._on( this.widget(), {
- "focusin": function( event ) {
- this._untrackInstance();
- this._trackingInstances().unshift( this );
+ focusin: function( event ) {
+ this._makeFocusTarget();
this._focusedElement = $( event.target );
}
});
},
+ _makeFocusTarget: function() {
+ this._untrackInstance();
+ this._trackingInstances().unshift( this );
+ },
+
_untrackInstance: function() {
var instances = this._trackingInstances(),
exists = $.inArray( this, instances );

0 comments on commit 69f25db

Please sign in to comment.