Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1813 from ONLYOFFICE/fix/bug-56175

Browse source 
[SSE] Fix Bug 56175
This commit is contained in:
Julia Radzhabova 2022-06-22 13:43:14 +03:00 committed by GitHub
parent b161cf23e1 80065ba3ec
commit ac2b0546c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/spreadsheeteditor/main/app/controller/FormulaDialog.js
View file

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

2
apps/spreadsheeteditor/main/app/controller/Main.js
View file

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

2
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -271,7 +271,7 @@ define([
'<tr>', '<tr>',
'<td class="group-name" colspan="2"><label><%= scope.strRegSettings %></label></td>', '<td class="group-name" colspan="2"><label><%= scope.strRegSettings %></label></td>',
'</tr>', '</tr>',
'<tr class="edit">', '<tr class="">',
'<td><label><%= scope.strFuncLocale %></label></td>', '<td><label><%= scope.strFuncLocale %></label></td>',
'<td>', '<td>',
'<div><div id="fms-cmb-func-locale" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>', '<div><div id="fms-cmb-func-locale" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',