[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.

bzr revid: bth@tinyerp.com-20131111094934-qh95bt41fptwepm0

1 files changed, 5 insertions, 6 deletions

diff --git a/addons/website/static/src/js/website.tour.basic.js b/addons/website/static/src/js/website.tour.basic.js
index 876d2a7b5b9..649317b8cfc 100644
--- a/addons/website/static/src/js/website.tour.basic.js
+++ b/addons/website/static/src/js/website.tour.basic.js
@@ -24,10 +24,14 @@
                     stepId: 'edit-page',
                     element: 'button[data-action=edit]',
                     placement: 'bottom',
-                    reflex: true,
                     title: "Edit this page",
                     content: "Every page of your website can be modified through the <i>Edit</i> button.",
                     template: render('website.tour_popover'),
+                    onShow: function () {
+                        editor.on('rte:snippets_ready', editor, function() {
+                            self.movetoStep('add-block');
+                        });
+                    },
                 },
                 {
                     stepId: 'add-block',
@@ -37,11 +41,6 @@
                     content: "To add content in a page, you can insert building blocks.",
                     template: render('website.tour_popover'),
                     onShow: function () {
-                        function refreshAddBlockStep () {
-                            self.tour.showStep(self.indexOfStep('add-block'));
-                            editor.off('rte:ready', editor, refreshAddBlockStep);
-                        }
-                        editor.on('rte:ready', editor, refreshAddBlockStep);
                         $('button[data-action=snippet]').click(function () {
                             self.movetoStep('drag-banner');
                         });