pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'feature/trim-font-rev1' (#912) from feature/trim-font-rev1 into develop

Browse Source
This commit is contained in:
Maxim Kadushkin
2026-01-02 15:12:19 +00:00
parent c4b4ad65df dd88567c63
commit 154ff5461f
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/common/main/lib/component/ComboBoxFonts.js
View File

@ -483,9 +483,14 @@ define([
this._isMouseDownMenu = false; return;
}
var val = $(e.target).val(),
var val = $(e.target).val().trim(),
record = {};
if(val != $(e.target).val()){
$(e.target).val(val);
this.selectCandidate(true);
}
if (this.lastValue === val && !(extra && extra.reapply)) {
if (extra && extra.onkeydown)
this.trigger('combo:blur', this, e);

2
apps/documenteditor/main/app/controller/Toolbar.js
View File

@ -1470,7 +1470,7 @@ define([
if (!item || isNaN(Common.Utils.String.parseFloat(record.value))) {
me._state.type_fontsize = 'number';
value = /^\+?(\d*(\.|,)?\d+)$|^\+?(\d+(\.|,)?\d*)$/.exec(record.value);
value = /^\+?(\d*(\.|,)?\d+)$|^\+?(\d+(\.|,)?\d*)$/.exec(record.value.trim());
if (!value) {
value = this._getApiTextSize();

2
apps/pdfeditor/main/app/controller/Toolbar.js
View File

@ -2304,7 +2304,7 @@ define([
});
if (!item) {
value = /^\+?(\d*(\.|,).?\d+)$|^\+?(\d+(\.|,)?\d*)$/.exec(record.value);
value = /^\+?(\d*(\.|,).?\d+)$|^\+?(\d+(\.|,)?\d*)$/.exec(record.value.trim());
if (!value) {
value = this._getApiTextSize();

2
apps/presentationeditor/main/app/controller/Toolbar.js
View File

@ -1511,7 +1511,7 @@ define([
});
if (!item) {
value = /^\+?(\d*(\.|,).?\d+)$|^\+?(\d+(\.|,)?\d*)$/.exec(record.value);
value = /^\+?(\d*(\.|,).?\d+)$|^\+?(\d+(\.|,)?\d*)$/.exec(record.value.trim());
if (!value) {
value = this._getApiTextSize();

2
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View File

@ -1790,7 +1790,7 @@ define([
});
if (!item) {
value = /^\+?(\d*(\.|,)?\d+)$|^\+?(\d+(\.|,)?\d*)$/.exec(record.value);
value = /^\+?(\d*(\.|,)?\d+)$|^\+?(\d+(\.|,)?\d*)$/.exec(record.value.trim());
if (!value) {
value = this._getApiTextSize();