diff options
| author | vta vta@openerp.com <> | 2012-10-12 13:26:00 +0200 |
|---|---|---|
| committer | vta vta@openerp.com <> | 2012-10-12 13:26:00 +0200 |
| commit | e1b02ba89a72464bf51b7ed6121b2949f2eefa34 (patch) | |
| tree | 1cfdbcca90f3225a495ba9948c3745cf7b777e32 /addons/web/static/src/js | |
| parent | 30c3602d034a202f04199fdbecb70e971b8bbb3a (diff) | |
| parent | 0602cd5748c46582175109208af58e40af96bb59 (diff) | |
[MERGE] trunk-trigger-datetime_on_change.
bzr revid: vta@openerp.com-20121012112600-33ekd0205e4cvs62
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 5505cd16fe0..fa8b8713a8f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2378,7 +2378,10 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ var self = this; this.$input = this.$el.find('input.oe_datepicker_master'); this.$input_picker = this.$el.find('input.oe_datepicker_container'); - this.$input.change(this.on_change); + this.$input.change(function(){ + self.datetime_changed(); + }); + this.picker({ onClose: this.on_picker_select, onSelect: this.on_picker_select, @@ -2446,9 +2449,10 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ format_client: function(v) { return instance.web.format_value(v, {"widget": this.type_of_date}); }, - on_change: function() { + datetime_changed: function() { if (this.is_valid_()) { this.set_value_from_ui_(); + this.trigger("datetime_changed"); } } }); @@ -2472,7 +2476,7 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc initialize_content: function() { if (!this.get("effective_readonly")) { this.datewidget = this.build_widget(); - this.datewidget.on_change.add_last(_.bind(function() { + this.datewidget.on('datetime_changed', this, _.bind(function() { this.set({'value': this.datewidget.get_value()}); }, this)); this.datewidget.appendTo(this.$el); |
