Revert "[FIX] website: moved website.xml loading to editor"

This reverts commit e18a3a43e44da86a92acbe77501838ec6deb87db.

website.error is used in the Javascript file it was removed from,
in website.js, line 350.

Another solution to not load this template when not needed has
to be found

opw-640822

2 files changed, 12 insertions, 11 deletions

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 750d664f6e4..12dceabac8f 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -939,7 +939,6 @@ define(['summernote/summernote'], function () {
 
     website.no_editor = !!$(document.documentElement).data('editable-no-editor');
 
-    website.add_template_file('/website/static/src/xml/website.xml');
     website.add_template_file('/website/static/src/xml/website.editor.xml');
     website.dom_ready.done(function () {
         website.ready().then(website.init_editor);
@@ -968,16 +967,6 @@ define(['summernote/summernote'], function () {
         });
     });
 
-    website.error = function(data, url) {
-        var $error = $(openerp.qweb.render('website.error_dialog', {
-            'title': data.data ? data.data.arguments[0] : "",
-            'message': data.data ? data.data.arguments[1] : data.statusText,
-            'backend_url': url
-        }));
-        $error.appendTo("body");
-        $error.modal('show');
-    };
-
     website.init_editor = function () {
         var editor = new website.EditorBar();
         var $body = $(document.body);
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 386e0e99864..3869986e48a 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -161,6 +161,16 @@
         return def;
     };
 
+    website.error = function(data, url) {
+        var $error = $(openerp.qweb.render('website.error_dialog', {
+            'title': data.data ? data.data.arguments[0] : "",
+            'message': data.data ? data.data.arguments[1] : data.statusText,
+            'backend_url': url
+        }));
+        $error.appendTo("body");
+        $error.modal('show');
+    };
+
     website.form = function (url, method, params) {
         var form = document.createElement('form');
         form.setAttribute('action', url);
@@ -252,6 +262,8 @@
         return def;
     };
 
+    website.add_template_file('/website/static/src/xml/website.xml');
+
     website.dom_ready = $.Deferred();
     $(document).ready(function () {
         website.dom_ready.resolve();