diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 10c576e35..21fc5848c 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -827,15 +827,8 @@ define([ }, onNumberFormat: function(btn) { - if (this.api) { - var format = btn.options.formatId; - 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); - } + if (this.api) + this.api.asc_setCellStyle(btn.options.styleName); Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.component.Analytics.trackEvent('ToolBar', 'Number Format'); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index c1a815423..6aaa5c58a 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -979,7 +979,7 @@ define([ iconCls : 'btn-percent-style', hint : me.tipDigStylePercent, 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({ @@ -988,7 +988,7 @@ define([ iconCls : 'btn-currency-style', hint : me.tipDigStyleAccounting, 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, menu : new Common.UI.Menu({ style: 'min-width: 120px;',