miklo
/
TiddlyWiki5
kopia lustrzana https://github.com/miklobit/TiddlyWiki5
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix problem with cloning tiddlers 

We were ignoring the tags on the template tiddler.

Fixes #1097
print-window-tiddler
Jermolene 2014-11-18 14:13:34 +00:00
rodzic 002d47b4d9
commit 931d47e50c
1 zmienionych plików z 11 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
core/modules/widgets/navigator.js
Wyświetl plik

@ -376,7 +376,7 @@ NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) {
NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) { NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
// Get the story details // Get the story details
var storyList = this.getStoryList(), var storyList = this.getStoryList(),
templateTiddler, additionalFields, title, draftTitle, existingTiddler, mergedTags; templateTiddler, additionalFields, title, draftTitle, existingTiddler;
// Get the template tiddler (if any) // Get the template tiddler (if any)
if(typeof event.param === "string") { if(typeof event.param === "string") {
// Get the template tiddler // Get the template tiddler
@ -406,13 +406,17 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
existingTiddler = this.wiki.getTiddler(title); existingTiddler = this.wiki.getTiddler(title);
} }
// Merge the tags // Merge the tags
if(existingTiddler && existingTiddler.fields.tags && additionalFields && additionalFields.tags) { var mergedTags = [];
if(existingTiddler && existingTiddler.fields.tags) {
$tw.utils.pushTop(mergedTags,existingTiddler.fields.tags)
}
if(additionalFields && additionalFields.tags) {
// Merge tags // Merge tags
mergedTags = $tw.utils.pushTop($tw.utils.parseStringArray(additionalFields.tags),existingTiddler.fields.tags); mergedTags = $tw.utils.pushTop(mergedTags,$tw.utils.parseStringArray(additionalFields.tags));
} else if(existingTiddler && existingTiddler.fields.tags) { }
mergedTags = existingTiddler.fields.tags; if(templateTiddler && templateTiddler.fields.tags) {
} else if(additionalFields && additionalFields.tags) { // Merge tags
mergedTags = additionalFields.tags; mergedTags = $tw.utils.pushTop(mergedTags,templateTiddler.fields.tags);
} }
// Save the draft tiddler // Save the draft tiddler
var draftTiddler = new $tw.Tiddler({ var draftTiddler = new $tw.Tiddler({