From 9be1dbfe9ec4cde33c748daed67687102c869687 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 6 Dec 2013 15:09:40 +0100
Subject: [PATCH] [FIX] Regression in shop tour

bzr revid: ddm@openerp.com-20131206140940-v0rerf362fuj2tqz
---
 addons/website/static/src/js/website.tour.js          |  4 ++--
 .../website_sale/static/src/js/website.tour.shop.js   | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index d028f15afdd..90f2f8a3d21 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -31,7 +31,7 @@
                     if (step.trigger === 'click') {
                         step.triggers = function (callback) {
                             $(step.element).one('click', function () {
-                                (callback || self.moveToNextStep).call(self);
+                                (callback || self.moveToNextStep).apply(self);
                             });
                         };
                     } else if (step.trigger === 'drag') {
@@ -68,7 +68,7 @@
                                     $doc.off('hide.bs.modal', onStop);
                                     self.moveToStep(step.trigger.modal.afterSubmit);
                                 });
-                                (callback || self.moveToNextStep).call(self);
+                                (callback || self.moveToNextStep).apply(self);
                             });
                         };
                     }
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index 93eb3732cc5..c323e5185e4 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -37,9 +37,11 @@
                     placement: 'left',
                     title: "Create a new product",
                     content: "Select 'New Product' to create it and manage its properties to boost your sales.",
-                    modal: {
-                        stopOnClose: true,
-                        afterSubmit: 'product-page',
+                    trigger: {
+                        modal: {
+                            stopOnClose: true,
+                            afterSubmit: 'product-page',
+                        },
                     },
                 },
                 {
@@ -48,7 +50,6 @@
                     placement: 'right',
                     title: "Choose name",
                     content: "Enter a name for your new product then click 'Continue'.",
-
                 },
                 {
                     stepId: 'product-page',
@@ -73,7 +74,7 @@
                     content: "Click here to set an image describing your product.",
                     triggers: function () {
                         function registerClick () {
-                            $('button.image-edit-button').one('click', function () {
+                            $('button.hover-edition-button').one('click', function () {
                                 $('#wrap img.img:first').off('hover', registerClick);
                                 self.moveToNextStep();
                             });