Bug 25309 - Не вызывается контекстное меню после закрытия Chart Editor Window для диаграммы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57312 954022d7-b5bf-4e40-9824-e11837661b57

Common/Drawings/CommonController.js

@@ -373,7 +373,7 @@ DrawingObjectsController.prototype =
                     && object.getObjectType() === historyitem_type_ChartSpace && !bInSelect && this.handleChartDoubleClick)
                 {
                     var drawing = this.selectedObjects[0].parent;
-                    this.handleChartDoubleClick(drawing, object);
+                    this.handleChartDoubleClick(drawing, object, e, x, y, pageIndex);
                 }
             }
             return true;

Common/Drawings/DrawingObjectsHandlers.js

@@ -447,7 +447,7 @@ function handleInlineHitNoText(drawing, drawingObjects, e, x, y, pageIndex)
             if(e.ClickCount > 1 && !e.ShiftKey && !e.CtrlKey && ((drawingObjects.selection.groupSelection && drawingObjects.selection.groupSelection.selectedObjects.length === 1) || drawingObjects.selectedObjects.length === 1)
                 && drawing.getObjectType() === historyitem_type_ChartSpace && drawingObjects.handleChartDoubleClick)
             {
-                drawingObjects.handleChartDoubleClick(drawing.parent, drawing);
+                drawingObjects.handleChartDoubleClick(drawing.parent, drawing, e, x, y, pageIndex);
             }
             drawingObjects.updateOverlay();
             return true;

Excel/view/DrawingObjectsController.js

@@ -341,7 +341,7 @@ DrawingObjectsController.prototype.createGroup = function()
 DrawingObjectsController.prototype.handleChartDoubleClick = function()
 {
     var drawingObjects = this.drawingObjects;
-    this.checkSelectedObjectsAndFireCallback(function(){this.drawingObjects.showChartSettings();}, []);
+    this.checkSelectedObjectsAndFireCallback(function(){drawingObjects.showChartSettings();}, []);
 };
 
 DrawingObjectsController.prototype.addChartDrawingObject = function(options)

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -975,13 +975,14 @@ CGraphicObjects.prototype =
 
     getTargetDocContent: DrawingObjectsController.prototype.getTargetDocContent,
 
-    handleChartDoubleClick: function(drawing, chart)
+    handleChartDoubleClick: function(drawing, chart, e, x, y, pageIndex)
     {
         if(false === this.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : drawing, CheckType : changestype_Paragraph_Content} ))
         {
             editor.asc_doubleClickOnChart(this.getChartObject());
-            this.changeCurrentState(new NullState(this));
         }
+        this.changeCurrentState(new NullState(this));
+        this.document.OnMouseUp(e, x, y, pageIndex);
     },
 
     addInlineImage: function( W, H, Img, Chart, bFlow )