diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/autocomplete.js | 2 | ||||
| -rw-r--r-- | ui/core.js | 25 | ||||
| -rw-r--r-- | ui/dialog.js | 26 | ||||
| -rw-r--r-- | ui/draggable.js | 15 | ||||
| -rw-r--r-- | ui/menu.js | 4 | ||||
| -rw-r--r-- | ui/spinner.js | 4 | ||||
| -rw-r--r-- | ui/tabs.js | 2 |
7 files changed, 40 insertions, 38 deletions
diff --git a/ui/autocomplete.js b/ui/autocomplete.js index dc970b5c7..6e477bb41 100644 --- a/ui/autocomplete.js +++ b/ui/autocomplete.js @@ -278,7 +278,7 @@ $.widget( "ui.autocomplete", { previous = this.previous; // only trigger when focus was lost (click on menu) - if ( this.element[ 0 ] !== this.document[ 0 ].activeElement ) { + if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) { this.element.focus(); this.previous = previous; // #6109 - IE triggers two focus events and the second diff --git a/ui/core.js b/ui/core.js index 0b2e03950..40703d73d 100644 --- a/ui/core.js +++ b/ui/core.js @@ -43,6 +43,31 @@ $.extend( $.ui, { SPACE: 32, TAB: 9, UP: 38 + }, + + // Internal use only + safeActiveElement: function( document ) { + var activeElement; + + // Support: IE 9 only + // IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe> + try { + activeElement = document.activeElement; + } catch ( error ) { + activeElement = document.body; + } + + return activeElement; + }, + + // Internal use only + safeBlur: function( element ) { + + // Support: IE9 - 10 only + // If the <body> is blurred, IE will switch windows, see #9420 + if ( element && element.nodeName.toLowerCase() !== "body" ) { + $( element ).blur(); + } } }); diff --git a/ui/dialog.js b/ui/dialog.js index d33f72c1e..c48d76db3 100644 --- a/ui/dialog.js +++ b/ui/dialog.js @@ -183,8 +183,7 @@ return $.widget( "ui.dialog", { enable: $.noop, close: function( event ) { - var activeElement, - that = this; + var that = this; if ( !this._isOpen || this._trigger( "beforeClose", event ) === false ) { return; @@ -197,21 +196,10 @@ return $.widget( "ui.dialog", { if ( !this.opener.filter( ":focusable" ).focus().length ) { - // support: IE9 - // IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe> - try { - activeElement = this.document[ 0 ].activeElement; - - // Support: IE9, IE10 - // If the <body> is blurred, IE will switch windows, see #4520 - if ( activeElement && activeElement.nodeName.toLowerCase() !== "body" ) { - - // Hiding a focused element doesn't trigger blur in WebKit - // so in case we have nothing to focus on, explicitly blur the active element - // https://bugs.webkit.org/show_bug.cgi?id=47182 - $( activeElement ).blur(); - } - } catch ( error ) {} + // Hiding a focused element doesn't trigger blur in WebKit + // so in case we have nothing to focus on, explicitly blur the active element + // https://bugs.webkit.org/show_bug.cgi?id=47182 + $.ui.safeBlur( $.ui.safeActiveElement( this.document[ 0 ] ) ); } this._hide( this.uiDialog, this.options.hide, function() { @@ -255,7 +243,7 @@ return $.widget( "ui.dialog", { } this._isOpen = true; - this.opener = $( this.document[ 0 ].activeElement ); + this.opener = $( $.ui.safeActiveElement( this.document[ 0 ] ) ); this._size(); this._position(); @@ -311,7 +299,7 @@ return $.widget( "ui.dialog", { _keepFocus: function( event ) { function checkFocus() { - var activeElement = this.document[0].activeElement, + var activeElement = $.ui.safeActiveElement( this.document[0] ), isActive = this.uiDialog[0] === activeElement || $.contains( this.uiDialog[0], activeElement ); if ( !isActive ) { diff --git a/ui/draggable.js b/ui/draggable.js index c3821ba8e..7437be108 100644 --- a/ui/draggable.js +++ b/ui/draggable.js @@ -136,25 +136,14 @@ $.widget("ui.draggable", $.ui.mouse, { }, _blurActiveElement: function( event ) { - var document = this.document[ 0 ]; // Only need to blur if the event occurred on the draggable itself, see #10527 if ( !this.handleElement.is( event.target ) ) { return; } - // support: IE9 - // IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe> - try { - - // Support: IE9, IE10 - // If the <body> is blurred, IE will switch windows, see #9520 - if ( document.activeElement && document.activeElement.nodeName.toLowerCase() !== "body" ) { - - // Blur any element that currently has focus, see #4261 - $( document.activeElement ).blur(); - } - } catch ( error ) {} + // Blur any element that currently has focus, see #4261 + $.ui.safeBlur( $.ui.safeActiveElement( this.document[ 0 ] ) ); }, _mouseStart: function(event) { diff --git a/ui/menu.js b/ui/menu.js index 4b1435935..bfd3f4958 100644 --- a/ui/menu.js +++ b/ui/menu.js @@ -87,7 +87,7 @@ return $.widget( "ui.menu", { // Open submenu on click if ( target.has( ".ui-menu" ).length ) { this.expand( event ); - } else if ( !this.element.is( ":focus" ) && $( this.document[ 0 ].activeElement ).closest( ".ui-menu" ).length ) { + } else if ( !this.element.is( ":focus" ) && $( $.ui.safeActiveElement( this.document[ 0 ] ) ).closest( ".ui-menu" ).length ) { // Redirect focus to the menu this.element.trigger( "focus", [ true ] ); @@ -126,7 +126,7 @@ return $.widget( "ui.menu", { }, blur: function( event ) { this._delay(function() { - if ( !$.contains( this.element[0], this.document[0].activeElement ) ) { + if ( !$.contains( this.element[0], $.ui.safeActiveElement( this.document[0] ) ) ) { this.collapseAll( event ); } }); diff --git a/ui/spinner.js b/ui/spinner.js index 9beeb133c..ccbce7c96 100644 --- a/ui/spinner.js +++ b/ui/spinner.js @@ -147,10 +147,10 @@ return $.widget( "ui.spinner", { // If the input is focused then this.previous is properly set from // when the input first received focus. If the input is not focused // then we need to set this.previous based on the value before spinning. - previous = this.element[0] === this.document[0].activeElement ? + previous = this.element[0] === $.ui.safeActiveElement( this.document[0] ) ? this.previous : this.element.val(); function checkFocus() { - var isActive = this.element[0] === this.document[0].activeElement; + var isActive = this.element[0] === $.ui.safeActiveElement( this.document[0] ); if ( !isActive ) { this.element.focus(); this.previous = previous; diff --git a/ui/tabs.js b/ui/tabs.js index db4c9726a..0dd0605b8 100644 --- a/ui/tabs.js +++ b/ui/tabs.js @@ -155,7 +155,7 @@ return $.widget( "ui.tabs", { }, _tabKeydown: function( event ) { - var focusedTab = $( this.document[0].activeElement ).closest( "li" ), + var focusedTab = $( $.ui.safeActiveElement( this.document[0] ) ).closest( "li" ), selectedIndex = this.tabs.index( focusedTab ), goingForward = true; |