haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cool#8465 clipboard: fix skipping the header of the complex case in JS 

Have 3 paragraphs in Writer, insert an image in the middle with
(to-char) anchoring. Select all text, copy to trigger the complex copy
codepath. Insert the result to Wrtier, some "text/html" and a number
extra paragraphs appear before the result content in the past result.

Seems the root of the problem is that the clipboard format generated by
ChildSession::getClipboard() is 1) a mime type on its own line 2) size
3) real content; but we just skipped 1) and 2) in the past, but now this
doesn't work, presumably due to a change on the core side.

Fix the problem by just making the header check case-insensitive for
now.

Once I add a html+plain text mode here, I'll probably switch to properly
skipping the first two lines instead, since the plain text won't have a
well-known header to identify the content. No testcase, this complex
download codepath will be Firefox-only in the future, so not easy to
cover with cypress.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: Ia99e5325188e5a34b56962cf4e3e9b8287e267c0
pull/8509/head
Miklos Vajna 2024-03-08 14:54:38 +01:00 committed by Caolán McNamara
parent 7267e34dd8
commit b1917aab1d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/src/control/Control.DownloadProgress.js
View File

@ -303,6 +303,9 @@ L.Control.DownloadProgress = L.Control.extend({
var text = reader.result;
window.app.console.log('async clipboard parse done: ' + text.substring(0, 256));
var idx = text.indexOf('<!DOCTYPE HTML');
if (idx === -1) {
idx = text.indexOf('<!DOCTYPE html');
}
if (idx > 0)
text = text.substring(idx, text.length);
that._map._clip.setTextSelectionHTML(text);