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

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

Browse source
This commit is contained in:
Julia Radzhabova 2016-05-05 18:06:43 +03:00
parent 3de9494268
commit b06edd9a41
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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