diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-11-08 14:20:07 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-11-08 14:20:07 +0100 |
| commit | c19f54650594211e4af7e68214de4f118686b8e1 (patch) | |
| tree | ae27c8fb401e8159bad45781a8e7b0ab20235b35 /addons/web/static/src/js/views | |
| parent | d32970830ea938bead60e8368a3389f9d20853df (diff) | |
| parent | b7957550010e0cecc1dbefcbc122d9a49f50ae1d (diff) | |
[MERGE] forward port branch 9.0 up to b795755
Diffstat (limited to 'addons/web/static/src/js/views')
| -rw-r--r-- | addons/web/static/src/js/views/form_relational_widgets.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_view.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/graph_view.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/list_view.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/pivot_view.js | 6 |
5 files changed, 19 insertions, 1 deletions
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 f5ac377913c..48f990de948 100644 --- a/addons/web/static/src/js/views/form_relational_widgets.js +++ b/addons/web/static/src/js/views/form_relational_widgets.js @@ -99,6 +99,9 @@ var FieldMany2One = common.AbstractField.extend(common.CompletionFieldMixin, com delete this.$dropdown; } if (this.$input) { + if (this.$input.data('ui-autocomplete')) { + this.$input.autocomplete("destroy"); + } this.$input.closest(".modal .modal-content").off('scroll'); this.$input.off('keyup blur autocompleteclose autocompleteopen ' + 'focus focusout change keydown'); diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js index a9da2e40304..8515eae3107 100644 --- a/addons/web/static/src/js/views/form_view.js +++ b/addons/web/static/src/js/views/form_view.js @@ -94,6 +94,9 @@ var FormView = View.extend(common.FieldManagerMixin, { }); }, start: function() { + if (this.$pager) { + this.$pager.off(); + } var self = this; this.rendering_engine.set_fields_registry(this.fields_registry); diff --git a/addons/web/static/src/js/views/graph_view.js b/addons/web/static/src/js/views/graph_view.js index ea9d09636f5..308c1359248 100644 --- a/addons/web/static/src/js/views/graph_view.js +++ b/addons/web/static/src/js/views/graph_view.js @@ -129,6 +129,12 @@ var GraphView = View.extend({ this.widget.set_measure(this.active_measure); } }, + destroy: function () { + if (this.$buttons) { + this.$buttons.find('button').off(); // remove jquery's tooltip() handlers + } + return this._super.apply(this, arguments); + }, }); core.view_registry.add('graph', GraphView); diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js index df6274ef12d..45fa6b6f1b6 100644 --- a/addons/web/static/src/js/views/list_view.js +++ b/addons/web/static/src/js/views/list_view.js @@ -267,7 +267,7 @@ var ListView = View.extend({ render_buttons: function($node) { if (!this.$buttons) { this.$buttons = $(QWeb.render("ListView.buttons", {'widget': this})); - this.$buttons.find('.o_list_button_add').click(this.proxy('do_add_record')); + this.$buttons.on('click', '.o_list_button_add', this.proxy('do_add_record')); this.$buttons.appendTo($node); } }, diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js index 264fa2af985..be63f02248d 100644 --- a/addons/web/static/src/js/views/pivot_view.js +++ b/addons/web/static/src/js/views/pivot_view.js @@ -827,6 +827,12 @@ var PivotView = View.extend({ error: crash_manager.rpc_error.bind(crash_manager) }); }, + destroy: function () { + if (this.$buttons) { + this.$buttons.find('button').off(); // remove jquery's tooltip() handlers + } + return this._super.apply(this, arguments); + }, }); function traverse_tree(root, f, arg1, arg2, arg3) { |
