Chromium Code Reviews| 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..bc4d274dbbb7d347a04078ec1f401b3999a891db 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,15 @@ Polymer({ |
| * @private |
| */ |
| onKeypress_: function(e) { |
| - if (e.target != this) |
| + if (!e.target) |
|
dpapad
2017/04/04 23:46:14
Is that possible?
tommycli
2017/04/05 21:07:07
Done.
|
| 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') |
|
dpapad
2017/04/04 23:46:14
Can we add a test for this? You can use a <paper-i
tommycli
2017/04/05 21:07:07
Done.
|
| + return; |
| + |
| var actionButton = |
| this.querySelector('.action-button:not([disabled]):not([hidden])'); |
| if (actionButton) { |