From 1f96ebed7a3ea971ed6be69c2802af0bc879966d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 29 Apr 2016 12:36:02 +0300 Subject: [PATCH] =?UTF-8?q?[SSE]=20=D0=9E=D1=82=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=B2=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D1=84=D0=B8=D0=BB?= =?UTF-8?q?=D1=8C=D1=82=D1=80=D0=BE=D0=B2=20=D0=B8=20=D1=81=D0=BE=D1=80?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/app/view/AutoFilterDialog.js | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js index a03796440..cc274bdd1 100644 --- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js @@ -824,7 +824,13 @@ define([ _setDefaults: function() { this.initialFilterType = this.configTo.asc_getFilterObj().asc_getType(); - var isCustomFilter = (this.initialFilterType === Asc.c_oAscAutoFilterTypes.CustomFilters); + var isCustomFilter = (this.initialFilterType === Asc.c_oAscAutoFilterTypes.CustomFilters), + isTextFilter = this.configTo.asc_getIsTextFilter(), + colorsFill = this.configTo.asc_getColorsFill(), + colorsFont = this.configTo.asc_getColorsFont(); + + this.miTextFilter.setVisible(isTextFilter); + this.miNumFilter.setVisible(!isTextFilter); this.miSortLow2High.setChecked(false, true); this.miSortHigh2Low.setChecked(false, true); @@ -837,6 +843,34 @@ define([ } } + if (colorsFont && colorsFont.length>0) { + var colors = []; + colorsFont.forEach(function(item, index) { + colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase()); + }); + this.mnuSortColorFontPicker.updateColors(colors); + this.mnuFilterColorFontPicker.updateColors(colors); + this.miSortFontColor.setVisible(true); + this.miFilterFontColor.setVisible(true); + } else { + this.miSortFontColor.setVisible(false); + this.miFilterFontColor.setVisible(false); + } + + if (colorsFill && colorsFill.length>0) { + var colors = []; + colorsFill.forEach(function(item, index) { + colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase()); + }); + this.mnuSortColorCellsPicker.updateColors(colors); + this.mnuFilterColorCellsPicker.updateColors(colors); + this.miSortCellColor.setVisible(true); + this.miFilterCellColor.setVisible(true); + } else { + this.miSortCellColor.setVisible(false); + this.miFilterCellColor.setVisible(false); + } + // this.chCustomFilter.setValue(isCustomFilter); this.btnOk.setDisabled(isCustomFilter); },