diff options
| author | Christophe Matthieu <chm@openerp.com> | 2014-02-21 10:43:43 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2014-02-21 10:43:43 +0100 |
| commit | bfeb2b963151c36544bc884175be4ef5e97334ec (patch) | |
| tree | bfba526303cb90aca4806a9a24a067852b8344b2 /addons/website/static/src/js/website.snippets.editor.js | |
| parent | ff37d0ebcaed01b628be188c4b0a29810765d18c (diff) | |
| parent | d24b67ed3ec568e3eb5b4296519e28a2721314b2 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20140221094343-s1oh3iq07zi2jo0x
Diffstat (limited to 'addons/website/static/src/js/website.snippets.editor.js')
| -rw-r--r-- | addons/website/static/src/js/website.snippets.editor.js | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index 8a3e7a4421d..e45bee9685b 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -9,7 +9,7 @@ var self = this; $("[data-oe-model]").on('click', function (event) { var $this = $(event.srcElement); - var tag = $this[0].tagName.toLowerCase(); + var tag = $this[0] && $this[0].tagName.toLowerCase(); if (!(tag === 'a' || tag === "button") && !$this.parents("a, button").length) { self.$('[data-action="edit"]').parent().effect('bounce', {distance: 18, times: 5}, 250); } @@ -416,6 +416,25 @@ } setTimeout(function () { $("#oe_snippets").trigger('snippet-dropped', $target); + + // reset snippet for rte + $target.removeData("snippet-editor"); + if ($target.data("overlay")) { + $target.data("overlay").remove(); + $target.removeData("overlay"); + } + self.create_overlay($target); + $target.find("[data-snippet-id]").each(function () { + var $snippet = $(this); + $snippet.removeData("snippet-editor"); + if ($snippet.data("overlay")) { + $snippet.data("overlay").remove(); + $snippet.removeData("overlay"); + } + self.create_overlay($snippet); + }); + // end + self.make_active($target); },0); } else { |