From 559d86ccfc3c647e106bdeb22927419a522b4eee Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 10 May 2016 17:31:41 +0300 Subject: [PATCH] =?UTF-8?q?[SSE]=20=D0=91=D0=B0=D0=B3=20=D1=81=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D1=81=D0=B2=D0=B5=D1=82=D0=BA=D0=BE=D0=B9=20"?= =?UTF-8?q?=D0=B1=D0=B5=D0=B7=20=D0=B7=D0=B0=D0=BB=D0=B8=D0=B2=D0=BA=D0=B8?= =?UTF-8?q?"=20=D0=B2=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B5=20=D0=B8=D0=BB=D0=B8=20=D1=84=D0=B8=D0=BB=D1=8C?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D1=85.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js index 093c3c1bd..318957d1d 100644 --- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js @@ -897,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.mnuSortColorCellsPicker.select(sortColor, true); + this.mnuSortColorCellsPicker.select((sortColor) ? sortColor : 'transparent', true); } if (isCustomFilter) { @@ -928,7 +928,7 @@ define([ filterColor = Common.Utils.ThemeColor.getHexColor(filterColor.get_r(), filterColor.get_g(), filterColor.get_b()).toLocaleUpperCase(); if ( colorFilter.asc_getCellColor()===null ) { // cell color this.miFilterCellColor.setChecked(true, true); - this.mnuFilterColorCellsPicker.select(filterColor, true); + this.mnuFilterColorCellsPicker.select((filterColor) ? filterColor : 'transparent', true); } else if (colorFilter.asc_getCellColor()===false) { // font color this.miFilterFontColor.setChecked(true, true); this.mnuFilterColorFontPicker.select(filterColor, true);