From a9eab1b8fca37ee194e94d7b350ce1130a254c2e Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Fri, 14 Nov 2014 10:33:41 +0000
Subject: [PATCH] Improve import logging

---
 core/modules/widgets/dropzone.js               |  6 ++++++
 core/modules/wiki.js                           |  2 +-
 editions/prerelease/tiddlers/ImportLogging.tid | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 editions/prerelease/tiddlers/ImportLogging.tid

diff --git a/core/modules/widgets/dropzone.js b/core/modules/widgets/dropzone.js
index 42b75b1fe..b0f7510fe 100644
--- a/core/modules/widgets/dropzone.js
+++ b/core/modules/widgets/dropzone.js
@@ -127,6 +127,9 @@ DropZoneWidget.prototype.importData = function(dataTransfer) {
 				var data = dataTransfer.getData(dataType.type);
 			// Import the tiddlers in the data
 			if(data !== "" && data !== null) {
+				if($tw.log.IMPORT) {
+					console.log("Importing data type '" + dataType.type + "', data: '" + data + "'")
+				}
 				var tiddlerFields = dataType.convertToFields(data);
 				if(!tiddlerFields.title) {
 					tiddlerFields.title = this.wiki.generateNewTitle("Untitled");
@@ -208,6 +211,9 @@ DropZoneWidget.prototype.handlePasteEvent  = function(event) {
 						text: str,
 						type: type
 					};
+					if($tw.log.IMPORT) {
+						console.log("Importing string '" + str + "', type: '" + type + "'");
+					}
 					self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify([tiddlerFields])});
 				});
 			}
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 61b83492a..18868e61c 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -1102,7 +1102,7 @@ exports.readFile = function(file,callback) {
 	var contentTypeInfo = $tw.config.contentTypeInfo[type],
 		isBinary = contentTypeInfo ? contentTypeInfo.encoding === "base64" : false;
 	// Log some debugging information
-	if($tw.log.FILES) {
+	if($tw.log.IMPORT) {
 		console.log("Importing file '" + file.name + "', type: '" + type + "', isBinary: " + isBinary);
 	}
 	// Create the FileReader
diff --git a/editions/prerelease/tiddlers/ImportLogging.tid b/editions/prerelease/tiddlers/ImportLogging.tid
new file mode 100644
index 000000000..946db72ca
--- /dev/null
+++ b/editions/prerelease/tiddlers/ImportLogging.tid
@@ -0,0 +1,14 @@
+title: ImportLogging
+created: 20141114100055595
+modified: 20141114100055595
+
+Browsers still have significant variations in their handling of drag and drop and clipboard operations.
+
+You can switch on special logging to help debug issues:
+
+# Open your browser JavaScript console
+# Type:
+#> ``$tw.log.IMPORT = true``
+# Drag or paste a file to import it
+# Look for debug information in the console. For example:
+#> ``Importing file 'my-image.png', type: 'image/png', isBinary: true``