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

правка бага 20640 - Не возможно выделить через ctrl диаграмму, когда выделена автофигура

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51055 954022d7-b5bf-4e40-9824-e11837661b57
parent 734dae5f
......@@ -252,22 +252,19 @@ function NullState(drawingObjectsController, drawingObjects)
this.drawingObjectsController.updateSelectionState(this.drawingObjects.drawingDocument);
return;
}
this.drawingObjectsController.clearPreTrackObjects();
var is_selected = cur_drawing.selected;
if(!(e.ctrlKey || e.shiftKey) && !is_selected)
this.drawingObjectsController.resetSelection();
cur_drawing.select(this.drawingObjectsController);
this.drawingObjects.OnUpdateOverlay();
for(var j = 0; j < selected_objects.length; ++j)
{
this.drawingObjectsController.addPreTrackObject(selected_objects[j].createMoveTrack());
}
this.drawingObjectsController.changeCurrentState(new PreMoveState(this.drawingObjectsController, this.drawingObjects,x, y, e.shiftKey, e.ctrl, cur_drawing, is_selected, true));
return;
}
this.drawingObjectsController.clearPreTrackObjects();
var is_selected = cur_drawing.selected;
if(!(e.ctrlKey || e.shiftKey) && !is_selected)
this.drawingObjectsController.resetSelection();
cur_drawing.select(this.drawingObjectsController);
this.drawingObjects.OnUpdateOverlay();
for(var j = 0; j < selected_objects.length; ++j)
{
this.drawingObjectsController.addPreTrackObject(selected_objects[j].createMoveTrack());
}
this.drawingObjectsController.changeCurrentState(new PreMoveState(this.drawingObjectsController, this.drawingObjects,x, y, e.shiftKey, e.ctrl, cur_drawing, is_selected, true));
return;
}
}
}
......
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