From 58276fdf3b6aecf159dde32eefe24e2ae07abb84 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Sun, 11 Jul 2021 12:07:19 +0300 Subject: [PATCH] [SSE] Change color buttons for rules format --- .../main/app/view/FormatRulesEditDlg.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js index 305ffa64b9..27fc78965b 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js @@ -390,21 +390,18 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-fontcolor', hint : this.textColor, - split : true, additionalAlign: this.menuAddAlign, color: '000000', menu : true }); this.mnuTextColorPicker = initNewColor(this.btnTextColor); this.btnTextColor.on('color:select', _.bind(this.onFormatTextColorSelect, this)); - this.btnTextColor.on('click', _.bind(this.onFormatTextColor, this)); this.btnFillColor = new Common.UI.ButtonColored({ parentEl: $('#format-rules-fillcolor'), cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-paracolor', hint : this.fillColor, - split : true, additionalAlign: this.menuAddAlign, color: '000000', transparent: true, @@ -412,7 +409,6 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', }); this.mnuFillColorPicker = initNewColor(this.btnFillColor); this.btnFillColor.on('color:select', _.bind(this.onFormatFillColorSelect, this)); - this.btnFillColor.on('click', _.bind(this.onFormatFillColor, this)); this.btnBorders = new Common.UI.Button({ parentEl : $('#format-rules-borders'), @@ -1682,10 +1678,6 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', this.previewFormat(); }, - onFormatTextColor: function(btn, e) { - this.mnuTextColorPicker.trigger('select', this.mnuTextColorPicker, this.mnuTextColorPicker.currentColor, true); - }, - onFormatFillColorSelect: function(btn, color, fromBtn) { this.btnFillColor.currentColor = color; this.mnuFillColorPicker.currentColor = color; @@ -1695,10 +1687,6 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', this.previewFormat(); }, - onFormatFillColor: function(picker, btn, e) { - this.mnuFillColorPicker.trigger('select', this.mnuFillColorPicker, this.mnuFillColorPicker.currentColor, true); - }, - onNumberFormatSelect: function(combo, record) { !this.xfsFormat && (this.xfsFormat = new Asc.asc_CellXfs()); this.xfsFormat.asc_setNumFormatInfo(record.format);