diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js index 1d98e72f6..8c3f5371b 100644 --- a/apps/common/main/lib/component/ComboBox.js +++ b/apps/common/main/lib/component/ComboBox.js @@ -350,11 +350,7 @@ define([ onAfterKeydownMenu: function(e) { if (e.keyCode == Common.UI.Keys.DOWN && !this.editable && !this.isMenuOpen()) { this.openMenu(); - var me = this; - _.delay(function() { - me._skipInputChange = true; - me.cmpEl.find('ul li:first a').focus(); - }, 10); + this.onAfterShowMenu(); return false; } else if (e.keyCode == Common.UI.Keys.RETURN && (this.editable || this.isMenuOpen())) { diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js index efd4bf487..be8342bc2 100644 --- a/apps/common/main/lib/view/LanguageDialog.js +++ b/apps/common/main/lib/view/LanguageDialog.js @@ -101,7 +101,9 @@ define([ '' ].join('')), data: this.options.languages, - search: true + takeFocusOnClose: true, + search: true, + scrollAlwaysVisible: true }); if (this.cmbLanguage.scroller) this.cmbLanguage.scroller.update({alwaysVisibleY: true}); @@ -109,6 +111,11 @@ define([ var langname = Common.util.LanguageInfo.getLocalLanguageName(this.options.current); this.cmbLanguage.setValue(langname[0], langname[1]); this.onLangSelect(this.cmbLanguage, this.cmbLanguage.getSelectedRecord()); + + var me = this; + setTimeout(function(){ + me.cmbLanguage.focus(); + }, 100); }, close: function(suppressevent) { diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 4e9bdc717..0510ce273 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -212,7 +212,9 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', menuStyle : 'min-width: 100%; max-height: 185px;', cls : 'input-group-nr', editable : false, - data : data + data : data, + search: true, + scrollAlwaysVisible: true }); this.cmbLang.setValue(0x0409); this.cmbLang.on('selected',function(combo, record) { diff --git a/apps/documenteditor/main/app/view/DateTimeDialog.js b/apps/documenteditor/main/app/view/DateTimeDialog.js index 0a52c600f..87de35f63 100644 --- a/apps/documenteditor/main/app/view/DateTimeDialog.js +++ b/apps/documenteditor/main/app/view/DateTimeDialog.js @@ -105,6 +105,7 @@ define([ editable : false, takeFocusOnClose: true, data : data, + search: true, scrollAlwaysVisible: true }); this.cmbLang.setValue(0x0409); diff --git a/apps/presentationeditor/main/app/view/DateTimeDialog.js b/apps/presentationeditor/main/app/view/DateTimeDialog.js index 9e9e0c22c..551eb8e55 100644 --- a/apps/presentationeditor/main/app/view/DateTimeDialog.js +++ b/apps/presentationeditor/main/app/view/DateTimeDialog.js @@ -102,7 +102,9 @@ define([ menuStyle : 'min-width: 100%; max-height: 185px;', cls : 'input-group-nr', editable : false, - data : data + data : data, + search: true, + scrollAlwaysVisible: true }); this.cmbLang.setValue(0x0409); this.cmbLang.on('selected', _.bind(function(combo, record) { diff --git a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js index ec2a29bff..8a320ebf4 100644 --- a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js +++ b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js @@ -136,7 +136,9 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', menuStyle : 'min-width: 100%; max-height: 185px;', cls : 'input-group-nr', editable : false, - data : data + data : data, + search: true, + scrollAlwaysVisible: true }); this.cmbLang.setValue(0x0409); this.cmbLang.on('selected', _.bind(function(combo, record) {