Commit 9ad24e79 authored by Erik Luo's avatar Erik Luo Committed by Commit Bot

DevTools: unify preventDefaults in TextPrompt clients

TextPrompt and its subclasses are all single-line prompts.  Since none
require multiline, we can preventDefault on Enter at the base and remove
several preventDefault calls.

Bug: none
Change-Id: I42c08c10052746954c4698975ca72383f3fc25ec
Reviewed-on: https://chromium-review.googlesource.com/683436Reviewed-by: default avatarDmitry Gozman <dgozman@chromium.org>
Commit-Queue: Erik Luo <luoe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505229}
parent ef59187a
......@@ -52,7 +52,7 @@ Elements.ClassesPaneWidget = class extends UI.Widget {
return;
if (isEnterKey(event)) {
event.consume(true);
event.consume();
if (this._prompt.acceptAutoComplete())
return;
}
......
......@@ -2600,7 +2600,6 @@ Elements.StylePropertyTreeElement = class extends UI.TreeElement {
var result;
if (isEnterKey(event)) {
event.preventDefault();
result = 'forward';
} else if (event.keyCode === UI.KeyboardShortcut.Keys.Esc.code || event.key === 'Escape') {
result = 'cancel';
......
......@@ -880,7 +880,7 @@ ObjectUI.ObjectPropertyTreeElement = class extends UI.TreeElement {
*/
_promptKeyDown(originalContent, event) {
if (isEnterKey(event)) {
event.consume(true);
event.consume();
this._editingCommitted(originalContent);
return;
}
......
......@@ -202,7 +202,6 @@ QuickOpen.FilteredListWidget = class extends UI.VBox {
* @param {!Event} event
*/
_onEnter(event) {
event.preventDefault();
if (!this._provider)
return;
var selectedIndexInProvider = this._provider.itemCount() ? this._list.selectedItem() : null;
......
......@@ -98,7 +98,7 @@ Resources.DatabaseQueryView = class extends UI.VBox {
}
_enterKeyPressed(event) {
event.consume(true);
event.consume();
this._prompt.clearAutocomplete();
......
......@@ -290,7 +290,7 @@ Sources.WatchExpression = class extends Common.Object {
*/
_finishEditing(event, canceled) {
if (event)
event.consume(true);
event.consume(canceled);
this._editing = false;
this._textPrompt.detach();
......
......@@ -179,8 +179,6 @@ UI.TextFilterUI = class extends Common.Object {
this._proxyElement = this._prompt.attach(this._filterInputElement);
this._proxyElement.title = Common.UIString('e.g. /small[\\d]+/ url:a.com/b');
this._prompt.setPlaceholder(Common.UIString('Filter'));
this._proxyElement.addEventListener('keydown', this._onInputKeyDown.bind(this), false);
this._prompt.addEventListener(UI.TextPrompt.Events.TextChanged, this._valueChanged.bind(this));
/** @type {?function(string, string, boolean=):!Promise<!UI.SuggestBox.Suggestions>} */
......@@ -244,14 +242,6 @@ UI.TextFilterUI = class extends Common.Object {
_valueChanged() {
this.dispatchEventToListeners(UI.FilterUI.Events.FilterChanged, null);
}
/**
* @param {!Event} event
*/
_onInputKeyDown(event) {
if (isEnterKey(event))
event.consume(true);
}
};
/**
......
......@@ -296,6 +296,8 @@ UI.TextPrompt = class extends Common.Object {
case 'Control':
break;
}
if (isEnterKey(event))
event.preventDefault();
if (!handled && this._isSuggestBoxVisible())
handled = this._suggestBox.keyPressed(event);
......
......@@ -643,8 +643,6 @@ UI.ToolbarInput = class extends UI.ToolbarItem {
* @param {!Event} event
*/
_onKeydownCallback(event) {
if (isEnterKey(event))
event.consume(true);
if (!isEscKey(event) || !this._prompt.text())
return;
this._internalSetValue('', true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment