From bca79da8c648955154ec21b364d2194848f75500 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: Wed, 12 Jul 2017 19:29:41 -0400
Subject: [PATCH] closes #4197

add in-topic search support to dbsearch
prevent multiple click handlers on in-topic search widget(each click was
causing multiple scrolls)
fix index
---
 package.json                    | 2 +-
 public/src/client/topic.js      | 2 +-
 public/src/modules/navigator.js | 2 +-
 public/src/modules/search.js    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index fbe4ad5246..935f3d130e 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
     "nodebb-plugin-composer-default": "5.0.1",
-    "nodebb-plugin-dbsearch": "2.0.4",
+    "nodebb-plugin-dbsearch": "2.0.5",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.2.1",
     "nodebb-plugin-markdown": "8.0.0",
diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index 08a707f029..0a0d857663 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -99,7 +99,7 @@ define('forum/topic', [
 
 	function handleTopicSearch() {
 		require(['search', 'mousetrap'], function (search, mousetrap) {
-			$('.topic-search')
+			$('.topic-search').off('click')
 				.on('click', '.prev', function () {
 					search.topicDOM.prev();
 				})
diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js
index a7fd657cac..d8b8cb4fe2 100644
--- a/public/src/modules/navigator.js
+++ b/public/src/modules/navigator.js
@@ -245,7 +245,7 @@ define('navigator', ['forum/pagination', 'components'], function (pagination, co
 			}
 		}
 
-		var page = Math.max(1, Math.ceil(index / config.postsPerPage));
+		var page = Math.max(1, Math.ceil((index + 1) / config.postsPerPage));
 
 		if (parseInt(page, 10) !== ajaxify.data.pagination.currentPage) {
 			pagination.loadPage(page, function () {
diff --git a/public/src/modules/search.js b/public/src/modules/search.js
index ce24bd4c40..daf9fae820 100644
--- a/public/src/modules/search.js
+++ b/public/src/modules/search.js
@@ -156,7 +156,7 @@ define('search', ['navigator', 'translator', 'storage'], function (nav, translat
 					return app.alertError(err.message);
 				}
 
-				nav.scrollToPost(postIndex, true);
+				nav.scrollToIndex(postIndex, true);
 			});
 		} else {
 			translator.translate('[[search:no-matches]]', function (text) {