[Libreoffice-commits] online.git: loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/control/Toolbar.js |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 3ed7cceeb73248d2f610b24c3c454793b33e96b5
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu May 14 13:09:32 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu May 14 15:31:14 2020 +0200

    Show the welcome message at maximum once, unless requested.
    
    Change-Id: I2a8a7b53876e402102d5fce2b56da78edd709ad9
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94196
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index c30abc500..a1bc47d8d 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -416,8 +416,15 @@ L.Map.include({
 		console.log('showWelcomeDialog, calledFromMenu: ' + calledFromMenu);
 		var welcomeLocation = 'welcome/welcome-' + String.locale + '.html';
 
-		// try to load the welcome message
 		var map = this;
+
+		// if the user doesn't accept cookies, or we get several triggers,
+		// ensure we only ever do this once.
+		if (!calledFromMenu && map._alreadyShownWelcomeDialog)
+			return;
+		map._alreadyShownWelcomeDialog = true;
+
+		// try to load the welcome message
 		$.get(welcomeLocation)
 			.done(function(data) {
 				map._showWelcomeDialogVex(data, calledFromMenu);