[SSE] Add focus for checkbox

apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template

@@ -58,18 +58,32 @@
         <div class="padding-small">
             <label class="header"><%= scope.textEffects %></label>
         </div>
-        <div>
+        <table cols="2">
-            <div class="padding-large" style="display: inline-block;">
+            <tr>
-                <div class="padding-small" id="paragraphadv-checkbox-strike"></div>
+                <td class="padding-small">
-                <div class="padding-small" id="paragraphadv-checkbox-double-strike"></div>
+                    <div id="paragraphadv-checkbox-strike"></div>
+                </td>
+                <td class="padding-small" style="padding-left: 40px;">
+                    <div id="paragraphadv-checkbox-subscript"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <div id="paragraphadv-checkbox-double-strike"></div>
+                </td>
+                <td class="padding-small" style="padding-left: 40px;">
+                    <div id="paragraphadv-checkbox-small-caps"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-large">
                     <div id="paragraphadv-checkbox-superscript"></div>
-            </div>
+                </td>
-            <div class="padding-large" style="display: inline-block; padding-left: 40px;">
+                <td class="padding-large" style="padding-left: 40px;">
-                <div class="padding-small" id="paragraphadv-checkbox-subscript"></div>
-                <div class="padding-small" id="paragraphadv-checkbox-small-caps"></div>
                     <div id="paragraphadv-checkbox-all-caps"></div>
-            </div>
+                </td>
-        </div>
+            </tr>
+        </table>
         <div class="padding-small">
             <label class="header"><%= scope.textCharacterSpacing %></label>
         </div>

apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js

@@ -1016,20 +1016,22 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
 
         getFocusedComponents: function() {
             return [
-                this.cmbChartTitle, this.cmbLegendPos, this.cmbDataLabels, this.txtSeparator, // 1 tab
+                this.cmbChartTitle, this.cmbLegendPos, this.cmbDataLabels, this.chSeriesName, this.chCategoryName, this.chValue, this.txtSeparator, // 1 tab
                 this.cmbVertTitle[0], this.cmbVertGrid[0],
-                this.cmbMinType[0], this.spnMinValue[0], this.cmbMaxType[0], this.spnMaxValue[0], this.cmbVCrossType[0], this.spnVAxisCrosses[0],
+                this.chVertHide[0], this.cmbMinType[0], this.spnMinValue[0], this.cmbMaxType[0], this.spnMaxValue[0], this.cmbVCrossType[0], this.spnVAxisCrosses[0],
-                this.cmbUnits[0] , this.cmbVMajorType[0], this.cmbVMinorType[0], this.cmbVLabelPos[0], // 2 tab
+                this.chVReverse[0], this.cmbUnits[0] , this.cmbVMajorType[0], this.cmbVMinorType[0], this.cmbVLabelPos[0], // 2 tab
                 this.cmbVertTitle[1], this.cmbVertGrid[1],
-                this.cmbMinType[1] , this.spnMinValue[1], this.cmbMaxType[1], this.spnMaxValue[1], this.cmbVCrossType[1], this.spnVAxisCrosses[1],
+                this.chVertHide[1], this.cmbMinType[1] , this.spnMinValue[1], this.cmbMaxType[1], this.spnMaxValue[1], this.cmbVCrossType[1], this.spnVAxisCrosses[1],
-                this.cmbUnits[1] , this.cmbVMajorType[1], this.cmbVMinorType[1], this.cmbVLabelPos[1], // 3 tab
+                this.chVReverse[1], this.cmbUnits[1] , this.cmbVMajorType[1], this.cmbVMinorType[1], this.cmbVLabelPos[1], // 3 tab
-                this.cmbHorTitle[0], this.cmbHorGrid[0],
+                this.chHorHide[0], this.cmbHorTitle[0], this.cmbHorGrid[0],
-                this.cmbHCrossType[0] , this.spnHAxisCrosses[0], this.cmbAxisPos[0], this.cmbHMajorType[0], this.cmbHMinorType[0], this.spnMarksInterval[0],
+                this.cmbHCrossType[0] , this.spnHAxisCrosses[0], this.cmbAxisPos[0], this.chHReverse[0], this.cmbHMajorType[0], this.cmbHMinorType[0], this.spnMarksInterval[0],
                 this.cmbHLabelPos[0] , this.spnLabelDist[0], this.cmbLabelInterval[0], this.spnLabelInterval[0], // 4 tab
-                this.cmbHorTitle[1], this.cmbHorGrid[1],
+                this.chHorHide[1], this.cmbHorTitle[1], this.cmbHorGrid[1],
-                this.cmbHCrossType[1] , this.spnHAxisCrosses[1], this.cmbAxisPos[1], this.cmbHMajorType[1], this.cmbHMinorType[1], this.spnMarksInterval[1],
+                this.cmbHCrossType[1] , this.spnHAxisCrosses[1], this.cmbAxisPos[1], this.chHReverse[1], this.cmbHMajorType[1], this.cmbHMinorType[1], this.spnMarksInterval[1],
                 this.cmbHLabelPos[1] , this.spnLabelDist[1], this.cmbLabelInterval[1], this.spnLabelInterval[1], // 5 tab
-                this.inputAltTitle, this.textareaAltDescription  // 7 tab
+                this.cmbEmptyCells, this.chShowEmpty, // 6 tab
+                this.chShowAxis, this.chReverse, this.cmbSparkMinType, this.spnSparkMinValue, this.cmbSparkMaxType, this.spnSparkMaxValue, // 7 tab
+                this.inputAltTitle, this.textareaAltDescription  // 9 tab
             ];
         },
 
@@ -1052,6 +1054,12 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
                         me.onHCategoryClick(index-4);
                         me.cmbHCrossType[index-4].focus();
                         break;
+                    case 6:
+                        me.cmbEmptyCells.focus();
+                        break;
+                    case 7:
+                        me.chShowAxis.focus();
+                        break;
                     case 9:
                         me.inputAltTitle.focus();
                         break;

apps/spreadsheeteditor/main/app/view/DataValidationDialog.js

@@ -265,9 +265,9 @@ define([    'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
 
         getFocusedComponents: function() {
             return [
-                this.cmbAllow, this.cmbData, this.inputRangeSource, this.inputRangeMin, this.inputRangeMax, // 0 tab
+                this.cmbAllow, this.cmbData, this.chIgnore, this.chShowDropDown, this.inputRangeSource, this.inputRangeMin, this.inputRangeMax, this.chApply, // 0 tab
-                this.inputInputTitle, this.textareaInput,  // 1 tab
+                this.chShowInput, this.inputInputTitle, this.textareaInput,  // 1 tab
-                this.cmbStyle, this.inputErrorTitle, this.textareaError  // 2 tab
+                this.chShowError, this.cmbStyle, this.inputErrorTitle, this.textareaError  // 2 tab
             ];
         },
 
@@ -281,10 +281,16 @@ define([    'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
                         me.cmbAllow.focus();
                         break;
                     case 1:
+                        if (!me.inputInputTitle.isDisabled())
                             me.inputInputTitle.focus();
+                        else
+                            me.chShowInput.focus();
                         break;
                     case 2:
+                        if (!me.cmbStyle.isDisabled())
                             me.cmbStyle.focus();
+                        else
+                            me.chShowError.focus();
                         break;
                 }
             }, 10);

apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js

@@ -212,6 +212,29 @@ define([    'text!spreadsheeteditor/main/app/template/FieldSettingsDialog.templa
             this.afterRender();
         },
 
+        getFocusedComponents: function() {
+            return [
+                this.inputCustomName, this.chCompact, this.chRepeat, this.chBlank, this.chSubtotals, 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
+            ];
+        },
+
+        onCategoryClick: function(btn, index) {
+            Common.Views.AdvancedSettingsWindow.prototype.onCategoryClick.call(this, btn, index);
+
+            var me = this;
+            setTimeout(function(){
+                switch (index) {
+                    case 0:
+                        me.inputCustomName.focus();
+                        break;
+                    case 1:
+                        me.chSum.focus();
+                        break;
+                }
+            }, 10);
+        },
+
         afterRender: function() {
             this._setDefaults(this.props);
             if (this.storageName) {

apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js

@@ -291,7 +291,7 @@ define([
         },
 
         getFocusedComponents: function() {
-            return [this.cmbFormat, this.spnDecimal, this.cmbSymbols, this.cmbNegative, this.cmbType, this.inputCustomFormat, {cmp: this.codesList, selector: '.listview'}];
+            return [this.cmbFormat, this.spnDecimal, this.chSeparator, this.cmbSymbols, this.cmbNegative, this.cmbType, this.inputCustomFormat, this.codesList, this.chLinked];
         },
 
         getDefaultFocusableComponent: function () {

apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js

@@ -148,7 +148,7 @@ define([    'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
 
         getFocusedComponents: function() {
             return [
-                this.spnAngle,  // 0 tab
+                this.spnAngle, this.chFlipHor, this.chFlipVert, // 0 tab
                 this.inputAltTitle, this.textareaAltDescription  // 2 tab
             ];
         },

apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js

@@ -407,8 +407,8 @@ define([    'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
             return [
                 this.cmbTextAlignment, this.numIndentsLeft, this.numIndentsRight, this.cmbSpecial, this.numSpecialBy,
                 this.numSpacingBefore, this.numSpacingAfter, this.cmbLineRule, this.numLineHeight, // 0 tab
-                this.numSpacing, // 1 tab
+                this.chStrike, this.chSubscript, this.chDoubleStrike, this.chSmallCaps, this.chSuperscript, this.chAllCaps, this.numSpacing, // 1 tab
-                this.numDefaultTab, this.numTab, this.cmbAlign, {cmp: this.tabList, selector: '.listview'} // 2 tab
+                this.numDefaultTab, this.numTab, this.cmbAlign, this.tabList // 2 tab
             ];
         },
 
@@ -422,7 +422,7 @@ define([    'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
                         me.cmbTextAlignment.focus();
                         break;
                     case 1:
-                        me.numSpacing.focus();
+                        me.chStrike.focus();
                         break;
                     case 2:
                         me.numDefaultTab.focus();

apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js

@@ -216,7 +216,7 @@ define([
         },
 
         getFocusedComponents: function() {
-            return [this.inputStart, this.inputEnd, this.inputBy, {cmp: this.listDate, selector: '.listview'}, this.spnDays];
+            return [this.chStart, this.inputStart, this.chEnd, this.inputEnd, this.inputBy, this.listDate, this.spnDays];
         },
 
         getDefaultFocusableComponent: function () {

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.numWrap, // 0 tab
+                this.inputName, this.chRows, this.chCols, this.numWrap, this.chHeaders, // 0 tab
                 this.txtDataRange,  // 1 tab
                 this.inputAltTitle, this.textareaAltDescription  // 2 tab
             ];

apps/spreadsheeteditor/main/app/view/PrintSettings.js

@@ -279,8 +279,8 @@ define([    'text!spreadsheeteditor/main/app/template/PrintSettings.template',
         },
 
         getFocusedComponents: function() {
-            return [this.cmbRange, this.cmbSheet, this.cmbPaperSize, this.cmbPaperOrientation, this.cmbLayout, this.txtRangeTop, this.txtRangeLeft,
+            return [this.cmbRange, this.chIgnorePrintArea, this.cmbSheet, this.cmbPaperSize, this.cmbPaperOrientation, this.cmbLayout, this.txtRangeTop, this.txtRangeLeft,
-                    this.spnMarginTop, this.spnMarginBottom, this.spnMarginLeft, this.spnMarginRight];
+                    this.spnMarginTop, this.spnMarginBottom, this.spnMarginLeft, this.spnMarginRight, this.chPrintGrid, this.chPrintRows];
         },
 
         getDefaultFocusableComponent: function () {

apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js

@@ -101,6 +101,7 @@ define([
                 store: new Common.UI.DataViewStore(),
                 simpleAddMode: true,
                 scrollAlwaysVisible: true,
+                tabindex: 1,
                 template: _.template(['<div class="listview inner" style=""></div>'].join('')),
                 itemTemplate: _.template([
                     '<div>',
@@ -249,6 +250,14 @@ define([
             }
         },
 
+        getFocusedComponents: function() {
+            return [this.chHeaders, this.columnsList];
+        },
+
+        getDefaultFocusableComponent: function () {
+            return this.columnsList;
+        },
+
         afterRender: function() {
             this._setDefaults(this.props);
         },
@@ -258,10 +267,6 @@ define([
                 this.chHeaders.setValue(!!props.asc_getHasHeaders(), true);
                 this.updateColumnsList();
             }
-            var me = this;
-            _.delay(function () {
-                me.columnsList.focus();
-            }, 100, this);
         },
 
         getSettings: function () {

apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js

@@ -576,9 +576,9 @@ define([    'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
         getFocusedComponents: function() {
             return [
                 this.spnWidth, this.spnHeight, // 0 tab
-                this.spnAngle,  // 1 tab
+                this.spnAngle, this.chFlipHor, this.chFlipVert, // 1 tab
                 this.cmbCapType, this.cmbJoinType, // 2 tab
-                this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, // 3 tab
+                this.chAutofit, this.chOverflow, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, // 3 tab
                 this.spnColumns, this.spnSpacing, // 4 tab
                 this.inputAltTitle, this.textareaAltDescription  // 6 tab
             ];

apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js

@@ -386,7 +386,8 @@ define([    'text!spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.tem
 
         getFocusedComponents: function() {
             return [
-                this.inputHeader, this.numWidth, this.numHeight, this.numCols, this.numColHeight, // 0 tab
+                this.inputHeader, this.chHeader, this.numWidth, this.numHeight, this.numCols, this.numColHeight, // 0 tab
+                this.chHideNoData, this.chIndNoData, this.chShowNoData, // 1 tab
                 this.inputName,  // 2 tab
                 this.inputAltTitle, this.textareaAltDescription  // 4 tab
             ];
@@ -401,6 +402,9 @@ define([    'text!spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.tem
                     case 0:
                         me.inputHeader.focus();
                         break;
+                    case 1:
+                        me.chHideNoData.focus();
+                        break;
                     case 2:
                         me.inputName.focus();
                         break;