Merge pull request #7493 from adobe/zaggino/fix-enter-dialogs

Narciso Jaramillo · Narciso Jaramillo · commit 7b1253963a13 · 2014-06-12T17:18:08.000-04:00
prevent event from being used to enter a newline into editor
diff --git a/src/widgets/Dialogs.js b/src/widgets/Dialogs.js
@@ -112,22 +112,27 @@ define(function (require, exports, module) {
     function _handleTab(event, $dlg) {
         var $inputs = $(":input:enabled, a", $dlg).filter(":visible");
 
+        function stopEvent() {
+            event.stopPropagation();
+            event.preventDefault();
+        }
+
         if ($(event.target).closest($dlg).length) {
             // If it's the first or last tabbable element, focus the last/first element
             if ((!event.shiftKey && event.target === $inputs[$inputs.length - 1]) ||
                     (event.shiftKey && event.target === $inputs[0])) {
                 $inputs.filter(event.shiftKey ? ":last" : ":first").focus();
-                event.preventDefault();
+                stopEvent();
 
             // If there is no element to focus, don't let it focus outside of the dialog
             } else if (!$inputs.length) {
-                event.preventDefault();
+                stopEvent();
             }
 
         // If the focus left the dialog, focus the first element in the dialog
         } else {
             $inputs.first().focus();
-            event.preventDefault();
+            stopEvent();
         }
     }
 
@@ -144,21 +149,36 @@ define(function (require, exports, module) {
             which           = String.fromCharCode(e.which),
             $focusedElement = this.find(".dialog-button:focus, a:focus");
         
+        function stopEvent() {
+            e.preventDefault();
+            e.stopPropagation();
+        }
+
         // There might be a textfield in the dialog's UI; don't want to mistake normal typing for dialog dismissal
         var inTextArea    = (e.target.tagName === "TEXTAREA"),
             inTypingField = inTextArea || ($(e.target).filter(":text, :password").length > 0);
         
         if (e.which === KeyEvent.DOM_VK_TAB) {
+            // We don't want to stopEvent() in this case since we might want the default behavior.
+            // _handleTab takes care of stopping/preventing default as necessary.
             _handleTab(e, this);
         } else if (e.which === KeyEvent.DOM_VK_ESCAPE) {
             buttonId = DIALOG_BTN_CANCEL;
         } else if (e.which === KeyEvent.DOM_VK_RETURN && (!inTextArea || e.ctrlKey)) {
             // Enter key in single-line text input always dismisses; in text area, only Ctrl+Enter dismisses
             // Click primary
-            $primaryBtn.click();
+            stopEvent();
+            if (e.target.tagName === "BUTTON") {
+                this.find(e.target).click();
+            } else {
+                $primaryBtn.click();
+            }
         } else if (e.which === KeyEvent.DOM_VK_SPACE) {
-            // Space bar on focused button or link
-            $focusedElement.click();
+            if ($focusedElement.length) {
+                // Space bar on focused button or link
+                stopEvent();
+                $focusedElement.click();
+            }
         } else if (brackets.platform === "mac") {
             // CMD+D Don't Save
             if (e.metaKey && (which === "D")) {
@@ -179,6 +199,7 @@ define(function (require, exports, module) {
         }
         
         if (buttonId) {
+            stopEvent();
             _processButton(this, buttonId, autoDismiss);
         }
         
