diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-06-29 16:40:39 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-06-29 16:40:39 +0200 |
| commit | 936f39886c2bb9b54930a9577a4617ccc75d36a4 (patch) | |
| tree | 676968c3efe88423c87aa16bd56e6cefef5e1a1a /addons/web/static/src/js/apps.js | |
| parent | 6fe3ae841b9e4a51c4fba798a308d26ee27c760e (diff) | |
| parent | cb01cfe9ff3c98bc91e923617bde492b69e3ecfe (diff) | |
[MERGE] forward port branch 10.0 up to cb01cfe9ff3
Diffstat (limited to 'addons/web/static/src/js/apps.js')
| -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; |