mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-25 06:43:15 +00:00
Code Issues Releases Wiki Activity

Provide option to suppress navigation for edit/cancel/save

Browse Source
This commit is contained in:
Jermolene 2015-08-05 15:07:19 +01:00
parent 72ed4b2673
commit fdce67399d
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,14 +220,17 @@ NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) {
return false; return false;
} }
// Replace the specified tiddler with a draft in edit mode // Replace the specified tiddler with a draft in edit mode
var draftTiddler = this.makeDraftTiddler(title), var draftTiddler = this.makeDraftTiddler(title);
draftTitle = draftTiddler.fields.title, // Update the story and history if required
storyList = this.getStoryList(); if(!event.paramObject || event.paramObject.suppressNavigation !== "yes") {
this.removeTitleFromStory(storyList,draftTitle); var draftTitle = draftTiddler.fields.title,
this.replaceFirstTitleInStory(storyList,title,draftTitle); storyList = this.getStoryList();
this.addToHistory(draftTitle,event.navigateFromClientRect); this.removeTitleFromStory(storyList,draftTitle);
this.saveStoryList(storyList); this.replaceFirstTitleInStory(storyList,title,draftTitle);
return false; this.addToHistory(draftTitle,event.navigateFromClientRect);
this.saveStoryList(storyList);
return false;
}
}; };
// Delete a tiddler // Delete a tiddler
@ -345,11 +348,13 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
if(isRename) { if(isRename) {
this.wiki.deleteTiddler(draftOf); this.wiki.deleteTiddler(draftOf);
} }
// Replace the draft in the story with the original if(!event.paramObject || event.paramObject.suppressNavigation !== "yes") {
this.replaceFirstTitleInStory(storyList,title,draftTitle); // Replace the draft in the story with the original
this.addToHistory(draftTitle,event.navigateFromClientRect); this.replaceFirstTitleInStory(storyList,title,draftTitle);
if(draftTitle !== this.storyTitle) { this.addToHistory(draftTitle,event.navigateFromClientRect);
this.saveStoryList(storyList); if(draftTitle !== this.storyTitle) {
this.saveStoryList(storyList);
}
} }
// Trigger an autosave // Trigger an autosave
$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"}); $tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});
@ -381,13 +386,15 @@ 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) { if(!event.paramObject || event.paramObject.suppressNavigation !== "yes") {
this.replaceFirstTitleInStory(storyList,draftTitle,originalTitle); if(originalTiddler) {
this.addToHistory(originalTitle,event.navigateFromClientRect); this.replaceFirstTitleInStory(storyList,draftTitle,originalTitle);
} else { this.addToHistory(originalTitle,event.navigateFromClientRect);
this.removeTitleFromStory(storyList,draftTitle); } else {
this.removeTitleFromStory(storyList,draftTitle);
}
this.saveStoryList(storyList);
} }
this.saveStoryList(storyList);
} }
} }
return false; return false;