From b149ab47f4fb15356e5328a5e2d382c6a3d1af0c Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Mon, 2 Dec 2013 09:59:38 +0000
Subject: [PATCH] Refactor importing to to use new wiki.importTiddler method

---
 core/modules/widgets/navigator.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js
index ed03acbd0..acdeb0fc4 100755
--- a/core/modules/widgets/navigator.js
+++ b/core/modules/widgets/navigator.js
@@ -359,21 +359,21 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 	}
 	// Process each tiddler
 	$tw.utils.each(tiddlers,function(tiddlerFields) {
-		// Generate a unique title for the tiddler
-		var title = self.wiki.generateNewTitle(tiddlerFields.title);
+		var title = tiddlerFields.title;
 		// Add it to the store
-		self.wiki.addTiddler(new $tw.Tiddler(
+		var imported = self.wiki.importTiddler(new $tw.Tiddler(
 			self.wiki.getCreationFields(),
 			self.wiki.getModificationFields(),
-			tiddlerFields,
-			{title: title}
+			tiddlerFields
 		));
-		// Add it to the story
-		if(self.storyList.indexOf(title) === -1) {
-			self.storyList.unshift(title);
+		if(imported) {
+			// Add it to the story
+			if(self.storyList.indexOf(title) === -1) {
+				self.storyList.unshift(title);
+			}
+			// And to history
+			history.push({title: title});
 		}
-		// And to history
-		history.push({title: title});
 	});
 	// Save the updated story and history
 	this.saveStoryList();