From 5c5a3c4887033e08f5b3e6e0a611d5f38d48a443 Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Tue, 8 Apr 2014 17:49:26 +0200 Subject: [FIX] website: snippet parallax bzr revid: chm@openerp.com-20140408154926-dq4k4bvmfaq2r6rl --- addons/website/static/src/js/website.snippets.editor.js | 3 +++ 1 file changed, 3 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 d9ef69d8218..befe7faeb53 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -1472,6 +1472,9 @@ this.$target.find(".parallax") .css("background-position", '') .removeAttr("data-scroll-background-offset"); + }, + _drag_and_drop: function(){ + this.$target.data("snippet-view", new website.snippet.animationRegistry.parallax(this.$target)); } }); -- cgit v1.2.3 From 3993d1ce2f0caf846a80666e4d1440f5ba8f2ac3 Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Wed, 9 Apr 2014 09:28:13 +0200 Subject: [FIX] website: snippet parallax. Error when the user activate a snippet parallax already inserted bzr revid: chm@openerp.com-20140409072813-43fqwcr7j6i0zl0e --- addons/website/static/src/js/website.snippets.editor.js | 6 +++--- 1 file changed, 3 insertions(+), 3 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 befe7faeb53..ad96b4c6c49 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -1441,6 +1441,9 @@ start : function () { var self = this; this._super(); + if (!self.$target.data("snippet-view")) { + this.$target.data("snippet-view", new website.snippet.animationRegistry.parallax(this.$target)); + } this.scroll(); this.$target.on('snippet-style-change snippet-style-preview', function () { self.$target.data("snippet-view").set_values(); @@ -1472,9 +1475,6 @@ this.$target.find(".parallax") .css("background-position", '') .removeAttr("data-scroll-background-offset"); - }, - _drag_and_drop: function(){ - this.$target.data("snippet-view", new website.snippet.animationRegistry.parallax(this.$target)); } }); -- cgit v1.2.3 From 7c75b5e004ef2e1c836ad2cc788a701a687a6440 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 10 Apr 2014 19:43:14 +0200 Subject: [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.editor.js | 5 +++-- 1 file changed, 3 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 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); -- cgit v1.2.3