diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-09-26 19:37:29 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-09-26 19:37:29 +0200 |
| commit | 5f08d82bcd7fa0eaed7c0b0f35c7221c5e0b657a (patch) | |
| tree | 1d1be253f568f18ffd0f7b2bd67577b77afaa3bd /addons/website/static/src/js/content | |
| parent | 7b13888c8e258a05a8044b7566b949071a911eab (diff) | |
| parent | fd122aec52166a2d19fe80579dbf9c98c6ab41fa (diff) | |
[MERGE] forward port branch 11.0 up to fd122aec521
Diffstat (limited to 'addons/website/static/src/js/content')
| -rw-r--r-- | addons/website/static/src/js/content/snippets.animation.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/addons/website/static/src/js/content/snippets.animation.js b/addons/website/static/src/js/content/snippets.animation.js index 602556c03cc..e28e1e0d14f 100644 --- a/addons/website/static/src/js/content/snippets.animation.js +++ b/addons/website/static/src/js/content/snippets.animation.js @@ -699,6 +699,7 @@ registry.gallery = Animation.extend({ * @param {Event} ev */ _onClickImg: function (ev) { + var self = this; var $cur = $(ev.currentTarget); var urls = []; @@ -743,7 +744,12 @@ registry.gallery = Animation.extend({ $modal.find('.modal-content, .modal-body.o_slideshow').css('height', '100%'); $modal.appendTo(document.body); - this.carousel = new registry.gallery_slider($modal.find('.carousel').carousel()); + $modal.one('shown.bs.modal', function () { + self.trigger_up('animation_start_demand', { + editableMode: false, + $target: $modal.find('.modal-body.o_slideshow'), + }); + }); }, }); |
