From 1ce15e69ab284ed2bf3986c66e3d2b4aff29a684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sun, 18 Nov 2018 10:32:08 -0500
Subject: [PATCH] dont require search and moustrap on topic page until needed

---
 public/src/client/topic.js | 23 +++++++++++++----------
 src/meta/js.js             |  1 -
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index 34644104f3..322fead491 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -73,18 +73,21 @@ define('forum/topic', [
 	};
 
 	function handleTopicSearch() {
-		require(['search', 'mousetrap'], function (search, mousetrap) {
-			$('.topic-search').off('click')
-				.on('click', '.prev', function () {
+		$('.topic-search').off('click')
+			.on('click', '.prev', function () {
+				require(['search'], function (search) {
 					search.topicDOM.prev();
-				})
-				.on('click', '.next', function () {
+				});
+			})
+			.on('click', '.next', function () {
+				require(['search'], function (search) {
 					search.topicDOM.next();
 				});
+			});
 
-			mousetrap.bind('ctrl+f', function (e) {
-				if (config.topicSearchEnabled) {
-					// If in topic, open search window and populate, otherwise regular behaviour
+		if (config.topicSearchEnabled) {
+			require(['mousetrap'], function (mousetrap) {
+				mousetrap.bind('ctrl+f', function (e) {
 					var match = ajaxify.currentPage.match(/^topic\/([\d]+)/);
 					var tid;
 					if (match) {
@@ -93,9 +96,9 @@ define('forum/topic', [
 						$('#search-fields input').val('in:topic-' + tid + ' ');
 						app.prepareSearch();
 					}
-				}
+				});
 			});
-		});
+		}
 	}
 
 	Topic.toTop = function () {
diff --git a/src/meta/js.js b/src/meta/js.js
index eed7783090..bc3398656b 100644
--- a/src/meta/js.js
+++ b/src/meta/js.js
@@ -67,7 +67,6 @@ JS.scripts = {
 		'public/src/modules/topicList.js',
 		'public/src/modules/categorySelector.js',
 		'public/src/modules/share.js',
-		'public/src/modules/search.js',
 		'public/src/modules/alerts.js',
 		'public/src/modules/taskbar.js',
 		'public/src/modules/helpers.js',