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

Merge pull request #1068 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-08-12 15:07:07 +03:00 committed by GitHub
parent 811977cb48 672145db05
commit f3cb1f3e0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/resources/less/combobox.less
View file

@ -38,6 +38,8 @@
.btn { .btn {
border-left: 0; border-left: 0;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-color: @border-regular-control-ie; border-color: @border-regular-control-ie;
border-color: @border-regular-control; border-color: @border-regular-control;
background-color: transparent; background-color: transparent;

2
apps/documenteditor/main/app/view/FormSettings.js
View file

@ -749,7 +749,7 @@ define([
if (rec) { if (rec) {
this.list.selectRecord(rec); this.list.selectRecord(rec);
this.list.scrollToRecord(rec); this.list.scrollToRecord(rec);
} else { } else if (!this.txtNewValue._input.is(':focus')) {
this.txtNewValue.setValue(''); this.txtNewValue.setValue('');
this._state.listValue = this._state.listIndex = undefined; this._state.listValue = this._state.listIndex = undefined;
} }