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

git-svn-id:...

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53088 954022d7-b5bf-4e40-9824-e11837661b57
parent a905c73b
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
// Обработчик кликов для граф.объектов // Обработчик кликов для граф.объектов
this.clickCounter = new ClickCounter(); this.clickCounter = new ClickCounter();
this.isLocked = false;
// Был ли DblClick обработан в onMouseDown эвенте // Был ли DblClick обработан в onMouseDown эвенте
this.isDblClickInMouseDown = false; this.isDblClickInMouseDown = false;
...@@ -1117,6 +1118,7 @@ ...@@ -1117,6 +1118,7 @@
var t = this; var t = this;
var coord = t._getCoordinates(event); var coord = t._getCoordinates(event);
event.isLocked = true; event.isLocked = true;
t.isLocked = true;
if (t.handlers.trigger("isGlobalLockEditCell")) if (t.handlers.trigger("isGlobalLockEditCell"))
return; return;
...@@ -1278,6 +1280,8 @@ ...@@ -1278,6 +1280,8 @@
// Shapes // Shapes
var coord = this._getCoordinates(event); var coord = this._getCoordinates(event);
event.isLocked = false; event.isLocked = false;
this.isLocked = false;
this.handlers.trigger("graphicObjectMouseUpEx", event, coord.x, coord.y); this.handlers.trigger("graphicObjectMouseUpEx", event, coord.x, coord.y);
if ( asc["editor"].isStartAddShape ) { if ( asc["editor"].isStartAddShape ) {
...@@ -1329,6 +1333,8 @@ ...@@ -1329,6 +1333,8 @@
_onMouseMove: function (event) { _onMouseMove: function (event) {
var t = this; var t = this;
var coord = t._getCoordinates(event); var coord = t._getCoordinates(event);
event.isLocked = t.isLocked;
t.hasCursor = true; t.hasCursor = true;
// Shapes // Shapes
......
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