mirrors
/
TiddlyWiki5
mirror of https://github.com/Jermolene/TiddlyWiki5
1
0
Fork 0
Code Issues Releases Wiki Activity

fix RSOD with format:variable operator

This commit is contained in:
pmario 2024-05-01 13:01:34 +02:00
parent 056a6daa58
commit 0662aa34f4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/modules/utils/utils.js
View File

@ -310,17 +310,17 @@ exports.slowInSlowOut = function(t) {
}; };
exports.formatVariableString = function(template,options) { exports.formatVariableString = function(template,options) {
var name = options.name || "", var result = "",
params = options.params || "",
firstLine = "", firstLine = "",
os = options.srcVariable, name = options.name || "",
type = (os.isFunctionDefinition) ? "\\\\function" : (os.isMacroDefinition) ? "\\\\define" : params = options.params || "",
os = options.srcVariable || options.name;
var type = (os.isFunctionDefinition) ? "\\\\function" : (os.isMacroDefinition) ? "\\\\define" :
(os.isProcedureDefinition) ? "\\\\procedure" : (os.isWidgetDefinition) ? "\\\\widget" : "", (os.isProcedureDefinition) ? "\\\\procedure" : (os.isWidgetDefinition) ? "\\\\widget" : "",
varType = (os.isFunctionDefinition) ? "fn" : (os.isMacroDefinition) ? "macro" : varType = (os.isFunctionDefinition) ? "fn" : (os.isMacroDefinition) ? "macro" :
(os.isProcedureDefinition) ? "proc" : (os.isWidgetDefinition) ? "widget" : "var"; (os.isProcedureDefinition) ? "proc" : (os.isWidgetDefinition) ? "widget" : "var";
var result = "", var t = (!os.isFunctionDefinition && !os.isMacroDefinition && !os.isProcedureDefinition && !os.isWidgetDefinition) ? "$name$" : template;
t = (!os.isFunctionDefinition && !os.isMacroDefinition && !os.isProcedureDefinition && !os.isWidgetDefinition) ? "$name$" : template, var matches = [
matches = [
[/^\$type\$/i, function() { [/^\$type\$/i, function() {
return (type) ? type : ""; return (type) ? type : "";
}], }],
@ -330,7 +330,7 @@ exports.formatVariableString = function(template,options) {
[/^\$params\$/i, function() { [/^\$params\$/i, function() {
var elements = [], var elements = [],
paramString = ""; paramString = "";
if (params && params[0] && params[0].name) { if(params && params[0] && params[0].name) {
$tw.utils.each(params, function(p) { $tw.utils.each(params, function(p) {
elements.push(p.name + ((p.default) ? ':"' + p.default + '"' : "")); elements.push(p.name + ((p.default) ? ':"' + p.default + '"' : ""));
}); });