mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-04-24 11:43:11 +00:00
Code Issues Releases Wiki Activity

Extend dropzone to also use the specified deserializer for strings either dropped or pasted on to the dropzone. (#5601)

Browse Source
This commit is contained in:
Saq Imtiaz 2021-04-27 11:15:27 +02:00 committed by GitHub
parent 30d23196b6
commit 07caa16e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
core/modules/widgets/dropzone.js
View File

@ -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]);
});
}
}