diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2014-02-07 16:50:55 +0100 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2014-02-07 16:50:55 +0100 |
| commit | 4232de7bf2f19fd01fc9dcccf421eaeba819e586 (patch) | |
| tree | 5ee2ab75842426634cd0bbc24ed201ae8f08729d /addons/website/static/src/js/website.snippets.editor.js | |
| parent | 34bc74ea422230fd052382e16c0c5e3fcdd26d27 (diff) | |
| parent | c254b7ae2cee1a240380880d76f10aeb715a5b37 (diff) | |
[MERGE] from saas-3
bzr revid: fva@openerp.com-20140207155055-3z8o3fvx2zkoqe91
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 { |