[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Andras Timar (via logerrit)]

 loleaflet/src/control/Control.Menubar.js  |    2 +-
 loleaflet/src/map/handler/Map.Keyboard.js |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b7a5a8b003cc317947cf02b8e6e4040c217fdc5c
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Jun 25 12:18:36 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 25 22:06:44 2020 +0200

    Fix: when help was invoked with F1 %productName was not replaced
    
    Change-Id: I2f0255e0aedbe70116b2fb7423b0d077c14fa7b4
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97068
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index c8d12a868..283318f2e 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1295,7 +1295,7 @@ L.Control.Menubar = L.Control.extend({
 
 		// handle help - F1
 		if (e.type === 'keydown' && !e.shiftKey && !e.ctrlKey && !e.altKey && e.keyCode == 112) {
-			self._map.showHelp();
+			self._map.showHelp('online-help');
 		}
 	},
 
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js
index 6ba2dc165..6ea10c40e 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -308,7 +308,7 @@ L.Map.Keyboard = L.Handler.extend({
 
 		// handle help - F1
 		if (ev.type === 'keydown' && !shift && !ctrl && !alt && !cmd && keyCode === 112) {
-			this._map.showHelp();
+			this._map.showHelp('online-help');
 			ev.preventDefault();
 			return;
 		}