From 8b6985eeed0a15ec673d96299b3ed331c684e62d Mon Sep 17 00:00:00 2001 From: "Laurent Stukkens (LTU)" Date: Fri, 17 Jul 2020 11:00:27 +0000 Subject: [PATCH] [MOV] website: move JS Qweb templates to snippets directory * Prior to this commit, Snippets XML Qweb templates files were located under website/static/src/xml/. * After this commit, Snippets XML Qweb templates files will be named AAA.xml (with AAA being the revision number) and located under the related Snippet directory '/website/static/src/snippets/SNIPPET_DIRECTORY/' task-2276740 PR #53175 --- addons/website/static/src/snippets/s_countdown/000.js | 2 +- .../website.s_countdown.xml => snippets/s_countdown/000.xml} | 0 addons/website/static/src/snippets/s_image_gallery/000.js | 5 +++-- .../website.gallery.xml => snippets/s_image_gallery/000.xml} | 0 .../website/static/src/snippets/s_image_gallery/options.js | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename addons/website/static/src/{xml/website.s_countdown.xml => snippets/s_countdown/000.xml} (100%) rename addons/website/static/src/{xml/website.gallery.xml => snippets/s_image_gallery/000.xml} (100%) diff --git a/addons/website/static/src/snippets/s_countdown/000.js b/addons/website/static/src/snippets/s_countdown/000.js index 9959f6680a4..5f28a71595c 100644 --- a/addons/website/static/src/snippets/s_countdown/000.js +++ b/addons/website/static/src/snippets/s_countdown/000.js @@ -11,7 +11,7 @@ const _t = core._t; const CountdownWidget = publicWidget.Widget.extend({ selector: '.s_countdown', - xmlDependencies: ['/website/static/src/xml/website.s_countdown.xml'], + xmlDependencies: ['/website/static/src/snippets/s_countdown/000.xml'], disabledInEditableMode: false, /** diff --git a/addons/website/static/src/xml/website.s_countdown.xml b/addons/website/static/src/snippets/s_countdown/000.xml similarity index 100% rename from addons/website/static/src/xml/website.s_countdown.xml rename to addons/website/static/src/snippets/s_countdown/000.xml diff --git a/addons/website/static/src/snippets/s_image_gallery/000.js b/addons/website/static/src/snippets/s_image_gallery/000.js index 94e31288442..be0553aa56a 100644 --- a/addons/website/static/src/snippets/s_image_gallery/000.js +++ b/addons/website/static/src/snippets/s_image_gallery/000.js @@ -7,8 +7,9 @@ var publicWidget = require('web.public.widget'); var qweb = core.qweb; const GalleryWidget = publicWidget.Widget.extend({ + selector: '.s_image_gallery:not(.o_slideshow)', - xmlDependencies: ['/website/static/src/xml/website.gallery.xml'], + xmlDependencies: ['/website/static/src/snippets/s_image_gallery/000.xml'], events: { 'click img': '_onClickImg', }, @@ -72,7 +73,7 @@ const GalleryWidget = publicWidget.Widget.extend({ const GallerySliderWidget = publicWidget.Widget.extend({ selector: '.o_slideshow', - xmlDependencies: ['/website/static/src/xml/website.gallery.xml'], + xmlDependencies: ['/website/static/src/snippets/s_image_gallery/000.xml'], disabledInEditableMode: false, /** diff --git a/addons/website/static/src/xml/website.gallery.xml b/addons/website/static/src/snippets/s_image_gallery/000.xml similarity index 100% rename from addons/website/static/src/xml/website.gallery.xml rename to addons/website/static/src/snippets/s_image_gallery/000.xml diff --git a/addons/website/static/src/snippets/s_image_gallery/options.js b/addons/website/static/src/snippets/s_image_gallery/options.js index a3fe94332da..9b8683d59d0 100644 --- a/addons/website/static/src/snippets/s_image_gallery/options.js +++ b/addons/website/static/src/snippets/s_image_gallery/options.js @@ -9,7 +9,7 @@ var _t = core._t; var qweb = core.qweb; options.registry.gallery = options.Class.extend({ - xmlDependencies: ['/website/static/src/xml/website.gallery.xml'], + xmlDependencies: ['/website/static/src/snippets/s_image_gallery/000.xml'], /** * @override