[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
This commit is contained in:
parent
4572ea9ef3
commit
750b9f405c
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue