Commit 159a09de authored by Alexander Trofimov's avatar Alexander Trofimov Committed by GitHub

Merge pull request #118 from ONLYOFFICE/hotfix/load-error

fix open error
parents 1bda4b64 9fdc584e
......@@ -568,15 +568,6 @@ var editor;
}
this.isUseEmbeddedCutFonts = false;
// Отправка стилей
this._sendWorkbookStyles();
if (this.IsSendDocumentLoadCompleate && this.collaborativeEditing) {
// Принимаем чужие изменения
this.collaborativeEditing.applyChanges();
// Пересылаем свои изменения
this.collaborativeEditing.sendChanges();
}
}
};
......
......@@ -5504,12 +5504,6 @@ background-repeat: no-repeat;\
return;
}
if (this.bInit_word_control === true)
{
AscCommon.CollaborativeEditing.Apply_Changes();
AscCommon.CollaborativeEditing.Release_Locks();
}
this.isUseEmbeddedCutFonts = false;
this.WordControl.checkNeedRules();
......
......@@ -6352,15 +6352,6 @@ background-repeat: no-repeat;\
return;
}
// быстрого перехода больше нет
/*
if ( this.bInit_word_control === true )
{
CollaborativeEditing.Apply_Changes();
CollaborativeEditing.Release_Locks();
}
*/
this.isUseEmbeddedCutFonts = false;
//this.WordControl.m_bIsRuler = true;
......
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