Commit f38b443f authored by Dmitry.Vikulov's avatar Dmitry.Vikulov

Правка для dbClick по чарту

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51498 954022d7-b5bf-4e40-9824-e11837661b57
parent 2387c3a0
...@@ -2532,7 +2532,7 @@ function PreMoveState(drawingObjectsController, drawingObjects, startX, startY, ...@@ -2532,7 +2532,7 @@ function PreMoveState(drawingObjectsController, drawingObjects, startX, startY,
var gr_obj = this.majorObject; var gr_obj = this.majorObject;
if(gr_obj.isChart()) if(gr_obj.isChart())
{ {
this.drawingObjectsController.changeCurrentState(new ExtpectDoubleClickState(this.drawingObjectsController, this.drawingObjects, gr_obj)); this.drawingObjectsController.changeCurrentState(new ExtpectDoubleClickState(this.drawingObjectsController, this.drawingObjects, gr_obj, x, y));
asc["editor"].asc_endAddShape(); asc["editor"].asc_endAddShape();
return; return;
/* if(false === this.graphicObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : gr_obj.Parent, CheckType : changestype_Paragraph_Content} )) { /* if(false === this.graphicObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : gr_obj.Parent, CheckType : changestype_Paragraph_Content} )) {
...@@ -2590,13 +2590,15 @@ function PreMoveState(drawingObjectsController, drawingObjects, startX, startY, ...@@ -2590,13 +2590,15 @@ function PreMoveState(drawingObjectsController, drawingObjects, startX, startY,
}; };
} }
function ExtpectDoubleClickState(drawingObjectsController, drawingObjects, chart) function ExtpectDoubleClickState(drawingObjectsController, drawingObjects, chart, x, y)
{ {
this.id = STATES_ID_EXPECT_DOUBLE_CLICK; this.id = STATES_ID_EXPECT_DOUBLE_CLICK;
this.drawingObjects = drawingObjects; this.drawingObjects = drawingObjects;
this.drawingObjectsController = drawingObjectsController; this.drawingObjectsController = drawingObjectsController;
this.nullState = new NullState(drawingObjectsController, drawingObjects); this.nullState = new NullState(drawingObjectsController, drawingObjects);
this.chart = chart; this.chart = chart;
this.x = x;
this.y = y;
this.onMouseDown = function(e, x, y) this.onMouseDown = function(e, x, y)
{ {
this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects)); this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects));
...@@ -2613,6 +2615,8 @@ function ExtpectDoubleClickState(drawingObjectsController, drawingObjects, chart ...@@ -2613,6 +2615,8 @@ function ExtpectDoubleClickState(drawingObjectsController, drawingObjects, chart
this.onMouseMove = function(e, x, y) this.onMouseMove = function(e, x, y)
{ {
if(this.x === x && this.y === y)
return;
this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects)); this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects));
this.drawingObjectsController.onMouseMove(e, x, y); this.drawingObjectsController.onMouseMove(e, x, y);
}; };
......
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