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

[Pranav Kant]

 loleaflet/src/control/Toolbar.js |    6 +++++-
 loleaflet/src/map/Map.js         |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7bee4d61c02d28565fa87927d12d0e9e951f4bbf
Author: Pranav Kant <pranavk at collabora.com>
Date:   Wed Feb 10 16:49:52 2016 +0530

    loleaflet: Fix wrong initializationcomplete signal
    
    This should ideally be fired when we receive 'commandvalues'
    command, not 'statechanged'.
    
    Change-Id: I34748979a7606cd50e6965850757eda891a9aa15

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 2d0bee3..3819328 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -94,7 +94,7 @@ L.Map = L.Evented.extend({
 			}
 			this._fireInitComplete('updatepermission');
 		});
-		this.on('commandstatechanged', function(e){
+		this.on('updatetoolbarcommandvalues', function(e){
 			if (this.initComplete) {
 				return;
 			}
commit 57afedff2c5fb850b04650d7c6615d71def582a3
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Feb 10 14:45:36 2016 +0100

    loleaflet: Send 'saveas' with the 'TakeOwnership' option.
    
    So that the .uno:ModifiedStatus works.

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 05bcf8a..1488b7d 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -57,10 +57,14 @@ L.Map.include({
 		if (options === undefined || options === null) {
 			options = '';
 		}
+
+		// TakeOwnership: we are performing a 'real' save-as, the document
+		// is just getting a new place, ie. it will get the
+		// '.uno:ModifiedStatus' upon completion.
 		this._socket.sendMessage('saveas ' +
 			'url=' + url + ' ' +
 			'format=' + format + ' ' +
-			'options=' + options);
+			'options=TakeOwnership,' + options);
 	},
 
 	applyStyle: function (style, familyName) {