Commit 559d86cc authored by Julia Radzhabova's avatar Julia Radzhabova

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

parent 25fc600b
...@@ -897,7 +897,7 @@ define([ ...@@ -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([ ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment