configure.ac | 1 + loleaflet/src/control/Toolbar.js | 4 ++-- wsd/LOOLWSD.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit 3c735207da6caf46925bb38737c47e9c4a3136be Author: Jan Holesovsky <[email protected]> AuthorDate: Thu Apr 16 11:28:32 2020 +0200 Commit: Jan Holesovsky <[email protected]> CommitDate: Thu Apr 16 14:31:08 2020 +0200 Welcome: Better default when the welcome.enabled is not present in config. Change-Id: Ia528f1cdf16af9b9724c31f9b1df8b51efb664fb Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92341 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Jan Holesovsky <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92358 diff --git a/configure.ac b/configure.ac index 6ba0b045c..d2ad138cb 100644 --- a/configure.ac +++ b/configure.ac @@ -601,6 +601,7 @@ AC_SUBST(MAX_DOCUMENTS) ENABLE_WELCOME_MESSAGE=false AS_IF([test "$enable_welcome_message" = "yes"], [ENABLE_WELCOME_MESSAGE="true"]) +AC_DEFINE_UNQUOTED([ENABLE_WELCOME_MESSAGE],["$ENABLE_WELCOME_MESSAGE"],[Should the Release notes message on startup should be enabled be default?]) AC_SUBST(ENABLE_WELCOME_MESSAGE) VEREIGN_URL= diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 89075fd16..0ec80f59f 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -942,7 +942,7 @@ void LOOLWSD::initialize(Application& self) { "trace.path[@compress]", "true" }, { "trace.path[@snapshot]", "false" }, { "trace[@enable]", "false" }, - { "welcome.enable", "true" }, + { "welcome.enable", ENABLE_WELCOME_MESSAGE }, { "welcome.path", "loleaflet/welcome" } }; commit 261f7efdb39bdc05051a6a88aa06de66c6a0e008 Author: Jan Holesovsky <[email protected]> AuthorDate: Thu Apr 16 11:00:29 2020 +0200 Commit: Jan Holesovsky <[email protected]> CommitDate: Thu Apr 16 14:30:58 2020 +0200 Welcome: Disable the easy dismissing of the welcome screen. Change-Id: I8d12a197c90e578a1015f3fb6a2a471bf1114bf7 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92340 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Jan Holesovsky <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92357 Tested-by: Jan Holesovsky <[email protected]> diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js index 4e17dece2..3ed636444 100644 --- a/loleaflet/src/control/Toolbar.js +++ b/loleaflet/src/control/Toolbar.js @@ -363,8 +363,8 @@ L.Map.include({ vex.open({ unsafeContent: data, showCloseButton: true, - escapeButtonCloses: true, - overlayClosesOnClick: true, + escapeButtonCloses: false, + overlayClosesOnClick: false, closeAllOnPopState: false, buttons: {}, afterOpen: function() { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
