Merge pull request #18 from ONLYOFFICE/release/v4.1.0

Release/v4.1.0

apps/documenteditor/main/app/view/ChartSettings.js

@@ -577,7 +577,7 @@ define([
         textBar:            'Bar Chart',
         textArea:           'Area Chart',
         textPie:            'Pie Chart',
-        textPoint:          'Point Chart',
+        textPoint:          'XY (Scatter) Chart',
         textStock:          'Stock Chart',
         textStyle:          'Style'
 

apps/documenteditor/main/app/view/ImageSettings.js

@@ -242,10 +242,10 @@ define([
 
                 if (this._state.isOleObject) {
                     var plugin = DE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
-                    this.btnEditObject.setDisabled(plugin===null || plugin ===undefined);
+                    this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked);
                 } else {
-                    this.btnInsertFromUrl.setDisabled(pluginGuid===null);
-                    this.btnInsertFromFile.setDisabled(pluginGuid===null);
+                    this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked);
+                    this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked);
                 }
             }
         },

apps/documenteditor/main/app/view/Toolbar.js

@@ -1815,7 +1815,7 @@ define([
         textBar:            'Bar Chart',
         textArea:           'Area Chart',
         textPie:            'Pie Chart',
-        textPoint:          'Point Chart',
+        textPoint:          'XY (Scatter) Chart',
         textStock:          'Stock Chart',
         tipColorSchemas:    'Change Color Scheme',
         tipInsertText: 'Insert Text',

apps/presentationeditor/main/app/view/ChartSettings.js

@@ -512,7 +512,7 @@ define([
         textBar:            'Bar Chart',
         textArea:           'Area Chart',
         textPie:            'Pie Chart',
-        textPoint:          'Point Chart',
+        textPoint:          'XY (Scatter) Chart',
         textStock:          'Stock Chart',
         textStyle:          'Style'
     }, PE.Views.ChartSettings || {}));

apps/presentationeditor/main/app/view/ImageSettings.js

@@ -181,10 +181,10 @@ define([
 
                 if (this._state.isOleObject) {
                     var plugin = PE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
-                    this.btnEditObject.setDisabled(plugin===null || plugin ===undefined);
+                    this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked);
                 } else {
-                    this.btnInsertFromUrl.setDisabled(pluginGuid===null);
-                    this.btnInsertFromFile.setDisabled(pluginGuid===null);
+                    this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked);
+                    this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked);
                 }
             }
         },

apps/presentationeditor/main/app/view/Toolbar.js

@@ -1595,7 +1595,7 @@ define([
         textBar:                'Bar Chart',
         textArea:               'Area Chart',
         textPie:                'Pie Chart',
-        textPoint:              'Point Chart',
+        textPoint:              'XY (Scatter) Chart',
         textStock:              'Stock Chart',
         tipSynchronize:         'The document has been changed by another user. Please click to save your changes and reload the updates.',
         txtScheme1:             'Office',

apps/spreadsheeteditor/main/app/view/ChartSettings.js

@@ -528,7 +528,7 @@ define([
         textBar:            'Bar Chart',
         textArea:           'Area Chart',
         textPie:            'Pie Chart',
-        textPoint:          'Point Chart',
+        textPoint:          'XY (Scatter) Chart',
         textStock:          'Stock Chart',
         textStyle:          'Style',
         textAdvanced:       'Show advanced settings'

apps/spreadsheeteditor/main/app/view/ImageSettings.js

@@ -236,10 +236,10 @@ define([
 
                 if (this._state.isOleObject) {
                     var plugin = SSE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
-                    this.btnEditObject.setDisabled(plugin===null || plugin ===undefined);
+                    this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked);
                 } else {
-                    this.btnInsertFromUrl.setDisabled(pluginGuid===null);
-                    this.btnInsertFromFile.setDisabled(pluginGuid===null);
+                    this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked);
+                    this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked);
                 }
             }
         },