From 94287c9ac31d3240960223a92558fe14251be7e3 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Wed, 10 Apr 2013 16:55:25 +0100
Subject: [PATCH] Tidying up drag and drop

---
 core/modules/widgets/import.js  | 15 +++++++++------
 core/templates/ControlPanel.tid |  2 +-
 core/templates/PageTemplate.tid |  3 +--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/modules/widgets/import.js b/core/modules/widgets/import.js
index 63b0128dd..fef47cd55 100644
--- a/core/modules/widgets/import.js
+++ b/core/modules/widgets/import.js
@@ -28,7 +28,6 @@ var ImportWidget = function(renderer) {
 ImportWidget.prototype.generate = function() {
 	// Get the parameters from the attributes
 	this.browse = this.renderer.getAttribute("browse","yes");
-	this.mutate = this.renderer.getAttribute("mutate","yes");
 	this["class"] = this.renderer.getAttribute("class");
 	// Compute classes
 	var classes = ["tw-import"];
@@ -132,7 +131,7 @@ ImportWidget.prototype.handlePasteEvent  = function(event) {
 						title: self.generateTitle("Untitled"),
 						text: str
 					};
-					self.renderer.renderTree.wiki.addTiddler(new $tw.Tiddler(fields));
+					self.storeTiddler(fields);
 					self.openTiddler(fields.title);
 				});
 			}
@@ -160,7 +159,7 @@ ImportWidget.prototype.importData = function(dataTransfer) {
 			if(!fields.title) {
 				fields.title = this.generateTitle("Untitled");
 			}
-			this.renderer.renderTree.wiki.addTiddler(new $tw.Tiddler(fields));
+			this.storeTiddler(fields);
 			this.openTiddler(fields.title);
 			return;
 		}
@@ -212,7 +211,7 @@ ImportWidget.prototype.importFiles = function(files) {
 				var commaPos = event.target.result.indexOf(",");
 				if(commaPos !== -1) {
 					fields.text = event.target.result.substr(commaPos+1);
-					self.renderer.renderTree.wiki.addTiddler(new $tw.Tiddler(fields));
+					self.storeTiddler(fields);
 					self.openTiddler(fields.title);
 				}
 			} else {
@@ -221,8 +220,8 @@ ImportWidget.prototype.importFiles = function(files) {
 					console.log("No tiddlers found in file ",file.name);
 				} else {
 					$tw.utils.each(tiddlers,function(tiddlerFields) {
-						var title = self.generateTitle(tiddlerFields.title);
-						self.renderer.renderTree.wiki.addTiddler(new $tw.Tiddler(tiddlerFields,{title: title}));
+						tiddlerFields.title = self.generateTitle(tiddlerFields.title);
+						self.storeTiddler(tiddlerFields);
 						self.openTiddler(title);
 					});
 				}
@@ -239,6 +238,10 @@ ImportWidget.prototype.importFiles = function(files) {
 	};
 };
 
+ImportWidget.prototype.storeTiddler = function(fields) {
+	this.renderer.renderTree.wiki.addTiddler(new $tw.Tiddler(fields));
+};
+
 ImportWidget.prototype.generateTitle = function(baseTitle) {
 	var c = 0;
 	do {
diff --git a/core/templates/ControlPanel.tid b/core/templates/ControlPanel.tid
index 6f86fbc85..df93eeaa7 100644
--- a/core/templates/ControlPanel.tid
+++ b/core/templates/ControlPanel.tid
@@ -4,7 +4,7 @@ title: $:/templates/ControlPanel
 
 ---
 
-Import: <$import mutate="sidebar importer" class="tw-drop-zone">
+Import: <$import class="tw-drop-zone">
 
 Drop files here
 
diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid
index fd11f0c27..1bcc58c3a 100644
--- a/core/templates/PageTemplate.tid
+++ b/core/templates/PageTemplate.tid
@@ -3,8 +3,7 @@ title: $:/templates/PageTemplate
 <!-- The navigator catches navigation events and updates the story and history tiddlers -->
 <$navigator story="$:/StoryList" history="$:/HistoryList">
 
-
-<$import browse="no" mutate="global importer" class="tw-drop-zone-fullscreen">
+<$import browse="no" class="tw-drop-zone-fullscreen">
 
 <!-- The sidebar header -->
 <header class="sidebar-header">