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

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js         |    2 +-
 loleaflet/src/map/handler/Map.Keyboard.js |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 460196beaeb5b3aa4e47f8b158aab3b91aeaa839
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed May 31 11:25:03 2017 +0530

    User save should terminate edit in calc; and save if unmodified
    
    Only autosave should do the opposite which it already does in
    DocumentBroker.
    
    Change-Id: Ibb86e0b29fc058318de96d2684c326dbe958e6fb
    (cherry picked from commit ac8e458bda37a17e289ee2da71a59b234db5e753)
    Reviewed-on: https://gerrit.libreoffice.org/38258
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 42069afd..ba7aa208 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -219,7 +219,7 @@ function onClick(id, item, subItem) {
 		}
 	}
 	else if (id === 'save') {
-		map.save(true, true);
+		map.save(false /* An explicit save should terminate cell edit */, false /* An explicit save should save it again */);
 	}
 	else if (id === 'repair') {
 		map._socket.sendMessage('commandvalues command=.uno:DocumentRepair');
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js
index 812ea847..1109b35f 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -511,7 +511,8 @@ L.Map.Keyboard = L.Handler.extend({
 			this._map.print();
 			return true;
 		case 83: // s
-			this._map.save(true, true);
+			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)