supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4364 from thelounge/maxleiter/escCloseSearch

Browse Source 
Allow escape key to close search bar and search page
This commit is contained in:
Max Leiter 2021-11-18 16:47:21 -08:00 committed by GitHub
commit 6dfd51bb57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/components/MessageSearchForm.vue
View File

@ -9,6 +9,7 @@
class="input" class="input"
placeholder="Search messages…" placeholder="Search messages…"
@blur="closeSearch" @blur="closeSearch"
@keyup.esc="closeSearch"
/> />
</div> </div>
<button <button
@ -113,6 +114,7 @@ export default {
methods: { methods: {
closeSearch() { closeSearch() {
if (!this.onSearchPage) { if (!this.onSearchPage) {
this.searchInput = "";
this.searchOpened = false; this.searchOpened = false;
} }
}, },

6
client/components/Windows/SearchResults.vue
View File

@ -93,6 +93,7 @@
<script> <script>
import socket from "../../js/socket"; import socket from "../../js/socket";
import eventbus from "../../js/eventbus";
import SidebarToggle from "../SidebarToggle.vue"; import SidebarToggle from "../SidebarToggle.vue";
import Message from "../Message.vue"; import Message from "../Message.vue";
@ -171,11 +172,16 @@ export default {
mounted() { mounted() {
this.setActiveChannel(); this.setActiveChannel();
this.doSearch(); this.doSearch();
eventbus.on("escapekey", this.closeSearch);
this.$root.$on("re-search", this.doSearch); // Enable MessageSearchForm to search for the same query again this.$root.$on("re-search", this.doSearch); // Enable MessageSearchForm to search for the same query again
}, },
beforeDestroy() { beforeDestroy() {
this.$root.$off("re-search"); this.$root.$off("re-search");
}, },
destroyed() {
eventbus.off("escapekey", this.closeSearch);
},
methods: { methods: {
setActiveChannel() { setActiveChannel() {
this.$store.commit("activeChannel", this.chan); this.$store.commit("activeChannel", this.chan);