Merge branch 'release/v7.2.0' into develop

apps/common/main/lib/controller/Desktop.js

@@ -194,7 +194,21 @@ define([
         };
 
         var _onHintsShow = function (visible, level) {
-            native.execCommand('althints:show', JSON.stringify(visible && !(level > 0)));
+            let info = {
+                visible: visible && !(level > 0),
+            };
+
+            if ( !!titlebuttons ) {
+                info.hints = {
+                    'print': titlebuttons['print'].btn.btnEl.attr('data-hint-title'),
+                    // 'home': Common.UI.HintManager.getStaticHint('btnhome'),
+                    'undo': titlebuttons['undo'].btn.btnEl.attr('data-hint-title'),
+                    'redo': titlebuttons['redo'].btn.btnEl.attr('data-hint-title'),
+                    'save': titlebuttons['save'].btn.btnEl.attr('data-hint-title'),
+                };
+            }
+
+            native.execCommand('althints:show', JSON.stringify(info));
         }
 
         var _onKeyDown = function (e) {

apps/common/main/lib/controller/Plugins.js

@@ -204,17 +204,7 @@ define([
                 arr = [];
             storePlugins.each(function(item){
                 var plugin = new Asc.CPlugin();
-                plugin.deserialize(item.attributes);
+                plugin.deserialize(item.get('original'));
-
-                var variations = item.get('variations'),
-                    variationsArr = [];
-                variations.forEach(function(itemVar){
-                    var variation = new Asc.CPluginVariation();
-                    variation.deserialize(itemVar.attributes);
-                    variationsArr.push(variation);
-                });
-
-                plugin.set_Variations(variationsArr);
                 item.set('pluginObj', plugin);
                 arr.push(plugin);
             });
@@ -562,7 +552,8 @@ define([
                             visible: pluginVisible,
                             groupName: (item.group) ? item.group.name : '',
                             groupRank: (item.group) ? item.group.rank : 0,
-                            minVersion: item.minVersion
+                            minVersion: item.minVersion,
+                            original: item
                         }));
                     }
                 });

apps/documenteditor/forms/app/controller/Plugins.js

@@ -133,17 +133,7 @@ define([
                 arr = [];
             storePlugins.each(function(item){
                 var plugin = new Asc.CPlugin();
-                plugin.deserialize(item.attributes);
+                plugin.deserialize(item.get('original'));
-
-                var variations = item.get('variations'),
-                    variationsArr = [];
-                variations.forEach(function(itemVar){
-                    var variation = new Asc.CPluginVariation();
-                    variation.deserialize(itemVar.attributes);
-                    variationsArr.push(variation);
-                });
-
-                plugin.set_Variations(variationsArr);
                 item.set('pluginObj', plugin);
                 arr.push(plugin);
             });
@@ -332,7 +322,8 @@ define([
                             visible: pluginVisible,
                             groupName: (item.group) ? item.group.name : '',
                             groupRank: (item.group) ? item.group.rank : 0,
-                            minVersion: item.minVersion
+                            minVersion: item.minVersion,
+                            original: item
                         }));
                     }
                 });

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

@@ -87,6 +87,7 @@ define([
                 menu: new Common.UI.Menu({
                     menuAlign: 'tr-br',
                     style: 'min-width: auto;',
+                    cls: 'shifted-right',
                     items: [
                         {
                             caption: this.txtExpand,

apps/documenteditor/main/locale/en.json

@@ -9,6 +9,10 @@
   "Common.Controllers.ExternalMergeEditor.textClose": "Close",
   "Common.Controllers.ExternalMergeEditor.warningText": "The object is disabled because it is being edited by another user.",
   "Common.Controllers.ExternalMergeEditor.warningTitle": "Warning",
+  "Common.Controllers.ExternalOleEditor.textAnonymous": "Anonymous",
+  "Common.Controllers.ExternalOleEditor.textClose": "Close",
+  "Common.Controllers.ExternalOleEditor.warningText": "The object is disabled because it is being edited by another user.",
+  "Common.Controllers.ExternalOleEditor.warningTitle": "Warning",
   "Common.Controllers.History.notcriticalErrorTitle": "Warning",
   "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "In order to compare documents all the tracked changes in them will be considered to have been accepted. Do you want to continue?",
   "Common.Controllers.ReviewChanges.textAtLeast": "at least",
@@ -287,6 +291,8 @@
   "del_Common.Views.ExternalMergeEditor.textClose": "Close",
   "del_Common.Views.ExternalMergeEditor.textSave": "Save & Exit",
   "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
+  "del_Common.Views.ExternalOleEditor.textClose": "Close",
+  "del_Common.Views.ExternalOleEditor.textSave": "Save & Exit",
   "Common.Views.ExternalOleEditor.textTitle": "Spreadsheet Editor",
   "Common.Views.Header.labelCoUsersDescr": "Users who are editing the file:",
   "Common.Views.Header.textAddFavorite": "Mark as favorite",

apps/documenteditor/mobile/src/controller/settings/Settings.jsx

@@ -76,7 +76,7 @@ const Settings = props => {
         setTimeout(() => {
             if(config && !!config.feedback && !!config.feedback.url) {
                 window.open(config.feedback.url, "_blank");
-            } else window.open('{{__SUPPORT_URL__}}', "_blank");
+            } else window.open(__SUPPORT_URL__, "_blank");
         }, 400);
     }
 

apps/presentationeditor/main/locale/en.json

@@ -5,6 +5,10 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Close",
   "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Warning",
+  "Common.Controllers.ExternalOleEditor.textAnonymous": "Anonymous",
+  "Common.Controllers.ExternalOleEditor.textClose": "Close",
+  "Common.Controllers.ExternalOleEditor.warningText": "The object is disabled because it is being edited by another user.",
+  "Common.Controllers.ExternalOleEditor.warningTitle": "Warning",
   "Common.define.chartData.textArea": "Area",
   "Common.define.chartData.textAreaStacked": "Stacked area",
   "Common.define.chartData.textAreaStackedPer": "100% Stacked area",
@@ -371,6 +375,8 @@
   "del_Common.Views.ExternalDiagramEditor.textClose": "Close",
   "del_Common.Views.ExternalDiagramEditor.textSave": "Save & Exit",
   "Common.Views.ExternalDiagramEditor.textTitle": "Chart Editor",
+  "del_Common.Views.ExternalOleEditor.textClose": "Close",
+  "del_Common.Views.ExternalOleEditor.textSave": "Save & Exit",
   "Common.Views.ExternalOleEditor.textTitle": "Spreadsheet Editor",
   "Common.Views.Header.labelCoUsersDescr": "Users who are editing the file:",
   "Common.Views.Header.textAddFavorite": "Mark as favorite",

apps/presentationeditor/mobile/src/view/settings/Settings.jsx

@@ -120,7 +120,7 @@ const SettingsList = inject("storeAppOptions", "storeToolbarSettings")(observer(
         closeModal();
         if(config && !!config.feedback && !!config.feedback.url) {
             window.open(config.feedback.url, "_blank");
-        } else window.open('{{__SUPPORT_URL__}}', "_blank");
+        } else window.open(__SUPPORT_URL__, "_blank");
     };
 
     const appOptions = props.storeAppOptions;

apps/spreadsheeteditor/main/app/controller/FormulaDialog.js

@@ -69,8 +69,6 @@ define([
             this.addListeners({
                 'FileMenu': {
                     'settings:apply': function() {
-                        if (!me.mode || !me.mode.isEdit) return;
-
                         me.needUpdateFormula = true;
 
                         var lang = Common.localStorage.getItem("sse-settings-func-locale");
@@ -116,13 +114,13 @@ define([
 
         setApi: function (api) {
             this.api = api;
-            this.api.asc_registerCallback('asc_onSendFunctionWizardInfo', _.bind(this.onSendFunctionWizardInfo, this));
 
-            if (this.formulasGroups && this.api) {
+            if (this.formulasGroups) {
                 Common.Utils.InternalSettings.set("sse-settings-func-last", Common.localStorage.getItem("sse-settings-func-last"));
-
                 this.reloadTranslations(Common.localStorage.getItem("sse-settings-func-locale") || this.appOptions.lang, true);
 
+                if (!this.mode.isEdit) return;
+
                 var me = this;
 
                 this.formulas = new SSE.Views.FormulaDialog({
@@ -140,6 +138,7 @@ define([
             }
 
             this.formulaTab && this.formulaTab.setApi(this.api);
+            this.api.asc_registerCallback('asc_onSendFunctionWizardInfo', _.bind(this.onSendFunctionWizardInfo, this));
 
             return this;
         },
@@ -193,6 +192,8 @@ define([
                     });
             }
 
+            if (!this.mode.isEdit) return;
+
             if (me.langDescJson[lang])
                 me.loadingFormulas(me.langDescJson[lang], suppressEvent);
             else  {

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -1006,6 +1006,8 @@ define([
                         }
                     }, 50);
                 } else {
+                    var formulasDlgController = application.getController('FormulaDialog');
+                    formulasDlgController && formulasDlgController.setMode(me.appOptions).setApi(me.api);
                     documentHolderView.createDelayedElementsViewer();
                     Common.NotificationCenter.trigger('document:ready', 'main');
                     me.applyLicense();

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

@@ -271,7 +271,7 @@ define([
                 '<tr>',
                     '<td class="group-name" colspan="2"><label><%= scope.strRegSettings %></label></td>',
                 '</tr>',
-                '<tr class="edit">',
+                '<tr class="">',
                     '<td><label><%= scope.strFuncLocale %></label></td>',
                     '<td>',
                         '<div><div id="fms-cmb-func-locale" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
@@ -321,7 +321,7 @@ define([
         '<div class="fms-flex-apply hidden">',
             '<table class="main" style="margin: 10px 18px; width: 100%"><tbody>',
                 '<tr>',
-                    '<td><button class="btn normal dlg-btn primary" data-hint="3" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
+                    '<td><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
                     '<td></td>',
                 '</tr>',
             '</tbody></table>',

apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx

@@ -130,7 +130,7 @@ const SettingsList = inject("storeAppOptions")(observer(props => {
         closeModal();
         if(config && !!config.feedback && !!config.feedback.url) {
             window.open(config.feedback.url, "_blank");
-        } else window.open('{{__SUPPORT_URL__}}', "_blank");
+        } else window.open(__SUPPORT_URL__, "_blank");
     };
 
     const appOptions = props.storeAppOptions;