From 2c6eb6407fd9173034e1b8ba6229d294cf85e8cc Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 13 Dec 2013 11:21:06 +0100
Subject: [PATCH] [IMP] Robustify automated tour execution

bzr revid: ddm@openerp.com-20131213102106-slphhqxhkwisgd0z
---
 addons/website/static/src/js/website.tour.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 942c3d79f58..c2f3b09911a 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -122,9 +122,11 @@
                 this.stop();
             } else if (index >= 0) {
                 var self = this;
+                $('.popover.tour').remove();
                 setTimeout(function () {
-                    $('.popover.tour').remove();
-                    self.tour.goto(index);
+                    setTimeout(function () {
+                        self.tour.goto(index);
+                    }, 0);
                 }, 0);
             }
         },
@@ -237,6 +239,9 @@
         snippetThumbnail: function (snippetId) {
             return $(this.snippetSelector(snippetId)).first();
         },
+        snippetThumbnailExists: function (snippetId) {
+            return this.snippetThumbnail(snippetId).length > 0;
+        },
         dragAndDropSnippet: function (snippetId) {
             function actualDragAndDrop ($thumbnail) {
                 var thumbnailPosition = $thumbnail.position();
@@ -246,12 +251,12 @@
                 var dropPosition = $dropZone.position();
                 $dropZone.trigger($.Event("mouseup", { which: 1, pageX: dropPosition.left, pageY: dropPosition.top }));
             }
-            if (this.snippetThumbnail(snippetId).length === 0) {
+            if (this.snippetThumbnailExists(snippetId)) {
+                actualDragAndDrop(this.snippetThumbnail(snippetId));
+            } else {
                 this.editor.on('rte:ready', this, function () {
                     actualDragAndDrop(this.snippetThumbnail(snippetId));
                 });
-            } else {
-                actualDragAndDrop(this.snippetThumbnail(snippetId));
             }
         },
     });