Commit 4ab7c6f8 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

spreadsheet CheckNextChange

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57902 954022d7-b5bf-4e40-9824-e11837661b57
parent 7047d461
......@@ -1903,6 +1903,10 @@ Workbook.prototype.DeserializeHistory = function(aChanges, fCallback){
{
var item = aUndoRedoElems[i];
if ((null != item.oClass || (item.oData && typeof item.oData.sChangedObjectId === "string")) && null != item.nActionType) {
if (window["NATIVE_EDITOR_ENJINE"] === true && window["native"]["CheckNextChange"]) {
if (!window["native"]["CheckNextChange"]())
break;
}
// TODO if(g_oUndoRedoGraphicObjects == item.oClass && item.oData.drawingData)
// item.oData.drawingData.bCollaborativeChanges = true;
History.RedoAdd(oRedoObjectParam, item.oClass, item.nActionType, item.nSheetId, item.oRange, item.oData);
......
......@@ -665,7 +665,7 @@ function CCollaborativeEditing()
// Применяем изменения, пока они есть
while ( this.m_aChanges.length > 0 )
{
if (window["NATIVE_EDITOR_ENJINE"] === true && window["native"]["SetCurrentChangeFile"])
if (window["NATIVE_EDITOR_ENJINE"] === true && window["native"]["CheckNextChange"])
{
if (!window["native"]["CheckNextChange"]())
break;
......
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