diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-08-06 11:05:37 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-08-07 14:05:07 +0200 |
| commit | 1587647dcd7ce866c7c435c48ec31bf11a5e9b32 (patch) | |
| tree | 68089a28c64299adc19fd7f35cb16dbedd0ba1ba | |
| parent | 10f2df8e59b595a14f9e8979e384577baee746e7 (diff) | |
[FIX] account,web(_diagram): FieldMany2One: rename $drop_down
$drop_down has been renamed into $dropdown in enterprise edition, which was
probably not a good idea, as it is accessed from outside web.
| -rw-r--r-- | addons/account/static/src/js/account_reconciliation_widgets.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_relational_widgets.js | 10 | ||||
| -rw-r--r-- | addons/web_diagram/static/src/js/diagram.js | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/addons/account/static/src/js/account_reconciliation_widgets.js b/addons/account/static/src/js/account_reconciliation_widgets.js index bc24600247a..7051e67ed80 100644 --- a/addons/account/static/src/js/account_reconciliation_widgets.js +++ b/addons/account/static/src/js/account_reconciliation_widgets.js @@ -1834,9 +1834,7 @@ var bankStatementReconciliationLine = abstractReconciliationLine.extend({ $.when(self.changePartner(false)).then(function(){ self.$(".change_partner_container").show(); self.$(".partner_name").hide(); - // Old design uses drop_down and new design uses dropdown - var m2o_widget_dropdown = self.change_partner_field.$drop_down || self.change_partner_field.$dropdown; - m2o_widget_dropdown.trigger("click"); + self.change_partner_field.$dropdown.trigger("click"); }); }, diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js index e8fb7fbba97..7b1b8788dd7 100644 --- a/addons/web/static/src/js/views/form_relational_widgets.js +++ b/addons/web/static/src/js/views/form_relational_widgets.js @@ -97,9 +97,9 @@ var FieldMany2One = common.AbstractField.extend(common.CompletionFieldMixin, com this.render_editable(); }, destroy_content: function () { - if (this.$drop_down) { - this.$drop_down.off('click'); - delete this.$drop_down; + if (this.$dropdown) { + this.$dropdown.off('click'); + delete this.$dropdown; } if (this.$input) { this.$input.closest(".modal .modal-content").off('scroll'); @@ -135,7 +135,7 @@ var FieldMany2One = common.AbstractField.extend(common.CompletionFieldMixin, com self.hide_error_displayer(); }); - this.$drop_down = this.$el.find(".oe_m2o_drop_down_button"); + this.$dropdown = this.$el.find(".oe_m2o_drop_down_button"); this.$follow_button = $(".oe_m2o_cm_button", this.$el); this.$follow_button.click(function(ev) { @@ -179,7 +179,7 @@ var FieldMany2One = common.AbstractField.extend(common.CompletionFieldMixin, com }; this.$input.keydown(input_changed); this.$input.change(input_changed); - this.$drop_down.click(function() { + this.$dropdown.click(function() { self.$input.focus(); if (self.$input.autocomplete("widget").is(":visible")) { self.$input.autocomplete("close"); diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index f28926ddb8e..9f372f67eec 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -261,7 +261,7 @@ var DiagramView = View.extend({ if (!(fld in form_controller.fields)) { return; } var field = form_controller.fields[fld]; field.$input.prop('disabled', true); - field.$drop_down.unbind(); + field.$dropdown.unbind(); }); }); }, |