debian/changelog | 6 ++++++
loleaflet/css/toolbar.css | 1 -
loleaflet/src/control/Control.Menubar.js | 2 +-
loleaflet/src/control/Control.Toolbar.js | 5 +++--
loolwsd.spec.in | 2 +-
5 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 6337c60137688bdcf5c95cbadf21cdd25a23fc89
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Jul 21 10:41:03 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jul 21 10:41:07 2020 +0200
Bump package version to 4.2.4-10
Change-Id: I351495accc53a14b0e127ddbbba6870598730a21
diff --git a/debian/changelog b/debian/changelog
index 5409a6d4d..d05525cb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.4-10) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-10
+
+ -- Andras Timar <andras.ti...@collabora.com> Tue, 21 Jul 2020 10:36:00 +0200
+
loolwsd (4.2.4-9) unstable; urgency=medium
* https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-9
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 7b9291a24..fe80462e1 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 9%{?dist}
+Release: 10%{?dist}
Vendor: %{vendor}
Summary: LibreOffice Online WebSocket Daemon
License: EULA
commit 815f657a932bcf8e73057935401288d26b1337cb
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Thu Jul 9 10:53:48 2020 -0400
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jul 21 10:41:07 2020 +0200
loleaflet: fix the show/hide close button
Explicit show/hide the close button if the page is loaded by
a WOPI Integrator.
Change-Id: I13d58bbbff03f283ed033a12a4489b610839748e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98443
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Henry Castro <hcas...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98798
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 0a795e187..ff228e7eb 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -230,7 +230,6 @@ td[id^=tb_editbar_item_sidebar]{
}
.closebuttonimage {
- display: none;
background: url('images/closedoc.svg') no-repeat center
!important;
}
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 3eea9a713..e1b76779a 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1360,7 +1360,7 @@ L.Control.Menubar = L.Control.extend({
if (menuItem.type === 'action') {
if ((menuItem.id === 'rev-history' &&
!L.Params.revHistoryEnabled) ||
- (menuItem.id === 'closedocument' &&
!window.closebutton) ||
+ (menuItem.id === 'closedocument' &&
!L.Params.closeButtonEnabled) ||
(menuItem.id === 'latest-updates' &&
!window.enableWelcomeMessage)) {
return false;
}
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 500ca36b5..6a52c4ec1 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1058,11 +1058,12 @@ function setupToolbar(e) {
map.on('commandresult', onCommandResult);
map.on('updateparts pagenumberchanged', onUpdateParts);
- if (!L.Params.closeButtonEnabled) {
+ if (map.options.wopi && L.Params.closeButtonEnabled) {
+ $('#closebuttonwrapper').show();
+ } else if (!L.Params.closeButtonEnabled) {
$('#closebuttonwrapper').hide();
} else if (L.Params.closeButtonEnabled && !window.mode.isMobile()) {
$('#closebuttonwrapper').show();
- $('.closebuttonimage').show();
}
$('#closebutton').click(function() {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
