From 0fe19076eebaeb56d9ed532f4e89f96adb9de866 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 24 Nov 2016 11:36:52 +0300
Subject: [PATCH] [SSE] Lock text editing in the toolbar when shape/chart is
 selected and locked

---
 .../main/app/controller/RightMenu.js          |  1 -
 .../main/app/controller/Toolbar.js            | 16 +++++++-
 .../main/app/view/Toolbar.js                  | 39 ++++++++++---------
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js
index ff0bb512e5..f181ceec4b 100644
--- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js
@@ -147,7 +147,6 @@ define([
 
             for (i=0; i<SelectedObjects.length; ++i)
             {
-                var type = SelectedObjects[i].asc_getObjectType();
                 var eltype = SelectedObjects[i].asc_getObjectType(),
                     settingsType = this.getDocumentSettingsType(eltype);
                 if (settingsType===undefined || settingsType>=this._settings.length || this._settings[settingsType]===undefined)
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 8d25e2dea4..1a8b32f992 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -2345,7 +2345,6 @@ define([
         _disableEditOptions: function(seltype, coauth_disable) {
             if (this.api.isCellEdited) return true;
             if (this.api.isRangeSelection) return true;
-            if (this._state.selection_type===seltype && this._state.coauthdisable===coauth_disable) return (seltype===Asc.c_oAscSelectionType.RangeImage);
 
             var toolbar = this.toolbar,
                 is_chart_text   = seltype == Asc.c_oAscSelectionType.RangeChartText,
@@ -2353,7 +2352,19 @@ define([
                 is_shape_text   = seltype == Asc.c_oAscSelectionType.RangeShapeText,
                 is_shape        = seltype == Asc.c_oAscSelectionType.RangeShape,
                 is_image        = seltype == Asc.c_oAscSelectionType.RangeImage,
-                is_mode_2       = is_shape_text || is_shape || is_chart_text || is_chart;
+                is_mode_2       = is_shape_text || is_shape || is_chart_text || is_chart,
+                is_objLocked    = false;
+
+            if (!(is_mode_2 || is_image) && this._state.selection_type===seltype && this._state.coauthdisable===coauth_disable) return (seltype===Asc.c_oAscSelectionType.RangeImage);
+
+            if (is_mode_2) {
+                var SelectedObjects = this.api.asc_getGraphicObjectProps();
+                for (var i=0; i<SelectedObjects.length; ++i)
+                {
+                    if (SelectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image)
+                        is_objLocked = is_objLocked || SelectedObjects[i].asc_getObjectValue().asc_getLocked();
+                }
+            }
 
             if ( coauth_disable ) {
                 toolbar.lockToolbar(SSE.enumLock.coAuth, coauth_disable);
@@ -2382,6 +2393,7 @@ define([
                     merge: true,
                     clear: [_set.selImage, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.coAuth]
                 });
+                toolbar.lockToolbar(SSE.enumLock.coAuthText, is_objLocked);
             }
 
             $('#ce-func-label').toggleClass('disabled', is_image || is_mode_2 || coauth_disable);
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index 12af500b9b..726b0b3b39 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -71,6 +71,7 @@ define([
         selRange:       'sel-range',
         lostConnect:    'disconnect',
         coAuth:         'co-auth',
+        coAuthText:     'co-auth-text',
         ruleMerge:      'rule-btn-merge',
         ruleFilter:     'rule-filter',
         ruleDelFilter:  'rule-clear-filter',
@@ -149,7 +150,7 @@ define([
                 cls         : 'input-group-nr',
                 menuStyle   : 'min-width: 55px;',
                 hint        : me.tipFontSize,
-                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
+                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
                 data        : [
                     { value: 8, displayValue: "8" },
                     { value: 9, displayValue: "9" },
@@ -189,7 +190,7 @@ define([
                 menuCls     : 'scrollable-menu',
                 menuStyle   : 'min-width: 325px;',
                 hint        : me.tipFontName,
-                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
+                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
                 store       : new Common.Collections.Fonts()
             });
 
@@ -239,21 +240,21 @@ define([
                 id          : 'id-toolbar-btn-incfont',
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-incfont',
-                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect]
+                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect]
             });
 
             me.btnDecFontSize = new Common.UI.Button({
                 id          : 'id-toolbar-btn-decfont',
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-decfont',
-                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect]
+                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect]
             });
 
             me.btnBold = new Common.UI.Button({
                 id          : 'id-toolbar-btn-bold',
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-bold',
-                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
+                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
                 enableToggle: true
             });
 
@@ -261,7 +262,7 @@ define([
                 id          : 'id-toolbar-btn-italic',
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-italic',
-                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
+                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
                 enableToggle: true
             });
 
@@ -269,7 +270,7 @@ define([
                 id          : 'id-toolbar-btn-underline',
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-underline',
-                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
+                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
                 enableToggle: true
             });
 
@@ -279,7 +280,7 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-fontcolor',
                 split       : true,
-                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
+                lock        : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
                 menu        : new Common.UI.Menu({
                     items: [
                         { template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 165px; height: 220px; margin: 10px;"></div>') },
@@ -302,7 +303,7 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-fillparag',
                 split       : true,
-                lock        : [_set.selImage, _set.editCell, _set.coAuth, _set.lostConnect],
+                lock        : [_set.selImage, _set.editCell, _set.coAuth, _set.coAuthText, _set.lostConnect],
                 menu        : new Common.UI.Menu({
                     items: [
                         { template: _.template('<div id="id-toolbar-menu-paracolor" style="width: 165px; height: 220px; margin: 10px;"></div>') },
@@ -337,7 +338,7 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-align-left',
                 enableToggle: true,
-                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
+                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
                 toggleGroup : 'alignGroup'
             });
 
@@ -346,7 +347,7 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-align-center',
                 enableToggle: true,
-                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
+                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
                 toggleGroup : 'alignGroup'
             });
 
@@ -355,7 +356,7 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-align-right',
                 enableToggle: true,
-                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
+                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
                 toggleGroup : 'alignGroup'
             });
 
@@ -364,7 +365,7 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-align-just',
                 enableToggle: true,
-                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
+                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
                 toggleGroup: 'alignGroup'
             });
 
@@ -402,7 +403,7 @@ define([
                 id          : 'id-toolbar-rtn-valign-top',
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-valign-top',
-                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
+                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
                 enableToggle: true,
                 toggleGroup : 'vAlignGroup'
             });
@@ -412,7 +413,7 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-valign-middle',
                 enableToggle: true,
-                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
+                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
                 toggleGroup : 'vAlignGroup'
             });
 
@@ -420,7 +421,7 @@ define([
                 id          : 'id-toolbar-rtn-valign-bottom',
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-valign-bottom',
-                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
+                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
                 enableToggle: true,
                 toggleGroup : 'vAlignGroup'
             });
@@ -438,7 +439,7 @@ define([
                 id          : 'id-toolbar-rtn-textorient',
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-text-orient',
-                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth],
+                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
                 menu        : new Common.UI.Menu({
                     items: [
                         {
@@ -961,7 +962,7 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-align-left',
                 icls        : 'btn-align-left',
-                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth],
+                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth, _set.coAuthText],
                 menu        : new Common.UI.Menu({
                     items: [
                         {
@@ -1010,7 +1011,7 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-valign-bottom',
                 icls        : 'btn-valign-bottom',
-                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth],
+                lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth, _set.coAuthText],
                 menu        : new Common.UI.Menu({
                     items: [
                         {