summaryrefslogtreecommitdiff
path: root/addons/website_mail/static
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2014-05-27 16:12:52 +0200
committerFabien Meghazi <fme@openerp.com>2014-05-27 16:12:52 +0200
commit0544fc2929c96aa7d8782ddf5770a4a8b5821957 (patch)
treee7689a56c8e63e5e30f2480de78e8f3dda34897b /addons/website_mail/static
parentc24848fea957553f79d9bf56f73f6bd510c226fc (diff)
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
This reverts commit dd900408ded4ece90df5f80f36daa049bc8f0e5b, reversing changes made to 4da882d48ffd09651b66e72a6e5c87e76d05a346.
Diffstat (limited to 'addons/website_mail/static')
-rw-r--r--addons/website_mail/static/src/js/website_email_designer.js9
-rw-r--r--addons/website_mail/static/src/js/website_mail.editor.js6
2 files changed, 9 insertions, 6 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 5d3052c9084..bd6516bc955 100644
--- a/addons/website_mail/static/src/js/website_email_designer.js
+++ b/addons/website_mail/static/src/js/website_email_designer.js
@@ -1,4 +1,13 @@
(function () {
+ 'use strict';
+ var website = openerp.website;
+
+ 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) {
diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js
index 85685f8d375..7a26920682b 100644
--- a/addons/website_mail/static/src/js/website_mail.editor.js
+++ b/addons/website_mail/static/src/js/website_mail.editor.js
@@ -3,12 +3,6 @@
var website = openerp.website;
var _t = openerp._t;
-
- website.snippet.BuildingBlock.include({
- _get_snippet_url: function () {
- return '/website_mail/snippets';
- }
- });
website.snippet.options.subscribe = website.snippet.Option.extend({
on_prompt: function () {