From 052bcacd5f80e68b3c6fbce31ccc56206eb480bb Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 6 Feb 2014 15:02:58 +0100 Subject: [FIX] website_sale template; snippet editor bzr revid: chm@openerp.com-20140206140258-l3hriceuksx0c061 --- addons/website/static/src/js/website.snippets.editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/website/static/src/js/website.snippets.editor.js') diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index 8a3e7a4421d..a702344a308 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); } -- cgit v1.2.3 From 8879fb17288c0ab902cb4c106dbabe430ab55d6f Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 7 Feb 2014 11:07:34 +0100 Subject: [FIX] website snippet: reset snippet-editor and overlay because the rte re-generate the dom and cancelled all snippet datas bzr revid: chm@openerp.com-20140207100734-pdzr0qz8mtmha96m --- addons/website/static/src/js/website.snippets.editor.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'addons/website/static/src/js/website.snippets.editor.js') diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index 8a3e7a4421d..7965c4b88f0 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -416,6 +416,19 @@ } setTimeout(function () { $("#oe_snippets").trigger('snippet-dropped', $target); + + // reset snippet for rte + $target.removeData("snippet-editor"); + $target.removeData("overlay"); + self.create_overlay($target); + $target.find("[data-snippet-id]").each(function () { + var $snippet = $(this); + $snippet.removeData("snippet-editor"); + $snippet.removeData("overlay"); + self.create_overlay($snippet); + }); + // end + self.make_active($target); },0); } else { -- cgit v1.2.3 From 6d7eccf10ab732b539ed44566d8679189b5d2561 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 7 Feb 2014 16:45:20 +0100 Subject: [FIX] website snippet drop for rte; remove dependence to qweb template (remove popover from tours); fx import file with ajax bzr revid: chm@openerp.com-20140207154520-2injapzg9lgrdbvc --- addons/website/static/src/js/website.snippets.editor.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'addons/website/static/src/js/website.snippets.editor.js') diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index 28dab725792..e45bee9685b 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -419,12 +419,18 @@ // reset snippet for rte $target.removeData("snippet-editor"); - $target.removeData("overlay"); + 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"); - $snippet.removeData("overlay"); + if ($snippet.data("overlay")) { + $snippet.data("overlay").remove(); + $snippet.removeData("overlay"); + } self.create_overlay($snippet); }); // end -- cgit v1.2.3