From 5b9de0e5215e0ea0276a11786120660963a68810 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Sep 2022 15:27:02 -0400 Subject: [PATCH] fix: be tidier and explicitly clean up ctrl-f hotkey on topic page --- public/src/client/topic.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index f9a8ca05b3..8f052bab2b 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -76,11 +76,13 @@ define('forum/topic', [ if (config.topicSearchEnabled) { require(['mousetrap', 'search'], function (mousetrap, search) { mousetrap.bind(['command+f', 'ctrl+f'], function (e) { - if (ajaxify.data.template.topic) { - e.preventDefault(); - $('#search-fields input').val('in:topic-' + ajaxify.data.tid + ' '); - search.showAndFocusInput(); - } + e.preventDefault(); + $('#search-fields input').val('in:topic-' + ajaxify.data.tid + ' '); + search.showAndFocusInput(); + }); + + hooks.onPage('action:ajaxify.cleanup', () => { + mousetrap.unbind(['command+f', 'ctrl+f']); }); }); }