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

FIX: Handle poll titles when headings are present (#10832)

Browse Source 
Poll markdown processing failed when there were any heading elements preceding a poll.

(Issue originally reported in babbebfb35 (commitcomment-42983768))
This commit is contained in:
Jarek Radosz
2020-10-06 13:24:38 +02:00
committed by GitHub
parent e639472fdd
commit 5c3f1202cf
2 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
View File

@ -81,18 +81,25 @@ function invalidPoll(state, tag) {
token.content = "[/" + tag + "]";
}
function getTitle(tokens) {
const open = tokens.findIndex((token) => token.type === "heading_open");
const close = tokens.findIndex((token) => token.type === "heading_close");
function getTitle(tokens, startToken) {
const startIndex = tokens.indexOf(startToken);
if (startIndex === -1) {
return;
}
const pollTokens = tokens.slice(startIndex);
const open = pollTokens.findIndex((token) => token.type === "heading_open");
const close = pollTokens.findIndex((token) => token.type === "heading_close");
if (open === -1 || close === -1) {
return;
}
const titleTokens = tokens.slice(open + 1, close);
const titleTokens = pollTokens.slice(open + 1, close);
// Remove the heading element
tokens.splice(open, close - open + 1);
tokens.splice(startIndex + open, close - open + 1);
return titleTokens;
}
@ -108,7 +115,7 @@ const rule = {
},
after: function (state, openToken, raw) {
const titleTokens = getTitle(state.tokens);
const titleTokens = getTitle(state.tokens, openToken);
let items = getListItems(state.tokens, openToken);
if (!items) {