@nodebb/nodebb-plugin-reactions 2.1.5 → 2.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodebb/nodebb-plugin-reactions",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "nbbpm": {
     "compatibility": "^3.3.0"
   },

package/public/client.js

@@ -217,11 +217,18 @@ $(document).ready(function () {
 
 	function createReactionTooltips() {
 		require(['bootstrap', 'translator'], function (bootstrap, translator) {
-			async function createTooltip(data) {
-				if (!mouseOverReactionEl || !mouseOverReactionEl.length) {
-					return;
+			function disposeTooltip(el) {
+				if (el && el.length) {
+					const tooltip = bootstrap.Tooltip.getInstance(el.get(0));
+					if (tooltip) {
+						tooltip.dispose();
+						el.attr('title', '');
+					}
 				}
+			}
+			async function createTooltip(data) {
 				const el = mouseOverReactionEl;
+				disposeTooltip(el);
 				let usernames = data.usernames.filter(name => name !== '[[global:former_user]]');
 				if (!usernames.length) {
 					return;
@@ -242,37 +249,45 @@ $(document).ready(function () {
 					animation: false,
 				})).show();
 			}
+			function clearTooltipTimeout() {
+				if (tooltipTimeoutId) {
+					clearTimeout(tooltipTimeoutId);
+					tooltipTimeoutId = 0;
+				}
+			}
 
 			if (!utils.isTouchDevice()) {
 				$('#content').on('mouseenter', '.reaction', function () {
 					const $this = $(this);
 					mouseOverReactionEl = $this;
-					const mid = $this.attr('data-mid');
-					const pid = $this.attr('data-pid');
+					clearTooltipTimeout();
 					tooltipTimeoutId = setTimeout(async () => {
 						if (mouseOverReactionEl && mouseOverReactionEl.length) {
-							const d = await socket.emit('plugins.reactions.getReactionUsernames', {
-								type: pid ? 'post' : 'message',
+							const pid = mouseOverReactionEl.attr('data-pid');
+							const mid = mouseOverReactionEl.attr('data-mid');
+							const type = pid ? 'post' : 'message';
+							const data = await socket.emit('plugins.reactions.getReactionUsernames', {
+								type: type,
 								mid: mid,
 								pid: pid,
-								reaction: $this.attr('data-reaction'),
+								reaction: mouseOverReactionEl.attr('data-reaction'),
 							});
-							createTooltip(d);
+
+							if (mouseOverReactionEl && mouseOverReactionEl.length &&
+								(
+									(type === 'post' && pid === mouseOverReactionEl.attr('data-pid')) ||
+									(type === 'message' && mid === mouseOverReactionEl.attr('data-mid'))
+								)
+							) {
+								createTooltip(data);
+							}
 						}
 					}, 200);
 				});
 				$('#content').on('mouseleave', '.reaction', function () {
-					if (tooltipTimeoutId) {
-						clearTimeout(tooltipTimeoutId);
-						tooltipTimeoutId = 0;
-					}
+					clearTooltipTimeout();
 					mouseOverReactionEl = null;
-					const $this = $(this);
-					const tooltip = bootstrap.Tooltip.getInstance(this);
-					if (tooltip) {
-						tooltip.dispose();
-						$this.attr('title', '');
-					}
+					disposeTooltip($(this));
 				});
 			}
 		});