IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-23 09:16:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix accessibility issue for Datetime cell in backgrid. Fixes #4508

Browse Source
This commit is contained in:
Murtuza Zabuawala 2019-07-25 17:54:24 +05:30 committed by Akshay Joshi
parent 136bb412a1
commit 108af5c10b
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_12.rst
View File

@ -18,3 +18,4 @@ Bug fixes
********* *********
| `Issue #4490 <https://redmine.postgresql.org/issues/4490>`_ - Fix accessibility issue for checkbox in IE11. | `Issue #4490 <https://redmine.postgresql.org/issues/4490>`_ - Fix accessibility issue for checkbox in IE11.
| `Issue #4508 <https://redmine.postgresql.org/issues/4508>`_ - Fix accessibility issue for Datetime cell in backgrid.

29
web/pgadmin/static/js/backgrid.pgadmin.js
View File

@ -1755,6 +1755,7 @@ define([
}, },
}, },
}); });
this.tabKeyPress = false;
this.$el.datetimepicker(options); this.$el.datetimepicker(options);
this.$el.datetimepicker('show'); this.$el.datetimepicker('show');
this.picker = this.$el.data('DateTimePicker'); this.picker = this.$el.data('DateTimePicker');
@ -1762,27 +1763,41 @@ define([
events: { events: {
'hide.datetimepicker': 'closeIt', 'hide.datetimepicker': 'closeIt',
'focusout':'closeIt', 'focusout':'closeIt',
'keydown': 'keydownHandler',
}, },
closeIt: function(ev) { keydownHandler: function(event) {
// If Tab key pressed from Cell and not from Datetime picker element
// then we should trigger edited event so that we can goto next cell
let self = this;
let tabKeyPressed = true;
if (event.keyCode === 9 && self.el === event.target) {
self.closeIt(event, tabKeyPressed);
}
},
closeIt: function(ev, isTabKeyPressed) {
if (this.is_closing || this.tabKeyPress)
return;
this.is_closing = true;
this.tabKeyPress = isTabKeyPressed;
var formatter = this.formatter, var formatter = this.formatter,
model = this.model, model = this.model,
column = this.column, column = this.column,
val = this.$el.val(), val = this.$el.val(),
newValue = formatter.toRaw(val, model); newValue = formatter.toRaw(val, model);
if (this.is_closing)
return;
this.is_closing = true;
this.$el.datetimepicker('destroy'); this.$el.datetimepicker('destroy');
this.is_closing = false; this.is_closing = false;
var command = new Backgrid.Command(ev);
if (_.isUndefined(newValue)) { if (_.isUndefined(newValue)) {
model.trigger('backgrid:error', model, column, val); model.trigger('backgrid:error', model, column, val);
} else { } else {
model.set(column.get('name'), newValue); model.set(column.get('name'), newValue);
model.trigger('backgrid:edited', model, column, command); let command = new Backgrid.Command(ev);
setTimeout(() => {
model.trigger('backgrid:edited', model, column, command);
}, 20);
} }
}, },
}); });