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

Remove old titles from story on save (#2587)

Browse Source 
fix for #2381
This commit is contained in:
Tobias Beer 2016-10-08 13:17:27 +02:00 committed by Jeremy Ruston
parent be574b713e
commit 3486acaec6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ NavigatorWidget.prototype.refresh = function(changedTiddlers) {
this.refreshSelf(); this.refreshSelf();
return true; return true;
} else { } else {
return this.refreshChildren(changedTiddlers); return this.refreshChildren(changedTiddlers);
} }
}; };
@ -355,6 +355,9 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
if(isRename) { if(isRename) {
this.wiki.deleteTiddler(draftOf); this.wiki.deleteTiddler(draftOf);
} }
// #2381 always remove new title & old
this.removeTitleFromStory(storyList,draftTitle);
this.removeTitleFromStory(storyList,draftOf);
if(!event.paramObject || event.paramObject.suppressNavigation !== "yes") { if(!event.paramObject || event.paramObject.suppressNavigation !== "yes") {
// Replace the draft in the story with the original // Replace the draft in the story with the original
this.replaceFirstTitleInStory(storyList,title,draftTitle); this.replaceFirstTitleInStory(storyList,title,draftTitle);
@ -451,7 +454,7 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
// Merge the tags // Merge the tags
var mergedTags = []; var mergedTags = [];
if(existingTiddler && existingTiddler.fields.tags) { if(existingTiddler && existingTiddler.fields.tags) {
$tw.utils.pushTop(mergedTags,existingTiddler.fields.tags) $tw.utils.pushTop(mergedTags,existingTiddler.fields.tags);
} }
if(additionalFields && additionalFields.tags) { if(additionalFields && additionalFields.tags) {
// Merge tags // Merge tags
@ -492,7 +495,6 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
// Import JSON tiddlers into a pending import tiddler // Import JSON tiddlers into a pending import tiddler
NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) { NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
var self = this;
// Get the tiddlers // Get the tiddlers
var tiddlers = []; var tiddlers = [];
try { try {
@ -544,7 +546,7 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
history.push(IMPORT_TITLE); history.push(IMPORT_TITLE);
// Save the updated story and history // Save the updated story and history
this.saveStoryList(storyList); this.saveStoryList(storyList);
this.addToHistory(history); this.addToHistory(history);
} }
return false; return false;
}; };
@ -577,8 +579,7 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
}; };
NavigatorWidget.prototype.handleFoldTiddlerEvent = function(event) { NavigatorWidget.prototype.handleFoldTiddlerEvent = function(event) {
var self = this, var paramObject = event.paramObject || {};
paramObject = event.paramObject || {};
if(paramObject.foldedState) { if(paramObject.foldedState) {
var foldedState = this.wiki.getTiddlerText(paramObject.foldedState,"show") === "show" ? "hide" : "show"; var foldedState = this.wiki.getTiddlerText(paramObject.foldedState,"show") === "show" ? "hide" : "show";
this.wiki.setText(paramObject.foldedState,"text",null,foldedState); this.wiki.setText(paramObject.foldedState,"text",null,foldedState);
@ -613,8 +614,7 @@ NavigatorWidget.prototype.handleUnfoldAllTiddlersEvent = function(event) {
}; };
NavigatorWidget.prototype.handleRenameTiddlerEvent = function(event) { NavigatorWidget.prototype.handleRenameTiddlerEvent = function(event) {
var self = this, var paramObject = event.paramObject || {},
paramObject = event.paramObject || {},
from = paramObject.from || event.tiddlerTitle, from = paramObject.from || event.tiddlerTitle,
to = paramObject.to; to = paramObject.to;
$tw.wiki.renameTiddler(from,to); $tw.wiki.renameTiddler(from,to);