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

[Ashod Nakashian (via logerrit)]

 loleaflet/src/map/handler/Map.Keyboard.js |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 977d64b048624e87f8da72c345ee460f63739364
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Tue Aug 13 10:24:30 2019 -0400
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Aug 26 17:21:21 2019 +0200

    leaflet: re-enable saving via ctrl+s shortcut
    
    Leaving the ctrl+s handler disabled in core config,
    we enable it in the loleaflet to allow for saving
    via the keyboard when the default handlers are enabled.
    
    Change-Id: I22d6583da4eca57889e77aed5570fa1fdc86f590
    Reviewed-on: https://gerrit.libreoffice.org/77435
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js
index 183d02928..4b71a7605 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -538,15 +538,13 @@ L.Map.Keyboard = L.Handler.extend({
 		case 80: // p
 			this._map.print();
 			return true;
-		// Explicitly disable the possiblity to Save via the keyboard
-		// (needs to be coupled with the loolkitconfig.xcu S_MOD1 disabling)
-		//case 83: // s
-		//	this._map.fire('postMessage', {msgId: 'UI_Save'});
-		//	if (!this._map._disableDefaultAction['UI_Save']) {
-		//		this._map.save(false /* An explicit save should terminate cell edit */,
-		//		               false /* An explicit save should save it again */);
-		//	}
-		//	return true;
+		case 83: // s
+			this._map.fire('postMessage', {msgId: 'UI_Save'});
+			if (!this._map._disableDefaultAction['UI_Save']) {
+				this._map.save(false /* An explicit save should terminate cell edit */,
+				               false /* An explicit save should save it again */);
+			}
+			return true;
 		case 86: // v
 		case 118: // v (Safari)
 			return true;