Skip to content

Commit 327b405

Browse files
author
valtih1978
committed
Undo clear on Esc. It makes no sense anyway (issue 34)
1 parent e39e29c commit 327b405

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

src/popup/popup.ts

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,20 @@ module Popup {
7878
} else {
7979
search(id, tabStates);
8080
}
81-
} else if (event.keyCode == 27) {
82-
Log.info("Esc pressed");
83-
setSearching(id, false, tabStates);
84-
Utils.sendCommand("clear");
8581
}
8682
}
8783

88-
var queryInputInput = function() {
89-
tabStates.set(id, "query", queryInput.value);
90-
84+
function clear() {
9185
if (tabStates.isSearching(id)) {
9286
setSearching(id, false, tabStates);
9387
Utils.sendCommand("clear");
9488
}
89+
}
90+
91+
var queryInputInput = function() {
92+
tabStates.set(id, "query", queryInput.value);
93+
94+
clear();
9595

9696
// Remove the invalid class if it's there
9797
queryInput.className = '';
@@ -103,10 +103,7 @@ module Popup {
103103
Log.info("Set checkbox state to " + caseInsensitiveCheckbox.checked);
104104
tabStates.set(id, "caseInsensitive", caseInsensitiveCheckbox.checked);
105105

106-
if (tabStates.isSearching(id)) {
107-
setSearching(id, false, tabStates);
108-
Utils.sendCommand("clear");
109-
}
106+
clear();
110107
}
111108

112109
prevButton.addEventListener("click", prevButtonClick);

0 commit comments

Comments
 (0)