Commit 06e8d624 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

fix bug #26732 (потенциальный баг был еще в копировании-вставке). При...

fix bug #26732 (потенциальный баг был еще в копировании-вставке). При незаконченной транзакции не делаем autosave.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58622 954022d7-b5bf-4e40-9824-e11837661b57
parent 3aba29c2
...@@ -3174,7 +3174,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -3174,7 +3174,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
////////////////////////////AutoSave api///////////////////////////////// ////////////////////////////AutoSave api/////////////////////////////////
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
spreadsheet_api.prototype._autoSave = function () { spreadsheet_api.prototype._autoSave = function () {
if (0 === this.autoSaveGap || this.asc_getCellEditMode() || !History.Is_Modified() || !this.canSave) if (0 === this.autoSaveGap || this.asc_getCellEditMode() ||
!History.Is_Modified() || !History.IsEndTransaction() || !this.canSave)
return; return;
if (null === this.lastSaveTime) { if (null === this.lastSaveTime) {
this.lastSaveTime = new Date(); this.lastSaveTime = new Date();
......
...@@ -696,6 +696,10 @@ CHistory.prototype.EndTransaction = function() ...@@ -696,6 +696,10 @@ CHistory.prototype.EndTransaction = function()
if(this.Transaction < 0) if(this.Transaction < 0)
this.Transaction = 0; this.Transaction = 0;
}; };
CHistory.prototype.IsEndTransaction = function()
{
return (0 === this.Transaction);
};
/** @returns {boolean} */ /** @returns {boolean} */
CHistory.prototype.Is_On = function() CHistory.prototype.Is_On = function()
{ {
......
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