mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-09-28 23:10:46 +00:00
Better backwards compatibility for legacy recursion marker
Fixes the problem with tag dropdowns @btheado
This commit is contained in:
parent
eef7d180a5
commit
0b11b499c2
@ -63,15 +63,18 @@ TranscludeWidget.prototype.execute = function() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// Set context variables for recursion detection
|
// Set context variables for recursion detection
|
||||||
var recursionMarker = this.makeLegacyRecursionMarker(),
|
var recursionMarker = this.makeRecursionMarker();
|
||||||
newRecursionMarker = this.makeRecursionMarker();
|
|
||||||
if(this.recursionMarker === "yes") {
|
if(this.recursionMarker === "yes") {
|
||||||
this.setVariable("transclusion",recursionMarker);
|
this.setVariable("$transclusion",recursionMarker);
|
||||||
this.setVariable("$transclusion",newRecursionMarker);
|
}
|
||||||
|
// 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
|
// Check for recursion
|
||||||
if(target.parser) {
|
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: {
|
parseTreeNodes = [{type: "element", tag: "span", attributes: {
|
||||||
"class": {type: "string", value: "tc-error"}
|
"class": {type: "string", value: "tc-error"}
|
||||||
}, children: [
|
}, children: [
|
||||||
|
Loading…
Reference in New Issue
Block a user