From e18a3a43e44da86a92acbe77501838ec6deb87db Mon Sep 17 00:00:00 2001
From: David Monjoie <dmo@odoo.com>
Date: Tue, 19 May 2015 16:48:05 +0200
Subject: [PATCH] [FIX] website: moved website.xml loading to editor

To avoid loading unneccesary templates on every page.
---
 addons/website/static/src/js/website.editor.js | 11 +++++++++++
 addons/website/static/src/js/website.js        | 12 ------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 12dceabac8f..750d664f6e4 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -939,6 +939,7 @@ 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);
@@ -967,6 +968,16 @@ 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 3869986e48a..386e0e99864 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -161,16 +161,6 @@
         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);
@@ -262,8 +252,6 @@
         return def;
     };
 
-    website.add_template_file('/website/static/src/xml/website.xml');
-
     website.dom_ready = $.Deferred();
     $(document).ready(function () {
         website.dom_ready.resolve();