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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Feb 10 15:07:29 UTC 2019


 loleaflet/src/core/Socket.js |    1 +
 loleaflet/src/map/Map.js     |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b00cbbe0da2a51ae5b76c47a2fee7b9d765be8df
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Sun Feb 10 11:16:24 2019 +0100
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Sun Feb 10 16:07:09 2019 +0100

    saveas: Explicitly ask for the command values only on saveas:
    
    The loadDocument() is called from many places, let's isolate the
    explicit call to sendInitUnoCommands() only to the SaveAs case.
    
    Change-Id: I685152d9915ee17e9f5b464aed27cf2d06075447
    Reviewed-on: https://gerrit.libreoffice.org/67606
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index a5b3abf90..541dc92a0 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -705,6 +705,7 @@ L.Socket = L.Class.extend({
 				this._map.options.doc = docUrl;
 				this._map.options.wopiSrc = encodeURIComponent(docUrl);
 				this._map.loadDocument();
+				this._map.sendInitUNOCommands();
 			}
 			// var name = command.name; - ignored, we get the new name via the wopi's BaseFileName
 		}
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 6880b4b1b..92d36160c 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -224,7 +224,6 @@ L.Map = L.Evented.extend({
 
 	loadDocument: function() {
 		this._socket.connect();
-		this.sendInitUNOCommands();
 	},
 
 	sendInitUNOCommands: function() {


More information about the Libreoffice-commits mailing list