From c4e3d07940595210f8e441b18318918259509673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 9 Jun 2020 16:49:44 -0400
Subject: [PATCH] feat: more merge fixes

---
 templates/partials/merge_topics_modal.tpl   | 7 ++++++-
 templates/partials/quick-search-results.tpl | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/templates/partials/merge_topics_modal.tpl b/templates/partials/merge_topics_modal.tpl
index d5cd6d3..36e68a6 100644
--- a/templates/partials/merge_topics_modal.tpl
+++ b/templates/partials/merge_topics_modal.tpl
@@ -8,12 +8,17 @@
 		</p>
 		<p>
 			<div class="input-group">
-				<input class="form-control" type="text">
+				<input class="form-control topic-search-input" type="text">
 				<span class="input-group-addon">
 					<i class="fa fa-search"></i>
 				</span>
 			</div>
 		</p>
+		<div style="position: relative;">
+			<div class="quick-search-container hidden">
+				<div id="quick-search-results-container"></div>
+			</div>
+		</div>
 		<p><strong>[[topic:merge-topic-list-title]]</strong></p>
 		<ul class="topics-section">
 			{{{each topics}}}
diff --git a/templates/partials/quick-search-results.tpl b/templates/partials/quick-search-results.tpl
index f0ddf06..18a6212 100644
--- a/templates/partials/quick-search-results.tpl
+++ b/templates/partials/quick-search-results.tpl
@@ -1,6 +1,6 @@
 <ul id="quick-search-results" class="quick-search-results">
 {{{each posts}}}
-<li>
+<li data-tid="{posts.topic.tid}" data-pid="{posts.pid}">
 	<a href="{config.relative_path}/post/{posts.pid}">
 		{buildAvatar(posts.user, "sm", true)}
 		<span class="quick-search-title">{posts.topic.title}</span>