Commit 7657f750 authored by SergeyLuzyanin's avatar SergeyLuzyanin

баг с бесконечной ромашкой при подключении вторым пользователем

parent 12331990
...@@ -4567,10 +4567,6 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function() ...@@ -4567,10 +4567,6 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
if (0 == this.DocumentType) if (0 == this.DocumentType)
this.WordControl.m_oLogicDocument.LoadEmptyDocument(); this.WordControl.m_oLogicDocument.LoadEmptyDocument();
else if (1 == this.DocumentType)
{
this.WordControl.m_oLogicDocument.LoadTestDocument();
}
else else
{ {
if(this.LoadedObject) if(this.LoadedObject)
...@@ -4586,28 +4582,6 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function() ...@@ -4586,28 +4582,6 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
AscCommon.CollaborativeEditing.Release_Locks(); AscCommon.CollaborativeEditing.Release_Locks();
this.bNoSendComments = false; this.bNoSendComments = false;
this.isApplyChangesOnOpen = true; this.isApplyChangesOnOpen = true;
var _slides = this.WordControl.m_oLogicDocument.Slides;
var _slidesCount = _slides.length;
for (var i = 0; i < _slidesCount; i++)
{
var slideComments = _slides[i].slideComments;
if(slideComments)
{
var _comments = slideComments.comments;
var _commentsCount = _comments.length;
for (var j = 0; j < _commentsCount; j++)
{
this.sync_AddComment(_comments[j].Get_Id(), _comments[j].Data );
}
}
}
this.bAddComments = true;
if(OtherChanges)
{
return;
}
// Применяем все lock-и (ToDo возможно стоит пересмотреть вообще Lock-и) // Применяем все lock-и (ToDo возможно стоит пересмотреть вообще Lock-и)
for (var i = 0; i < this.arrPreOpenLocksObjects.length; ++i) for (var i = 0; i < this.arrPreOpenLocksObjects.length; ++i)
{ {
...@@ -4669,9 +4643,8 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function() ...@@ -4669,9 +4643,8 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
this.WordControl.m_oLogicDocument.Document_UpdateRulersState(); this.WordControl.m_oLogicDocument.Document_UpdateRulersState();
this.WordControl.m_oLogicDocument.Document_UpdateSelectionState(); this.WordControl.m_oLogicDocument.Document_UpdateSelectionState();
this.LoadedObject = null; this.LoadedObject = null;
this.bInit_word_control = true; this.bInit_word_control = true;
if(!(this.bAddComments === true) && !this.bNoSendComments) if(!this.bNoSendComments)
{ {
var _slides = this.WordControl.m_oLogicDocument.Slides; var _slides = this.WordControl.m_oLogicDocument.Slides;
var _slidesCount = _slides.length; var _slidesCount = _slides.length;
...@@ -4691,7 +4664,7 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function() ...@@ -4691,7 +4664,7 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
} }
this.asc_fireCallback("asc_onDocumentContentReady"); this.asc_fireCallback("asc_onDocumentContentReady");
this.isApplyChangesOnOpen = false; this.isApplyChangesOnOpen = false;
this.bAddComments = false;
this.WordControl.InitControl(); this.WordControl.InitControl();
if (bIsScroll) if (bIsScroll)
{ {
......
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