loleaflet/src/map/handler/Map.WOPI.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bfaf229f85b1160f1752ea0305729db4819d0ca6
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Mon Dec 10 15:29:29 2018 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Dec 11 11:41:11 2018 +0100
Remove reference to wrong function name
Change-Id: I7ee24cacfd7facb96419167643202a04ee7adaad
(cherry picked from commit 02e7a2680af111750d7fabd8eaa003d06eca42c5)
diff --git a/loleaflet/src/map/handler/Map.WOPI.js
b/loleaflet/src/map/handler/Map.WOPI.js
index 1eb422cbc..7120977d3 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -193,7 +193,7 @@ L.Map.WOPI = L.Handler.extend({
return;
}
if (this._map._permission !== 'edit') {
- console.log('No toolbar in readonly mode -
ignoring Remove_Button request.');
+ console.log('No toolbar in readonly mode -
ignoring request.');
return;
}
if (!w2ui['editbar'].get(msg.Values.id)) {
commit 6217e2808dc012c41453cbd8ded1ebb8269e720c
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Mon Dec 10 15:26:47 2018 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Dec 11 11:41:05 2018 +0100
Fix Show_Button / Hide_Button
Was broken with 131f3e9b6b3f3ee48de6be056a07e46b6bf40e94
Change-Id: I88e607cb005e3acfc80c12e87db1ac3e1258fb5a
(cherry picked from commit 7047b9b681942309403b31aaac07cf8440009cec)
diff --git a/loleaflet/src/map/handler/Map.WOPI.js
b/loleaflet/src/map/handler/Map.WOPI.js
index a8bc65fa9..1eb422cbc 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -196,14 +196,14 @@ L.Map.WOPI = L.Handler.extend({
console.log('No toolbar in readonly mode -
ignoring Remove_Button request.');
return;
}
- if (!w2ui['toolbar-up'].get(msg.Values.id)) {
+ if (!w2ui['editbar'].get(msg.Values.id)) {
console.error('Toolbar button with id "' +
msg.Values.id + '" not found.');
return;
}
if (msg.MessageId === 'Show_Button') {
- w2ui['toolbar-up'].show(msg.Values.id);
+ w2ui['editbar'].show(msg.Values.id);
} else {
- w2ui['toolbar-up'].hide(msg.Values.id);
+ w2ui['editbar'].hide(msg.Values.id);
}
}
else if (msg.MessageId === 'Set_Settings') {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
