Commit 3d104815 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Правка падения при вставке и undo

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57519 954022d7-b5bf-4e40-9824-e11837661b57
parent 41e87580
...@@ -3243,6 +3243,7 @@ ...@@ -3243,6 +3243,7 @@
} }
ws.objectRender.showDrawingObjects(true); ws.objectRender.showDrawingObjects(true);
ws.objectRender.controller.updateOverlay();
ws.setSelectionShape(true); ws.setSelectionShape(true);
History.EndTransaction(); History.EndTransaction();
if(aImagesSync.length > 0) if(aImagesSync.length > 0)
...@@ -3347,6 +3348,8 @@ ...@@ -3347,6 +3348,8 @@
window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImagesSync, null, ws.objectRender.asyncImagesDocumentEndLoaded); window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImagesSync, null, ws.objectRender.asyncImagesDocumentEndLoaded);
ws.objectRender.showDrawingObjects(true); ws.objectRender.showDrawingObjects(true);
ws.setSelectionShape(true);
ws.objectRender.controller.updateOverlay();
History.EndTransaction(); History.EndTransaction();
}, },
......
...@@ -8201,11 +8201,12 @@ ...@@ -8201,11 +8201,12 @@
if ( result ) { if ( result ) {
for (var j = 0; j < a_drawings.length; ++j) { for (var j = 0; j < a_drawings.length; ++j) {
a_drawings[j].recalculateTransform(); a_drawings[j].recalculateTransform();
//TODO History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, null, null, new UndoRedoDataGraphicObjects(a_drawings[j].Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
a_drawings[j].addToDrawingObjects(); a_drawings[j].addToDrawingObjects();
a_drawings[j].select( t.objectRender.controller); a_drawings[j].select( t.objectRender.controller, 0);
} }
t.objectRender.controller.startRecalculate(); t.objectRender.controller.startRecalculate();
t.objectRender.controller.updateOverlay();
t.setSelectionShape(true);
} }
} }
for(var j = 0; j < a_drawings.length; ++j) for(var j = 0; j < a_drawings.length; ++j)
......
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