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

- Fix Bug 21704 - [Copy&Paste] Не осуществляется копирование через cmd

- Fix Bug 21011 - Нет возможности выделить несколько изображений через cmd на Mac

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51373 954022d7-b5bf-4e40-9824-e11837661b57
parent 4f36f39d
......@@ -1106,6 +1106,10 @@
// Shapes
var graphicsInfo = t.handlers.trigger("getGraphicsInfo", coord.x, coord.y);
if ( asc["editor"].isStartAddShape || (graphicsInfo && graphicsInfo.isGraphicObject) ) {
//for Mac OS
if ( event.metaKey )
event.ctrlKey = true;
asc["editor"].isStartAddShape = true;
var currTime = getCurrentTime();
......@@ -1257,6 +1261,11 @@
var coord = this._getCoordinates(event);
this.handlers.trigger("graphicObjectMouseUpEx", event, coord.x, coord.y);
if ( asc["editor"].isStartAddShape ) {
//for Mac OS
if ( event.metaKey )
event.ctrlKey = true;
event.ClickCount = this.mouseClickCount;
this.handlers.trigger("graphicObjectMouseUp", event, coord.x, coord.y);
this._changeSelectionDone(event);
......
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