From 7294033e1f7c5bd1e7d324f36cb5d13a4faf7972 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 26 Jul 2013 15:44:59 +0200 Subject: [PATCH] [IMP] disable RTE on t-record results (data-oe-type) bzr revid: xmo@openerp.com-20130726134459-8mb3p4eh2ob8rxyq --- addons/website/static/src/js/website.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 5159e655cfb..449d4fc14ab 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -142,8 +142,9 @@ instance.website.RTE = instance.web.Widget.extend({ }, start_edition: function ($elements) { var self = this; + CKEDITOR.on('currentInstance', this.proxy('_change_focused_editor')); $elements - .not('span') + .not('span, [data-oe-type]') .each(function () { var $this = $(this); CKEDITOR.inline(this, self._config()).on('change', function () { @@ -151,7 +152,6 @@ instance.website.RTE = instance.web.Widget.extend({ self.trigger('change', this, null); }); }); - this.$el.show(); }, button_for: function (command) { @@ -173,6 +173,9 @@ instance.website.RTE = instance.web.Widget.extend({ _current_editor: function () { return CKEDITOR.currentInstance; }, + _change_focused_editor: function () { + this.$el.toggle(!!CKEDITOR.currentInstance); + }, _config: function () { return { // Don't load ckeditor's style rules