Commit 63532acf authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

двойной диалог при ошибки в скачивании mailmerge

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62265 954022d7-b5bf-4e40-9824-e11837661b57
parent d7822f2a
......@@ -6952,7 +6952,7 @@ function sendCommand(editor, fCallback, rdata){
data: sData,
contentType: sRequestContentType,
error: function(){
if("save" != rdata["c"])
if("save" != rdata["c"] && "chsave" != rdata["c"])
editor.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical);
if(fCallback)
fCallback();
......@@ -7026,7 +7026,7 @@ function sendCommand(editor, fCallback, rdata){
fCallback(incomeObject);
break;
case "err":
if("save" != rdata["c"]){
if("save" != rdata["c"] && "chsave" != rdata["c"]){
var nErrorLevel = c_oAscError.Level.NoCritical;
//todo передалеть работу с callback
if("getsettings" == rdata["c"] || "open" == rdata["c"] || "chopen" == rdata["c"] || "create" == rdata["c"])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment