Commit 20e00da8 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Have_Changes IsUserSave -> IsNotUserSave

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@67438 954022d7-b5bf-4e40-9824-e11837661b57
parent d55b4e60
......@@ -3108,7 +3108,7 @@ function CEditorPage(api)
if ((_curTime - oWordControl.m_nLastAutosaveTime) > _interval && !oWordControl.m_oDrawingDocument.TransitionSlide.IsPlaying() && !oWordControl.m_oApi.isLongAction())
{
if (History.Have_Changes(false) == true)
if (History.Have_Changes(true) == true)
{
oWordControl.m_oApi.asc_Save(true);
}
......
......@@ -573,7 +573,7 @@ CPresentation.prototype =
}
}
var bHaveChanges = History.Have_Changes(false);
var bHaveChanges = History.Have_Changes(true);
if (true !== bHaveChanges && true === CollaborativeEditing.Have_OtherChanges())
{
// Принимаем чужие изменение. Своих нет, но функцию отсылки надо вызвать, чтобы снялить локи.
......
......@@ -3776,7 +3776,7 @@ function CEditorPage(api)
if ((_curTime - oWordControl.m_nLastAutosaveTime) > _interval)
{
if (History.Have_Changes(false) == true)
if (History.Have_Changes(true) == true)
{
oWordControl.m_oApi.asc_Save(true);
}
......
......@@ -14706,7 +14706,7 @@ CDocument.prototype.Continue_FastCollaborativeEditing = function()
if (true === this.Selection_Is_TableBorderMove() || true === this.Api.isStartAddShape || this.DrawingObjects.checkTrackDrawings())
return;
var HaveChanges = this.History.Have_Changes(false);
var HaveChanges = this.History.Have_Changes(true);
if (true !== HaveChanges && true === this.CollaborativeEditing.Have_OtherChanges())
{
// Принимаем чужие изменения. Своих нет, но функцию отсылки надо вызвать, чтобы снять локи.
......
......@@ -685,9 +685,9 @@ CHistory.prototype =
}
},
Have_Changes : function(IsUserSave)
Have_Changes : function(IsNotUserSave)
{
var checkIndex = (this.Is_UserSaveMode() && IsUserSave) ? this.UserSavedIndex : this.SavedIndex;
var checkIndex = (this.Is_UserSaveMode() && !IsNotUserSave) ? this.UserSavedIndex : this.SavedIndex;
if (-1 === this.Index && null === checkIndex && false === this.ForceSave)
return 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