Commit 0bdbc357 authored by Alexander.Trofimov's avatar Alexander.Trofimov

update minimize script error builds

parent 28ae3750
...@@ -328,7 +328,7 @@ CCollaborativeEditingBase.prototype.Apply_Changes = function() ...@@ -328,7 +328,7 @@ CCollaborativeEditingBase.prototype.Apply_Changes = function()
// Если нет чужих изменений, тогда и делать ничего не надо // Если нет чужих изменений, тогда и делать ничего не надо
if (true === OtherChanges) if (true === OtherChanges)
{ {
editor.WordControl.m_oLogicDocument.Stop_Recalculate(); editor.Stop_Recalculate();
editor.WordControl.m_oLogicDocument.EndPreview_MailMergeResult(); editor.WordControl.m_oLogicDocument.EndPreview_MailMergeResult();
editor.sync_StartAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.ApplyChanges); editor.sync_StartAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.ApplyChanges);
...@@ -812,7 +812,7 @@ CDocumentPositionsManager.prototype.Update_DocumentPosition = function(DocPos) ...@@ -812,7 +812,7 @@ CDocumentPositionsManager.prototype.Update_DocumentPosition = function(DocPos)
{ {
var Run = NewDocPos[0].Class; var Run = NewDocPos[0].Class;
var Para = Run.Get_Paragraph(); var Para = Run.Get_Paragraph();
if (Para && true === Para.Is_UseInDocument() && true === Run.Is_UseInParagraph()) if (AscCommonWord.CanUpdatePosition(Para, Run))
{ {
DocPos.length = 0; DocPos.length = 0;
DocPos.push({Class : Run, Position : NewDocPos[0].Position}); DocPos.push({Class : Run, Position : NewDocPos[0].Position});
...@@ -825,7 +825,7 @@ CDocumentPositionsManager.prototype.Update_DocumentPosition = function(DocPos) ...@@ -825,7 +825,7 @@ CDocumentPositionsManager.prototype.Update_DocumentPosition = function(DocPos)
var Run = DocPos[DocPos.length - 1].Class; var Run = DocPos[DocPos.length - 1].Class;
var RunPos = DocPos[DocPos.length - 1].Position; var RunPos = DocPos[DocPos.length - 1].Position;
var Para = Run.Get_Paragraph(); var Para = Run.Get_Paragraph();
if (Para && true === Para.Is_UseInDocument() && true === Run.Is_UseInParagraph()) if (AscCommonWord.CanUpdatePosition(Para, Run))
{ {
DocPos.length = 0; DocPos.length = 0;
DocPos.push({Class : Run, Position : RunPos}); DocPos.push({Class : Run, Position : RunPos});
......
...@@ -114,7 +114,7 @@ CWordCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, Addition ...@@ -114,7 +114,7 @@ CWordCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, Addition
} }
// TODO: Пока у нас обнуляется история на сохранении нужно обновлять Undo/Redo // TODO: Пока у нас обнуляется история на сохранении нужно обновлять Undo/Redo
editor.WordControl.m_oLogicDocument.Document_UpdateUndoRedoState(); editor.Document_UpdateUndoRedoState();
// Перерисовываем документ (для обновления локов) // Перерисовываем документ (для обновления локов)
editor.WordControl.m_oLogicDocument.DrawingDocument.ClearCachePages(); editor.WordControl.m_oLogicDocument.DrawingDocument.ClearCachePages();
......
...@@ -11013,6 +11013,11 @@ CReviewInfo.prototype.Get_UserId = function() ...@@ -11013,6 +11013,11 @@ CReviewInfo.prototype.Get_UserId = function()
return this.UserId; return this.UserId;
}; };
function CanUpdatePosition(Para, Run) {
return (Para && true === Para.Is_UseInDocument() && true === Run.Is_UseInParagraph());
}
//--------------------------------------------------------export---------------------------------------------------- //--------------------------------------------------------export----------------------------------------------------
window['AscCommonWord'] = window['AscCommonWord'] || {}; window['AscCommonWord'] = window['AscCommonWord'] || {};
window['AscCommonWord'].ParaRun = ParaRun; window['AscCommonWord'].ParaRun = ParaRun;
window['AscCommonWord'].CanUpdatePosition = CanUpdatePosition;
...@@ -791,7 +791,7 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() { ...@@ -791,7 +791,7 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() {
}; };
this.CoAuthoringApi.onConnectionStateChanged = function(e) { this.CoAuthoringApi.onConnectionStateChanged = function(e) {
if (true === AscCommon.CollaborativeEditing.Is_Fast() && false === e['state']) { if (true === AscCommon.CollaborativeEditing.Is_Fast() && false === e['state']) {
editor.WordControl.m_oLogicDocument.Remove_ForeignCursor(e['id']); t.WordControl.m_oLogicDocument.Remove_ForeignCursor(e['id']);
} }
t.asc_fireCallback("asc_onConnectionStateChanged", e); t.asc_fireCallback("asc_onConnectionStateChanged", e);
}; };
...@@ -821,17 +821,17 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() { ...@@ -821,17 +821,17 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() {
Lock.Set_UserId(e["user"]); Lock.Set_UserId(e["user"]);
if (Class instanceof AscCommonWord.CHeaderFooterController) { if (Class instanceof AscCommonWord.CHeaderFooterController) {
editor.sync_LockHeaderFooters(); t.sync_LockHeaderFooters();
} else if (Class instanceof AscCommonWord.CDocument) { } else if (Class instanceof AscCommonWord.CDocument) {
editor.sync_LockDocumentProps(); t.sync_LockDocumentProps();
} else if (Class instanceof AscCommon.CComment) { } else if (Class instanceof AscCommon.CComment) {
editor.sync_LockComment(Class.Get_Id(), e["user"]); t.sync_LockComment(Class.Get_Id(), e["user"]);
} else if (Class instanceof AscCommonWord.CGraphicObjects) { } else if (Class instanceof AscCommonWord.CGraphicObjects) {
editor.sync_LockDocumentSchema(); t.sync_LockDocumentSchema();
} }
// Теперь обновлять состояние необходимо, чтобы обновить локи в режиме рецензирования. // Теперь обновлять состояние необходимо, чтобы обновить локи в режиме рецензирования.
editor.WordControl.m_oLogicDocument.Document_UpdateInterfaceState(); t.WordControl.m_oLogicDocument.Document_UpdateInterfaceState();
} else { } else {
AscCommon.CollaborativeEditing.Add_NeedLock(Id, e["user"]); AscCommon.CollaborativeEditing.Add_NeedLock(Id, e["user"]);
} }
...@@ -872,50 +872,50 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() { ...@@ -872,50 +872,50 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() {
Lock.Set_Type(NewType, true); Lock.Set_Type(NewType, true);
// Теперь обновлять состояние необходимо, чтобы обновить локи в режиме рецензирования. // Теперь обновлять состояние необходимо, чтобы обновить локи в режиме рецензирования.
editor.WordControl.m_oLogicDocument.Document_UpdateInterfaceState(); t.WordControl.m_oLogicDocument.Document_UpdateInterfaceState();
if (Class instanceof AscCommonWord.CHeaderFooterController) if (Class instanceof AscCommonWord.CHeaderFooterController)
{ {
if (NewType !== locktype_Mine && NewType !== locktype_None) if (NewType !== locktype_Mine && NewType !== locktype_None)
{ {
editor.sync_LockHeaderFooters(); t.sync_LockHeaderFooters();
} }
else else
{ {
editor.sync_UnLockHeaderFooters(); t.sync_UnLockHeaderFooters();
} }
} }
else if (Class instanceof AscCommonWord.CDocument) else if (Class instanceof AscCommonWord.CDocument)
{ {
if (NewType !== locktype_Mine && NewType !== locktype_None) if (NewType !== locktype_Mine && NewType !== locktype_None)
{ {
editor.sync_LockDocumentProps(); t.sync_LockDocumentProps();
} }
else else
{ {
editor.sync_UnLockDocumentProps(); t.sync_UnLockDocumentProps();
} }
} }
else if (Class instanceof AscCommon.CComment) else if (Class instanceof AscCommon.CComment)
{ {
if (NewType !== locktype_Mine && NewType !== locktype_None) if (NewType !== locktype_Mine && NewType !== locktype_None)
{ {
editor.sync_LockComment(Class.Get_Id(), e["user"]); t.sync_LockComment(Class.Get_Id(), e["user"]);
} }
else else
{ {
editor.sync_UnLockComment(Class.Get_Id()); t.sync_UnLockComment(Class.Get_Id());
} }
} }
else if (Class instanceof AscCommonWord.CGraphicObjects) else if (Class instanceof AscCommonWord.CGraphicObjects)
{ {
if (NewType !== locktype_Mine && NewType !== locktype_None) if (NewType !== locktype_Mine && NewType !== locktype_None)
{ {
editor.sync_LockDocumentSchema(); t.sync_LockDocumentSchema();
} }
else else
{ {
editor.sync_UnLockDocumentSchema(); t.sync_UnLockDocumentSchema();
} }
} }
} }
...@@ -928,7 +928,7 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() { ...@@ -928,7 +928,7 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() {
if (bFirstLoad) { if (bFirstLoad) {
bUseColor = -1 === AscCommon.CollaborativeEditing.m_nUseType; bUseColor = -1 === AscCommon.CollaborativeEditing.m_nUseType;
} }
if (editor.CollaborativeMarksShowType === c_oAscCollaborativeMarksShowType.None) { if (t.CollaborativeMarksShowType === c_oAscCollaborativeMarksShowType.None) {
bUseColor = false; bUseColor = false;
} }
...@@ -972,7 +972,7 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() { ...@@ -972,7 +972,7 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() {
}; };
this.CoAuthoringApi.onEndCoAuthoring = function(isStartEvent) { this.CoAuthoringApi.onEndCoAuthoring = function(isStartEvent) {
AscCommon.CollaborativeEditing.End_CollaborationEditing(); AscCommon.CollaborativeEditing.End_CollaborationEditing();
editor.asc_setDrawCollaborationMarks(false); t.asc_setDrawCollaborationMarks(false);
}; };
}; };
...@@ -6860,6 +6860,13 @@ asc_docs_api.prototype._onEndLoadSdk = function() { ...@@ -6860,6 +6860,13 @@ asc_docs_api.prototype._onEndLoadSdk = function() {
asc_docs_api.superclass._onEndLoadSdk.call(this); asc_docs_api.superclass._onEndLoadSdk.call(this);
}; };
asc_docs_api.prototype.Stop_Recalculate = function() {
this.WordControl.m_oLogicDocument.Stop_Recalculate();
};
asc_docs_api.prototype.Document_UpdateUndoRedoState = function() {
editor.WordControl.m_oLogicDocument.Document_UpdateUndoRedoState();
};
window["asc_docs_api"] = asc_docs_api; window["asc_docs_api"] = asc_docs_api;
window["asc_docs_api"].prototype["asc_nativeOpenFile"] = function(base64File, version) window["asc_docs_api"].prototype["asc_nativeOpenFile"] = function(base64File, version)
{ {
......
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