summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-11-08 15:01:20 +0100
committerChristophe Simonis <chs@odoo.com>2016-11-08 15:01:20 +0100
commit3d085f632d4c5a8aece92731494e1dbbc8923049 (patch)
tree373dc715bb2f38482300fd66b1fb022104173b98 /addons/web/static/src/js/framework
parent74ef15f01f123bc4adbfdaeb3d20b6c77341492a (diff)
parent63860373acb47356c7731cbc8258af0fd7fd9da4 (diff)
[MERGE] forward port branch saas-12 up to 6386037
Diffstat (limited to 'addons/web/static/src/js/framework')
-rw-r--r--addons/web/static/src/js/framework/view.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/addons/web/static/src/js/framework/view.js b/addons/web/static/src/js/framework/view.js
index 9b3d1751570..ded3ba10bb7 100644
--- a/addons/web/static/src/js/framework/view.js
+++ b/addons/web/static/src/js/framework/view.js
@@ -196,6 +196,12 @@ var View = Widget.extend({
get_context: function () {
return {};
},
+ destroy: function () {
+ if (this.$buttons) {
+ this.$buttons.off();
+ }
+ return this._super.apply(this, arguments);
+ },
set_scrollTop: function(scrollTop) {
this.scrollTop = scrollTop;
},