clone/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/TiddlyWiki/TiddlyWiki5.git synced 2026-05-05 06:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

added triple double-quotes delimiters for marco/widget parameters (to support json strings)

Browse Source
This commit is contained in:
buggyj
2014-06-19 07:29:14 +02:00
parent 9147cadd3c
commit a2ec4c55e3
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/parsers/parseutils.js
View File

@@ -99,11 +99,13 @@ exports.parseStringLiteral = function(source,pos) {
type: "string",
start: pos
};
var reString = /(?:"([^"]*)")|(?:'([^']*)')/g;
var reString = /(?:"""([\s\S]*?)"""|"([^"]*)")|(?:'([^']*)')/g;
reString.lastIndex = pos;
var match = reString.exec(source);
if(match && match.index === pos) {
node.value = match[1] === undefined ? match[2] : match[1];
node.value = match[1] !== undefined ? match[1] :(
match[2] !== undefined ? match[2] : match[3]
);
node.end = pos + match[0].length;
return node;
} else {
@@ -134,7 +136,9 @@ exports.parseMacroParameter = function(source,pos) {
token.match[3] !== undefined ? token.match[3] : (
token.match[4] !== undefined ? token.match[4] : (
token.match[5] !== undefined ? token.match[5] : (
""
token.match[6] !== undefined ? token.match[6] : (
""
)
)
)
)