mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-05-06 17:34:11 +00:00
Code Issues Releases Wiki Activity

Moved support for parameter substitution into wiki.parseText()

Browse Source 
We'll later refactor the same logic out of the tiddler macro
This commit is contained in:
Jeremy Ruston 2012-08-25 12:05:57 +01:00
parent 1d6eba3071
commit 175d7c67fd
1 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
core/modules/wiki.js
View File

@ -398,9 +398,11 @@ Parse a block of text of a specified MIME type
Options are: Options are:
defaultType: Default MIME type to use if the specified one is unknown defaultType: Default MIME type to use if the specified one is unknown
with: Optional array of strings to be substituted for $1, $2 etc.
*/ */
exports.parseText = function(type,text,options) { exports.parseText = function(type,text,options) {
options = options || {}; options = options || {};
// Select a parser
var parser = this.parsers[type]; var parser = this.parsers[type];
if(!parser && $tw.config.fileExtensionInfo[type]) { if(!parser && $tw.config.fileExtensionInfo[type]) {
parser = this.parsers[$tw.config.fileExtensionInfo[type].type]; parser = this.parsers[$tw.config.fileExtensionInfo[type].type];
@ -408,19 +410,37 @@ exports.parseText = function(type,text,options) {
if(!parser) { if(!parser) {
parser = this.parsers[options.defaultType || "text/x-tiddlywiki"]; parser = this.parsers[options.defaultType || "text/x-tiddlywiki"];
} }
if(parser) { if(!parser) {
return parser.parse(type,text);
} else {
return null; return null;
} }
// Substitute any `with` tokens
if("with" in options) {
for(var token in options["with"]) {
var placeholderRegExp = new RegExp("\\$"+token,"mg");
text = text.replace(placeholderRegExp,options["with"][token]);
}
}
return parser.parse(type,text);
}; };
exports.parseTiddler = function(title) { /*
Parse a tiddler according to its MIME type
Options are:
defaultType: Default MIME type to use if the specified one is unknown
with: Optional array of strings to be substituted for $1, $2 etc.
*/
exports.parseTiddler = function(title,options) {
options = options || {};
var me = this, var me = this,
tiddler = this.getTiddler(title); tiddler = this.getTiddler(title);
if("with" in options) {
return this.parseText(tiddler.fields.type,tiddler.fields.text,options);
} else {
return tiddler ? this.getCacheForTiddler(title,"parseTree",function() { return tiddler ? this.getCacheForTiddler(title,"parseTree",function() {
return me.parseText(tiddler.fields.type,tiddler.fields.text); return me.parseText(tiddler.fields.type,tiddler.fields.text,options);
}) : null; }) : null;
}
}; };
/* /*
@ -431,6 +451,7 @@ Parse text in a specified format and render it into another format
options: see wiki.parseText() options: see wiki.parseText()
Options are: Options are:
defaultType: Default MIME type to use if the specified one is unknown defaultType: Default MIME type to use if the specified one is unknown
with: Optional array of strings to be substituted for $1, $2 etc.
*/ */
exports.renderText = function(outputType,textType,text,options) { exports.renderText = function(outputType,textType,text,options) {
var renderer = this.parseText(textType,text,options); var renderer = this.parseText(textType,text,options);
@ -438,8 +459,17 @@ exports.renderText = function(outputType,textType,text,options) {
return renderer.render(outputType); return renderer.render(outputType);
}; };
exports.renderTiddler = function(outputType,title) { /*
var renderer = this.parseTiddler(title); Parse text from a tiddler and render it into another format
outputType: content type for the output
title: title of the tiddler to be rendered
options: see wiki.parseText()
Options are:
defaultType: Default MIME type to use if the specified one is unknown
with: Optional array of strings to be substituted for $1, $2 etc.
*/
exports.renderTiddler = function(outputType,title,options) {
var renderer = this.parseTiddler(title,options);
renderer.execute([],title); renderer.execute([],title);
return renderer.render(outputType); return renderer.render(outputType);
}; };