From 9a038b86fadfb410a28940d3c00a51ec540a455f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Jul 2022 18:21:17 +0300 Subject: [PATCH] Fix Bug 58177 --- apps/common/main/lib/component/ComboBox.js | 3 +++ .../main/app/view/ChartSettingsAdvanced.js | 8 ++++---- .../main/app/view/ImageSettingsAdvanced.js | 8 ++++---- .../main/app/view/ShapeSettingsAdvanced.js | 8 ++++---- .../main/app/view/TableSettingsAdvanced.js | 8 ++++---- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js index 74bc96275..7d7727391 100644 --- a/apps/common/main/lib/component/ComboBox.js +++ b/apps/common/main/lib/component/ComboBox.js @@ -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); } }, diff --git a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js index ae949444a..d742002dd 100644 --- a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js @@ -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 } diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js index cebc6d8e4..7697d3085 100644 --- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js @@ -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 } diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js index d7eda7afd..51d4291f8 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js @@ -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 } diff --git a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js index 32240d336..2db83447a 100644 --- a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js @@ -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 }