diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-07-04 14:40:20 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-07-04 14:40:20 +0200 |
| commit | 10cb34bcacc0983cdab722e528d413a996df3a7b (patch) | |
| tree | 749977ed99f5895080eac3d0fd842033eb276b7b /addons/web/static | |
| parent | 81d0bfa4738c5563a26df5cd666ef895cd59d3d0 (diff) | |
| parent | 97258040d80f3435b6d461de35f86a615ee2b106 (diff) | |
[MERGE] forward port branch saas-14 up to 97258040d80
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/js/apps.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/addons/web/static/src/js/apps.js b/addons/web/static/src/js/apps.js index 7250674272c..bb642ed57e7 100644 --- a/addons/web/static/src/js/apps.js +++ b/addons/web/static/src/js/apps.js @@ -61,7 +61,7 @@ var Apps = Widget.extend({ }, destroy: function() { - $(window).off("message.apps"); + $(window).off("message." + this.uniq); if (this.$ifr) { this.$ifr.remove(); this.$ifr = null; @@ -116,10 +116,11 @@ var Apps = Widget.extend({ qs.debug = session.debug; } var u = $.param.querystring(client.origin + "/apps/embed/client", qs); - var css = {width: '100%', height: '400px'}; + var css = {width: '100%', height: '750px'}; self.$ifr = $('<iframe>').attr('src', u); - $(window).on("message.apps", self.proxy('_on_message')); + self.uniq = _.uniqueId('apps'); + $(window).on("message." + self.uniq, self.proxy('_on_message')); self.on('message:ready', self, function(m) { var w = this.$ifr[0].contentWindow; |