[Libreoffice-commits] online.git: loleaflet/src

[Pranav Kant]

 loleaflet/src/core/Socket.js |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 3a42330b05f081aae652dc97b7f04864456a6a76
Author: Pranav Kant <pranavk at collabora.com>
Date:   Thu Apr 28 17:54:40 2016 +0530

    bccu#1755: Fix 'Cancel' button on password dialog
    
    Change-Id: Icbfd129fa839ac7af868cc2d857fc280ae1ff681

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 5412d3a..606e137 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -152,8 +152,15 @@ L.Socket = L.Class.extend({
 					message: msg,
 					input: '<input name="password" type="password" required />',
 					callback: L.bind(function(data) {
-						this._map._docPassword = data.password;
-						this.initialize(this._map);
+						if (data) {
+							this._map._docPassword = data.password;
+							this.initialize(this._map);
+						} else if (passwordType === 'to-modify') {
+							this._map._docPassword = '';
+							this.initialize(this._map);
+						} else {
+							this._map.hideBusy();
+						}
 					}, this)
 				});
 				return;