From 8c67e113655e39ec14f470097da341f5011639bf Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Sun, 9 Nov 2014 16:45:14 +0000
Subject: [PATCH] Fixes to action-deletetiddler widget

---
 core/modules/widgets/action-deletetiddler.js   | 18 +++++++++++++-----
 .../tiddlers/ActionDeleteTiddlerWidget.tid     |  7 ++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/core/modules/widgets/action-deletetiddler.js b/core/modules/widgets/action-deletetiddler.js
index 61186d638..e6fc14e5e 100644
--- a/core/modules/widgets/action-deletetiddler.js
+++ b/core/modules/widgets/action-deletetiddler.js
@@ -35,8 +35,8 @@ DeleteTiddlerWidget.prototype.render = function(parent,nextSibling) {
 Compute the internal state of the widget
 */
 DeleteTiddlerWidget.prototype.execute = function() {
-	this.actionTiddler = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
-	this.actionConfirm = this.getAttribute("$confirm");
+	this.actionFilter = this.getAttribute("$filter");
+	this.actionTiddler = this.getAttribute("$tiddler");
 };
 
 /*
@@ -44,7 +44,7 @@ Refresh the widget by ensuring our attributes are up to date
 */
 DeleteTiddlerWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes["$tiddler"] || changedAttributes["$confirm"]) {
+	if(changedAttributes["$filter"] || changedAttributes["$tiddler"]) {
 		this.refreshSelf();
 		return true;
 	}
@@ -55,8 +55,16 @@ DeleteTiddlerWidget.prototype.refresh = function(changedTiddlers) {
 Invoke the action associated with this widget
 */
 DeleteTiddlerWidget.prototype.invokeAction = function(triggeringWidget,event) {
-	
-	this.wiki.setText(this.actionTiddler,this.actionField,this.actionIndex,this.actionValue);
+	var tiddlers;
+	if(this.actionFilter) {
+		tiddlers = this.wiki.filterTiddlers(this.actionFilter,this);
+	}
+	if(this.actionTiddler) {
+		tiddlers.push(this.actionTiddler);
+	}
+	for(var t=0; t<tiddlers.length; t++) {
+		this.wiki.deleteTiddler(tiddlers[t]);
+	}
 	return true; // Action was invoked
 };
 
diff --git a/editions/prerelease/tiddlers/ActionDeleteTiddlerWidget.tid b/editions/prerelease/tiddlers/ActionDeleteTiddlerWidget.tid
index 291050d98..e40535c66 100644
--- a/editions/prerelease/tiddlers/ActionDeleteTiddlerWidget.tid
+++ b/editions/prerelease/tiddlers/ActionDeleteTiddlerWidget.tid
@@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki
 
 ! Introduction
 
-The ''action-deletetiddler'' widget is an [[action widget|ActionWidgets]] that deletes a tiddler. ActionWidgets are used within triggering widgets such as the ButtonWidget.
+The ''action-deletetiddler'' widget is an [[action widget|ActionWidgets]] that deletes tiddlers. ActionWidgets are used within triggering widgets such as the ButtonWidget.
 
 There are several differences compared to the [[WidgetMessage: tm-delete-tiddler]]:
 
@@ -20,7 +20,8 @@ There are several differences compared to the [[WidgetMessage: tm-delete-tiddler
 The ''action-deletetiddler'' widget is invisible. Any content within it is ignored.
 
 |!Attribute |!Description |
-|$tiddler |The title of the tiddler to be deleted (if not provided defaults to the [[WidgetVariable: currentTiddler]] |
+|$tiddler |Optional title of the tiddler to be deleted |
+|$filter |Optional filter identifying tiddlers to be deleted |
 
 ! Examples
 
@@ -29,5 +30,5 @@ Here is an example of a button that deletes the tiddler HelloThere. Note:
 <$macrocall $name='wikitext-example-without-html'
 src='<$button>
 <$action-deletetiddler $tiddler="HelloThere"/>
-Go to Control Panel "Appearance" tab
+Delete "HelloThere"
 </$button>'/>