kopia lustrzana https://github.com/miklobit/TiddlyWiki5
Extend dropzone to also use the specified deserializer for strings either dropped or pasted on to the dropzone. (#5601)
rodzic
30d23196b6
commit
07caa16e87
|
@ -168,7 +168,23 @@ DropZoneWidget.prototype.handleDropEvent = function(event) {
|
||||||
}
|
}
|
||||||
// Try to import the various data types we understand
|
// Try to import the various data types we understand
|
||||||
if(numFiles === 0) {
|
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
|
// Tell the browser that we handled the drop
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
@ -196,17 +212,26 @@ DropZoneWidget.prototype.handlePasteEvent = function(event) {
|
||||||
});
|
});
|
||||||
} else if(item.kind === "string") {
|
} else if(item.kind === "string") {
|
||||||
// Create tiddlers from string items
|
// Create tiddlers from string items
|
||||||
var type = item.type;
|
var tiddlerFields,
|
||||||
|
type = item.type;
|
||||||
item.getAsString(function(str) {
|
item.getAsString(function(str) {
|
||||||
var tiddlerFields = {
|
// Use the deserializer specified if any
|
||||||
title: self.wiki.generateNewTitle("Untitled"),
|
if(self.dropzoneDeserializer) {
|
||||||
text: str,
|
tiddlerFields = self.wiki.deserializeTiddlers(null,str,{title: self.wiki.generateNewTitle("Untitled")},{deserializer:self.dropzoneDeserializer});
|
||||||
type: type
|
if(tiddlerFields && tiddlerFields.length) {
|
||||||
};
|
readFileCallback(tiddlerFields);
|
||||||
if($tw.log.IMPORT) {
|
}
|
||||||
console.log("Importing string '" + str + "', type: '" + type + "'");
|
} 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]);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue