Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-01 16:59:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "FEATURE: fenced code blocks can hint with "pre" or "text"""

Browse Source 
This reverts commit 4487d6a4c25ba5d3a366e2a8ada489a6a08d67ab.
This commit is contained in:
Sam Saffron 2014-09-18 15:15:42 +10:00
parent d6a562658a
commit b0875f8332
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/dialects/code_dialect.js
View File

@ -10,6 +10,8 @@ var acceptableCodeClasses =
"profile", "python", "r", "rib", "rsl", "ruby", "rust", "scala", "smalltalk", "sql", "tex", "text", "profile", "python", "r", "rib", "rsl", "ruby", "rust", "scala", "smalltalk", "sql", "tex", "text",
"vala", "vbscript", "vhdl"]; "vala", "vbscript", "vhdl"];
var textCodeClasses = ["text", "pre"];
function flattenBlocks(blocks) { function flattenBlocks(blocks) {
var result = ""; var result = "";
blocks.forEach(function(b) { blocks.forEach(function(b) {
@ -28,7 +30,12 @@ Discourse.Dialect.replaceBlock({
if (matches[1] && acceptableCodeClasses.indexOf(matches[1]) !== -1) { if (matches[1] && acceptableCodeClasses.indexOf(matches[1]) !== -1) {
klass = matches[1]; klass = matches[1];
} }
return ['p', ['pre', ['code', {'class': klass}, flattenBlocks(blockContents) ]]];
if (textCodeClasses.indexOf(matches[1]) !== -1) {
return ['p', ['pre', ['code', flattenBlocks(blockContents) ]]];
} else {
return ['p', ['pre', ['code', {'class': klass}, flattenBlocks(blockContents) ]]];
}
} }
}); });