Commit 740894a4 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix set localization formulas

parent cc2d359f
...@@ -88,6 +88,7 @@ var editor; ...@@ -88,6 +88,7 @@ var editor;
this.wb = null; this.wb = null;
this.wbModel = null; this.wbModel = null;
this.tmpLocale = null; this.tmpLocale = null;
this.tmpLocalization = null;
this.documentFormatSave = c_oAscFileType.XLSX; this.documentFormatSave = c_oAscFileType.XLSX;
...@@ -3142,7 +3143,12 @@ var editor; ...@@ -3142,7 +3143,12 @@ var editor;
}; };
// Выставление локали // Выставление локали
spreadsheet_api.prototype.asc_setLocalization = function(oLocalizedData) { spreadsheet_api.prototype.asc_setLocalization = function (oLocalizedData) {
if (!this.isLoadFullApi) {
this.tmpLocalization = oLocalizedData;
return;
}
if (null == oLocalizedData) { if (null == oLocalizedData) {
AscCommonExcel.cFormulaFunctionLocalized = null; AscCommonExcel.cFormulaFunctionLocalized = null;
AscCommonExcel.cFormulaFunctionToLocale = null; AscCommonExcel.cFormulaFunctionToLocale = null;
...@@ -3157,7 +3163,7 @@ var editor; ...@@ -3157,7 +3163,7 @@ var editor;
AscCommonExcel.cFormulaFunctionToLocale[i] = localName; AscCommonExcel.cFormulaFunctionToLocale[i] = localName;
} }
} }
AscCommon.build_local_rx(oLocalizedData?oLocalizedData["LocalFormulaOperands"]:null); AscCommon.build_local_rx(oLocalizedData ? oLocalizedData["LocalFormulaOperands"] : null);
if (this.wb) { if (this.wb) {
this.wb.initFormulasList(); this.wb.initFormulasList();
} }
...@@ -3354,11 +3360,12 @@ var editor; ...@@ -3354,11 +3360,12 @@ var editor;
}); });
}; };
spreadsheet_api.prototype._onEndLoadSdk = function() { spreadsheet_api.prototype._onEndLoadSdk = function () {
History = AscCommon.History; History = AscCommon.History;
if (this.isMobileVersion) if (this.isMobileVersion) {
this.asc_setMobileVersion(true); this.asc_setMobileVersion(true);
}
spreadsheet_api.superclass._onEndLoadSdk.call(this); spreadsheet_api.superclass._onEndLoadSdk.call(this);
...@@ -3366,6 +3373,7 @@ var editor; ...@@ -3366,6 +3373,7 @@ var editor;
this.formulasList = AscCommonExcel.getFormulasInfo(); this.formulasList = AscCommonExcel.getFormulasInfo();
this.asc_setLocale(this.tmpLocale); this.asc_setLocale(this.tmpLocale);
this.asc_setLocalization(this.tmpLocalization);
this.asc_setViewMode(this.isViewMode); this.asc_setViewMode(this.isViewMode);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment