From ca02d8820a86e7f08bbc25c85f3eaa5642ff7303 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 2 Jul 2014 13:54:57 +0200
Subject: [PATCH] [FIX] website: customize menu stay empty if it's open to
 quick. Don't throw an exception when the tour have an error: log error and
 close tour.

---
 addons/web/static/src/js/tour.js                    | 2 +-
 addons/website/static/src/js/website.contentMenu.js | 4 ++--
 addons/website/static/src/js/website.editor.js      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index e46d1b21a3d..c1738614d34 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -335,7 +335,7 @@ var Tour = {
         Tour.reset();
         if (state.mode === "test") {
             console.log(message);
-            throw new Error(message);
+            Tour.endTour();
         }
     },
     lists: function () {
diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js
index 1180fea192b..aed70698c6c 100644
--- a/addons/website/static/src/js/website.contentMenu.js
+++ b/addons/website/static/src/js/website.contentMenu.js
@@ -225,8 +225,8 @@
         },
     });
 
-    website.ready().done(function() {
-        var content = new website.EditorBarContent()
+    $(document).ready(function() {
+        var content = new website.EditorBarContent();
         content.setElement($('.oe_content_menu'));
         content.start();
     });
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 94c1a7214b4..2ff6fca89e2 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -754,7 +754,7 @@
         },
     });
 
-    website.ready().done(function() {
+    $(document).ready(function() {
         var editorBarCustomize = new website.EditorBarCustomize();
         editorBarCustomize.setElement($('li[id=customize-menu]'));
         editorBarCustomize.start();