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-19 16:13:51 +03:00
parent fd7d2bcd9f
commit 74d2cff18f
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -704,7 +704,7 @@ define([
el: $('#filter-dlg-filter-cells-color'), el: $('#filter-dlg-filter-cells-color'),
colors: [] colors: []
}); });
this.mnuFilterColorCellsPicker.on('select', _.bind(this.onFilterColorSelect, this, null)); this.mnuFilterColorCellsPicker.on('select', _.bind(this.onFilterColorSelect, this, true));
this.mnuFilterColorFontPicker = new Common.UI.ColorPaletteExt({ this.mnuFilterColorFontPicker = new Common.UI.ColorPaletteExt({
el: $('#filter-dlg-filter-font-color'), el: $('#filter-dlg-filter-font-color'),
@ -933,8 +933,8 @@ define([
} }
var colorFilter = filterObj.asc_getFilter(); var colorFilter = filterObj.asc_getFilter();
colorFilter.asc_setCellColor(isCellColor); colorFilter.asc_setCellColor(isCellColor ? null : false);
colorFilter.asc_setCColor(color == 'transparent' ? null : Common.Utils.ThemeColor.getRgbColor(color)); colorFilter.asc_setCColor((isCellColor && color == 'transparent' || !isCellColor && color == '#000000') ? null : Common.Utils.ThemeColor.getRgbColor(color));
this.api.asc_applyAutoFilter(this.configTo); this.api.asc_applyAutoFilter(this.configTo);
@ -943,7 +943,8 @@ define([
onSortColorSelect: function(type, picker, color) { onSortColorSelect: function(type, picker, color) {
if (this.api && this.configTo) { if (this.api && this.configTo) {
this.api.asc_sortColFilter(type, this.configTo.asc_getCellId(), this.configTo.asc_getDisplayName(), color == 'transparent' ? null : Common.Utils.ThemeColor.getRgbColor(color)); var isCellColor = (type == Asc.c_oAscSortOptions.ByColorFill);
this.api.asc_sortColFilter(type, this.configTo.asc_getCellId(), this.configTo.asc_getDisplayName(), (isCellColor && color == 'transparent' || !isCellColor && color == '#000000') ? null : Common.Utils.ThemeColor.getRgbColor(color));
} }
this.close(); this.close();
}, },
@ -1067,7 +1068,10 @@ define([
if (hasColors) { if (hasColors) {
var colors = []; 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()); if (item)
colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase());
else
colors.push('000000');
}); });
this.mnuSortColorFontPicker.updateColors(colors); this.mnuSortColorFontPicker.updateColors(colors);
this.mnuFilterColorFontPicker.updateColors(colors); this.mnuFilterColorFontPicker.updateColors(colors);