Merge pull request #1813 from ONLYOFFICE/fix/bug-56175
[SSE] Fix Bug 56175
This commit is contained in:
commit
ac2b0546c9
|
@ -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 {
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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>',
|
||||
|
|
Loading…
Reference in a new issue