Commit 232469cb authored by Sergey.Konovalov's avatar Sergey.Konovalov

не работал ввод после ошибки в imgurls

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@65379 954022d7-b5bf-4e40-9824-e11837661b57
parent 364002c0
...@@ -2464,10 +2464,11 @@ function sendImgUrls(api, images, callback, bExcel) { ...@@ -2464,10 +2464,11 @@ function sendImgUrls(api, images, callback, bExcel) {
api.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage); api.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
else else
api.asc_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage); api.asc_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
var nError = c_oAscError.ID.No;
var data;
if (null != input && "imgurls" == input["type"]) { if (null != input && "imgurls" == input["type"]) {
if ("ok" == input["status"]) { if ("ok" == input["status"]) {
var data = input["data"]; data = input["data"];
var urls = {}; var urls = {};
for (var i = 0, length = data.length; i < length; ++i) { for (var i = 0, length = data.length; i < length; ++i) {
var elem = data[i]; var elem = data[i];
...@@ -2476,19 +2477,24 @@ function sendImgUrls(api, images, callback, bExcel) { ...@@ -2476,19 +2477,24 @@ function sendImgUrls(api, images, callback, bExcel) {
} }
} }
g_oDocumentUrls.addUrls(urls); g_oDocumentUrls.addUrls(urls);
callback(data);
} else { } else {
if(!bExcel) nError = g_fMapAscServerErrorToAscError(parseInt(input["data"]));
api.asc_fireCallback("asc_onError", g_fMapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.NoCritical);
else
api.handlers.trigger("asc_onError", g_fMapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.NoCritical);
} }
} else { } else {
nError = c_oAscError.ID.Unknown;
}
if ( c_oAscError.ID.No !== nError ) {
//todo сделать функцию очистки, чтобы можно было оборвать paste и показать error
data = [];
for ( var i = 0; i < images.length; ++i) {
data.push({'url': 'error', 'path': 'error'});
}
if(!bExcel) if(!bExcel)
api.asc_fireCallback("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical); api.asc_fireCallback("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
else else
api.handlers.trigger("asc_onError", c_oAscError.ID.Unknown,c_oAscError.Level.NoCritical); api.handlers.trigger("asc_onError", c_oAscError.ID.Unknown,c_oAscError.Level.NoCritical);
} }
callback(data);
}; };
sendCommand2(api, null, rData); sendCommand2(api, null, rData);
} }
......
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