From a504403aedaa138e04a2e39f7a63cd0c052df183 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 6 May 2016 17:07:51 +0300 Subject: [PATCH] =?UTF-8?q?[SSE]=20=D0=9E=D1=82=D0=BB=D0=B0=D0=B4=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B2=D1=8B=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=86=D0=B2=D0=B5=D1=82=D0=B0=20=D1=81=D0=BE=D1=80=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/app/view/AutoFilterDialog.js | 30 ++++--------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js index 4e9ae185ae..94fb81a5fc 100644 --- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js @@ -515,45 +515,25 @@ define([ this.mnuSortColorCellsPicker = new Common.UI.ColorPaletteExt({ el: $('#filter-dlg-sort-cells-color'), - colors: [ - 'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3' - ] + colors: [] }); this.mnuSortColorCellsPicker.on('select', _.bind(this.onSortColorSelect, this, Asc.c_oAscSortOptions.ByColorFill)); this.mnuSortColorFontPicker = new Common.UI.ColorPaletteExt({ el: $('#filter-dlg-sort-font-color'), - colors: [ - 'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3' - ] + colors: [] }); this.mnuSortColorFontPicker.on('select', _.bind(this.onSortColorSelect, this, Asc.c_oAscSortOptions.ByColorFont)); this.mnuFilterColorCellsPicker = new Common.UI.ColorPaletteExt({ el: $('#filter-dlg-filter-cells-color'), - colors: [ - 'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3' - ] + colors: [] }); this.mnuFilterColorCellsPicker.on('select', _.bind(this.onFilterColorSelect, this, null)); this.mnuFilterColorFontPicker = new Common.UI.ColorPaletteExt({ el: $('#filter-dlg-filter-font-color'), - colors: [ - 'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3' - ] + colors: [] }); this.mnuFilterColorFontPicker.on('select', _.bind(this.onFilterColorSelect, this, false)); @@ -917,7 +897,7 @@ define([ this.miFilterCellColor.setChecked(false, true); this.miSortCellColor.setChecked(sort == Asc.c_oAscSortOptions.ByColorFill, true); if (sort == Asc.c_oAscSortOptions.ByColorFill) - this.mnuSortColorFontPicker.select(sortColor, true); + this.mnuSortColorCellsPicker.select(sortColor, true); } if (isCustomFilter) {