Commit c2e37273 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Дополнение к #53457 - ресайз и поворот

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53459 954022d7-b5bf-4e40-9824-e11837661b57
parent c2777c99
...@@ -2217,6 +2217,7 @@ function PreRotateState(drawingObjectsController, drawingObjects, majorObject) ...@@ -2217,6 +2217,7 @@ function PreRotateState(drawingObjectsController, drawingObjects, majorObject)
function RotateState(drawingObjectsController, drawingObjects, majorObject) function RotateState(drawingObjectsController, drawingObjects, majorObject)
{ {
var _this = this;
this.id = STATES_ID_ROTATE; this.id = STATES_ID_ROTATE;
this.drawingObjectsController = drawingObjectsController; this.drawingObjectsController = drawingObjectsController;
this.drawingObjects = drawingObjects; this.drawingObjects = drawingObjects;
...@@ -2266,9 +2267,13 @@ function RotateState(drawingObjectsController, drawingObjects, majorObject) ...@@ -2266,9 +2267,13 @@ function RotateState(drawingObjectsController, drawingObjects, majorObject)
if(bLock) if(bLock)
{ {
History.Create_NewPoint(); History.Create_NewPoint();
for(var i = 0; i < track_objects2.length; ++i) var aId = [];
for (var i = 0; i < track_objects2.length; ++i) {
track_objects2[i].trackEnd(); track_objects2[i].trackEnd();
drawingObjects.showDrawingObjects(true); aId.push(track_objects2[i].originalObject.Id);
}
//drawingObjects.showDrawingObjects(true);
drawingObjects.showDrawingObjects(true, new GraphicOption(_this.drawingObjects.getWorksheet(), c_oAscGraphicOption.ChangePosition, null, aId));
} }
}; };
...@@ -2351,6 +2356,7 @@ function PreResizeState(drawingObjectsController, drawingObjects, majorObject, c ...@@ -2351,6 +2356,7 @@ function PreResizeState(drawingObjectsController, drawingObjects, majorObject, c
function ResizeState(drawingObjectsController, drawingObjects, majorObject, cardDirection) function ResizeState(drawingObjectsController, drawingObjects, majorObject, cardDirection)
{ {
var _this = this;
this.id = STATES_ID_RESIZE; this.id = STATES_ID_RESIZE;
this.drawingObjectsController = drawingObjectsController; this.drawingObjectsController = drawingObjectsController;
this.drawingObjects = drawingObjects; this.drawingObjects = drawingObjects;
...@@ -2395,9 +2401,13 @@ function ResizeState(drawingObjectsController, drawingObjects, majorObject, card ...@@ -2395,9 +2401,13 @@ function ResizeState(drawingObjectsController, drawingObjects, majorObject, card
if(bLock) if(bLock)
{ {
History.Create_NewPoint(); History.Create_NewPoint();
for(var i = 0; i < track_objects2.length; ++i) var aId = [];
for (var i = 0; i < track_objects2.length; ++i) {
track_objects2[i].trackEnd(); track_objects2[i].trackEnd();
drawingObjects.showDrawingObjects(true); aId.push(track_objects2[i].originalObject.Id);
}
//drawingObjects.showDrawingObjects(true);
drawingObjects.showDrawingObjects(true, new GraphicOption(_this.drawingObjects.getWorksheet(), c_oAscGraphicOption.ChangePosition, null, aId));
drawingObjects.sendGraphicObjectProps(); drawingObjects.sendGraphicObjectProps();
} }
......
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