Merge pull request #7677 from adobe/tom/issue-7598

Narciso Jaramillo · Narciso Jaramillo · commit 9bbfceaaf556 · 2014-06-03T19:46:54.000-04:00
Fix 7598: showModalDialogUsingTemplate doesn't blur current editor
diff --git a/src/widgets/Dialogs.js b/src/widgets/Dialogs.js
@@ -272,10 +272,11 @@ define(function (require, exports, module) {
         
         $("body").append("<div class='modal-wrapper'><div class='modal-inner-wrapper'></div></div>");
 
-        var result    = $.Deferred(),
-            promise   = result.promise(),
-            $dlg      = $(template)
+        var result  = new $.Deferred(),
+            promise = result.promise(),
+            $dlg    = $(template)
                 .addClass("instance")
+                .prop("tabindex", "-1")
                 .appendTo(".modal-inner-wrapper:last");
 
         // Don't allow dialog to exceed viewport size
@@ -311,11 +312,17 @@ define(function (require, exports, module) {
             //Remove wrapper
             $(".modal-wrapper:last").remove();
         }).one("shown", function () {
-            // Set focus to the default button
-            var primaryBtn = $dlg.find(".primary");
-
-            if (primaryBtn) {
-                primaryBtn.focus();
+            var $primaryBtn = $dlg.find(".primary:enabled"),
+                $otherBtn   = $dlg.find(".modal-footer .dialog-button:enabled:eq(0)");
+            
+            // Set focus to the primary button, to any other button, or to the dialog depending
+            // if there are buttons
+            if ($primaryBtn.length) {
+                $primaryBtn.focus();
+            } else if ($otherBtn.length) {
+                $otherBtn.focus();
+            } else {
+                $dlg.focus();
             }
 
             // Push our global keydown handler onto the global stack of handlers.
