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

Merge pull request #1000 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-07-20 23:44:30 +03:00 committed by GitHub
parent b5b891abfa 92f24c0d04
commit c33b5eed12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 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

@ -863,7 +863,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
record.value==Asc.c_oAscCfvoType.AutoMin || record.value==Asc.c_oAscCfvoType.AutoMax);
me.setDefComboValue(combo.options.type, record.value, me.barControls[combo.options.type].range);
});
combo.setValue(arr[1].value);
var value = (i==0) ? Asc.c_oAscCfvoType.AutoMin : Asc.c_oAscCfvoType.AutoMax;
combo.setValue(value);
Common.UI.FocusManager.add(this, combo);
var range = new Common.UI.InputFieldBtn({
@ -873,9 +874,10 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
allowBlank : true,
btnHint : this.textSelectData,
validateOnChange: false,
type : i
type : i,
disabled : (value==Asc.c_oAscCfvoType.AutoMin || value==Asc.c_oAscCfvoType.AutoMax || value==Asc.c_oAscCfvoType.Minimum || value==Asc.c_oAscCfvoType.Maximum)
});
range.setValue(0);
me.setDefComboValue(i, value, range);
range.on('button:click', _.bind(this.onSelectData, this));
this.barControls.push({combo: combo, range: range});
Common.UI.FocusManager.add(this, range);

2
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file

@ -436,7 +436,7 @@ define([
if (this.chFilter.isDisabled() !== (!this._state.CheckHeader || this._locked || value===null))
this.chFilter.setDisabled(!this._state.CheckHeader || this._locked || value===null);
if (needTablePictures)
if (needTablePictures || !this.mnuTableTemplatePicker)
this.onApiInitTableTemplates(this.api.asc_getTablePictures(props));
//for table-template