Dialog: Adjusted logic for finding the first tabbable element. Fixes #5767 - On open...

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index df896e7eafa8e769cd7d4e743b9b47f5f102c5a4..ae96b2d8b9a608d65b4b6c72307f214e257046bc 100644 (file)
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -324,12 +324,9 @@ $.widget("ui.dialog", {
 
                // set focus to the first tabbable element in the content area or the first button
                // if there are no tabbable elements, set focus on the dialog itself
-               $([])
-                       .add(uiDialog.find('.ui-dialog-content :tabbable:first'))
-                       .add(uiDialog.find('.ui-dialog-buttonpane :tabbable:first'))
-                       .add(uiDialog)
-                       .filter(':first')
-                       .focus();
+               $(self.element.find(':tabbable').get().concat(
+                       uiDialog.find('.ui-dialog-buttonpane :tabbable').get().concat(
+                               uiDialog.get()))).eq(0).focus();
 
                self._trigger('open');
                self._isOpen = true;