Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refactoring focus manager for disabled components

Browse source
This commit is contained in:
Julia Radzhabova 2020-09-26 00:43:43 +03:00
parent 2272003f44
commit 82ec0ba7a4
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/component/FocusManager.js
View file

@ -100,7 +100,7 @@ Common.UI.FocusManager = function (tabindex, parent) {
this.trapFirst.on('focus', function() { this.trapFirst.on('focus', function() {
for (var i=0; i<me.fields.length; i++) { for (var i=0; i<me.fields.length; i++) {
var field = me.fields[i]; var field = me.fields[i];
if (field.cmp.isVisible ? field.cmp.isVisible() : field.cmp.is(':visible')) { if ((field.cmp.isVisible ? field.cmp.isVisible() : field.cmp.is(':visible')) && !(field.cmp.isDisabled && field.cmp.isDisabled())) {
var el = (field.selector) ? (field.cmp.$el || $(field.cmp.el)).find(field.selector).addBack().filter(field.selector) : field.el; var el = (field.selector) ? (field.cmp.$el || $(field.cmp.el)).find(field.selector).addBack().filter(field.selector) : field.el;
el.focus(); el.focus();
break; break;
@ -113,7 +113,7 @@ Common.UI.FocusManager = function (tabindex, parent) {
this.trapLast.on('focus', function() { this.trapLast.on('focus', function() {
for (var i=me.fields.length-1; i>=0; i--) { for (var i=me.fields.length-1; i>=0; i--) {
var field = me.fields[i]; var field = me.fields[i];
if (field.cmp.isVisible ? field.cmp.isVisible() : field.cmp.is(':visible')) { if ((field.cmp.isVisible ? field.cmp.isVisible() : field.cmp.is(':visible')) && !(field.cmp.isDisabled && field.cmp.isDisabled())) {
var el = (field.selector) ? (field.cmp.$el || $(field.cmp.el)).find(field.selector).addBack().filter(field.selector) : field.el; var el = (field.selector) ? (field.cmp.$el || $(field.cmp.el)).find(field.selector).addBack().filter(field.selector) : field.el;
el.focus(); el.focus();
break; break;

5
apps/spreadsheeteditor/main/app/view/AdvancedSeparatorDialog.js
View file

@ -47,7 +47,8 @@ define([
options: { options: {
width: 330, width: 330,
cls: 'modal-dlg', cls: 'modal-dlg',
buttons: ['ok', 'cancel'] buttons: ['ok', 'cancel'],
focusManager: true
}, },
initialize : function(options) { initialize : function(options) {
@ -95,6 +96,8 @@ define([
var $window = this.getChild(); var $window = this.getChild();
$window.find('.btn').on('click', _.bind(this.onBtnClick, this)); $window.find('.btn').on('click', _.bind(this.onBtnClick, this));
this.focusManager.add([this.inputDecimalSeparator, this.inputThousandsSeparator], '.form-control');
this.afterRender(); this.afterRender();
}, },

5
apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js
View file

@ -48,7 +48,8 @@ define([
SSE.Views.CreatePivotDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ SSE.Views.CreatePivotDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: { options: {
contentWidth: 310, contentWidth: 310,
height: 250 height: 250,
focusManager: true
}, },
initialize : function(options) { initialize : function(options) {
@ -161,6 +162,8 @@ define([
me.txtDestRange.cmpEl.find('input').focus(); me.txtDestRange.cmpEl.find('input').focus();
}); });
this.focusManager.add([this.txtSourceRange, this.txtDestRange], '.form-control');
this.afterRender(); this.afterRender();
}, },

8
apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js
View file

@ -52,7 +52,8 @@ define([
options: { options: {
alias: 'NamedRangeEditDlg', alias: 'NamedRangeEditDlg',
contentWidth: 380, contentWidth: 380,
height: 250 height: 250,
focusManager: true
}, },
initialize: function (options) { initialize: function (options) {
@ -150,7 +151,8 @@ define([
menuStyle : 'min-width: 100%;max-height: 280px;', menuStyle : 'min-width: 100%;max-height: 280px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : [] data : [],
takeFocusOnClose: true
}); });
this.txtDataRange = new Common.UI.InputFieldBtn({ this.txtDataRange = new Common.UI.InputFieldBtn({
@ -171,6 +173,8 @@ define([
}); });
this.txtDataRange.on('button:click', _.bind(this.onSelectData, this)); this.txtDataRange.on('button:click', _.bind(this.onSelectData, this));
this.focusManager.add([this.inputName, this.cmbScope, this.txtDataRange], '.form-control');
this.afterRender(); this.afterRender();
}, },