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

Fix Bug 45283, Bug 25773

Browse source
This commit is contained in:
Julia Radzhabova 2020-05-08 21:48:46 +03:00
parent 556315ab0b
commit 37e1834091
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/documenteditor/main/app/controller/Main.js
View file

@ -1620,10 +1620,12 @@ define([
}, this);
}
if (id !== Asc.c_oAscError.ID.ForceSaveTimeout)
Common.UI.alert(config);
if (id !== Asc.c_oAscError.ID.ForceSaveTimeout) {
if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1)
Common.UI.alert(config).$window.attr('data-value', id);
}
Common.component.Analytics.trackEvent('Internal Error', id.toString());
(id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString());
},
onCoAuthoringDisconnect: function() {

8
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1290,10 +1290,12 @@ define([
}, this);
}
if (id !== Asc.c_oAscError.ID.ForceSaveTimeout)
Common.UI.alert(config);
if (id !== Asc.c_oAscError.ID.ForceSaveTimeout) {
if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1)
Common.UI.alert(config).$window.attr('data-value', id);
}
Common.component.Analytics.trackEvent('Internal Error', id.toString());
(id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString());
},
onCoAuthoringDisconnect: function() {

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

@ -1532,10 +1532,12 @@ define([
}, this);
}
if (id == Asc.c_oAscError.ID.EditingError || $('.asc-window.modal.alert:visible').length < 1 && (id !== Asc.c_oAscError.ID.ForceSaveTimeout)) {
Common.UI.alert(config);
(id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString());
if (id !== Asc.c_oAscError.ID.ForceSaveTimeout) {
if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1)
Common.UI.alert(config).$window.attr('data-value', id);
}
(id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString());
},
onCoAuthoringDisconnect: function() {