From 814483f7a78f4cecd391491479550af7da65c785 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 9 Aug 2021 12:35:21 +0300 Subject: [PATCH 1/2] [SSE] Fix Bug 51785 --- apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js index 5ef8ac76e8..a588ff9a2b 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js @@ -1407,8 +1407,10 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', barProps.asc_setBorderColor(Common.Utils.ThemeColor.getRgbColor(this.btnPosBorder.colorPicker.currentColor)); barProps.asc_setNegativeBorderColor(Common.Utils.ThemeColor.getRgbColor(this.chBorder.getValue()=='checked' ? this.btnPosBorder.colorPicker.currentColor : this.btnNegBorder.colorPicker.currentColor)); barProps.asc_setNegativeBarBorderColorSameAsPositive(this.chBorder.getValue()=='checked'); - } else + } else { barProps.asc_setBorderColor(null); + barProps.asc_setNegativeBorderColor(null); + } barProps.asc_setDirection(this.cmbBarDirection.getValue()); barProps.asc_setShowValue(this.chShowBar.getValue()!=='checked'); From adf7b05b6353f395609963b90fb9abb7462c536b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 9 Aug 2021 12:55:55 +0300 Subject: [PATCH 2/2] [SSE] Fix Bug 51797 --- apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js index a588ff9a2b..71333ab456 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js @@ -1330,7 +1330,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', if (type == Asc.c_oAscCFType.containsText || type == Asc.c_oAscCFType.containsBlanks || type == Asc.c_oAscCFType.duplicateValues || type == Asc.c_oAscCFType.timePeriod || type == Asc.c_oAscCFType.aboveAverage || type == Asc.c_oAscCFType.top10 || type == Asc.c_oAscCFType.cellIs || type == Asc.c_oAscCFType.expression) { - this.xfsFormat && props.asc_setDxf(this.xfsFormat); + (this.xfsFormat || this.xfsFormat===null) && props.asc_setDxf(this.xfsFormat); } switch (type) { @@ -1493,7 +1493,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', if (type == Asc.c_oAscCFType.containsText || type == Asc.c_oAscCFType.containsBlanks || type == Asc.c_oAscCFType.duplicateValues || type == Asc.c_oAscCFType.timePeriod || type == Asc.c_oAscCFType.aboveAverage || type == Asc.c_oAscCFType.top10 || type == Asc.c_oAscCFType.cellIs || type == Asc.c_oAscCFType.expression) { - this.xfsFormat && this._changedProps.asc_setDxf(this.xfsFormat); + (this.xfsFormat || this.xfsFormat===null) && this._changedProps.asc_setDxf(this.xfsFormat); } else if (type == Asc.c_oAscCFType.colorScale) { var scalesCount = rec.get('num'); var arr = (scalesCount==2) ? [this.scaleControls[0], this.scaleControls[2]] : this.scaleControls;