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-06 17:07:51 +03:00
parent b06edd9a41
commit a504403aed
1 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -515,45 +515,25 @@ define([
this.mnuSortColorCellsPicker = new Common.UI.ColorPaletteExt({
el: $('#filter-dlg-sort-cells-color'),
colors: [
'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3'
]
colors: []
});
this.mnuSortColorCellsPicker.on('select', _.bind(this.onSortColorSelect, this, Asc.c_oAscSortOptions.ByColorFill));
this.mnuSortColorFontPicker = new Common.UI.ColorPaletteExt({
el: $('#filter-dlg-sort-font-color'),
colors: [
'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3'
]
colors: []
});
this.mnuSortColorFontPicker.on('select', _.bind(this.onSortColorSelect, this, Asc.c_oAscSortOptions.ByColorFont));
this.mnuFilterColorCellsPicker = new Common.UI.ColorPaletteExt({
el: $('#filter-dlg-filter-cells-color'),
colors: [
'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3'
]
colors: []
});
this.mnuFilterColorCellsPicker.on('select', _.bind(this.onFilterColorSelect, this, null));
this.mnuFilterColorFontPicker = new Common.UI.ColorPaletteExt({
el: $('#filter-dlg-filter-font-color'),
colors: [
'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3',
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3'
]
colors: []
});
this.mnuFilterColorFontPicker.on('select', _.bind(this.onFilterColorSelect, this, false));
@ -917,7 +897,7 @@ define([
this.miFilterCellColor.setChecked(false, true);
this.miSortCellColor.setChecked(sort == Asc.c_oAscSortOptions.ByColorFill, true);
if (sort == Asc.c_oAscSortOptions.ByColorFill)
this.mnuSortColorFontPicker.select(sortColor, true);
this.mnuSortColorCellsPicker.select(sortColor, true);
}
if (isCustomFilter) {