diff --git a/apps/common/main/lib/component/FocusManager.js b/apps/common/main/lib/component/FocusManager.js index d5c670f8c..b0f40b6cc 100644 --- a/apps/common/main/lib/component/FocusManager.js +++ b/apps/common/main/lib/component/FocusManager.js @@ -143,6 +143,11 @@ Common.UI.FocusManager = new(function() { updateTabIndexes(true); } } + + if ( e.getDefaultFocusedComponent ) + setTimeout(function(){ + e.getDefaultFocusedComponent().focus(); + }, 100); }, 'window:show': function(e){ if (e && e.cid && _windows[e.cid] && !_windows[e.cid].fields) { diff --git a/apps/documenteditor/main/app/view/CustomColumnsDialog.js b/apps/documenteditor/main/app/view/CustomColumnsDialog.js index bc0d05d4d..c2e6b69b5 100644 --- a/apps/documenteditor/main/app/view/CustomColumnsDialog.js +++ b/apps/documenteditor/main/app/view/CustomColumnsDialog.js @@ -129,15 +129,19 @@ define([ this.updateMetricUnit(); - setTimeout(function(){ - me.spnColumns.focus(); - }, 100); + // setTimeout(function(){ + // me.spnColumns.focus(); + // }, 100); }, getFocusedComponents: function() { return [this.spnColumns, this.spnSpacing]; }, + getDefaultFocusedComponent: function () { + return this.spnColumns; + }, + _handleInput: function(state) { if (this.options.handler) { this.options.handler.call(this, this, state); diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js index 6ff07c81b..9047463ad 100644 --- a/apps/documenteditor/main/app/view/ListSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js @@ -341,6 +341,10 @@ define([ return [this.cmbFormat, this.cmbAlign, this.cmbSize, {cmp: this.levelsList, selector: '.listview'}]; }, + getDefaultFocusedComponent: function () { + return this.type > 0 ? this.cmbFormat : this.cmbAlign; + }, + afterRender: function() { this.updateThemeColors(); this._setDefaults(this.props); @@ -357,10 +361,10 @@ define([ show: function() { Common.UI.Window.prototype.show.apply(this, arguments); - var me = this; - _.delay(function(){ - (me.type>0) ? me.cmbFormat.focus() : me.cmbAlign.focus(); - },100); + // var me = this; + // _.delay(function(){ + // (me.type>0) ? me.cmbFormat.focus() : me.cmbAlign.focus(); + // },100); }, updateThemeColors: function() {