mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 12:07:19 +00:00
Code Issues Releases Wiki Activity

Adjust the parent stack for transclusion

Browse Source 
This enables the dropdowns to work a bit better
This commit is contained in:
Jeremy Ruston 2012-06-19 10:59:58 +01:00
parent cabc11d517
commit 1963c56fa9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/modules/macros/transclude.js
View File

@ -26,7 +26,8 @@ exports.info = {
exports.executeMacro = function() { exports.executeMacro = function() {
var titles,templateTiddler,templateText,t,title,templateParseTree, var titles,templateTiddler,templateText,t,title,templateParseTree,
nodes,node,c, nodes,node,c,
parents = this.parents; parents = this.parents.slice(0);
parents.push(this.tiddlerTitle);
// Get the tiddlers we're transcluding // Get the tiddlers we're transcluding
if(this.hasParameter("filter")) { if(this.hasParameter("filter")) {
titles = this.wiki.filterTiddlers(this.params.filter,this.tiddlerTitle); titles = this.wiki.filterTiddlers(this.params.filter,this.tiddlerTitle);
@ -44,8 +45,7 @@ exports.executeMacro = function() {
// Check for recursion // Check for recursion
if(parents.indexOf(this.params.templateTitle) !== -1) { if(parents.indexOf(this.params.templateTitle) !== -1) {
return $tw.Tree.errorNode("Tiddler recursion error in <<transclude>> macro"); return $tw.Tree.errorNode("Tiddler recursion error in <<transclude>> macro");
} }
parents = parents.slice(0);
parents.push(this.params.templateTitle); parents.push(this.params.templateTitle);
templateParseTree = this.wiki.parseTiddler(this.params.templateTitle); templateParseTree = this.wiki.parseTiddler(this.params.templateTitle);
} else { } else {