summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-11-08 14:43:28 +0100
committerChristophe Simonis <chs@odoo.com>2016-11-08 14:43:28 +0100
commit63860373acb47356c7731cbc8258af0fd7fd9da4 (patch)
treeb669d2c50f6d2326adad219acd7014b86faf5e3f /addons/web/static/src/js/framework
parent3c3cced5d964f410f32c410cce1133f504bdad2f (diff)
parentc19f54650594211e4af7e68214de4f118686b8e1 (diff)
[MERGE] forward port branch saas-11 up to c19f546
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;
},