From 5a3036a6cd055dfb6ac02201d2341fad6d0fd2a7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 9 Oct 2013 15:55:04 +0200
Subject: [PATCH] [IMP] Remove ununsed code and dom attributes

bzr revid: fme@openerp.com-20131009135504-5cqnbiuxqn4m6if3
---
 .../website/static/src/js/website.editor.js   | 22 +++++++++----------
 addons/website/views/views.xml                |  5 ++---
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index f40ccea715b..54121ca5018 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -3,13 +3,12 @@
 
     var website = openerp.website;
     // $.fn.data automatically parses value, '0'|'1' -> 0|1
-    website.is_editable = $(document.documentElement).data('editable');
 
     website.templates.push('/website/static/src/xml/website.editor.xml');
     website.dom_ready.done(function () {
         var is_smartphone = $(document.body)[0].clientWidth < 767;
 
-        if (website.is_editable && !is_smartphone) {
+        if (!is_smartphone) {
             website.ready().then(website.init_editor);
         }
     });
@@ -21,16 +20,15 @@
         return new website.editor.RTEImageDialog(editor).appendTo(document.body);
     }
 
-    if (website.is_editable) {
-        // only enable editors manually
-        CKEDITOR.disableAutoInline = true;
-        // EDIT ALL THE THINGS
-        CKEDITOR.dtd.$editable = $.extend(
-            {}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline);
-        // Disable removal of empty elements on CKEDITOR activation. Empty
-        // elements are used for e.g. support of FontAwesome icons
-        CKEDITOR.dtd.$removeEmpty = {};
-    }
+    // only enable editors manually
+    CKEDITOR.disableAutoInline = true;
+    // EDIT ALL THE THINGS
+    CKEDITOR.dtd.$editable = $.extend(
+        {}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline);
+    // Disable removal of empty elements on CKEDITOR activation. Empty
+    // elements are used for e.g. support of FontAwesome icons
+    CKEDITOR.dtd.$removeEmpty = {};
+
     website.init_editor = function () {
         CKEDITOR.plugins.add('customdialogs', {
 //            requires: 'link,image',
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 39596cfbe66..37172b6fd8c 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -14,9 +14,8 @@
         <template id="layout" name="Main layout">
                 &lt;!DOCTYPE html&gt;
                 <html t-att-lang="lang.replace('_', '-')"
-                      t-att-data-editable="'1' if editable else '0'"
-                      t-att-data-translatable="'1' if translatable else '0'"
-                      t-att-data-view-xmlid="str(__stack__[0])">
+                      t-att-data-translatable="'1' if translatable else None"
+                      t-att-data-view-xmlid="str(__stack__[0]) if editable else None">
                     <head>
                         <title><t t-esc="title or res_company.name"/></title>
                         <meta name="openerp.company" t-att-value="res_company.name" />