This commit is contained in:
the-djmaze 2022-03-08 17:22:08 +01:00
parent e2338b0ab1
commit 0b91ef04a0

View file

@ -2019,7 +2019,6 @@ function onPaste ( event ) {
let clipboardData = event.clipboardData; let clipboardData = event.clipboardData;
let items = clipboardData && clipboardData.items; let items = clipboardData && clipboardData.items;
let choosePlain = this.isShiftDown; let choosePlain = this.isShiftDown;
let fireDrop = false;
let hasRTF = false; let hasRTF = false;
let hasImage = false; let hasImage = false;
let plainItem = null; let plainItem = null;
@ -2044,7 +2043,7 @@ function onPaste ( event ) {
plainItem = item; plainItem = item;
} else if ( type === 'text/rtf' ) { } else if ( type === 'text/rtf' ) {
hasRTF = true; hasRTF = true;
} else if ( /^image\/.*/.test( type ) ) { } else if ( /^image\//.test( type ) ) {
hasImage = true; hasImage = true;
} }
} }
@ -2059,18 +2058,15 @@ function onPaste ( event ) {
// the presence of text/rtf as an indicator to choose the html version // the presence of text/rtf as an indicator to choose the html version
// over the image. // over the image.
if ( hasImage && !( hasRTF && htmlItem ) ) { if ( hasImage && !( hasRTF && htmlItem ) ) {
event.preventDefault(); /*
this.fireEvent( 'dragover', { if (item.kind === 'file') {
dataTransfer: clipboardData, event.preventDefault();
/*jshint loopfunc: true */ let reader = new FileReader();
preventDefault: () => fireDrop = true reader.onload = event =>
/*jshint loopfunc: false */ self.insertHTML( '<img src="'+event.target.result+'">', true );
}); reader.readAsDataURL(item.getAsFile());
if ( fireDrop ) {
this.fireEvent( 'drop', {
dataTransfer: clipboardData
});
} }
*/
return; return;
} }
@ -2084,7 +2080,6 @@ function onPaste ( event ) {
} else if ( plainItem ) { } else if ( plainItem ) {
plainItem.getAsString( text => self.insertPlainText( text, true ) ); plainItem.getAsString( text => self.insertPlainText( text, true ) );
} }
return;
} }
// Safari (and indeed many other OS X apps) copies stuff as text/rtf // Safari (and indeed many other OS X apps) copies stuff as text/rtf