github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 11:23:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: quoting a spoiler

Browse Source 
Was "removing" (rather not re-applying) the `[spoiler]` BBCode because we were testing the **whole** class of the `span`/`div` was `spoiled` but we added another class and thus broke this functionnality.

In order to fix this issue, the test to determine whether a `span`/`div` is a spoiler, now uses a regular expression to check whether the `class` **contains** the word `spoiled`.

Reference - https://meta.discourse.org/t/quoting-spoiler-text-doesnt-include-spoiler-tags-in-the-quote/170145
This commit is contained in:
Régis Hanol 2024-05-28 18:07:42 +02:00
parent c3f43125a2
commit 94cf1c4786
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/spoiler-alert/assets/javascripts/initializers/spoiler-alert.js
View File

@ -28,7 +28,9 @@ export function initializeSpoiler(api) {
});
addTagDecorateCallback(function () {
if (this.element.attributes.class === "spoiled") {
const { attributes } = this.element;
if (/\bspoiled\b/.test(attributes.class)) {
this.prefix = "[spoiler]";
this.suffix = "[/spoiler]";
}
@ -37,9 +39,9 @@ export function initializeSpoiler(api) {
addBlockDecorateCallback(function (text) {
const { name, attributes } = this.element;
if (name === "div" && attributes.class === "spoiled") {
this.prefix = "[spoiler]";
this.suffix = "[/spoiler]";
if (name === "div" && /\bspoiled\b/.test(attributes.class)) {
this.prefix = "[spoiler]\n";
this.suffix = "\n[/spoiler]";
return text.trim();
}
});

4
plugins/spoiler-alert/test/javascripts/unit/lib/to-markdown-test.js
View File

@ -10,8 +10,8 @@ discourseModule("Spoiler Alert | Unit | to-markdown", function (hooks) {
});
test("handles spoiler tags", function (assert) {
let html = `<div>Text with a</div><div class="spoiled">spoiled</div><div>word.</div>`;
let markdown = `Text with a\n\n[spoiler]spoiled[/spoiler]\n\nword.`;
let html = `<div>Text with a</div><div class="spoiled spoiler-blurred">spoiled</div><div>word.</div>`;
let markdown = `Text with a\n\n[spoiler]\nspoiled\n[/spoiler]\n\nword.`;
assert.strictEqual(
toMarkdown(html),