From 6f4cb3f12eaf5ee570616f9cb2e44283bc8d9c4b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 24 Nov 2022 18:05:07 +0300 Subject: [PATCH] Add focus for small buttons in modal window --- apps/common/main/lib/view/SignDialog.js | 2 +- apps/common/main/resources/less/buttons.less | 9 +++++++++ .../main/app/view/ImageSettingsAdvanced.js | 2 +- .../main/app/view/ChartSettingsAdvanced.js | 2 +- .../main/app/view/ImageSettingsAdvanced.js | 2 +- .../main/app/view/ShapeSettingsAdvanced.js | 2 +- .../main/app/view/TableSettingsAdvanced.js | 2 +- .../main/app/view/ShapeSettingsAdvanced.js | 2 +- .../main/app/view/SlicerSettingsAdvanced.js | 2 +- 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/apps/common/main/lib/view/SignDialog.js b/apps/common/main/lib/view/SignDialog.js index b1f994fa5c..a57da7b581 100644 --- a/apps/common/main/lib/view/SignDialog.js +++ b/apps/common/main/lib/view/SignDialog.js @@ -248,7 +248,7 @@ define([ }, getFocusedComponents: function() { - return [this.inputPurpose, this.inputName, this.cmbFonts, this.cmbFontSize]; + return [this.inputPurpose, this.inputName, this.cmbFonts, this.cmbFontSize, this.btnBold, this.btnItalic, this.btnSelectImage, this.btnChangeCertificate]; }, show: function() { diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 13d0e4ed5d..677bb81a9e 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -1009,6 +1009,15 @@ } } +.asc-window.modal { + .btn-toolbar, .btn-group { + &:focus:not(.disabled) { + .box-shadow(0 0 0 @scaled-one-px-value-ie @border-control-focus-ie); + .box-shadow(0 0 0 @scaled-one-px-value @border-control-focus); + } + } +} + .btn-large-dataview { display: inline-block; width: 72px; diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js index 96ad6a0bc5..edb5686e89 100644 --- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js @@ -1165,7 +1165,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat getFocusedComponents: function() { return [ - this.spnWidth, this.spnHeight, this.btnOriginalSize, // 0 tab + this.spnWidth, this.btnRatio, this.spnHeight, this.btnOriginalSize, // 0 tab this.radioHSize, this.spnShapeWidth , this.spnShapeWidthPc, this.radioHSizePc, this.cmbWidthPc, this.radioVSize, this.spnShapeHeight, this.spnShapeHeightPc, this.radioVSizePc, this.cmbHeightPc, this.chRatio, // 1 tab this.spnAngle, this.chFlipHor, this.chFlipVert, // 2 tab diff --git a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js index d742002ddd..e8bf454f47 100644 --- a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js @@ -235,7 +235,7 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem getFocusedComponents: function() { return [ - this.spnWidth, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab + this.spnWidth, this.btnRatio, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab this.inputAltTitle, this.textareaAltDescription // 1 tab ]; }, diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js index 7697d30854..f404b193e5 100644 --- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js @@ -250,7 +250,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem getFocusedComponents: function() { return [ - this.spnWidth, this.spnHeight, this.btnOriginalSize, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY,// 0 tab + this.spnWidth, this.btnRatio, this.spnHeight, this.btnOriginalSize, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY,// 0 tab this.spnAngle, this.chFlipHor, this.chFlipVert, // 1 tab this.inputAltTitle, this.textareaAltDescription // 2 tab ]; diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js index cad1f7e979..d6a458cb9f 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js @@ -580,7 +580,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem getFocusedComponents: function() { return [ - this.spnWidth, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab + this.spnWidth, this.btnRatio, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab this.spnAngle, this.chFlipHor, this.chFlipVert, // 1 tab this.cmbCapType, this.cmbJoinType, // 2 tab this.radioNofit, this.radioShrink, this.radioFit, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, // 3 tab diff --git a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js index 2db83447a3..1812dc1ba7 100644 --- a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js @@ -431,7 +431,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem getFocusedComponents: function() { return [ - this.spnWidth, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab + this.spnWidth, this.btnRatio, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab this.chCellMargins, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, this.spnTableMarginTop, this.spnTableMarginLeft, this.spnTableMarginBottom, this.spnTableMarginRight, // 1 tab this.inputAltTitle, this.textareaAltDescription // 2 tab diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js index 5646a2e757..a8d8e4a86d 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js @@ -583,7 +583,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp getFocusedComponents: function() { return [ - this.spnWidth, this.spnHeight, // 0 tab + this.spnWidth, this.btnRatio, this.spnHeight, // 0 tab this.spnAngle, this.chFlipHor, this.chFlipVert, // 1 tab this.cmbCapType, this.cmbJoinType, // 2 tab this.chAutofit, this.chOverflow, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, // 3 tab diff --git a/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js index ef1503c37e..e476af1658 100644 --- a/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js @@ -386,7 +386,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.tem getFocusedComponents: function() { return [ - this.inputHeader, this.chHeader, this.numWidth, this.numHeight, this.numCols, this.numColHeight, // 0 tab + this.inputHeader, this.chHeader, this.numWidth, this.btnRatio, this.numHeight, this.numCols, this.numColHeight, // 0 tab this.radioAsc, this.radioDesc, this.chHideNoData, this.chIndNoData, this.chShowNoData, // 1 tab this.inputName, // 2 tab this.radioTwoCell, this.radioOneCell, this.radioAbsolute, // 3 tab