From 7285e7fbbad2d5f7b9ff510e102f2ec6a02f8371 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 22 May 2018 13:58:06 +0200 Subject: [PATCH] FIX: uses tooltip to display local dates previews --- .../assets/javascripts/discourse-local-dates.js | 5 ++++- .../javascripts/initializers/discourse-local-dates.js.es6 | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js index f64c694e01a..c68c51a4617 100644 --- a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js +++ b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js @@ -46,9 +46,12 @@ html += relativeTime.replace("TZ", _formatTimezone(moment.tz.guess()).join(": ")); html += ""; + var joinedPreviews = previews.join("\n"); + $element .html(html) - .attr("title", previews.join("\n")) + .attr("title", joinedPreviews) + .attr("data-tooltip", joinedPreviews) .addClass("cooked"); if (repeat) { diff --git a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6 b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6 index b79a2a648a5..395a776fb76 100644 --- a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6 +++ b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6 @@ -1,9 +1,11 @@ import { withPluginApi } from "discourse/lib/plugin-api"; import showModal from "discourse/lib/show-modal"; +import { registerTooltip } from "discourse/lib/tooltip"; function initializeDiscourseLocalDates(api) { api.decorateCooked($elem => { $(".discourse-local-date", $elem).applyLocalDates(); + registerTooltip($(".discourse-local-date", $elem)); }); api.addToolbarPopupMenuOptionsCallback(() => {