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

allow 1 nested button. button in button in button will return an error

Browse Source
This commit is contained in:
pmario 2024-04-19 10:37:05 +02:00
parent 9f4f76d4c8
commit 49208cf056
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
*/
ButtonWidget.prototype.isNestedButton = function() {
var pointer = this.parentWidget;
var pointer = this.parentWidget,
depth = 0;
while(pointer) {
if(pointer instanceof ButtonWidget) {
return true;
// we allow 1 nested button
if(depth > 1) return true;
depth += 1;
}
pointer = pointer.parentWidget;
}

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

@ -12,4 +12,4 @@ title: Output
+
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
<$button>Test Button
<$button>Invalid button
<$button>Second button
</$button>
+
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>