Index: ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js |
diff --git a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js |
index 0e197fa099552776aee1e43f7e083202f6fc77ca..4c49a3a9121eec83c30f99a13af9e20d5822d294 100644 |
--- a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js |
+++ b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js |
@@ -113,11 +113,13 @@ Polymer({ |
* @private |
*/ |
onKeypress_: function(e) { |
- if (e.target != this) |
- return; |
if (e.key != 'Enter') |
return; |
+ // Accept Enter keys from either the dialog, or a child paper-input element. |
+ if (e.target != this && e.target.tagName != 'PAPER-INPUT') |
+ return; |
+ |
var actionButton = |
this.querySelector('.action-button:not([disabled]):not([hidden])'); |
if (actionButton) { |