clone/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/TiddlyWiki/TiddlyWiki5.git synced 2026-04-29 02:56:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of the tweakParseTreeNode() hack

Browse Source 
It’s an embarrassing hangover from a refactoring of the parsing
mechanism last year.
This commit is contained in:
Jermolene
2014-05-14 08:51:08 +01:00
parent 92aa1f24be
commit c9c1b0fbb4
15 changed files with 39 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/modules/parsers/wikiparser/rules/html.js
View File

@@ -97,6 +97,9 @@ exports.parseTag = function(source,pos,options) {
return null;
}
node.tag = token.match[1];
if(node.tag.charAt(0) === "$") {
node.type = node.tag.substr(1);
}
pos = token.end;
// Process attributes
var attribute = $tw.utils.parseAttribute(source,pos);
@@ -142,7 +145,7 @@ exports.findNextTag = function(source,pos,options) {
// Try to parse the candidate as a tag
var tag = this.parseTag(source,match.index,options);
// Return success
if(tag && this.isLegalTag(tag.tag)) {
if(tag && this.isLegalTag(tag)) {
return tag;
}
// Look for the next match
@@ -154,11 +157,11 @@ exports.findNextTag = function(source,pos,options) {
};
exports.isLegalTag = function(tag) {
// If it starts with a $ then we'll let anything go
if(tag.charAt(0) === "$") {
// Widgets are always OK
if(tag.type !== "element") {
return true;
// If it starts with a dash then it's not legal
} else if(tag.charAt(0) === "-") {
// If it's an HTML tag that starts with a dash then it's not legal
} else if(tag.tag.charAt(0) === "-") {
return false;
} else {
// Otherwise it's OK