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

Merge pull request #1292 from ONLYOFFICE/fix/bugfix

Browse source 
[SSE] Fix Bug 53565
This commit is contained in:
Julia Radzhabova 2021-11-08 20:34:33 +03:00 committed by GitHub
parent 09512b0ccb 57b2efa988
commit 0abcf31915
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/SortDialog.js
View file

@ -274,14 +274,18 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
if (levelProps) { if (levelProps) {
var levelColors = (levelSort==Asc.c_oAscSortOptions.ByColorFill) ? levelProps.asc_getColorsFill() : levelProps.asc_getColorsFont(); var levelColors = (levelSort==Asc.c_oAscSortOptions.ByColorFill) ? levelProps.asc_getColorsFill() : levelProps.asc_getColorsFont();
levelColors.forEach(function(item, index) { levelColors.forEach(function(item, index) {
if (item) if (item) {
var value = Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase();
color_data.push({ color_data.push({
value: Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase(), value: value,
displayValue: '', displayValue: '',
color: item color: item,
styleObj: {'background-color': '#' + value},
styleStr: 'background-color: #' + value + ';'
}); });
else } else
color_data.unshift({ value: -1, displayValue: (levelSort==Asc.c_oAscSortOptions.ByColorFill) ? me.textNone : me.textAuto , color: null}); color_data.unshift({ value: -1, displayValue: (levelSort==Asc.c_oAscSortOptions.ByColorFill) ? me.textNone : me.textAuto , color: null,
styleObj: {'background-color': 'transparent' }, styleStr: 'background-color:transparent;'});
}); });
} }
} }