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

Merge pull request #1860 from ONLYOFFICE/fix/bugfix

Browse source 
Fix Bug 58177
This commit is contained in:
Julia Radzhabova 2022-07-19 18:28:35 +03:00 committed by GitHub
parent 40bdd4b160 9a038b86fa
commit 42b903f3ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/main/lib/component/ComboBox.js
View file

@ -358,6 +358,9 @@ define([
Common.NotificationCenter.trigger('menu:hide', this, isFromInputControl);
if (this.options.takeFocusOnClose) {
var me = this;
(me._input && !me.editable) && (me._input[0].selectionStart===me._input[0].selectionEnd) && setTimeout(function() {
me._input[0].selectionStart = me._input[0].selectionEnd = 0;
},1);
setTimeout(function(){me.focus();}, 1);
}
},

8
apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js
View file

@ -179,8 +179,8 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
this.cmbFromX = new Common.UI.ComboBox({
el: $('#chart-advanced-combo-from-x'),
cls: 'input-group-nr',
style: "width: 115px;",
menuStyle: 'min-width: 115px;',
style: "width: 125px;",
menuStyle: 'min-width: 125px;',
data: [
{ value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter }
@ -192,8 +192,8 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
this.cmbFromY = new Common.UI.ComboBox({
el: $('#chart-advanced-combo-from-y'),
cls: 'input-group-nr',
style: "width: 115px;",
menuStyle: 'min-width: 115px;',
style: "width: 125px;",
menuStyle: 'min-width: 125px;',
data: [
{ value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter }

8
apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -182,8 +182,8 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
this.cmbFromX = new Common.UI.ComboBox({
el: $('#image-advanced-combo-from-x'),
cls: 'input-group-nr',
style: "width: 115px;",
menuStyle: 'min-width: 115px;',
style: "width: 125px;",
menuStyle: 'min-width: 125px;',
data: [
{ value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter }
@ -195,8 +195,8 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
this.cmbFromY = new Common.UI.ComboBox({
el: $('#image-advanced-combo-from-y'),
cls: 'input-group-nr',
style: "width: 115px;",
menuStyle: 'min-width: 115px;',
style: "width: 125px;",
menuStyle: 'min-width: 125px;',
data: [
{ value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter }

8
apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -187,8 +187,8 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
this.cmbFromX = new Common.UI.ComboBox({
el: $('#shape-advanced-combo-from-x'),
cls: 'input-group-nr',
style: "width: 115px;",
menuStyle: 'min-width: 115px;',
style: "width: 125px;",
menuStyle: 'min-width: 125px;',
data: [
{ value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter }
@ -200,8 +200,8 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
this.cmbFromY = new Common.UI.ComboBox({
el: $('#shape-advanced-combo-from-y'),
cls: 'input-group-nr',
style: "width: 115px;",
menuStyle: 'min-width: 115px;',
style: "width: 125px;",
menuStyle: 'min-width: 125px;',
data: [
{ value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter }

8
apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
View file

@ -184,8 +184,8 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this.cmbFromX = new Common.UI.ComboBox({
el: $('#tableadv-combo-from-x'),
cls: 'input-group-nr',
style: "width: 115px;",
menuStyle: 'min-width: 115px;',
style: "width: 125px;",
menuStyle: 'min-width: 125px;',
data: [
{ value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter }
@ -197,8 +197,8 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this.cmbFromY = new Common.UI.ComboBox({
el: $('#tableadv-combo-from-y'),
cls: 'input-group-nr',
style: "width: 115px;",
menuStyle: 'min-width: 115px;',
style: "width: 125px;",
menuStyle: 'min-width: 125px;',
data: [
{ value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter }