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

сбрасывание состояния добавления шейпа

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64613 954022d7-b5bf-4e40-9824-e11837661b57
parent ceb5f103
...@@ -1246,6 +1246,14 @@ SplineBezierState.prototype = ...@@ -1246,6 +1246,14 @@ SplineBezierState.prototype =
onMouseUp: function(e, X, Y, pageIndex) onMouseUp: function(e, X, Y, pageIndex)
{ {
if(asc["editor"])
{
asc["editor"].asc_endAddShape();
}
else if(editor && editor.sync_EndAddShape)
{
editor.sync_EndAddShape();
}
this.drawingObjects.changeCurrentState(new NullState(this.drawingObjects)); this.drawingObjects.changeCurrentState(new NullState(this.drawingObjects));
this.drawingObjects.curState.updateAnchorPos(); this.drawingObjects.curState.updateAnchorPos();
} }
...@@ -1722,6 +1730,15 @@ PolyLineAddState.prototype = ...@@ -1722,6 +1730,15 @@ PolyLineAddState.prototype =
onMouseUp: function() onMouseUp: function()
{ {
if(asc["editor"])
{
asc["editor"].asc_endAddShape();
}
else if(editor && editor.sync_EndAddShape)
{
editor.sync_EndAddShape();
}
this.drawingObjects.changeCurrentState(new NullState(this.drawingObjects)); this.drawingObjects.changeCurrentState(new NullState(this.drawingObjects));
} }
}; };
...@@ -1782,6 +1799,15 @@ PolyLineAddState2.prototype = ...@@ -1782,6 +1799,15 @@ PolyLineAddState2.prototype =
this.drawingObjects.clearTrackObjects(); this.drawingObjects.clearTrackObjects();
this.drawingObjects.updateOverlay(); this.drawingObjects.updateOverlay();
this.drawingObjects.changeCurrentState(new NullState(this.drawingObjects)); this.drawingObjects.changeCurrentState(new NullState(this.drawingObjects));
if(asc["editor"])
{
asc["editor"].asc_endAddShape();
}
else if(editor && editor.sync_EndAddShape)
{
editor.sync_EndAddShape();
}
} }
} }
...@@ -1836,6 +1862,14 @@ AddPolyLine2State2.prototype = ...@@ -1836,6 +1862,14 @@ AddPolyLine2State2.prototype =
return {objectId: "1", bMarker: true}; return {objectId: "1", bMarker: true};
if(e.ClickCount > 1) if(e.ClickCount > 1)
{ {
if(asc["editor"])
{
asc["editor"].asc_endAddShape();
}
else if(editor && editor.sync_EndAddShape)
{
editor.sync_EndAddShape();
}
this.drawingObjects.changeCurrentState(new NullState(this.drawingObjects)); this.drawingObjects.changeCurrentState(new NullState(this.drawingObjects));
} }
}, },
......
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