diff --git a/src/view/form.js b/src/view/form.js index b74da5754a..4c1d948127 100644 --- a/src/view/form.js +++ b/src/view/form.js @@ -1524,7 +1524,12 @@ function eval_pyson(value){ } else { value = null; } - this.date.data('DateTimePicker').date(value); + this.date.off('dp.change'); + try { + this.date.data('DateTimePicker').date(value); + } finally { + this.date.on('dp.change', this.focus_out.bind(this)); + } }, focus: function() { this.input.focus(); @@ -4413,7 +4418,13 @@ function eval_pyson(value){ return value; }, set_value: function(value) { - this.date.data('DateTimePicker').date(value); + this.date.off('dp.change'); + try { + this.date.data('DateTimePicker').date(value); + } finally { + this.date.on('dp.change', + this.parent_widget.focus_out.bind(this.parent_widget)); + } } });