Korbs/Squire
0
Fork 0
mirror of https://github.com/fastmail/Squire.git synced 2024-12-22 07:13:08 -05:00
Code Issues Activity

Fix pasting image copied from browser

Browse source
This commit is contained in:
Neil Jenkins 2019-01-10 15:18:24 +11:00
parent 892986b17c
commit 2059c5a4ae
3 changed files with 63 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
build/squire-raw.js
View file

@ -2348,50 +2348,34 @@ var onPaste = function ( event ) {
var fireDrop = false;
var hasImage = false;
var plainItem = null;
var htmlItem = null;
var self = this;
var l, item, type, types, data;
// Current HTML5 Clipboard interface
// ---------------------------------
// https://html.spec.whatwg.org/multipage/interaction.html
// Edge only provides access to plain text as of 2016-03-11 and gives no
// indication there should be an HTML part. However, it does support access
// to image data, so check if this is present and use if so.
if ( isEdge && items ) {
l = items.length;
while ( l-- ) {
if ( !choosePlain && /^image\/.*/.test( items[l].type ) ) {
hasImage = true;
}
}
if ( !hasImage ) {
items = null;
}
}
if ( items ) {
event.preventDefault();
l = items.length;
while ( l-- ) {
item = items[l];
type = item.type;
if ( !choosePlain && type === 'text/html' ) {
/*jshint loopfunc: true */
item.getAsString( function ( html ) {
self.insertHTML( html, true );
});
/*jshint loopfunc: false */
return;
}
if ( type === 'text/plain' ) {
if ( type === 'text/html' ) {
htmlItem = item;
} else if ( type === 'text/plain' ) {
plainItem = item;
}
if ( !choosePlain && /^image\/.*/.test( type ) ) {
} else if ( /^image\/.*/.test( type ) ) {
hasImage = true;
}
}
// Treat image paste as a drop of an image file.
// Treat image paste as a drop of an image file. When you copy
// an image in Chrome/Firefox (at least), it copies the image data
// but also an HTML version (referencing the original URL of the image)
// and a plain text version. So we check for image data first, only if
// none look for text/html.
if ( hasImage ) {
event.preventDefault();
this.fireEvent( 'dragover', {
dataTransfer: clipboardData,
/*jshint loopfunc: true */
@ -2405,12 +2389,26 @@ var onPaste = function ( event ) {
dataTransfer: clipboardData
});
}
} else if ( plainItem ) {
plainItem.getAsString( function ( text ) {
self.insertPlainText( text, true );
});
return;
}
// Edge only provides access to plain text as of 2016-03-11 and gives no
// indication there should be an HTML part. However, it does support
// access to image data, so we check for that first. Otherwise though,
// fall through to fallback clipboard handling methods
if ( !isEdge ) {
event.preventDefault();
if ( htmlItem && ( !choosePlain || !plainItem ) ) {
htmlItem.getAsString( function ( html ) {
self.insertHTML( html, true );
});
} else if ( plainItem ) {
plainItem.getAsString( function ( text ) {
self.insertPlainText( text, true );
});
}
return;
}
return;
}
// Old interface

3
build/squire.js
View file

File diff suppressed because one or more lines are too long

64
source/Clipboard.js
View file

@ -147,50 +147,34 @@ var onPaste = function ( event ) {
var fireDrop = false;
var hasImage = false;
var plainItem = null;
var htmlItem = null;
var self = this;
var l, item, type, types, data;
// Current HTML5 Clipboard interface
// ---------------------------------
// https://html.spec.whatwg.org/multipage/interaction.html
// Edge only provides access to plain text as of 2016-03-11 and gives no
// indication there should be an HTML part. However, it does support access
// to image data, so check if this is present and use if so.
if ( isEdge && items ) {
l = items.length;
while ( l-- ) {
if ( !choosePlain && /^image\/.*/.test( items[l].type ) ) {
hasImage = true;
}
}
if ( !hasImage ) {
items = null;
}
}
if ( items ) {
event.preventDefault();
l = items.length;
while ( l-- ) {
item = items[l];
type = item.type;
if ( !choosePlain && type === 'text/html' ) {
/*jshint loopfunc: true */
item.getAsString( function ( html ) {
self.insertHTML( html, true );
});
/*jshint loopfunc: false */
return;
}
if ( type === 'text/plain' ) {
if ( type === 'text/html' ) {
htmlItem = item;
} else if ( type === 'text/plain' ) {
plainItem = item;
}
if ( !choosePlain && /^image\/.*/.test( type ) ) {
} else if ( /^image\/.*/.test( type ) ) {
hasImage = true;
}
}
// Treat image paste as a drop of an image file.
// Treat image paste as a drop of an image file. When you copy
// an image in Chrome/Firefox (at least), it copies the image data
// but also an HTML version (referencing the original URL of the image)
// and a plain text version. So we check for image data first, only if
// none look for text/html.
if ( hasImage ) {
event.preventDefault();
this.fireEvent( 'dragover', {
dataTransfer: clipboardData,
/*jshint loopfunc: true */
@ -204,12 +188,26 @@ var onPaste = function ( event ) {
dataTransfer: clipboardData
});
}
} else if ( plainItem ) {
plainItem.getAsString( function ( text ) {
self.insertPlainText( text, true );
});
return;
}
// Edge only provides access to plain text as of 2016-03-11 and gives no
// indication there should be an HTML part. However, it does support
// access to image data, so we check for that first. Otherwise though,
// fall through to fallback clipboard handling methods
if ( !isEdge ) {
event.preventDefault();
if ( htmlItem && ( !choosePlain || !plainItem ) ) {
htmlItem.getAsString( function ( html ) {
self.insertHTML( html, true );
});
} else if ( plainItem ) {
plainItem.getAsString( function ( text ) {
self.insertPlainText( text, true );
});
}
return;
}
return;
}
// Old interface