mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-09-13 00:06:04 +00:00
Code Issues Releases Wiki Activity

Added support for block macro calls

Browse Source
This commit is contained in:
Jeremy Ruston
2012-12-20 17:03:41 +00:00
parent b0893956bc
commit 015145952d
4 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/rendertree/renderers/macrocall.js
View File

@@ -32,7 +32,7 @@ var MacroCallRenderer = function(renderTree,renderContext,parseTreeNode) {
// Substitute the macro parameters
var text = this.substituteParameters(macro.text,this.parseTreeNode,macro);
// Parse the text
childTree = this.renderTree.wiki.new_parseText("text/vnd.tiddlywiki",text).tree;
childTree = this.renderTree.wiki.new_parseText("text/vnd.tiddlywiki",text,{parseAsInline: !this.parseTreeNode.isBlock}).tree;
}
// Create the renderers for the child nodes
this.children = this.renderTree.createRenderers(this.renderContext,childTree);
@@ -83,7 +83,7 @@ MacroCallRenderer.prototype.render = function(type) {
MacroCallRenderer.prototype.renderInDom = function() {
// Create the element
this.domNode = document.createElement("span");
this.domNode = document.createElement(this.parseTreeNode.isBlock ? "div" : "span");
this.domNode.setAttribute("data-macro-name",this.parseTreeNode.name);
// Render any child nodes
var self = this;