diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index 3bc9b281774..3e1763c0e20 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -291,7 +291,7 @@ var self = this; var testId = 'test_'+tour.id+'_tour'; this.tours.push(tour); - var stepDelay = 500; //ms + var defaultDelay = 500; //ms var test = { id: tour.id, run: function (force) { @@ -306,29 +306,26 @@ function next () { var nextStep = actionSteps.shift(); if (nextStep) { - // Ensure the previous step has been fully propagated - setTimeout(function () { - setTimeout(function () { - executeStep(nextStep); - }, stepDelay); - }, 0); + executeStep(nextStep); } else { window.localStorage.removeItem(testId); } } - if (step.triggers) step.triggers(next); - var $element = $(step.element); - if (step.snippet && step.trigger === 'drag') { - website.TestConsole.dragAndDropSnippet(step.snippet); - } else if (step.trigger && step.trigger.id === 'change') { - $element.trigger($.Event("change", { srcElement: $element })); - } else if (step.sampleText) { - $element.val(step.sampleText); - $element.trigger($.Event("change", { srcElement: $element })); - } else if ($element.is(":visible")) { // Click by default - $element.trigger($.Event("click", { srcElement: $element })); - } - if (!step.triggers) next(); + setTimeout(function () { + if (step.triggers) step.triggers(next); + var $element = $(step.element); + if (step.snippet && step.trigger === 'drag') { + website.TestConsole.dragAndDropSnippet(step.snippet); + } else if (step.trigger && step.trigger.id === 'change') { + $element.trigger($.Event("change", { srcElement: $element })); + } else if (step.sampleText) { + $element.val(step.sampleText); + $element.trigger($.Event("change", { srcElement: $element })); + } else if ($element.is(":visible")) { // Click by default + $element.trigger($.Event("click", { srcElement: $element })); + } + if (!step.triggers) next(); + }, step.delay || defaultDelay); } var url = new website.UrlParser(window.location.href); if (tour.path && url.pathname !== tour.path) { @@ -347,11 +344,7 @@ executeStep(currentStep); }); } else { - setTimeout(function () { - setTimeout(function () { - executeStep(currentStep); - }, stepDelay); - }, 0); + executeStep(currentStep); } } }, diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js index 663735c7f72..dbaf31f315e 100644 --- a/addons/website_blog/static/src/js/website.tour.blog.js +++ b/addons/website_blog/static/src/js/website.tour.blog.js @@ -148,6 +148,7 @@ title: "Publish Your Post", content: "Your blog post is not yet published. You can update this draft version and publish it once you are ready.", trigger: 'click', + delay: 5000, }, { stepId: 'end-tutorial', diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js index 2dbf930edc9..4f544c85f0e 100644 --- a/addons/website_event/static/src/js/website.tour.event.js +++ b/addons/website_event/static/src/js/website.tour.event.js @@ -146,6 +146,7 @@ title: "Publish your event", content: "Click to publish your event.", trigger: 'click', + delay: 5000, }, { stepId: 'customize-event',