kopia lustrzana https://github.com/miklobit/TiddlyWiki5
Smarter cancel edit behaviour
If we cancel editing a tiddler that doesn’t exist, then we no longer show the resulting missing tiddler.print-window-tiddler
rodzic
3b08b5e9dd
commit
1dfa6f369b
|
@ -338,11 +338,12 @@ NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) {
|
||||||
var draftTitle = event.param || event.tiddlerTitle,
|
var draftTitle = event.param || event.tiddlerTitle,
|
||||||
draftTiddler = this.wiki.getTiddler(draftTitle),
|
draftTiddler = this.wiki.getTiddler(draftTitle),
|
||||||
originalTitle = draftTiddler.fields["draft.of"],
|
originalTitle = draftTiddler.fields["draft.of"],
|
||||||
|
originalTiddler = this.wiki.getTiddler(originalTitle),
|
||||||
storyList = this.getStoryList();
|
storyList = this.getStoryList();
|
||||||
if(draftTiddler && originalTitle) {
|
if(draftTiddler && originalTitle) {
|
||||||
// Ask for confirmation if the tiddler text has changed
|
// Ask for confirmation if the tiddler text has changed
|
||||||
var isConfirmed = true;
|
var isConfirmed = true;
|
||||||
if(this.wiki.getTiddlerText(draftTitle) !== this.wiki.getTiddlerText(originalTitle)) {
|
if(this.wiki.isDraftModified(draftTitle)) {
|
||||||
isConfirmed = confirm($tw.language.getString(
|
isConfirmed = confirm($tw.language.getString(
|
||||||
"ConfirmCancelTiddler",
|
"ConfirmCancelTiddler",
|
||||||
{variables:
|
{variables:
|
||||||
|
@ -353,8 +354,12 @@ NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) {
|
||||||
// Remove the draft tiddler
|
// Remove the draft tiddler
|
||||||
if(isConfirmed) {
|
if(isConfirmed) {
|
||||||
this.wiki.deleteTiddler(draftTitle);
|
this.wiki.deleteTiddler(draftTitle);
|
||||||
|
if(originalTiddler) {
|
||||||
this.replaceFirstTitleInStory(storyList,draftTitle,originalTitle);
|
this.replaceFirstTitleInStory(storyList,draftTitle,originalTitle);
|
||||||
this.addToHistory(originalTitle,event.navigateFromClientRect);
|
this.addToHistory(originalTitle,event.navigateFromClientRect);
|
||||||
|
} else {
|
||||||
|
this.removeTitleFromStory(storyList,draftTitle);
|
||||||
|
}
|
||||||
this.saveStoryList(storyList);
|
this.saveStoryList(storyList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue