From 57b2efa988984465344f596ff43741281c570568 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 8 Nov 2021 20:23:07 +0300 Subject: [PATCH] [SSE] Fix Bug 53565 --- apps/spreadsheeteditor/main/app/view/SortDialog.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js index a791ed32ca..c3dbc30356 100644 --- a/apps/spreadsheeteditor/main/app/view/SortDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js @@ -274,14 +274,18 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', if (levelProps) { var levelColors = (levelSort==Asc.c_oAscSortOptions.ByColorFill) ? levelProps.asc_getColorsFill() : levelProps.asc_getColorsFont(); 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({ - value: Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase(), + value: value, displayValue: '', - color: item + color: item, + styleObj: {'background-color': '#' + value}, + styleStr: 'background-color: #' + value + ';' }); - else - color_data.unshift({ value: -1, displayValue: (levelSort==Asc.c_oAscSortOptions.ByColorFill) ? me.textNone : me.textAuto , color: null}); + } else + 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;'}); }); } }