diff --git a/core/modules/parsers/wikiparser/rules/codeblock.js b/core/modules/parsers/wikiparser/rules/codeblock.js index 71efe2dfd..11681261b 100644 --- a/core/modules/parsers/wikiparser/rules/codeblock.js +++ b/core/modules/parsers/wikiparser/rules/codeblock.js @@ -57,7 +57,7 @@ exports.parse = function() { }]; }; -exports.getText = function(tree) { +exports.serialize = function(tree) { return "\n```" + tree.attributes.language.value + "\n" + tree.attributes.code.value + "\n```\n"; } diff --git a/core/modules/parsers/wikiparser/rules/horizrule.js b/core/modules/parsers/wikiparser/rules/horizrule.js index 2e69e1986..697bd65a5 100644 --- a/core/modules/parsers/wikiparser/rules/horizrule.js +++ b/core/modules/parsers/wikiparser/rules/horizrule.js @@ -31,8 +31,8 @@ exports.parse = function() { return [{type: "element", tag: "hr"}]; }; -exports.getText = function() { - return "---"; +exports.serialize = function() { + return "\n---\n"; } })(); diff --git a/core/modules/utils/parsetree.js b/core/modules/utils/parsetree.js index d553ec4f0..ae548de0e 100644 --- a/core/modules/utils/parsetree.js +++ b/core/modules/utils/parsetree.js @@ -137,15 +137,15 @@ exports.serializeParseTree = function serializeParseTree(tree, tiddlerType) { output.push(tree.text); } else { var Parser = $tw.wiki.getParser(tiddlerType); - var Rule = Parser.prototype.blockRuleClasses[tree.type] || - Parser.prototype.inlineRuleClasses[tree.type] || - Parser.prototype.pragmaRuleClasses[tree.type]; - if(Rule && Rule.prototype.getText) { - output.push(Rule.prototype.getText(tree)); + var Rule = Parser.prototype.blockRuleClasses[tree.rule] || + Parser.prototype.inlineRuleClasses[tree.rule] || + Parser.prototype.pragmaRuleClasses[tree.rule]; + if(Rule && Rule.prototype.serialize) { + output.push(Rule.prototype.serialize(tree)); } } if(tree.children) { - return getParseTreeText(tree.children); + return serializeParseTree(tree.children); } } return output.join("");