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

[Libreoffice Gerrit user]

 loleaflet/src/control/Signing.js |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 524f6242a066105ae85d82ee2d583a5ba00c608f
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Jan 17 15:19:35 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jan 18 09:38:47 2019 +0100

    use export,sign,upload codepath for DOCX and ODT too
    
    Change-Id: Ic6c397e3936bfd659a6b4e8627ba45dbd4e6ae25
    (cherry picked from commit a5ca9620922adaeb2bbe75cffc06ed7ec68f498c)
    Reviewed-on: https://gerrit.libreoffice.org/66540
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index 4195cb185..17d605128 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -368,7 +368,7 @@ function vereignUpload(documentType) {
 	});
 }
 
-function vereignSignAndUploadPDF(documentType) {
+function vereignExportSignAndUploadToVereign(documentType) {
 	library.getOneTimeCertificateByPassport(currentPassport.uuid).then(function(result) {
 		if (!isSuccess(result)) {
 			return;
@@ -417,10 +417,10 @@ function vereignSignAndUploadForType(uploadDocType) {
 	if (documentType == null)
 		return;
 
-	if (uploadDocType == 'PDF') {
-		vereignSignAndUploadPDF(documentType);
+	if (uploadDocType == 'PDF' || uploadDocType == 'DOCX' || uploadDocType == 'ODT') {
+		vereignExportSignAndUploadToVereign(documentType);
 	}
-	else if (uploadDocType == 'DOCX' || uploadDocType == 'ODT') {
+	else {
 		library.getOneTimeCertificateByPassport(currentPassport.uuid).then(function(result) {
 			if (isSuccess(result)) {
 				var otp = result.data;