mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 12:07:19 +00:00
Code Issues Releases Wiki Activity

Change module type for parsers to "parser"

Browse Source
This commit is contained in:
Jeremy Ruston 2013-01-16 13:56:11 +00:00
parent 0e2a0068e5
commit d28ee0b82a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/parsers/imageparser.js
View File

@ -1,7 +1,7 @@
/*\ /*\
title: $:/core/modules/parsers/imageparser.js title: $:/core/modules/parsers/imageparser.js
type: application/javascript type: application/javascript
module-type: newparser module-type: parser
The image parser parses an image into an embeddable HTML element The image parser parses an image into an embeddable HTML element

2
core/modules/parsers/textparser.js
View File

@ -1,7 +1,7 @@
/*\ /*\
title: $:/core/modules/parsers/textparser.js title: $:/core/modules/parsers/textparser.js
type: application/javascript type: application/javascript
module-type: newparser module-type: parser
The plain text parser processes blocks of source text into a degenerate parse tree consisting of a single text node The plain text parser processes blocks of source text into a degenerate parse tree consisting of a single text node

2
core/modules/parsers/wikiparser/wikiparser.js
View File

@ -1,7 +1,7 @@
/*\ /*\
title: $:/core/modules/parsers/wikiparser/wikiparser.js title: $:/core/modules/parsers/wikiparser/wikiparser.js
type: application/javascript type: application/javascript
module-type: newparser module-type: parser
The wiki text parser processes blocks of source text into a parse tree. The wiki text parser processes blocks of source text into a parse tree.

12
core/modules/wiki.js
View File

@ -374,12 +374,12 @@ exports.clearCache = function(title) {
exports.initParsers = function(moduleType) { exports.initParsers = function(moduleType) {
// Install the new parser modules // Install the new parser modules
$tw.wiki.newparsers = {}; $tw.wiki.parsers = {};
var self = this; var self = this;
$tw.modules.forEachModuleOfType("newparser",function(title,module) { $tw.modules.forEachModuleOfType("parser",function(title,module) {
for(var f in module) { for(var f in module) {
if($tw.utils.hop(module,f)) { if($tw.utils.hop(module,f)) {
$tw.wiki.newparsers[f] = module[f]; // Store the parser class $tw.wiki.parsers[f] = module[f]; // Store the parser class
} }
} }
}); });
@ -396,12 +396,12 @@ Options include:
exports.parseText = function(type,text,options) { exports.parseText = function(type,text,options) {
options = options || {}; options = options || {};
// Select a parser // Select a parser
var Parser = this.newparsers[type]; var Parser = this.parsers[type];
if(!Parser && $tw.config.fileExtensionInfo[type]) { if(!Parser && $tw.config.fileExtensionInfo[type]) {
Parser = this.newparsers[$tw.config.fileExtensionInfo[type].type]; Parser = this.parsers[$tw.config.fileExtensionInfo[type].type];
} }
if(!Parser) { if(!Parser) {
Parser = this.newparsers[options.defaultType || "text/vnd.tiddlywiki"]; Parser = this.parsers[options.defaultType || "text/vnd.tiddlywiki"];
} }
if(!Parser) { if(!Parser) {
return null; return null;