diff options
| author | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-01-28 15:34:45 +0100 |
|---|---|---|
| committer | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-01-28 15:34:45 +0100 |
| commit | 8c00a0125c24fe5c0fc264a1b244afa6bd76d9f0 (patch) | |
| tree | 7a629e8a8b78c0f850843eb2c1a8a4b23addf2f5 /addons/website/static/src | |
| parent | c43fff56276b6a6c635b4c1c79cb585062a4bc3b (diff) | |
| parent | 4a965b96e5b87673a0c42a6ce8f00ddd1379c370 (diff) | |
[MERGE] Sync with trunk-website-al
bzr revid: rim@openerp.com-20140128143445-tse97tsr0yvubv0y
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 2 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.snippets.animation.js | 31 |
2 files changed, 21 insertions, 12 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 3f253e9b34c..55ab6e8fcad 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1072,7 +1072,7 @@ } else { // Create the page, get the URL back done = $.get(_.str.sprintf( - '/pagenew/%s?noredirect', encodeURI(data.id))) + '/pagenew/%s?noredirect=1', encodeURI(data.id))) .then(function (response) { self.make_link(response, false, data.id); }); diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js index 7d3b84f2254..60c5aea49e2 100644 --- a/addons/website/static/src/js/website.snippets.animation.js +++ b/addons/website/static/src/js/website.snippets.animation.js @@ -3,21 +3,28 @@ var website = openerp.website; website.snippet = {}; + website.snippet.readyAnimation = []; website.snippet.start_animation = function () { - $("[data-snippet-id]").each(function() { - var $snipped_id = $(this); - if ( !$snipped_id.parents("#oe_snippets").length && - !$snipped_id.parent("body").length && - !$snipped_id.data("snippet-view") && - website.snippet.animationRegistry[$snipped_id.data("snippet-id")]) { - var snippet = new website.snippet.animationRegistry[$snipped_id.data("snippet-id")]($snipped_id); - $snipped_id.data("snippet-view", snippet); + for (var k in website.snippet.animationRegistry) { + var Animation = website.snippet.animationRegistry[k]; + var selector = "[data-snippet-id='"+k+"']"; + if (Animation.prototype.selector) { + selector += ", " + Animation.prototype.selector; } - }); + $(selector).each(function() { + var $snipped_id = $(this); + if ( !$snipped_id.parents("#oe_snippets").length && + !$snipped_id.parent("body").length && + !$snipped_id.data("snippet-view")) { + website.snippet.readyAnimation.push($snipped_id); + $snipped_id.data("snippet-view", new Animation($snipped_id)); + } + }); + } }; website.snippet.stop_animation = function () { - $("[data-snippet-id]").each(function() { + $(website.snippet.readyAnimation).each(function() { var $snipped_id = $(this); if ($snipped_id.data("snippet-view")) { $snipped_id.data("snippet-view").stop(); @@ -30,6 +37,7 @@ website.snippet.animationRegistry = {}; website.snippet.Animation = openerp.Class.extend({ + selector: false, $: function () { return this.$el.find.apply(this.$el, arguments); }, @@ -51,14 +59,15 @@ }, }); - website.snippet.animationRegistry.carousel = website.snippet.animationRegistry.slider = website.snippet.Animation.extend({ + selector: ".carousel", start: function () { this.$target.carousel({interval: 10000}); }, }); website.snippet.animationRegistry.parallax = website.snippet.Animation.extend({ + parallax: ".parallax", start: function () { var self = this; setTimeout(function () {self.set_values();}); |
