From 80f97fbd19d3ec24b8dbb949809f2d81460c08b0 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Fri, 2 Mar 2018 13:17:46 +0100 Subject: [PATCH] [FIX] website_slides: load viewer for app's iframes only The website_slides JS was working on all iframe in all pages while it should only affect its own ones, which contains a PDF document. --- addons/website_slides/models/slides.py | 2 +- addons/website_slides/static/src/js/slides.js | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/website_slides/models/slides.py b/addons/website_slides/models/slides.py index b4eb7be8036..c1eea51f6ab 100644 --- a/addons/website_slides/models/slides.py +++ b/addons/website_slides/models/slides.py @@ -322,7 +322,7 @@ class Slide(models.Model): base_url = self.env['ir.config_parameter'].get_param('web.base.url') for record in self: if record.datas and (not record.document_id or record.slide_type in ['document', 'presentation']): - record.embed_code = '' % (base_url, record.id, 315, 420) + record.embed_code = '' % (base_url, record.id, 315, 420) elif record.slide_type == 'video' and record.document_id: if not record.mime_type: # embed youtube video diff --git a/addons/website_slides/static/src/js/slides.js b/addons/website_slides/static/src/js/slides.js index 71d20378044..ab7da4a937f 100644 --- a/addons/website_slides/static/src/js/slides.js +++ b/addons/website_slides/static/src/js/slides.js @@ -108,11 +108,12 @@ $(document).ready(function () { }, }); - $('iframe').ready(function() { + $('iframe.o_wslides_iframe_viewer').ready(function() { // TODO : make it work. For now, once the iframe is loaded, the value of #page_count is // still now set (the pdf is still loading) - var max_page = $('iframe').contents().find('#page_count').val(); - new SlideSocialEmbed($(this), max_page).setElement($('.oe_slide_js_embed_code_widget')); + var $iframe = $(this); + var max_page = $iframe.contents().find('#page_count').val(); + new SlideSocialEmbed($iframe, max_page).setElement($('.oe_slide_js_embed_code_widget')); });