jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Composition: Only try to convert html from text/signal

This commit is contained in:
Sidney Keese 2020-11-19 09:38:25 -08:00 committed by GitHub
parent 3bc68b20ea
commit 4d09b71972
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ts/quill/signal-clipboard/index.ts
View File

@ -22,6 +22,19 @@ const getSelectionHTML = () => {
return div.innerHTML;
};
const replaceAngleBrackets = (text: string) => {
const entities: Array<[RegExp, string]> = [
[/&/g, '&amp;'],
[/</g, '&lt;'],
[/>/g, '&gt;'],
];
return entities.reduce(
(acc, [re, replaceValue]) => acc.replace(re, replaceValue),
text
);
};
export class SignalClipboard {
quill: Quill;
@ -86,6 +99,10 @@ export class SignalClipboard {
const text = event.clipboardData.getData('text/plain');
const html = event.clipboardData.getData('text/signal');
const clipboardDelta = html
? clipboard.convert(html)
: clipboard.convert(replaceAngleBrackets(text));
const { scrollTop } = this.quill.scrollingContainer;
this.quill.selection.update('silent');
@ -94,7 +111,7 @@ export class SignalClipboard {
setTimeout(() => {
const delta = new Delta()
.retain(selection.index)
.concat(clipboard.convert(html || text));
.concat(clipboardDelta);
this.quill.updateContents(delta, 'user');
this.quill.setSelection(delta.length(), 0, 'silent');
this.quill.scrollingContainer.scrollTop = scrollTop;