Index: chrome/browser/resources/settings/bluetooth_page/bluetooth_device_list_item.js |
diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_list_item.js b/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_list_item.js |
index 5f0dee2bdde2c6d898c54f88284cb7e8b9f86980..048908d6c0e965dd87820fafb6bdd92301b182b2 100644 |
--- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_list_item.js |
+++ b/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_list_item.js |
@@ -21,6 +21,24 @@ Polymer({ |
}, |
}, |
+ listeners: { |
+ 'keydown': 'onKeyDown_', |
+ }, |
+ |
+ /** |
+ * This is necessary, otherwise pressing enter will first trigger iron-list's |
+ * keydown handler and intefere with icon-button's on-tap behavior. |
+ * @param {!Event} event |
+ * @private |
+ */ |
+ onKeyDown_: function(event) { |
+ if (event.key == 'Enter' && |
+ Polymer.dom(event).rootTarget == |
+ this.$$('button[is="paper-icon-button-light"]')) { |
+ event.stopPropagation(); |
+ } |
+ }, |
+ |
/** |
* @param {!Event} event |
* @private |