Merge pull request #225 from odoo-dev/master-frontend-assets

[IMP] Move website assets to frontend bundle

2 files changed, 6 insertions, 9 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 bd6516bc955..5d3052c9084 100644
--- a/addons/website_mail/static/src/js/website_email_designer.js
+++ b/addons/website_mail/static/src/js/website_email_designer.js
@@ -1,13 +1,4 @@
 (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 7a26920682b..85685f8d375 100644
--- a/addons/website_mail/static/src/js/website_mail.editor.js
+++ b/addons/website_mail/static/src/js/website_mail.editor.js
@@ -3,6 +3,12 @@
 
     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 () {