mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-09-28 23:10:46 +00:00
Code Issues Releases Wiki Activity

Better backwards compatibility for legacy recursion marker

Browse Source 
Fixes the problem with tag dropdowns @btheado
This commit is contained in:
jeremy@jermolene.com 2022-05-10 10:21:56 +01:00
parent eef7d180a5
commit 0b11b499c2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/modules/widgets/transclude.js
View File

@ -63,15 +63,18 @@ TranscludeWidget.prototype.execute = function() {
break;
}
// Set context variables for recursion detection
var recursionMarker = this.makeLegacyRecursionMarker(),
newRecursionMarker = this.makeRecursionMarker();
var recursionMarker = this.makeRecursionMarker();
if(this.recursionMarker === "yes") {
this.setVariable("transclusion",recursionMarker);
this.setVariable("$transclusion",newRecursionMarker);
this.setVariable("$transclusion",recursionMarker);
}
// Set the legacy transclusion context variables only if we're not transcluding a variable
if(!this.transcludeVariable) {
var legacyRecursionMarker = this.makeLegacyRecursionMarker();
this.setVariable("transclusion",legacyRecursionMarker);
}
// Check for recursion
if(target.parser) {
if(this.parentWidget && this.parentWidget.hasVariable("$transclusion",newRecursionMarker)) {
if(this.parentWidget && this.parentWidget.hasVariable("$transclusion",recursionMarker)) {
parseTreeNodes = [{type: "element", tag: "span", attributes: {
"class": {type: "string", value: "tc-error"}
}, children: [