strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cool#8023 browser: generate and interpret new-style clipboard marker

Browse source 
Seeing:

	short-circuit, internal paste, new style? true

on the console with this, which will work even after our HTML gets
stripped with the new-style clipboard API.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I74b14a4415fa026cf24909323d23f760997bd392
This commit is contained in:
Miklos Vajna 2024-01-15 16:38:20 +01:00
parent 141e1ce7d0
commit 5dd39010f8
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
browser/src/map/Clipboard.js
View file

@ -115,7 +115,7 @@ L.Clipboard = L.Class.extend({
_originWrapBody: function(body, isStub) {
var encodedOrigin = encodeURIComponent(this.getMetaURL());
var text = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">\n' +
'<html>\n' +
'<div id="meta-origin" data-coolorigin="' + encodedOrigin + '"><html>\n' +
' <head>\n';
if (isStub)
text += ' ' + this._getHtmlStubMarker() + '\n';
@ -123,7 +123,7 @@ L.Clipboard = L.Class.extend({
' <meta name="origin" content="' + encodedOrigin + '"/>\n' +
' </head>\n'
+ body +
'</html>';
'</html></div>';
return text;
},
@ -147,17 +147,16 @@ L.Clipboard = L.Class.extend({
));
},
_getMetaOrigin: function (html) {
var match = '<meta name="origin" content="';
var start = html.indexOf(match);
_getMetaOrigin: function (html, prefix) {
var start = html.indexOf(prefix);
if (start < 0) {
return '';
}
var end = html.indexOf('"', start + match.length);
var end = html.indexOf('"', start + prefix.length);
if (end < 0) {
return '';
}
var meta = html.substring(start + match.length, end);
var meta = html.substring(start + prefix.length, end);
// quick sanity checks that it one of ours.
if (meta.indexOf('%2Fclipboard%3FWOPISrc%3D') >= 0 &&
@ -360,7 +359,13 @@ L.Clipboard = L.Class.extend({
// Look for our HTML meta magic.
// cf. ClientSession.cpp /textselectioncontent:/
var meta = this._getMetaOrigin(htmlText);
var meta = this._getMetaOrigin(htmlText, '<div id="meta-origin" data-coolorigin="');
var newStyle = true;
if (meta === '')
{
meta = this._getMetaOrigin(htmlText, '<meta name="origin" content="');
newStyle = false;
}
var id = this.getMetaPath(0);
var idOld = this.getMetaPath(1);
@ -369,7 +374,7 @@ L.Clipboard = L.Class.extend({
(meta.indexOf(id) >= 0 || meta.indexOf(idOld) >= 0))
{
// Home from home: short-circuit internally.
window.app.console.log('short-circuit, internal paste');
window.app.console.log('short-circuit, internal paste, new style? ' + newStyle);
this._doInternalPaste(this._map, usePasteKeyEvent);
return true;
}