Commit 982f177e authored by Ilya Kirillov's avatar Ilya Kirillov Committed by GitHub

Merge pull request #87 from ONLYOFFICE/hotfix/v4.2.1

Hotfix/v4.2.1
parents 740894a4 ed86c2f5
...@@ -2866,7 +2866,7 @@ function DrawingObjects() { ...@@ -2866,7 +2866,7 @@ function DrawingObjects() {
_this.controller.selectObject(aObjects[0].graphicObject, 0); _this.controller.selectObject(aObjects[0].graphicObject, 0);
} }
_this.controller.editChartDrawingObjects(chart); _this.controller.editChartDrawingObjects(chart);
_this.showDrawingObjects(false); //_this.showDrawingObjects(false);
} }
}; };
......
...@@ -1124,9 +1124,9 @@ CHistory.prototype.private_UpdateContentChangesOnRedo = function(Item) ...@@ -1124,9 +1124,9 @@ CHistory.prototype.private_UpdateContentChangesOnRedo = function(Item)
var bAdd = this.private_IsAddContentChange(Item.Class, Item.Data); var bAdd = this.private_IsAddContentChange(Item.Class, Item.Data);
var Count = this.private_GetItemsCountInContentChange(Item.Class, Item.Data); var Count = this.private_GetItemsCountInContentChange(Item.Class, Item.Data);
var ContentChanges = new AscCommon.CContentChangesElement( ( bAdd == true ? AscCommon.contentchanges_Add : AscCommon.contentchanges_Remove ), Data.Pos, Count, Item ); var ContentChanges = new AscCommon.CContentChangesElement(( bAdd == true ? AscCommon.contentchanges_Add : AscCommon.contentchanges_Remove ), Item.Data.Pos, Count, Item);
Class.Add_ContentChanges( ContentChanges ); Item.Class.Add_ContentChanges(ContentChanges);
this.CollaborativeEditing.Add_NewDC( Class ); this.CollaborativeEditing.Add_NewDC(Item.Class);
} }
}; };
CHistory.prototype.private_IsContentChange = function(Class, Data) CHistory.prototype.private_IsContentChange = function(Class, Data)
...@@ -1149,6 +1149,8 @@ CHistory.prototype.private_IsContentChange = function(Class, Data) ...@@ -1149,6 +1149,8 @@ CHistory.prototype.private_IsContentChange = function(Class, Data)
}; };
CHistory.prototype.private_IsAddContentChange = function(Class, Data) CHistory.prototype.private_IsAddContentChange = function(Class, Data)
{ {
var bPresentation = !(typeof CPresentation === "undefined");
var bSlide = !(typeof Slide === "undefined");
return ( ( Class instanceof CDocument && AscDFH.historyitem_Document_AddItem === Data.Type ) || return ( ( Class instanceof CDocument && AscDFH.historyitem_Document_AddItem === Data.Type ) ||
( ((Class instanceof CDocumentContent || Class instanceof AscFormat.CDrawingDocContent)) && AscDFH.historyitem_DocumentContent_AddItem === Data.Type ) || ( ((Class instanceof CDocumentContent || Class instanceof AscFormat.CDrawingDocContent)) && AscDFH.historyitem_DocumentContent_AddItem === Data.Type ) ||
( Class instanceof CTable && AscDFH.historyitem_Table_AddRow === Data.Type ) || ( Class instanceof CTable && AscDFH.historyitem_Table_AddRow === Data.Type ) ||
......
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