mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-10-30 23:23:02 +00:00
Code Issues Releases Wiki Activity

Change macro attributes to not wikify their content

Browse Source 
One consequence of wikifying macro attributes before use was that we
couldn’t have tiddler titles with wikitext syntax in, which was
definitely a problem.
This commit is contained in:
Jermolene
2013-11-22 20:02:44 +00:00
parent f19da7af8c
commit f380d4b27d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/modules/widgets/widget.js
View File

@@ -214,8 +214,7 @@ Widget.prototype.computeAttributes = function() {
if(attribute.type === "indirect") { if(attribute.type === "indirect") {
value = self.wiki.getTextReference(attribute.textReference,"",self.getVariable("currentTiddler")); value = self.wiki.getTextReference(attribute.textReference,"",self.getVariable("currentTiddler"));
} else if(attribute.type === "macro") { } else if(attribute.type === "macro") {
var text = self.getVariable(attribute.value.name,{params: attribute.value.params}); value = self.getVariable(attribute.value.name,{params: attribute.value.params});
value = self.wiki.renderText("text/plain","text/vnd.tiddlywiki",text,{parentWidget: self});
} else { // String attribute } else { // String attribute
value = attribute.value; value = attribute.value;
} }

2
editions/test/tiddlers/tests/test-wikitext.js
View File

@@ -43,7 +43,7 @@ describe("WikiText tests", function() {
expect(wiki.renderTiddler("text/html","TiddlerThree")).toBe("<p>The speed of sound</p><p>The light of speed</p>"); expect(wiki.renderTiddler("text/html","TiddlerThree")).toBe("<p>The speed of sound</p><p>The light of speed</p>");
}); });
it("should support attributes specified as macro invocations", function() { it("should support attributes specified as macro invocations", function() {
expect(wiki.renderTiddler("text/html","TiddlerFour")).toBe("<p><a class=' tw-tiddlylink tw-tiddlylink-missing' href='#This%20is%20my%20amazingly%20groovy%20macro!'>This is a link</a></p>"); expect(wiki.renderTiddler("text/html","TiddlerFour")).toBe("<p><a class=' tw-tiddlylink tw-tiddlylink-missing' href='#This%20is%20my%20''amazingly''%20groovy%20macro!'>This is a link</a></p>");
}); });
}); });