kopia lustrzana https://github.com/miklobit/TiddlyWiki5
Require confirmation for all tiddler deletions
Previously we only asked for confirmation when deleting a draft tiddlerprint-window-tiddler
rodzic
776bf29afc
commit
f9a274df85
|
@ -198,20 +198,29 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
|
||||||
// Get the tiddler we're deleting
|
// Get the tiddler we're deleting
|
||||||
var title = event.param || event.tiddlerTitle,
|
var title = event.param || event.tiddlerTitle,
|
||||||
tiddler = this.wiki.getTiddler(title),
|
tiddler = this.wiki.getTiddler(title),
|
||||||
storyList = this.getStoryList();
|
storyList = this.getStoryList(),
|
||||||
|
originalTitle, confirmationTitle;
|
||||||
// Check if the tiddler we're deleting is in draft mode
|
// Check if the tiddler we're deleting is in draft mode
|
||||||
if(tiddler.hasField("draft.title")) {
|
if(tiddler.hasField("draft.title")) {
|
||||||
// Delete the original tiddler
|
// If so, we'll prompt for confirmation referencing the original tiddler
|
||||||
var originalTitle = tiddler.fields["draft.of"];
|
originalTitle = tiddler.fields["draft.of"];
|
||||||
// Ask for confirmation if the tiddler has changed
|
confirmationTitle = originalTitle;
|
||||||
|
} else {
|
||||||
|
// If not a draft, then prompt for confirmation referencing the specified tiddler
|
||||||
|
originalTitle = null;
|
||||||
|
confirmationTitle = title;
|
||||||
|
}
|
||||||
|
// Seek confirmation
|
||||||
if(!confirm($tw.language.getString(
|
if(!confirm($tw.language.getString(
|
||||||
"ConfirmDeleteTiddler",
|
"ConfirmDeleteTiddler",
|
||||||
{variables:
|
{variables:
|
||||||
{title: originalTitle}
|
{title: confirmationTitle}
|
||||||
}
|
}
|
||||||
))) {
|
))) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
// Delete the original tiddler
|
||||||
|
if(originalTitle) {
|
||||||
this.wiki.deleteTiddler(originalTitle);
|
this.wiki.deleteTiddler(originalTitle);
|
||||||
this.removeTitleFromStory(storyList,originalTitle);
|
this.removeTitleFromStory(storyList,originalTitle);
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue