OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5389 from matrix-org/t3chguy/fix/15536 

Fix onPaste handler to work with copying files from Finder
pull/21833/head
Michael Telatynski 2021-07-22 09:22:55 +01:00 committed by GitHub
parent 51178735c9 e6007874d9
commit 9219661d7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/views/rooms/SendMessageComposer.tsx
View File

@ -514,13 +514,11 @@ export default class SendMessageComposer extends React.Component<IProps> {
private onPaste = (event: ClipboardEvent<HTMLDivElement>): boolean => { private onPaste = (event: ClipboardEvent<HTMLDivElement>): boolean => {
const { clipboardData } = event; const { clipboardData } = event;
// Prioritize text on the clipboard over files as Office on macOS puts a bitmap // Prioritize text on the clipboard over files if RTF is present as Office on macOS puts a bitmap
// in the clipboard as well as the content being copied. // in the clipboard as well as the content being copied. Modern versions of Office seem to not do this anymore.
if (clipboardData.files.length && !clipboardData.types.some(t => t === "text/plain")) { // We check text/rtf instead of text/plain as when copy+pasting a file from Finder or Gnome Image Viewer
// This actually not so much for 'files' as such (at time of writing // it puts the filename in as text/plain which we want to ignore.
// neither chrome nor firefox let you paste a plain file copied if (clipboardData.files.length && !clipboardData.types.includes("text/rtf")) {
// from Finder) but more images copied from a different website
// / word processor etc.
ContentMessages.sharedInstance().sendContentListToRoom( ContentMessages.sharedInstance().sendContentListToRoom(
Array.from(clipboardData.files), this.props.room.roomId, this.context, Array.from(clipboardData.files), this.props.room.roomId, this.context,
); );