Commit b06edd9a authored by Julia Radzhabova's avatar Julia Radzhabova

[SSE] AutoFilterDialog: отладка заполнения массивов с цветами.

parent 3de94942
......@@ -887,7 +887,7 @@ define([
this.miSortFontColor.setVisible(hasColors);
this.miFilterFontColor.setVisible(hasColors);
if (hasColors) {
var colors = ['transparent'];
var colors = [];
colorsFont.forEach(function(item, index) {
colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase());
});
......@@ -904,10 +904,13 @@ define([
this.miSortCellColor.setVisible(hasColors);
this.miFilterCellColor.setVisible(hasColors);
if (hasColors) {
var colors = ['transparent'];
var colors = [];
colorsFill.forEach(function(item, index) {
colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase());
});
if (item)
colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase());
else
colors.push('transparent');
});
this.mnuSortColorCellsPicker.updateColors(colors);
this.mnuFilterColorCellsPicker.updateColors(colors);
......
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