From 2256eeda45c0f52df87ee2241a88b3d70e83711e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Scott=20Gonz=C3=A1lez?= Date: Mon, 9 Mar 2015 16:03:22 -0400 Subject: [PATCH] Core: Add methods to work around IE active element bugs Closes gh-1478 (cherry picked from commit f33027840cdac5152599da66635981bbe68c6bda) --- ui/autocomplete.js | 2 +- ui/core.js | 25 +++++++++++++++++++++++++ ui/dialog.js | 26 +++++++------------------- ui/draggable.js | 15 ++------------- ui/menu.js | 4 ++-- ui/spinner.js | 4 ++-- 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