diff options
| author | Christophe Matthieu <chm@odoo.com> | 2015-01-14 15:27:22 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@odoo.com> | 2015-01-16 16:38:09 +0100 |
| commit | 9dafe51f4722dbe83e2ab689d1aa74af05bd4f68 (patch) | |
| tree | aa5f8718d7e7bba903e2c7f20268f1a3c3088223 /addons/website/static/src/js/website.editor.js | |
| parent | db9b7bc8256b17ea1adda3b832d7654abccc00df (diff) | |
[FIX] website editor: can't select and edit an empty field html or text
Diffstat (limited to 'addons/website/static/src/js/website.editor.js')
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index a229b18aa32..a5c6e0a5209 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -915,7 +915,6 @@ define(['summernote/summernote'], function () { this.$('#website-top-view').hide(); this.$el.show(); this.$('#website-top-edit').show(); - $('.css_non_editable_mode_hidden').removeClass("css_non_editable_mode_hidden"); if (!no_editor) { this.rte.start_edition(); @@ -943,7 +942,7 @@ define(['summernote/summernote'], function () { var defs = $('.o_editable') .filter('.o_dirty') .removeAttr('contentEditable') - .removeClass('o_dirty o_editable oe_carlos_danger') + .removeClass('o_dirty o_editable oe_carlos_danger o_is_inline_editable') .map(function () { var $el = $(this); @@ -1207,6 +1206,12 @@ define(['summernote/summernote'], function () { $('.o_editable').each(function () { var node = this; var $node = $(node); + + // add class to display inline-block for empty t-field + if(window.getComputedStyle(node).display === "inline") { + $node.addClass('o_is_inline_editable'); + } + // start element observation observer.observe(node, OBSERVER_CONFIG); $(node).one('content_changed', function () { @@ -1221,6 +1226,22 @@ define(['summernote/summernote'], function () { $('#wrapwrap, .o_editable').on('click', '*', function (event) { event.preventDefault(); }); + + $('body').addClass("editor_enable"); + + $(document) + .tooltip({ + selector: '[data-oe-readonly]', + container: 'body', + trigger: 'hover', + delay: { "show": 1000, "hide": 100 }, + placement: 'bottom', + title: _t("Readonly field") + }) + .on('click', function () { + $(this).tooltip('hide'); + }); + self.trigger('rte:ready'); } }, |
