From b0cbaf330a9ae94769f592358378ce64f53d7dd6 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 5 May 2014 13:38:00 +0200 Subject: [PATCH] [IMP] website: load website.xml templates only in editable mode bzr revid: fme@openerp.com-20140505113800-wv5vh802us270oez --- addons/website/static/src/js/website.editor.newpage.js | 5 ++--- addons/website/static/src/js/website.js | 10 +++++++--- .../website_blog/static/src/js/website_blog.editor.js | 1 - .../static/src/js/website_event.editor.js | 1 - .../static/src/js/website_forum.editor.js | 1 - .../static/src/js/website_hr_recruitment.editor.js | 1 - .../website_sale/static/src/js/website_sale.editor.js | 1 - 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js index b475223ecd9..5fa5df7a750 100644 --- a/addons/website/static/src/js/website.editor.newpage.js +++ b/addons/website/static/src/js/website.editor.newpage.js @@ -3,9 +3,8 @@ var website = openerp.website; var _t = openerp._t; - website.is_editable = true; website.is_editable_button = true; - + website.EditorBar.include({ start: function() { var res = this._super(); @@ -56,4 +55,4 @@ } }), }); -})(); \ No newline at end of file +})(); diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index b6f42c8b20e..2c3b2afebc5 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -3,7 +3,9 @@ var website = {}; openerp.website = website; - openerp.website.translatable = !!$('html').data('translatable'); + + website.translatable = !!$('html').data('translatable'); + website.is_editable = !!$('html').data('editable'); /* ---------------------------------------------------- Helpers @@ -244,11 +246,13 @@ return def; }); }; - website.add_template_file('/website/static/src/xml/website.xml'); + + if (website.is_editable) { + website.add_template_file('/website/static/src/xml/website.xml'); + } website.dom_ready = $.Deferred(); $(document).ready(function () { - website.is_editable = website.is_editable || $('html').data('editable'); website.is_editable_button= website.is_editable_button || $('html').data('editable'); website.dom_ready.resolve(); // fix for ie diff --git a/addons/website_blog/static/src/js/website_blog.editor.js b/addons/website_blog/static/src/js/website_blog.editor.js index 103b2bee1e7..d953b9628a8 100644 --- a/addons/website_blog/static/src/js/website_blog.editor.js +++ b/addons/website_blog/static/src/js/website_blog.editor.js @@ -5,7 +5,6 @@ var _t = openerp._t; website.add_template_file('/website_blog/static/src/xml/website_blog.xml'); - website.is_editable = true; website.EditorBar.include({ start: function() { website.is_editable_button = website.is_editable_button || !!$("#wrap.js_blog").size(); diff --git a/addons/website_event/static/src/js/website_event.editor.js b/addons/website_event/static/src/js/website_event.editor.js index ac81be7ec36..28eedf3c868 100644 --- a/addons/website_event/static/src/js/website_event.editor.js +++ b/addons/website_event/static/src/js/website_event.editor.js @@ -5,7 +5,6 @@ var _t = openerp._t; website.add_template_file('/website_event/static/src/xml/website_event.xml'); - website.is_editable = true; website.EditorBar.include({ start: function() { website.is_editable_button = website.is_editable_button || !!$("#wrap.js_event").size(); diff --git a/addons/website_forum/static/src/js/website_forum.editor.js b/addons/website_forum/static/src/js/website_forum.editor.js index 0c2adf1a4bc..a267d304dbd 100644 --- a/addons/website_forum/static/src/js/website_forum.editor.js +++ b/addons/website_forum/static/src/js/website_forum.editor.js @@ -5,7 +5,6 @@ var _t = openerp._t; website.add_template_file('/website_forum/static/src/xml/website_forum.xml'); - website.is_editable = true; website.EditorBar.include({ start: function() { website.is_editable_button = website.is_editable_button || !!$("#wrap").size(); diff --git a/addons/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js b/addons/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js index a1d95b888b4..8fd63961a61 100644 --- a/addons/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js +++ b/addons/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js @@ -3,7 +3,6 @@ var website = openerp.website; website.add_template_file('/website_hr_recruitment/static/src/xml/website_hr_recruitment.xml'); - website.is_editable = true; website.EditorBar.include({ start: function() { website.is_editable_button = website.is_editable_button || !!$("#wrap.js_hr_recruitment").size(); diff --git a/addons/website_sale/static/src/js/website_sale.editor.js b/addons/website_sale/static/src/js/website_sale.editor.js index fc1fb4e1165..fd423e2a6bf 100644 --- a/addons/website_sale/static/src/js/website_sale.editor.js +++ b/addons/website_sale/static/src/js/website_sale.editor.js @@ -5,7 +5,6 @@ var _t = openerp._t; website.add_template_file('/website_sale/static/src/xml/website_sale.xml'); - website.is_editable = true; website.EditorBar.include({ start: function() { website.is_editable_button = website.is_editable_button || !!$("#wrap.js_sale").size();