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

[SSE] Баг с подсветкой "без заливки" в сортировке или фильтрах.

Browse source
This commit is contained in:
Julia Radzhabova 2016-05-10 17:31:41 +03:00
parent 25fc600bff
commit 559d86ccfc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -897,7 +897,7 @@ define([
this.miFilterCellColor.setChecked(false, true); this.miFilterCellColor.setChecked(false, true);
this.miSortCellColor.setChecked(sort == Asc.c_oAscSortOptions.ByColorFill, true); this.miSortCellColor.setChecked(sort == Asc.c_oAscSortOptions.ByColorFill, true);
if (sort == Asc.c_oAscSortOptions.ByColorFill) if (sort == Asc.c_oAscSortOptions.ByColorFill)
this.mnuSortColorCellsPicker.select(sortColor, true); this.mnuSortColorCellsPicker.select((sortColor) ? sortColor : 'transparent', true);
} }
if (isCustomFilter) { if (isCustomFilter) {
@ -928,7 +928,7 @@ define([
filterColor = Common.Utils.ThemeColor.getHexColor(filterColor.get_r(), filterColor.get_g(), filterColor.get_b()).toLocaleUpperCase(); filterColor = Common.Utils.ThemeColor.getHexColor(filterColor.get_r(), filterColor.get_g(), filterColor.get_b()).toLocaleUpperCase();
if ( colorFilter.asc_getCellColor()===null ) { // cell color if ( colorFilter.asc_getCellColor()===null ) { // cell color
this.miFilterCellColor.setChecked(true, true); 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 } else if (colorFilter.asc_getCellColor()===false) { // font color
this.miFilterFontColor.setChecked(true, true); this.miFilterFontColor.setChecked(true, true);
this.mnuFilterColorFontPicker.select(filterColor, true); this.mnuFilterColorFontPicker.select(filterColor, true);