pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
To avoid loading unneccesary templates on every page.
This commit is contained in:
David Monjoie
2015-05-21 16:17:10 +02:00
parent 14a7d52307
commit e18a3a43e4
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/website.editor.js
+11
View File
@@ -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);
addons/website/static/src/js/website.js
-12
View File
@@ -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();