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

для Revision: 63020 ошибки в консоли после приема сообщений об ошибках

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63126 954022d7-b5bf-4e40-9824-e11837661b57
parent 45d3b2a7
...@@ -116,16 +116,16 @@ function sendCommand2 (fCallback, callback, rdata) { ...@@ -116,16 +116,16 @@ function sendCommand2 (fCallback, callback, rdata) {
url: g_sMainServiceLocalUrl, url: g_sMainServiceLocalUrl,
data: sData, data: sData,
contentType: sRequestContentType, contentType: sRequestContentType,
error: function () { callback(fCallback, true); }, error: function () { callback(fCallback, true, undefined, rdata); },
success: function (msg) { success: function (msg) {
if (!msg || msg.length < 1) { if (!msg || msg.length < 1) {
//result = {returnCode: c_oAscError.Level.Critical, val:c_oAscError.ID.Unknown}; //result = {returnCode: c_oAscError.Level.Critical, val:c_oAscError.ID.Unknown};
//oThis.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.Critical); //oThis.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.Critical);
//if(callback) //if(callback)
// callback(result); // callback(result);
callback(fCallback, true); callback(fCallback, true, undefined, rdata);
} else { } else {
callback(fCallback, false, JSON.parse(msg)); callback(fCallback, false, JSON.parse(msg), rdata);
} }
}, },
dataType: 'text' dataType: 'text'
......
...@@ -900,7 +900,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -900,7 +900,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
return this.wbModel.getWorksheet(sheetIndex).PagePrintOptions; return this.wbModel.getWorksheet(sheetIndex).PagePrintOptions;
}; };
spreadsheet_api.prototype._sendCommandCallback = function (fCallback, error, result) { spreadsheet_api.prototype._sendCommandCallback = function (fCallback, error, result, rdata) {
if (error || !result) { if (error || !result) {
this.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.Critical); this.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.Critical);
if(fCallback) if(fCallback)
......
...@@ -5094,7 +5094,7 @@ asc_docs_api.prototype.sync_ContextMenuCallback = function(Data) ...@@ -5094,7 +5094,7 @@ asc_docs_api.prototype.sync_ContextMenuCallback = function(Data)
this.asc_fireCallback("asc_onContextMenu", Data); this.asc_fireCallback("asc_onContextMenu", Data);
}; };
function _sendCommandCallback (fCallback, error, result) { function _sendCommandCallback (fCallback, error, result, rdata) {
if (error || !result) { if (error || !result) {
editor.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical); editor.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical);
if(fCallback) if(fCallback)
......
...@@ -6986,7 +6986,7 @@ window["asc_nativeOnSpellCheck"] = function (response) ...@@ -6986,7 +6986,7 @@ window["asc_nativeOnSpellCheck"] = function (response)
editor.SpellCheckApi.onSpellCheck(response); editor.SpellCheckApi.onSpellCheck(response);
}; };
function _sendCommandCallback (fCallback, error, result) { function _sendCommandCallback (fCallback, error, result, rdata) {
if (error || !result) { if (error || !result) {
if("save" != rdata["c"] && "chsave" != rdata["c"]) if("save" != rdata["c"] && "chsave" != rdata["c"])
editor.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical); editor.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical);
......
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