From 7c75b5e004ef2e1c836ad2cc788a701a687a6440 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 10 Apr 2014 19:43:14 +0200 Subject: [PATCH] [FIX] website: avoid discarding snippet animator after edit + properly restart animation while disabling clicks bzr revid: odo@openerp.com-20140410174314-vecg7inmfgm7r5fq --- addons/website/static/src/js/website.snippets.animation.js | 1 - addons/website/static/src/js/website.snippets.editor.js | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js index 1b8dfc0b320..c72e2c3b84e 100644 --- a/addons/website/static/src/js/website.snippets.animation.js +++ b/addons/website/static/src/js/website.snippets.animation.js @@ -34,7 +34,6 @@ var $snipped_id = $(this); if ($snipped_id.data("snippet-view")) { $snipped_id.data("snippet-view").stop(); - $snipped_id.data("snippet-view", false); } }); }; diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index eef4a71ba94..d8eee3cbec5 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -151,10 +151,11 @@ $("[data-oe-model] *, [data-oe-type=html] *").off('click'); window.snippets = this.snippets = new website.snippet.BuildingBlock(this); this.snippets.appendTo(this.$el); + website.snippet.stop_animation(); this.on('rte:ready', this, function () { self.snippets.$button.removeClass("hidden"); - website.snippet.stop_animation(); - website.snippet.start_animation(true, $(".media_iframe_video")); + website.snippet.start_animation(); + $("#wrapwrap *").off('mousedown mouseup click'); }); return this._super.apply(this, arguments);