github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 07:01:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: tooltip regression in admin dashboard

Browse Source 
- adds registerHoverTooltip in tooltip qunit test
This commit is contained in:
Penar Musaraj
2018-12-03 11:15:31 -05:00
parent 1a4676c6e0
commit 923692d45a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/lib/tooltip.js.es6
View File

@ -3,8 +3,9 @@ import { escapeExpression } from "discourse/lib/utilities";
const fadeSpeed = 300; const fadeSpeed = 300;
const tooltipID = "#discourse-tooltip"; const tooltipID = "#discourse-tooltip";
export function showTooltip($this) { export function showTooltip(e) {
const $parent = $this.offsetParent(); const $this = $(e.currentTarget),
$parent = $this.offsetParent();
// html tooltip are risky try your best to sanitize anything // html tooltip are risky try your best to sanitize anything
// displayed as html to avoid XSS attacks // displayed as html to avoid XSS attacks
const content = $this.attr("data-tooltip") const content = $this.attr("data-tooltip")
@ -77,9 +78,7 @@ export function hideTooltip() {
export function registerTooltip(jqueryContext) { export function registerTooltip(jqueryContext) {
if (jqueryContext.length) { if (jqueryContext.length) {
jqueryContext jqueryContext.off("click").on("click", event => showTooltip(event));
.off("click")
.on("click", event => showTooltip($(event.currentTarget)));
} }
} }

4
test/javascripts/lib/tooltip-test.js.es6
View File

@ -1,4 +1,4 @@
import { registerTooltip } from "discourse/lib/tooltip"; import { registerTooltip, registerHoverTooltip } from "discourse/lib/tooltip";
// prettier-ignore // prettier-ignore
QUnit.module("lib:tooltip", { QUnit.module("lib:tooltip", {
@ -37,7 +37,7 @@ QUnit.test("text support", async assert => {
QUnit.test("html support", async assert => { QUnit.test("html support", async assert => {
const $testHtmlLink = fixture(".test-html-link"); const $testHtmlLink = fixture(".test-html-link");
registerTooltip($testHtmlLink); registerHoverTooltip($testHtmlLink);
await $testHtmlLink.click(); await $testHtmlLink.click();