From 43ce1d1c9246167c7ab643af6263c28d68de230b Mon Sep 17 00:00:00 2001
From: konovalovsergey <Sergey.Konovalov@onlyoffice.com>
Date: Wed, 27 Apr 2016 18:36:06 +0300
Subject: [PATCH] add param:password; error: drm, password
---
common/apiBase.js | 3 +++
common/editorscommon.js | 12 ++++++++++++
2 files changed, 15 insertions(+)
diff --git a/common/apiBase.js b/common/apiBase.js
index cab5db124..27f025922 100644
--- a/common/apiBase.js
+++ b/common/apiBase.js
@@ -494,6 +494,9 @@ baseEditorsApi.prototype._coAuthoringInit = function() {
case "needparams":
t._onNeedParams(input["data"]);
break;
+ case "needpassword":
+ t.sendEvent("asc_onError", Asc.c_oAscError.ID.ConvertationPassword, c_oAscError.Level.Critical);
+ break;
case "err":
t.sendEvent("asc_onError", AscCommon.mapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.Critical);
break;
diff --git a/common/editorscommon.js b/common/editorscommon.js
index 6f91f5ced..0a0f8e05c 100644
--- a/common/editorscommon.js
+++ b/common/editorscommon.js
@@ -345,7 +345,13 @@ function mapAscServerErrorToAscError(nServerError) {
case c_oAscServerError.TaskResult : nRes = Asc.c_oAscError.ID.Database; break;
case c_oAscServerError.ConvertDownload : nRes = Asc.c_oAscError.ID.DownloadError; break;
case c_oAscServerError.ConvertTimeout : nRes = Asc.c_oAscError.ID.ConvertationTimeout; break;
+ case c_oAscServerError.ConvertDRM :
+ case c_oAscServerError.ConvertPASSWORD :
case c_oAscServerError.ConvertMS_OFFCRYPTO : nRes = Asc.c_oAscError.ID.ConvertationPassword; break;
+ case c_oAscServerError.ConvertCONVERT_CORRUPTED :
+ case c_oAscServerError.ConvertLIBREOFFICE :
+ case c_oAscServerError.ConvertPARAMS :
+ case c_oAscServerError.ConvertNEED_PARAMS :
case c_oAscServerError.ConvertUnknownFormat :
case c_oAscServerError.ConvertReadFile :
case c_oAscServerError.Convert : nRes = Asc.c_oAscError.ID.ConvertationError; break;
@@ -750,6 +756,12 @@ var c_oAscServerError = {
ConvertTimeout:-83,
ConvertReadFile:-84,
ConvertMS_OFFCRYPTO:-85,
+ ConvertCONVERT_CORRUPTED:-86,
+ ConvertLIBREOFFICE:-87,
+ ConvertPARAMS:-88,
+ ConvertNEED_PARAMS:-89,
+ ConvertDRM:-90,
+ ConvertPASSWORD:-91,
Upload:-100,
UploadContentLength:-101,
--
2.30.9