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

[Alexandru Vlăduţu (via logerrit)]

 loleaflet/reference.html     |    8 ++++++++
 loleaflet/src/core/Socket.js |    1 +
 2 files changed, 9 insertions(+)

New commits:
commit c4adca997897cd4d6d72c5c5a0bb36deeda61b36
Author:     Alexandru Vlăduţu <alexandru.vladutu at 1and1.ro>
AuthorDate: Mon Jan 13 13:58:50 2020 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Jan 16 17:27:08 2020 +0100

    tdf#129979: loleaflet send postMessage on cancel for password protected files
    
    Change-Id: Ied484ee8cce185c707d16c5181ca9246f69bdea2
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86679
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index f472d46f7..5f917e102 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -3395,6 +3395,14 @@ Note that they usually don't change but there is no guarantee that they are stab
 		Response to this query is sent via <code>Action_SaveAs</code> message.
 		</td>
 	</tr>
+	<tr>
+		<td><code><b>UI_Cancel_Password</b></code></td>
+		<td></td>
+		<td>
+		Notifies WOPI host that the user clicked on the 'cancel' option when opening
+		a password protected file, instead of providing the password to decrypt it.
+		</td>
+	</tr>
 	<tr>
 		<td><code><b>Doc_ModifiedStatus</b></code></td>
 		<td></td>
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index a65133d4c..fa6054095 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -655,6 +655,7 @@ L.Socket = L.Class.extend({
 							this._map._docPassword = '';
 							this._map.loadDocument();
 						} else {
+							this._map.fire('postMessage', {msgId: 'UI_Cancel_Password'});
 							this._map.hideBusy();
 						}
 					}, this)