Bug 30075 - Не отрисовывается график диаграммы после изменения заголовка и клика по диаграмме

Bug 30079 - Сбрасывается select с заголовка диаграммы

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

Common/Drawings/CommonController.js

@@ -631,7 +631,7 @@ DrawingObjectsController.prototype =
                 if(this.selection.textSelection !== object)
                 {
                     this.resetSelection(true);
-                    this.selectObject(object,pageIndex)
+                    this.selectObject(object,pageIndex);
                     this.selection.textSelection = object;
                 }
             }
@@ -4898,7 +4898,7 @@ DrawingObjectsController.prototype =
                 else
                 {
                     nPageNum1 = 0;
-                    chart_selection.addToRecalculate();
+                    chart_selection.recalculate();
                 }
                 chart_selection.recalcInfo.bRecalculatedTitle = false;
             }

Common/Drawings/DrawingObjectsHandlers.js

@@ -323,12 +323,12 @@ function handleChart(drawing, drawingObjectsController, e, x, y, group, pageInde
                     if(title !== oTargetTextObject)
                     {
                         drawingObjectsController.checkChartTextSelection();
+                        selector.resetSelection();
+                        selector.selectObject(drawing, pageIndex);
+                        selector.selection.chartSelection = drawing;
+                        drawing.selectTitle(title, pageIndex);
+                        drawing.selection.textSelection = title;
                     }
-                    selector.resetSelection();
-                    selector.selectObject(drawing, pageIndex);
-                    selector.selection.chartSelection = drawing;
-                    drawing.selectTitle(title, pageIndex);
-                    drawing.selection.textSelection = title;
                     title.selectionSetStart(e, x, y, pageIndex);
                     drawingObjectsController.changeCurrentState(new TextAddState(drawingObjectsController, title));
                     if(e.ClickCount <= 1)

Excel/model/DrawingObjects/DrawingDocument.js

@@ -4521,7 +4521,9 @@ function CDrawingDocument(drawingObjects)
         else
         {
             this.GuiCanvasTextProps = document.createElement('canvas');
-            this.GuiCanvasTextProps.style = "position:absolute;left:0;top:0;";
+            this.GuiCanvasTextProps.style.position = "absolute";
+            this.GuiCanvasTextProps.style.left = "0px";
+            this.GuiCanvasTextProps.style.top = "0px";
             this.GuiCanvasTextProps.id = this.GuiCanvasTextPropsId;
 
             var _width = parseInt(_div_elem.offsetWidth);