summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@openerp.com>2014-01-21 16:23:07 +0100
committerChristophe Matthieu <chm@openerp.com>2014-01-21 16:23:07 +0100
commitb38d4d8a8116f25cb4a5b39505f692a2bb0e349f (patch)
tree0e1bdde2e755f9a2b75f915643a5429e48416a27 /addons/website/static/src
parentc35ac33cf1c1ed5b119b4de6c03b9d3c41b54278 (diff)
[FIX] website_blog: tour
bzr revid: chm@openerp.com-20140121152307-kx92ee0za0w0pprr
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/js/website.tour.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index eef3d1b8ae7..7e8d2aea7a0 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -156,8 +156,8 @@
this.stop();
} else if (index >= 0) {
var self = this;
- $('.popover.tour').remove();
setTimeout(function () {
+ $('.popover.tour').remove();
setTimeout(function () {
self.tour.goto(index);
}, 0);
@@ -346,7 +346,7 @@
window.localStorage.setItem("last-"+testId, tryStep);
if (tryStep > 2) {
window.localStorage.removeItem(testId);
- throw "Test: '" + testId + "' cycling stape: '" + step.stepId + "'";
+ throw "Test: '" + testId + "' cycling step: '" + step.stepId + "'";
}
var _next = false;
@@ -365,12 +365,12 @@
}
overlapsCrash = setTimeout(function () {
window.localStorage.removeItem(testId);
- throw "Test: '" + testId + "' can't resolve stape: '" + step.stepId + "'";
+ throw "Test: '" + testId + "' can't resolve step: '" + step.stepId + "'";
}, (step.delay || defaultDelay) + 500);
var $element = $(step.element);
if (step.triggers) step.triggers(next);
- if ((step.trigger === 'reload' || step.trigger.url) && _next) return;
+ if ((step.trigger === 'reload' || (step.trigger && step.trigger.url)) && _next) return;
if (step.snippet && step.trigger === 'drag') {
website.TestConsole.dragAndDropSnippet(step.snippet);