Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 58329

Browse source
This commit is contained in:
Julia Radzhabova 2022-07-29 00:10:57 +03:00
parent 36b3af56b8
commit 0c9511419b
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1535,6 +1535,11 @@ define([
}, },
onError: function(id, level, errData, callback) { onError: function(id, level, errData, callback) {
if (this.isFrameClosed) {
this.lastFrameError = {id: id, level: level, errData: errData, callback: callback};
return;
}
if (id == Asc.c_oAscError.ID.LoadingScriptError) { if (id == Asc.c_oAscError.ID.LoadingScriptError) {
this.showTips([this.scriptLoadError]); this.showTips([this.scriptLoadError]);
this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000); this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000);
@ -2590,6 +2595,10 @@ define([
if (typeof chart === 'object' && this.api) { if (typeof chart === 'object' && this.api) {
this.api.asc_addChartDrawingObject(chart); this.api.asc_addChartDrawingObject(chart);
this.isFrameClosed = false; this.isFrameClosed = false;
if (this.lastFrameError) {
this.onError(this.lastFrameError.id, this.lastFrameError.level, this.lastFrameError.errData, this.lastFrameError.callback);
this.lastFrameError = undefined;
}
} }
}, },
@ -2613,6 +2622,10 @@ define([
if ((typeof obj === 'object' || obj==="empty") && this.api) { if ((typeof obj === 'object' || obj==="empty") && this.api) {
this.api.asc_addTableOleObjectInOleEditor(typeof obj === 'object' ? obj : undefined); this.api.asc_addTableOleObjectInOleEditor(typeof obj === 'object' ? obj : undefined);
this.isFrameClosed = false; this.isFrameClosed = false;
if (this.lastFrameError) {
this.onError(this.lastFrameError.id, this.lastFrameError.level, this.lastFrameError.errData, this.lastFrameError.callback);
this.lastFrameError = undefined;
}
} }
}, },
@ -2631,6 +2644,10 @@ define([
if (typeof merge === 'object' && this.api) { if (typeof merge === 'object' && this.api) {
this.api.asc_setData(merge); this.api.asc_setData(merge);
this.isFrameClosed = false; this.isFrameClosed = false;
if (this.lastFrameError) {
this.onError(this.lastFrameError.id, this.lastFrameError.level, this.lastFrameError.errData, this.lastFrameError.callback);
this.lastFrameError = undefined;
}
} }
}, },