diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js index f376196a7..ba74998dd 100644 --- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js +++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js @@ -453,8 +453,8 @@ define([ }, getFocusedComponents: function() { - return [ this.chPages, this.chAlign, this.cmbLeader, this.chLinks, this.spnLevels, this.stylesList, this.cmbStyles, - this.cmbCaptions, this.cmbTOFStyles, this.chFullCaption]; + return [ this.chPages, this.chAlign, this.cmbLeader, this.chLinks, this.radioLevels, this.radioStyles, this.spnLevels, this.stylesList, this.cmbStyles, + this.radioCaption, this.radioStyle, this.cmbCaptions, this.cmbTOFStyles, this.chFullCaption]; }, getDefaultFocusableComponent: function () { diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js index a7d8eb979..12d8ff4e2 100644 --- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js @@ -190,7 +190,7 @@ define([ }, getFocusedComponents: function() { - return [this.cmbCondition1, this.cmbValue1, this.cmbCondition2, this.cmbValue2]; + return [this.cmbCondition1, this.cmbValue1, this.rbAnd, this.rbOr, this.cmbCondition2, this.cmbValue2]; }, getDefaultFocusableComponent: function () { @@ -854,7 +854,8 @@ define([ cls : 'input-group-nr', data : [], scrollAlwaysVisible: true, - editable : false + editable : false, + takeFocusOnClose: true }); this.cmbFieldsDesc = new Common.UI.ComboBox({ @@ -865,13 +866,23 @@ define([ data : [], scrollAlwaysVisible: true, editable : false, - disabled: true + disabled: true, + takeFocusOnClose: true }); this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); this.loadDefaults(); }, + + getFocusedComponents: function() { + return [this.radioAsc, this.cmbFieldsAsc, this.radioDesc, this.cmbFieldsDesc]; + }, + + getDefaultFocusableComponent: function () { + return !this.cmbFieldsAsc.isDisabled() ? this.cmbFieldsAsc : this.cmbFieldsDesc; + }, + show: function () { Common.UI.Window.prototype.show.call(this); }, diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index 6f3156c4a..3a231213e 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -1031,6 +1031,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.cmbHLabelPos[1] , this.spnLabelDist[1], this.cmbLabelInterval[1], this.spnLabelInterval[1], // 5 tab this.cmbEmptyCells, this.chShowEmpty, // 6 tab this.chShowAxis, this.chReverse, this.cmbSparkMinType, this.spnSparkMinValue, this.cmbSparkMaxType, this.spnSparkMaxValue, // 7 tab + this.radioTwoCell, this.radioOneCell, this.radioAbsolute, // 8 tab this.inputAltTitle, this.textareaAltDescription // 9 tab ]; }, @@ -1060,6 +1061,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' case 7: me.chShowAxis.focus(); break; + case 8: + me.radioTwoCell.focus(); + break; case 9: me.inputAltTitle.focus(); break; diff --git a/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js b/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js index 943c54311..908ab8bfa 100644 --- a/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js +++ b/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js @@ -165,7 +165,7 @@ define([ }, getFocusedComponents: function() { - return [this.txtSourceRange, this.txtDestRange]; + return [this.txtSourceRange, this.radioNew, this.radioExist, this.txtDestRange]; }, getDefaultFocusableComponent: function () { diff --git a/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js index e8a8396ea..f281e1050 100644 --- a/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js @@ -214,7 +214,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FieldSettingsDialog.templa getFocusedComponents: function() { return [ - this.inputCustomName, this.chCompact, this.chRepeat, this.chBlank, this.chSubtotals, this.chEmpty, // 0 tab + this.inputCustomName, this.radioTabular, this.radioOutline, this.chCompact, this.chRepeat, this.chBlank, this.chSubtotals, this.radioTop, this.radioBottom, this.chEmpty, // 0 tab this.chSum, this.chCount, this.chAve, this.chMax, this.chMin, this.chProduct, this.chNum, this.chDev, this.chDevp, this.chVar, this.chVarp // 1 tab ]; }, diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js index d72ade03c..c2354f37c 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js @@ -149,6 +149,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp getFocusedComponents: function() { return [ this.spnAngle, this.chFlipHor, this.chFlipVert, // 0 tab + this.radioTwoCell, this.radioOneCell, this.radioAbsolute, // 1 tab this.inputAltTitle, this.textareaAltDescription // 2 tab ]; }, @@ -162,6 +163,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp case 0: me.spnAngle.focus(); break; + case 1: + me.radioTwoCell.focus(); + break; case 2: me.inputAltTitle.focus(); break; diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js index f3588b789..c3648e833 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js @@ -183,7 +183,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp getFocusedComponents: function() { return [ - this.inputName, this.chRows, this.chCols, this.numWrap, this.chHeaders, // 0 tab + this.inputName, this.chRows, this.chCols, this.radioDown, this.radioOver, this.numWrap, this.chHeaders, // 0 tab this.txtDataRange, // 1 tab this.inputAltTitle, this.textareaAltDescription // 2 tab ]; diff --git a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js index 8397b25a8..9f02ce49c 100644 --- a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js @@ -168,7 +168,7 @@ define([ }, getFocusedComponents: function() { - return [this.cmbScaleWidth, this.cmbScaleHeight, this.spnScale]; + return [this.radioFitTo, this.cmbScaleWidth, this.cmbScaleHeight, this.radioScaleTo, this.spnScale]; }, getDefaultFocusableComponent: function () { diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js index 680a77d7d..566045676 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js @@ -580,6 +580,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp this.cmbCapType, this.cmbJoinType, // 2 tab this.chAutofit, this.chOverflow, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, // 3 tab this.spnColumns, this.spnSpacing, // 4 tab + this.radioTwoCell, this.radioOneCell, this.radioAbsolute, // 5 tab this.inputAltTitle, this.textareaAltDescription // 6 tab ]; }, @@ -605,6 +606,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp case 4: me.spnColumns.focus(); break; + case 5: + me.radioTwoCell.focus(); + break; case 6: me.inputAltTitle.focus(); break; diff --git a/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js index 19ab22c74..ef1503c37 100644 --- a/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js @@ -387,8 +387,9 @@ 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.chHideNoData, this.chIndNoData, this.chShowNoData, // 1 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 this.inputAltTitle, this.textareaAltDescription // 4 tab ]; }, @@ -408,6 +409,9 @@ define([ 'text!spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.tem case 2: me.inputName.focus(); break; + case 3: + me.radioTwoCell.focus(); + break; case 4: me.inputAltTitle.focus(); break; diff --git a/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js b/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js index 3dae5613c..41610b5de 100644 --- a/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js @@ -130,6 +130,14 @@ define([ this.afterRender(); }, + getFocusedComponents: function() { + return [this.chHeaders, this.radioTop, this.radioLeft]; + }, + + getDefaultFocusableComponent: function () { + return this.radioTop; + }, + afterRender: function() { this._setDefaults(this.props); }, diff --git a/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js b/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js index 894738de9..28e8789c4 100644 --- a/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js @@ -351,6 +351,16 @@ define([ this.afterRender(); }, + getFocusedComponents: function() { + return [this.radioAll, this.radioFormulas, this.radioValues, this.radioFormats, this.radioComments, this.radioColWidth, + this.radioWBorders, this.radioFFormat, this.radioFWidth, this.radioFNFormat, this.radioVNFormat, this.radioVFormat, + this.radioNone, this.radioAdd, this.radioMult, this.radioSub, this.radioDiv, this.chBlanks, this.chTranspose]; + }, + + getDefaultFocusableComponent: function () { + return this.radioAll; + }, + afterRender: function() { this._setDefaults(this.props); },