From 7c4ea6421069c4f183d9c1b6ddd49294247e8033 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 28 Dec 2015 11:29:43 +0100 Subject: [PATCH 1/2] fixes #2158 check if new fields are present and warn on cancel --- core/modules/wiki.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/modules/wiki.js b/core/modules/wiki.js index b6e9fa068..7dc16f04c 100755 --- a/core/modules/wiki.js +++ b/core/modules/wiki.js @@ -1164,7 +1164,9 @@ exports.findDraft = function(targetTitle) { } /* -Check whether the specified draft tiddler has been modified +Check whether the specified draft tiddler has been modified. +If the original tiddler doesn't exist, create a vanilla tiddler variable, +to check if aditional fields have been added. */ exports.isDraftModified = function(title) { var tiddler = this.getTiddler(title); @@ -1172,11 +1174,9 @@ exports.isDraftModified = function(title) { return false; } var ignoredFields = ["created", "modified", "title", "draft.title", "draft.of"], - origTiddler = this.getTiddler(tiddler.fields["draft.of"]); - if(!origTiddler) { - return tiddler.fields.text !== ""; - } - return tiddler.fields["draft.title"] !== tiddler.fields["draft.of"] || !tiddler.isEqual(origTiddler,ignoredFields); + origTiddler = this.getTiddler(tiddler.fields["draft.of"]) || new $tw.Tiddler({text:"", tags:[]}), + titleModified = tiddler.fields["draft.title"] !== tiddler.fields["draft.of"]; + return titleModified || !tiddler.isEqual(origTiddler,ignoredFields); }; /* From 3977cf009b8b8a9e813756beffa1f8a3764b73e9 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 28 Dec 2015 11:31:36 +0100 Subject: [PATCH 2/2] fixes #2158 check if new fields are present and warn on cancel --- core/modules/wiki.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/wiki.js b/core/modules/wiki.js index 7dc16f04c..0c0cdd1d4 100755 --- a/core/modules/wiki.js +++ b/core/modules/wiki.js @@ -1166,7 +1166,7 @@ exports.findDraft = function(targetTitle) { /* Check whether the specified draft tiddler has been modified. If the original tiddler doesn't exist, create a vanilla tiddler variable, -to check if aditional fields have been added. +to check if additional fields have been added. */ exports.isDraftModified = function(title) { var tiddler = this.getTiddler(title);