Commit b34ce289 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Правка бага с select-ом и move-ом для объектов и диаграмм

Баг http://bugzserver/show_bug.cgi?id=22261

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52141 954022d7-b5bf-4e40-9824-e11837661b57
parent ee1c130f
...@@ -1316,12 +1316,6 @@ ...@@ -1316,12 +1316,6 @@
var graphicsInfo = t.handlers.trigger("getGraphicsInfo", coord.x, coord.y); var graphicsInfo = t.handlers.trigger("getGraphicsInfo", coord.x, coord.y);
if ( graphicsInfo && graphicsInfo.isGraphicObject ) if ( graphicsInfo && graphicsInfo.isGraphicObject )
this.clickCounter.mouseMoveEvent(coord.x, coord.y); this.clickCounter.mouseMoveEvent(coord.x, coord.y);
if ( asc["editor"].isStartAddShape || ( !t.isSelectMode && !t.isResizeMode && graphicsInfo) ) {
t.handlers.trigger("graphicObjectMouseMove", event, coord.x, coord.y);
t.handlers.trigger("updateWorksheet", t.element[0], coord.x, coord.y, event.ctrlKey, function(info){t.targetInfo = info;});
return;
}
if (t.isSelectMode) { if (t.isSelectMode) {
t._changeSelection(event, /*isSelectMode*/true); t._changeSelection(event, /*isSelectMode*/true);
...@@ -1351,6 +1345,12 @@ ...@@ -1351,6 +1345,12 @@
return true; return true;
} }
if (asc["editor"].isStartAddShape || graphicsInfo) {
t.handlers.trigger("graphicObjectMouseMove", event, coord.x, coord.y);
t.handlers.trigger("updateWorksheet", t.element[0], coord.x, coord.y, event.ctrlKey, function(info){t.targetInfo = info;});
return true;
}
t.handlers.trigger("updateWorksheet", t.element[0], coord.x, coord.y, event.ctrlKey, function(info){t.targetInfo = info;}); t.handlers.trigger("updateWorksheet", t.element[0], coord.x, coord.y, event.ctrlKey, function(info){t.targetInfo = info;});
return true; return true;
}, },
......
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