Commit 0ee5b8bd authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Убрал блокирующие операции при сохранении.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58317 954022d7-b5bf-4e40-9824-e11837661b57
parent 857e5d70
...@@ -567,10 +567,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -567,10 +567,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
// Не даем пользователю сохранять, пока не закончится сохранение // Не даем пользователю сохранять, пока не закончится сохранение
this.canSave = false; this.canSave = false;
this.isAutoSave = !!isAutoSave; this.isAutoSave = !!isAutoSave;
if (!this.isAutoSave) { if (!this.isAutoSave)
this.asc_StartAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.Save); this.asc_StartAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.Save);
this.asc_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Save);
}
// Нужно закрыть редактор // Нужно закрыть редактор
this.asc_closeCellEditor(); this.asc_closeCellEditor();
...@@ -579,8 +577,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -579,8 +577,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
}; };
spreadsheet_api.prototype.asc_OnSaveEnd = function (isDocumentSaved) { spreadsheet_api.prototype.asc_OnSaveEnd = function (isDocumentSaved) {
if (!this.isAutoSave)
this.asc_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Save);
this.asc_EndAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.Save); this.asc_EndAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.Save);
this.canSave = true; this.canSave = true;
this.isAutoSave = false; this.isAutoSave = false;
......
...@@ -1414,18 +1414,14 @@ asc_docs_api.prototype.asc_Save = function (isAutoSave) { ...@@ -1414,18 +1414,14 @@ asc_docs_api.prototype.asc_Save = function (isAutoSave) {
if (true === this.canSave) { if (true === this.canSave) {
this.canSave = false; this.canSave = false;
this.isAutoSave = !!isAutoSave; this.isAutoSave = !!isAutoSave;
if (!this.isAutoSave) { if (!this.isAutoSave)
this.sync_StartAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.Save); this.sync_StartAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.Save);
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Save);
}
var t = this; var t = this;
this.CoAuthoringApi.askSaveChanges (function (e) { t.onSaveCallback (e); }); this.CoAuthoringApi.askSaveChanges (function (e) { t.onSaveCallback (e); });
} }
}; };
asc_docs_api.prototype.asc_OnSaveEnd = function (isDocumentSaved) { asc_docs_api.prototype.asc_OnSaveEnd = function (isDocumentSaved) {
if (!this.isAutoSave)
this.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Save);
this.sync_EndAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.Save); this.sync_EndAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.Save);
this.canSave = true; this.canSave = true;
this.isAutoSave = false; this.isAutoSave = false;
......
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