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

Revert "Changes for handling readonly mode click events:" 

This reverts commit 924f13f106.

Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
pull/8470/head
Gökay Şatır 2024-02-07 10:54:57 +03:00 committed by Andras Timar
parent f05e06b26c
commit 1354d23a2f
5 changed files with 29 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
browser/src/layer/tile/CanvasTileLayer.js
View File

@ -1913,11 +1913,6 @@ L.CanvasTileLayer = L.Layer.extend({
}
}
}
else if (textMsg.startsWith('readonlyhyperlinkclicked: ')) {
var json = JSON.parse(textMsg.replace('readonlyhyperlinkclicked: ', ''));
var position = this._twipsToLatLng(json.position);
this._showURLPopUp(position, json.link);
}
},
_onTabStopListUpdate: function (textMsg) {
@ -2608,40 +2603,28 @@ L.CanvasTileLayer = L.Layer.extend({
link.innerText = url;
var copyBtn = L.DomUtil.createWithId('div', 'hyperlink-pop-up-copy', parent);
L.DomUtil.addClass(copyBtn, 'hyperlink-popup-btn');
if (app.file.permission !== 'readonly')
copyBtn.setAttribute('title', _('Copy link location'));
else
copyBtn.setAttribute('title', _('Select link text'));
copyBtn.setAttribute('title', _('Copy link location'));
var imgCopyBtn = L.DomUtil.create('img', 'hyperlink-pop-up-copyimg', copyBtn);
L.LOUtil.setImage(imgCopyBtn, 'lc_copyhyperlinklocation.svg', this._map);
imgCopyBtn.setAttribute('width', 18);
imgCopyBtn.setAttribute('height', 18);
imgCopyBtn.setAttribute('style', 'padding: 4px');
if (app.file.permission !== 'readonly') {
var editBtn = L.DomUtil.createWithId('div', 'hyperlink-pop-up-edit', parent);
L.DomUtil.addClass(editBtn, 'hyperlink-popup-btn');
editBtn.setAttribute('title', _('Edit link'));
var imgEditBtn = L.DomUtil.create('img', 'hyperlink-pop-up-editimg', editBtn);
L.LOUtil.setImage(imgEditBtn, 'lc_edithyperlink.svg', this._map);
imgEditBtn.setAttribute('width', 18);
imgEditBtn.setAttribute('height', 18);
imgEditBtn.setAttribute('style', 'padding: 4px');
var removeBtn = L.DomUtil.createWithId('div', 'hyperlink-pop-up-remove', parent);
L.DomUtil.addClass(removeBtn, 'hyperlink-popup-btn');
removeBtn.setAttribute('title', _('Remove link'));
var imgRemoveBtn = L.DomUtil.create('img', 'hyperlink-pop-up-removeimg', removeBtn);
L.LOUtil.setImage(imgRemoveBtn, 'lc_removehyperlink.svg', this._map);
imgRemoveBtn.setAttribute('width', 18);
imgRemoveBtn.setAttribute('height', 18);
imgRemoveBtn.setAttribute('style', 'padding: 4px');
}
else // Readonly.
link.style.userSelect = 'auto';
var editBtn = L.DomUtil.createWithId('div', 'hyperlink-pop-up-edit', parent);
L.DomUtil.addClass(editBtn, 'hyperlink-popup-btn');
editBtn.setAttribute('title', _('Edit link'));
var imgEditBtn = L.DomUtil.create('img', 'hyperlink-pop-up-editimg', editBtn);
L.LOUtil.setImage(imgEditBtn, 'lc_edithyperlink.svg', this._map);
imgEditBtn.setAttribute('width', 18);
imgEditBtn.setAttribute('height', 18);
imgEditBtn.setAttribute('style', 'padding: 4px');
var removeBtn = L.DomUtil.createWithId('div', 'hyperlink-pop-up-remove', parent);
L.DomUtil.addClass(removeBtn, 'hyperlink-popup-btn');
removeBtn.setAttribute('title', _('Remove link'));
var imgRemoveBtn = L.DomUtil.create('img', 'hyperlink-pop-up-removeimg', removeBtn);
L.LOUtil.setImage(imgRemoveBtn, 'lc_removehyperlink.svg', this._map);
imgRemoveBtn.setAttribute('width', 18);
imgRemoveBtn.setAttribute('height', 18);
imgRemoveBtn.setAttribute('style', 'padding: 4px');
this._map.hyperlinkPopup = new L.Popup({className: 'hyperlink-popup', closeButton: false, closeOnClick: false, autoPan: false})
.setHTMLContent(parent)
.setLatLng(position)
@ -2652,7 +2635,6 @@ L.CanvasTileLayer = L.Layer.extend({
if (offsetDiffTop < 10) this._movePopUpBelow();
if (offsetDiffLeft < 10) this._movePopUpRight();
var map_ = this._map;
this._setupClickFuncForId('hyperlink-pop-up', function() {
if (!url.startsWith('#'))
map_.fire('warn', {url: url, map: map_, cmd: 'openlink'});
@ -2660,24 +2642,14 @@ L.CanvasTileLayer = L.Layer.extend({
map_.sendUnoCommand('.uno:JumpToMark?Bookmark:string=' + encodeURIComponent(url.substring(1)));
});
this._setupClickFuncForId('hyperlink-pop-up-copy', function () {
if (app.file.permission !== 'readonly')
map_.sendUnoCommand('.uno:CopyHyperlinkLocation');
else {
document.getSelection().removeAllRanges();
var range = new Range();
range.selectNodeContents(link);
document.getSelection().addRange(range);
}
map_.sendUnoCommand('.uno:CopyHyperlinkLocation');
});
this._setupClickFuncForId('hyperlink-pop-up-edit', function () {
map_.sendUnoCommand('.uno:EditHyperlink');
});
this._setupClickFuncForId('hyperlink-pop-up-remove', function () {
map_.sendUnoCommand('.uno:RemoveHyperlink');
});
if (app.file.permission !== 'readonly') {
this._setupClickFuncForId('hyperlink-pop-up-edit', function () {
map_.sendUnoCommand('.uno:EditHyperlink');
});
this._setupClickFuncForId('hyperlink-pop-up-remove', function () {
map_.sendUnoCommand('.uno:RemoveHyperlink');
});
}
if (this._map['wopi'].EnableRemoteLinkPicker)
this._map.fire('postMessage', { msgId: 'Action_GetLinkPreview', args: { url: url } });
@ -3717,16 +3689,10 @@ L.CanvasTileLayer = L.Layer.extend({
this._sendClientVisibleArea();
// Writer only for now.
if (app.file.permission === 'readonly' && type === 'buttonup' && this._docType === 'text') {
this._closeURLPopUp();
app.socket.sendMessage('readonlyclick x=' + x + ' y=' + y);
}
else {
app.socket.sendMessage('mouse type=' + type +
' x=' + x + ' y=' + y + ' count=' + count +
' buttons=' + buttons + ' modifier=' + modifier);
}
app.socket.sendMessage('mouse type=' + type +
' x=' + x + ' y=' + y + ' count=' + count +
' buttons=' + buttons + ' modifier=' + modifier);
if (type === 'buttondown') {
this._clearSearchResults();

36
kit/ChildSession.cpp
View File

@ -463,8 +463,7 @@ bool ChildSession::_handleInput(const char *buffer, int length)
tokens.equals(0, "a11ystate") ||
tokens.equals(0, "geta11yfocusedparagraph") ||
tokens.equals(0, "geta11ycaretposition") ||
tokens.equals(0, "toggletiledumping") ||
tokens.equals(0, "readonlyclick"));
tokens.equals(0, "toggletiledumping"));
std::string pzName("ChildSession::_handleInput:" + tokens[0]);
ProfileZone pz(pzName.c_str());
@ -528,10 +527,6 @@ bool ChildSession::_handleInput(const char *buffer, int length)
{
return mouseEvent(tokens, LokEventTargetEnum::Window);
}
else if (tokens.equals(0, "readonlyclick"))
{
return readOnlyClickEvent(tokens);
}
else if (tokens.equals(0, "windowgesture"))
{
return gestureEvent(tokens);
@ -1651,35 +1646,6 @@ bool ChildSession::mouseEvent(const StringVector& tokens,
return true;
}
bool ChildSession::readOnlyClickEvent(const StringVector& tokens)
{
getLOKitDocument()->setView(_viewId);
if (tokens.size() != 3)
return false;
const int x = Util::safe_atoi(tokens[1].data(), tokens[1].size());
const int y = Util::safe_atoi(tokens[2].data(), tokens[2].size());
char* test = getLOKitDocument()->hyperlinkInfoAtPosition(x, y);
if (test != nullptr)
{
std::string result(test);
std::free(test);
if (!result.empty() && x != 0 && y != 0)
{
std::ostringstream message;
message << "readonlyhyperlinkclicked: { \"link\": \"" << result << "\""
<< " \"position\": { \"x\": " << x << ", \"y\": " << y << " }";
sendTextFrame(message.str());
}
}
return true;
}
bool ChildSession::dialogEvent(const StringVector& tokens)
{
if (tokens.size() <= 2)

1
kit/ChildSession.hpp
View File

@ -319,7 +319,6 @@ private:
bool extTextInputEvent(const StringVector& tokens);
bool dialogKeyEvent(const char* buffer, int length, const std::vector<std::string>& tokens);
bool mouseEvent(const StringVector& tokens, const LokEventTargetEnum target);
bool readOnlyClickEvent(const StringVector& tokens);
bool gestureEvent(const StringVector& tokens);
bool dialogEvent(const StringVector& tokens);
bool completeFunction(const StringVector& tokens);

11
kit/DummyLibreOfficeKit.cpp
View File

@ -99,9 +99,6 @@ static void doc_setTextSelection (LibreOfficeKitDocument* pThis,
int nType,
int nX,
int nY);
static char* doc_hyperlinkInfoAtPosition () (LibreOfficeKitDocument* pThis,
int nX,
int nY);
static char* doc_getTextSelection(LibreOfficeKitDocument* pThis,
const char* pMimeType,
char** pUsedMimeType);
@ -172,7 +169,6 @@ LibLODocument_Impl::LibLODocument_Impl()
m_pDocumentClass->postMouseEvent = doc_postMouseEvent;
m_pDocumentClass->postUnoCommand = doc_postUnoCommand;
m_pDocumentClass->setTextSelection = doc_setTextSelection;
m_pDocumentClass->hyperlinkInfoAtPosition = doc_hyperlinkInfoAtPosition;
m_pDocumentClass->getTextSelection = doc_getTextSelection;
m_pDocumentClass->paste = doc_paste;
m_pDocumentClass->setGraphicSelection = doc_setGraphicSelection;
@ -441,13 +437,6 @@ static void doc_setTextSelection(LibreOfficeKitDocument* pThis, int nType, int n
(void) nY;
}
static char* doc_hyperlinkInfoAtPosition(LibreOfficeKitDocument* pThis, int nX, int nY)
{
(void) pThis;
(void) nX;
(void) nY;
}
static char* doc_getTextSelection(LibreOfficeKitDocument* pThis, const char* pMimeType, char** pUsedMimeType)
{
(void) pThis;

4
wsd/ClientSession.cpp
View File

@ -1135,10 +1135,6 @@ bool ClientSession::_handleInput(const char *buffer, int length)
return forwardToChild(std::string(buffer, length), docBroker);
}
}
else if (tokens.equals(0, "readonlyclick"))
{
return forwardToChild(std::string(buffer, length), docBroker);
}
else if (tokens.equals(0, "attemptlock"))
{
return attemptLock(docBroker);