mirrors
/
TiddlyWiki5
mirror of https://github.com/Jermolene/TiddlyWiki5
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'button-in-button-fix' into dynamic-max-widget-tree-depth

This commit is contained in:
pmario 2024-04-19 10:41:59 +02:00
parent 3ea14a3a71 49208cf056
commit 1a5c05d2a9
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/modules/widgets/button.js
View File

@ -29,10 +29,13 @@ ButtonWidget.prototype = new Widget();
Detect nested buttons Detect nested buttons
*/ */
ButtonWidget.prototype.isNestedButton = function() { ButtonWidget.prototype.isNestedButton = function() {
var pointer = this.parentWidget; var pointer = this.parentWidget,
depth = 0;
while(pointer) { while(pointer) {
if(pointer instanceof ButtonWidget) { if(pointer instanceof ButtonWidget) {
return true; // we allow 1 nested button
if(depth > 1) return true;
depth += 1;
} }
pointer = pointer.parentWidget; pointer = pointer.parentWidget;
} }

2
editions/test/tiddlers/tests/data/transclude/Recursion-Button-Transclusion.tid
View File

@ -12,4 +12,4 @@ title: Output
+ +
title: ExpectedResult title: ExpectedResult
<p><button class=""><span class="tc-error">Possible Recursive Error: Button in button is not allowed</span></button></p> <p><button class=""><button class=""><button class=""><span class="tc-error">Possible Recursive Error: Button in button is not allowed</span></button></button></button></p>

4
editions/test/tiddlers/tests/data/transclude/Recursion-Button-in-Button.tid
View File

@ -7,9 +7,9 @@ title: Output
\whitespace trim \whitespace trim
<$button>Test Button <$button>Test Button
<$button>Invalid button <$button>Second button
</$button> </$button>
+ +
title: ExpectedResult title: ExpectedResult
<p><button class="">Test Button<span class="tc-error">Possible Recursive Error: Button in button is not allowed</span></button></p> <p><button class="">Test Button<button class="">Second button</button></button></p>