From 750b9f405cd2f330242c290e5ea302a01de16d89 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 25 Feb 2014 14:12:28 +0100
Subject: [PATCH] [FIX] tags edition breakage in website_event_track

* remove some nodes from the $editables set, ``li`` really does not like being
  widgetified. Remove a few others just in case

* split fa outside of li to make it safely (ish) editable

* simplify upcast function for icons cke widget

bzr revid: xmo@openerp.com-20140225131228-2m75itgi4zbj5xfh
---
 addons/website/static/src/js/website.editor.js     | 10 ++++++----
 addons/website_event_track/views/website_event.xml |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index dc82c0c17b9..f782f2ff83a 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -66,8 +66,10 @@
     // only enable editors manually
     CKEDITOR.disableAutoInline = true;
     // EDIT ALL THE THINGS
-    CKEDITOR.dtd.$editable = $.extend(
-        {}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline);
+    CKEDITOR.dtd.$editable = _.omit(
+        $.extend({}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline),
+        // well maybe not *all* the things
+        'ul', 'ol', 'li', 'table', 'tr', 'th', 'td');
     // Disable removal of empty elements on CKEDITOR activation. Empty
     // elements are used for e.g. support of FontAwesome icons
     CKEDITOR.dtd.$removeEmpty = {};
@@ -377,8 +379,7 @@
                         });
                     },
                     upcast: function (el) {
-                        return el.attributes['class']
-                            && (/\bfa\b/.test(el.attributes['class']));
+                        return el.hasClass('fa');
                     }
                 });
             }
@@ -650,6 +651,7 @@
                 if (previous && previous === this) { return; }
 
                 var selected = new CKEDITOR.dom.element(this);
+                // FIXME: fa nodes may not be editable widgets (?)
                 if (!is_editable_node(selected) && !selected.hasClass('fa')) {
                     return;
                 }
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 14ed725ba5b..7232160b759 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -197,7 +197,8 @@
             <h2 t-field="track.name" class="text-center"/>
             <h3 t-field="event.name" class="text-center text-muted"/>
             <ul t-if="track.tag_ids" class="text-center text-muted list-inline">
-                <li t-foreach="track.tag_ids" t-as="tag_id" class="fa fa-tags">
+                <li t-foreach="track.tag_ids" t-as="tag_id">
+                    <span class="fa fa-tags"></span>
                     <a t-attf-href="/event/#{ slug(event) }/track/tag/#{ slug(tag_id) }">
                         <span t-field="tag_id.name"/>
                     </a>