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

Merge pull request #1053 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-08-09 13:02:45 +03:00 committed by GitHub
parent 9ea8dc50b4 adf7b05b63
commit 4d51e1c0ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
View file

@ -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) {
@ -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');
@ -1491,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;