mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-10-30 23:23:02 +00:00
Code Issues Releases Wiki Activity

Fix: issues with drag and drop in Chrome 96 (#6261)

Browse Source 
* fix: issues with drag and drop (false positives in detection for files being dropped) introduced by Chrome 96

* fix: call dragEventContainsType method more consistently.

* fix: call dragEventContainsType method more consistently.
This commit is contained in:
Saq Imtiaz
2021-11-21 21:48:16 +01:00
committed by GitHub
parent 0664895670
commit 7fcc84156e
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/editor/factory.js
View File

@@ -324,7 +324,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
If there are no Files, let the browser handle it. If there are no Files, let the browser handle it.
*/ */
EditTextWidget.prototype.handleDropEvent = function(event) { EditTextWidget.prototype.handleDropEvent = function(event) {
if(event.dataTransfer.files.length) { if($tw.utils.dragEventContainsFiles(event)) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
this.dispatchDOMEvent(this.cloneEvent(event,["dataTransfer"])); this.dispatchDOMEvent(this.cloneEvent(event,["dataTransfer"]));

10
core/modules/utils/dom/dragndrop.js
View File

@@ -208,10 +208,10 @@ function parseJSONTiddlers(json,fallbackTitle) {
return data; return data;
}; };
exports.dragEventContainsFiles = function(event) { function dragEventContainsType(event,targetType) {
if(event.dataTransfer.types) { if(event.dataTransfer.types) {
for(var i=0; i<event.dataTransfer.types.length; i++) { for(var i=0; i<event.dataTransfer.types.length; i++) {
if(event.dataTransfer.types[i] === "Files") { if(event.dataTransfer.types[i] === targetType) {
return true; return true;
break; break;
} }
@@ -220,4 +220,10 @@ exports.dragEventContainsFiles = function(event) {
return false; return false;
}; };
exports.dragEventContainsFiles = function(event) {
return (dragEventContainsType(event,"Files") && !dragEventContainsType(event,"text/plain"));
};
exports.dragEventContainsType = dragEventContainsType;
})(); })();

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

@@ -198,7 +198,8 @@ DropZoneWidget.prototype.handleDropEvent = function(event) {
this.resetState(); this.resetState();
// Import any files in the drop // Import any files in the drop
var numFiles = 0; var numFiles = 0;
if(dataTransfer.files) { // If we have type text/vnd.tiddlywiki then skip trying to import files
if(dataTransfer.files && !$tw.utils.dragEventContainsType(event,"text/vnd.tiddler")) {
numFiles = this.wiki.readFiles(dataTransfer.files,{ numFiles = this.wiki.readFiles(dataTransfer.files,{
callback: readFileCallback, callback: readFileCallback,
deserializer: this.dropzoneDeserializer deserializer: this.dropzoneDeserializer