Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-02-06 15:26:54 +00:00
commit 23df00a53d

View file

@ -37,6 +37,9 @@ export default React.createClass({
// callback to call when Enter is pressed // callback to call when Enter is pressed
onEnterPressed: PropTypes.func, onEnterPressed: PropTypes.func,
// called when a key is pressed
onKeyDown: PropTypes.func,
// CSS class to apply to dialog div // CSS class to apply to dialog div
className: PropTypes.string, className: PropTypes.string,
@ -49,6 +52,9 @@ export default React.createClass({
}, },
_onKeyDown: function(e) { _onKeyDown: function(e) {
if (this.props.onKeyDown) {
this.props.onKeyDown(e);
}
if (e.keyCode === KeyCode.ESCAPE) { if (e.keyCode === KeyCode.ESCAPE) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();