Commit 6f84a5ac authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Поправил падение при сборке изменений

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59108 954022d7-b5bf-4e40-9824-e11837661b57
parent 95d65761
...@@ -263,6 +263,7 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) { ...@@ -263,6 +263,7 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
this._checkCurPoint(); this._checkCurPoint();
Point = this.Points[this.Index]; Point = this.Points[this.Index];
CollaborativeEditing.Apply_LinkData(); CollaborativeEditing.Apply_LinkData();
if(!window["NATIVE_EDITOR_ENJINE"]) {
this.Get_RecalcData(Point); this.Get_RecalcData(Point);
wsViews = Asc["editor"].wb.wsViews; wsViews = Asc["editor"].wb.wsViews;
for (i = 0; i < wsViews.length; ++i) { for (i = 0; i < wsViews.length; ++i) {
...@@ -276,15 +277,19 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) { ...@@ -276,15 +277,19 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
// wsView.objectRender.controller.updateOverlay(); // wsView.objectRender.controller.updateOverlay();
//} //}
} }
}
if (null != Point) { if (null != Point) {
if (bUndo) { if (bUndo) {
if(!window["NATIVE_EDITOR_ENJINE"]) {
this.Get_RecalcData(Point); this.Get_RecalcData(Point);
wsViews = Asc["editor"].wb.wsViews; wsViews = Asc["editor"].wb.wsViews;
for (i = 0; i < wsViews.length; ++i) { for (i = 0; i < wsViews.length; ++i) {
if (wsViews[i]) { if (wsViews[i]) {
wsViews[i].objectRender.controller.recalculate2(undefined); wsViews[i].objectRender.controller.recalculate2(undefined);
} }
}
} }
gUndoInsDelCellsFlag = true; gUndoInsDelCellsFlag = 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