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

FIX: details plugin wasn't working properly

Browse Source
This commit is contained in:
Régis Hanol 2016-07-06 19:12:21 +02:00 committed by Robin Ward
parent 6dc4a3f2d6
commit a2b9b01d0f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/pretty-text/engines/discourse-markdown/html.js.es6
View File

@ -1,5 +1,5 @@
const BLOCK_TAGS = ['address', 'article', 'aside', 'audio', 'blockquote', 'canvas', 'dd', 'div', const BLOCK_TAGS = ['address', 'article', 'aside', 'audio', 'blockquote', 'canvas', 'dd', 'details',
'dl', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3', 'div', 'dl', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3',
'h4', 'h5', 'h6', 'header', 'hgroup', 'hr', 'iframe', 'noscript', 'ol', 'output', 'h4', 'h5', 'h6', 'header', 'hgroup', 'hr', 'iframe', 'noscript', 'ol', 'output',
'p', 'pre', 'section', 'table', 'tfoot', 'ul', 'video']; 'p', 'pre', 'section', 'table', 'tfoot', 'ul', 'video'];

11
plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js.es6
View File

@ -12,7 +12,8 @@ function replaceDetails(text) {
// add new lines to make sure we *always* have a <p> element after </summary> and around </details> // add new lines to make sure we *always* have a <p> element after </summary> and around </details>
// otherwise we can't hide the content since we can't target text nodes via CSS // otherwise we can't hide the content since we can't target text nodes via CSS
return text.replace(/<\/summary>/ig, "</summary>\n\n").replace(/<\/details>/ig, "\n\n</details>\n\n"); return text.replace(/<\/summary>/ig, "</summary>\n\n")
.replace(/<\/details>/ig, "\n\n</details>\n\n");
} }
registerOption((siteSettings, opts) => { registerOption((siteSettings, opts) => {
@ -20,6 +21,12 @@ registerOption((siteSettings, opts) => {
}); });
export function setup(helper) { export function setup(helper) {
helper.whiteList('details.elided'); helper.whiteList([
'summary',
'summary[title]',
'details',
'details.elided'
]);
helper.addPreProcessor(text => replaceDetails(text)); helper.addPreProcessor(text => replaceDetails(text));
} }