Bug 30813 - [CoEdit] Лочить диаграммы после открытия её настроек другим юзером

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

Common/Charts/DrawingObjects.js

@@ -2855,6 +2855,9 @@ function DrawingObjects() {
             settings.putHorAxisProps(hor_axis_settings);
             hor_axis_settings.setDefault();
         }
+        else{
+            this.controller.checkSelectedObjectsAndFireCallback(function(){});
+        }
         return settings;
     };
 

Common/apiBase.js

@@ -59,6 +59,7 @@ function baseEditorsApi(name) {
   this.textArtPreviewManager = new TextArtPreviewManager();
   // Режим вставки диаграмм в редакторе документов
   this.isChartEditor = false;
+  this.isOpenedChartFrame = false;
 
   // CoAuthoring and Chat
   this.User = undefined;
@@ -481,8 +482,11 @@ baseEditorsApi.prototype.asc_getChartPreviews = function(chartType) {
 baseEditorsApi.prototype.asc_getTextArtPreviews = function() {
   return this.textArtPreviewManager.getWordArtStyles();
 };
+baseEditorsApi.prototype.asc_onOpenChartFrame = function() {
+    this.isOpenedChartFrame = true;
+};
 baseEditorsApi.prototype.asc_onCloseChartFrame = function() {
-
+    this.isOpenedChartFrame = false;
 };
 // Add image
 baseEditorsApi.prototype._addImageUrl = function() {

Excel/api.js

@@ -2034,6 +2034,7 @@ var editor;
   };
 
   spreadsheet_api.prototype.asc_getChartObject = function() {		// Return new or existing chart. For image return null
+    this.asc_onOpenChartFrame();
     var ws = this.wb.getWorksheet();
     return ws.objectRender.getAscChartObject();
   };
@@ -2846,7 +2847,7 @@ var editor;
   ////////////////////////////AutoSave api/////////////////////////////////
   /////////////////////////////////////////////////////////////////////////
   spreadsheet_api.prototype._autoSave = function() {
-    if ((0 === this.autoSaveGap && !this.collaborativeEditing.getFast()) || this.asc_getCellEditMode() || this.asc_getIsTrackShape() ||
+    if ((0 === this.autoSaveGap && !this.collaborativeEditing.getFast()) || this.asc_getCellEditMode() || this.asc_getIsTrackShape() || this.isOpenedChartFrame ||
       !History.IsEndTransaction() || !this.canSave) {
       return;
     }

Excel/view/DrawingObjectsController.js

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