diff options
| author | Fabien Meghazi <fme@openerp.com> | 2014-09-17 10:03:33 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-09-17 14:50:12 +0200 |
| commit | 8d08e067584587e9cd06a738258f2771534d6000 (patch) | |
| tree | 320536040c08b5f2cb949bc4250446c7712d861d /addons/website_mail | |
| parent | 5bfad4dd52cc96ff6a290a69b5f85d7d48ef6c8f (diff) | |
[FIX] Bundlification remains (Fixes #2463)
Diffstat (limited to 'addons/website_mail')
| -rw-r--r-- | addons/website_mail/static/src/js/website_email_designer.js | 14 | ||||
| -rw-r--r-- | addons/website_mail/views/website_email_designer.xml | 3 | ||||
| -rw-r--r-- | addons/website_mail/views/website_mail.xml | 8 |
3 files changed, 14 insertions, 11 deletions
diff --git a/addons/website_mail/static/src/js/website_email_designer.js b/addons/website_mail/static/src/js/website_email_designer.js index 1ea39ae657c..9f0692b17ce 100644 --- a/addons/website_mail/static/src/js/website_email_designer.js +++ b/addons/website_mail/static/src/js/website_email_designer.js @@ -2,15 +2,15 @@ 'use strict'; var website = openerp.website; - website.snippet.BuildingBlock.include({ - _get_snippet_url: function () { - return '/website_mail/snippets'; - } - }); + website.if_dom_contains('#email_designer', function () { + website.snippet.BuildingBlock.include({ + _get_snippet_url: function () { + return '/website_mail/snippets'; + } + }); - // Copy the template to the body of the email - $(document).ready(function () { $('.js_template_set').click(function(ev) { + // Copy the template to the body of the email $('#email_designer').show(); $('#email_template').hide(); $(".js_content", $(this).parent()).children().clone().appendTo('#email_body'); diff --git a/addons/website_mail/views/website_email_designer.xml b/addons/website_mail/views/website_email_designer.xml index 31df858d50b..470e0f1f583 100644 --- a/addons/website_mail/views/website_email_designer.xml +++ b/addons/website_mail/views/website_email_designer.xml @@ -5,9 +5,6 @@ <!-- Template Choice page --> <template id="email_designer" name="Email Designer"> <t t-call="website.layout"> - <t t-set="head"> - <script type="text/javascript" src="/website_mail/static/src/js/website_email_designer.js"></script> - </t> <div id="wrap" class="container" t-ignore="True"> <div id="email_template" class="mb32" t-att-style="mode != 'email_template' and 'display: none' or ''"> <a class="mt16 btn btn-default pull-right" diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml index 2b810095231..23939268019 100644 --- a/addons/website_mail/views/website_mail.xml +++ b/addons/website_mail/views/website_mail.xml @@ -21,11 +21,17 @@ </template> <template id="head" inherit_id="website.assets_frontend" name="Mail customization"> - <xpath expr="/t" position="inside"> + <xpath expr="." position="inside"> <script type="text/javascript" src="/website_mail/static/src/js/follow.js"></script> <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/> </xpath> </template> +<template id="editor" inherit_id="website.assets_editor" name="Editor assets for Mail customization"> + <xpath expr="." position="inside"> + <script type="text/javascript" src="/website_mail/static/src/js/website_email_designer.js"></script> + </xpath> +</template> + </data> </openerp> |