mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-06-03 15:14:07 +00:00
Code Issues Releases Wiki Activity

Smarter cancel edit behaviour

Browse Source 
If we cancel editing a tiddler that doesn’t exist, then we no longer
show the resulting missing tiddler.
This commit is contained in:
Jermolene 2014-11-09 21:47:48 +00:00
parent 3b08b5e9dd
commit 1dfa6f369b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/modules/widgets/navigator.js
View File

@ -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,9 +354,13 @@ 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);
this.replaceFirstTitleInStory(storyList,draftTitle,originalTitle); if(originalTiddler) {
this.addToHistory(originalTitle,event.navigateFromClientRect); this.replaceFirstTitleInStory(storyList,draftTitle,originalTitle);
this.saveStoryList(storyList); this.addToHistory(originalTitle,event.navigateFromClientRect);
} else {
this.removeTitleFromStory(storyList,draftTitle);
}
this.saveStoryList(storyList);
} }
} }
return false; return false;