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

[SSE] Fix Bug 32990.

Browse source
This commit is contained in:
Julia Radzhabova 2016-08-24 11:35:32 +03:00
parent a3e36a3d3c
commit 2c3891c2bd
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -827,15 +827,8 @@ define([
}, },
onNumberFormat: function(btn) { onNumberFormat: function(btn) {
if (this.api) { if (this.api)
var format = btn.options.formatId; this.api.asc_setCellStyle(btn.options.styleName);
if (btn.options.formatId == this.toolbar.ascFormatOptions.Accounting){
var value = Common.localStorage.getItem("sse-settings-reg-settings");
value = (value!==null) ? parseInt(value) : ((this.toolbar.mode.lang) ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.toolbar.mode.lang)) : 0x0409);
format = this.api.asc_getLocaleCurrency(value);
}
this.api.asc_setCellFormat(format);
}
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Number Format'); Common.component.Analytics.trackEvent('ToolBar', 'Number Format');

4
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -979,7 +979,7 @@ define([
iconCls : 'btn-percent-style', iconCls : 'btn-percent-style',
hint : me.tipDigStylePercent, hint : me.tipDigStylePercent,
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],
formatId : me.ascFormatOptions.Percent styleName : 'Percent'
}); });
me.btnCurrencyStyle = new Common.UI.Button({ me.btnCurrencyStyle = new Common.UI.Button({
@ -988,7 +988,7 @@ define([
iconCls : 'btn-currency-style', iconCls : 'btn-currency-style',
hint : me.tipDigStyleAccounting, hint : me.tipDigStyleAccounting,
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],
formatId : me.ascFormatOptions.Accounting, styleName : 'Currency',
split : true, split : true,
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
style: 'min-width: 120px;', style: 'min-width: 120px;',