@jasonwch/nodebb-plugin-meilisearch-r 1.1.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jasonwch/nodebb-plugin-meilisearch-r",
-	"version": "1.1.0",
+	"version": "1.1.2",
 	"description": "Enhanced plugin for integrating MeiliSearch with NodeBB",
 	"author": {
 		"name": "JasonCH",

package/static/less/meilisearch.less

@@ -92,19 +92,42 @@
     user-select: none;
 }
 
-/* Cap dropdown to roughly 3 result rows so it never overflows past the
-   browser bottom bar when the composer is in half-screen mode. Activated
-   only on composer dropdowns (data-meilisearch-decorated="1" set by
-   static/lib/client/quick-search.js). */
+/* Cap dropdown so it never overflows past the browser bottom bar when the
+   composer is in half-screen mode. Activated only on composer dropdowns
+   (data-meilisearch-decorated="1" set by static/lib/client/quick-search.js).
+   The max-height here is the single height control — the <ul> fills the
+   remaining space after the header and scrolls internally. */
 .quick-search-container[data-meilisearch-decorated="1"] {
-    max-height: 320px;
+    max-height: 370px;
     overflow: hidden;
     display: flex;
     flex-direction: column;
 }
 
+.quick-search-container[data-meilisearch-decorated="1"] .quick-search-results-container {
+    display: flex;
+    flex-direction: column;
+    flex: 1 1 auto;
+    min-height: 0;
+    overflow: hidden;
+    position: relative;
+}
+
 .quick-search-container[data-meilisearch-decorated="1"] .quick-search-results {
     max-height: 260px !important;
     overflow: auto;
     flex: 1 1 auto;
+    min-height: 0;
+    padding-bottom: 2rem;
+}
+
+/* Overlay the desktop "See more results" button at lower-right corner of the
+   scrolling results. No gradient, no padding — just the bare button. */
+.quick-search-container[data-meilisearch-decorated="1"] .quick-search-results-container > .text-center.mt-2.d-none.d-md-block {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    z-index: 10;
+    margin-top: 0 !important;
+    padding: 0;
 }

package/static/lib/chat-search-global.js

@@ -80,7 +80,10 @@ $(document).ready(function () {
 		// Render the template FIRST (async), then atomically remove + prepend.
 		// This prevents chat-search's MutationObserver from re-injecting its
 		// container during the await gap (which caused duplicate search boxes).
-		const html = await app.parseAndTranslate('client/partials/chats/search-bar', {});
+		// Pre-translate placeholder (NodeBB 4.15.0 removed translator step from app.parseAndTranslate).
+		const translator = await app.require('translator');
+		const placeholder = await translator.translateKey('meilisearch:chatSearch.client.placeholder');
+		const html = await app.parseAndTranslate('client/partials/chats/search-bar', { placeholder: placeholder });
 		$('#global-chat-search-container').remove();
 		container.prepend(html);
 		restoreState();
@@ -138,19 +141,10 @@ $(document).ready(function () {
 		return text.replace(/\s+/g, ' ').trim();
 	}
 
-	async function translateHtml(html) {
-		return new Promise(function (resolve) {
-			require(['translator'], function (translator) {
-				translator.translate(html, function (translated) {
-					resolve(translator.unescape(translated));
-				});
-			});
-		});
-	}
-
 	async function executeSearch() {
 		const query = $('#global-chat-search').val();
 		const resultsContainer = $('#global-search-results');
+		const translator = await app.require('translator');
 
 		if (!query) {
 			resultsContainer.hide();
@@ -159,7 +153,8 @@ $(document).ready(function () {
 			return;
 		}
 
-		const spinnerHtml = await translateHtml('<div class="text-center" style="padding:10px;"><i class="fa fa-spinner fa-spin"></i> [[meilisearch:chatSearch.client.searching]]</div>');
+		const searchingLabel = await translator.translateKey('meilisearch:chatSearch.client.searching');
+		const spinnerHtml = '<div class="text-center" style="padding:10px;"><i class="fa fa-spinner fa-spin"></i> ' + searchingLabel + '</div>';
 		resultsContainer.show().html(spinnerHtml);
 		window.chatSearchState.isOpen = true;
 
@@ -169,17 +164,22 @@ $(document).ready(function () {
 		socket.emit('plugins.meilisearch.chatSearchGlobal', payload, async function (err, messages) {
 			if (seq !== searchSeq) return;
 			if (err) {
-				const errorHtml = await translateHtml('<div class="alert alert-danger" style="margin:5px;">[[meilisearch:chatSearch.client.error]]</div>');
+				const errorLabel = await translator.translateKey('meilisearch:chatSearch.client.error');
+				const errorHtml = '<div class="alert alert-danger" style="margin:5px;">' + errorLabel + '</div>';
 				resultsContainer.html(errorHtml);
 				return;
 			}
 			if (!messages || messages.length === 0) {
-				const noResHtml = await translateHtml('<div class="text-center" style="padding:10px; color: var(--bs-secondary-color);">[[meilisearch:chatSearch.client.no-results]]</div>');
+				const noResultsLabel = await translator.translateKey('meilisearch:chatSearch.client.no-results');
+				const noResHtml = '<div class="text-center" style="padding:10px; color: var(--bs-secondary-color);">' + noResultsLabel + '</div>';
 				resultsContainer.html(noResHtml);
 				window.chatSearchState.resultsHtml = noResHtml;
 				return;
 			}
 
+			// Pre-translate unknown-user fallback (NodeBB 4.15.0 removed translator step from app.parseAndTranslate).
+			const unknownUserLabel = await translator.translateKey('meilisearch:chatSearch.client.unknown-user');
+
 			// Pre-process messages for the template
 			const preparedMessages = messages.map(function (msg) {
 				var ts = parseInt(msg.timestamp, 10);
@@ -195,7 +195,7 @@ $(document).ready(function () {
 				var chatLink = hasRank
 					? (config.relative_path || '') + '/user/' + app.user.userslug + '/chats/' + roomId + '/' + (rank + 1)
 					: (config.relative_path || '') + '/message/' + mid;
-				var senderName = (msg.user && msg.user.username) ? msg.user.username : '[[meilisearch:chatSearch.client.unknown-user]]';
+				var senderName = (msg.user && msg.user.username) ? msg.user.username : unknownUserLabel;
 
 				return {
 					mid: mid,

package/static/lib/client/quick-search.js

@@ -47,7 +47,7 @@
 	function bindResultClick(resultEl) {
 		resultEl
 			.off('click.meili-minimize')
-			.on('click.meili-minimize', '#quick-search-results a', function () {
+			.on('click.meili-minimize', '.quick-search-results-container a', function () {
 				var composerEl = resultEl.closest('.composer');
 				if (!composerEl.length) { return; }
 				var hideBtn = composerEl.find('[data-action="hide"]').first();

package/static/scss/meilisearch.scss

@@ -86,19 +86,42 @@
 	user-select: none;
 }
 
-/* Cap dropdown to roughly 3 result rows so it never overflows past the
-   browser bottom bar when the composer is in half-screen mode. Activated
-   only on composer dropdowns (data-meilisearch-decorated="1" set by
-   static/lib/client/quick-search.js). */
+/* Cap dropdown so it never overflows past the browser bottom bar when the
+   composer is in half-screen mode. Activated only on composer dropdowns
+   (data-meilisearch-decorated="1" set by static/lib/client/quick-search.js).
+   The max-height here is the single height control — the <ul> fills the
+   remaining space after the header and scrolls internally. */
 .quick-search-container[data-meilisearch-decorated="1"] {
-	max-height: 320px;
+	max-height: 370px;
 	overflow: hidden;
 	display: flex;
 	flex-direction: column;
 }
 
+.quick-search-container[data-meilisearch-decorated="1"] .quick-search-results-container {
+	display: flex;
+	flex-direction: column;
+	flex: 1 1 auto;
+	min-height: 0;
+	overflow: hidden;
+	position: relative;
+}
+
 .quick-search-container[data-meilisearch-decorated="1"] .quick-search-results {
 	max-height: 260px !important;
 	overflow: auto;
 	flex: 1 1 auto;
+	min-height: 0;
+	padding-bottom: 2rem;
+}
+
+/* Overlay the desktop "See more results" button at lower-right corner of the
+   scrolling results. No gradient, no padding — just the bare button. */
+.quick-search-container[data-meilisearch-decorated="1"] .quick-search-results-container > .text-center.mt-2.d-none.d-md-block {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	z-index: 10;
+	margin-top: 0 !important;
+	padding: 0;
 }

package/static/templates/client/partials/chats/search-bar.tpl

@@ -1,6 +1,6 @@
 <div id="global-chat-search-container" data-plugin="meilisearch" style="padding: 10px; background-color: var(--bs-body-bg); border-bottom: 1px solid var(--bs-border-color); margin-bottom: 5px;">
 	<div class="input-group">
-		<input type="text" id="global-chat-search" class="form-control" placeholder="[[meilisearch:chatSearch.client.placeholder]]" style="font-size: 14px; height: 34px;">
+		<input type="text" id="global-chat-search" class="form-control" placeholder="{placeholder}" style="font-size: 14px; height: 34px;">
 		<span class="input-group-btn">
 			<button class="btn btn-primary" id="btn-chat-search" type="button" style="height: 34px;"><i class="fa fa-search"></i></button>
 		</span>