From 07caa16e8714afe9a64eb202375e4a2f95da1508 Mon Sep 17 00:00:00 2001
From: Saq Imtiaz <saq.imtiaz@gmail.com>
Date: Tue, 27 Apr 2021 11:15:27 +0200
Subject: [PATCH] Extend dropzone to also use the specified deserializer for
 strings either dropped or pasted on to the dropzone. (#5601)

---
 core/modules/widgets/dropzone.js | 45 +++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/core/modules/widgets/dropzone.js b/core/modules/widgets/dropzone.js
index 82cef63e3..70bd2bf2e 100644
--- a/core/modules/widgets/dropzone.js
+++ b/core/modules/widgets/dropzone.js
@@ -168,7 +168,23 @@ DropZoneWidget.prototype.handleDropEvent  = function(event) {
 	}
 	// Try to import the various data types we understand
 	if(numFiles === 0) {
-		$tw.utils.importDataTransfer(dataTransfer,this.wiki.generateNewTitle("Untitled"),readFileCallback);
+		var fallbackTitle = self.wiki.generateNewTitle("Untitled");
+		//Use the deserializer specified if any
+		if(this.dropzoneDeserializer) {
+			for(var t= 0; t<dataTransfer.items.length; t++) {
+				var item = dataTransfer.items[t];
+				if(item.kind === "string") {
+					item.getAsString(function(str){
+						var tiddlerFields = self.wiki.deserializeTiddlers(null,str,{title: fallbackTitle},{deserializer:self.dropzoneDeserializer});
+						if(tiddlerFields && tiddlerFields.length) {
+							readFileCallback(tiddlerFields);
+						}
+					})
+				}
+			}
+		} else {
+			$tw.utils.importDataTransfer(dataTransfer,fallbackTitle,readFileCallback);
+		}
 	}
 	// Tell the browser that we handled the drop
 	event.preventDefault();
@@ -196,17 +212,26 @@ DropZoneWidget.prototype.handlePasteEvent  = function(event) {
 				});
 			} else if(item.kind === "string") {
 				// Create tiddlers from string items
-				var type = item.type;
+				var tiddlerFields,
+					type = item.type;
 				item.getAsString(function(str) {
-					var tiddlerFields = {
-						title: self.wiki.generateNewTitle("Untitled"),
-						text: str,
-						type: type
-					};
-					if($tw.log.IMPORT) {
-						console.log("Importing string '" + str + "', type: '" + type + "'");
+					// Use the deserializer specified if any
+					if(self.dropzoneDeserializer) {
+						tiddlerFields = self.wiki.deserializeTiddlers(null,str,{title: self.wiki.generateNewTitle("Untitled")},{deserializer:self.dropzoneDeserializer});
+						if(tiddlerFields && tiddlerFields.length) {
+							readFileCallback(tiddlerFields);
+						}
+					} else {
+						tiddlerFields = {
+							title: self.wiki.generateNewTitle("Untitled"),
+							text: str,
+							type: type
+						};
+						if($tw.log.IMPORT) {
+							console.log("Importing string '" + str + "', type: '" + type + "'");
+						}
+						readFileCallback([tiddlerFields]);
 					}
-					readFileCallback([tiddlerFields]);
 				});
 			}
 		}