mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-03-01 09:20:02 +00:00
Code Issues Releases Wiki Activity

fix: macro in widget param

Browse Source
This commit is contained in:
lin onetwo 2024-10-13 20:55:03 +08:00
parent 375df47b19
commit 53296a484c
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,8 +405,15 @@ exports.serializeAttribute = function(node) {
} else if(node.type === "substituted") { } else if(node.type === "substituted") {
attributeString += "=`" + node.rawValue + "`"; attributeString += "=`" + node.rawValue + "`";
} else if(node.type === "macro") { } else if(node.type === "macro") {
// Assuming macro serialization is complex and handled elsewhere if(node.value && typeof node.value === "object" && node.value.type === "macrocall") {
attributeString += "=" + node.value.serialize(); var params = node.value.params.map(function(param) {
return param.value;
}).join(" ");
attributeString += "=<<" + node.value.name + " " + params + ">>";
} else {
// Unsupported macro structure
return null;
}
} else { } else {
// Unsupported type // Unsupported type
return null; return null;

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

@ -197,9 +197,9 @@ exports.isLegalTag = function(tag) {
exports.serialize = function(tree, serialize) { exports.serialize = function(tree, serialize) {
var tag = tree.tag; var tag = tree.tag;
var attributes = Object.keys(tree.attributes).map(function(key) { var attributes = tree.orderedAttributes.map(function(attribute) {
return key + '="' + tree.attributes[key].value + '"'; return $tw.utils.serializeAttribute(attribute);
}).join(""); }).join(" ");
// Children // Children
var children = tree.children ? serialize(tree.children) : ""; var children = tree.children ? serialize(tree.children) : "";
// Self-closing tag // Self-closing tag

5
editions/test/tiddlers/tests/data/serialize/Attribute.tid Normal file
View File

@ -0,0 +1,5 @@
tags: $:/tags/wikitext-serialize-test-spec
title: Serialize/Attribute
type: text/vnd.tiddlywiki
<$macrocall $name="rpn" a=<<rpn 2 2 *>> b="pi" operation="*" decimals="4" />