summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@openerp.com>2014-02-28 10:55:31 +0100
committerChristophe Matthieu <chm@openerp.com>2014-02-28 10:55:31 +0100
commitc11f4f9352aea4ed9febae82fab8f2e91ad9f8cd (patch)
tree19f8095e12c1721ac18c1bee1f3c7aee798ba62d /addons/website/static/src
parent80f5dd13227b82335caaa7d3bf2976cabb5fc206 (diff)
[FIX] website: snippet: continue slide cycling when the user edit the content
bzr revid: chm@openerp.com-20140228095531-8c735qyacmffryno
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/js/website.snippets.animation.js4
-rw-r--r--addons/website/static/src/js/website.snippets.editor.js12
2 files changed, 13 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 bc2ea064731..f1d19125a0c 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -64,6 +64,10 @@
start: function () {
this.$target.carousel({interval: 10000});
},
+ stop: function () {
+ this.$target.carousel('pause');
+ this.$target.removeData("bs.carousel");
+ },
});
website.snippet.animationRegistry.parallax = website.snippet.Animation.extend({
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index a01d7605851..8414196b696 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -19,12 +19,11 @@
edit: function () {
var self = this;
$("body").off('click');
+ website.snippet.stop_animation();
window.snippets = this.snippets = new website.snippet.BuildingBlock(this);
this.snippets.appendTo(this.$el);
-
this.on('rte:ready', this, function () {
self.snippets.$button.removeClass("hidden");
- website.snippet.stop_animation();
website.snippet.start_animation();
});
@@ -1305,6 +1304,14 @@
this.$target.find(".item:first").addClass("active");
}
},
+ onFocus : function () {
+ this._super();
+ this.$target.carousel('pause');
+ },
+ onBlur : function () {
+ this._super();
+ this.$target.carousel('cycle');
+ },
start : function () {
var self = this;
this._super();
@@ -1315,7 +1322,6 @@
this.$editor.find(".js_add").on('click', function () {self.on_add_slide(); return false;});
this.$editor.find(".js_remove").on('click', function () {self.on_remove_slide(); return false;});
- this.$target.carousel('pause');
this.rebind_event();
},
on_add_slide: function () {