From e06a7036f108f473dde1a795c64a2273c5e2b0fe Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (Open ERP)" Date: Mon, 7 Apr 2014 14:13:58 +0530 Subject: [PATCH 1/3] [IMP]Implement effect on close tour like smartsheet. bzr revid: kch@tinyerp.com-20140407084358-xnfsn6vsnnqy3lzf --- addons/website/static/src/js/website.tour.js | 30 ++++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index b7e55fe166b..32b7582a988 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -297,13 +297,31 @@ website.Tour = openerp.Class.extend({ $(".popover.tour button") .off() .on("click", function () { - $(".popover.tour").remove(); + var help = $("#help-menu-button"); + var offset = help.offset(); + var left = (offset.left > 0) ? (offset.left + link.width()) : offset.left; + var top = (link.height() > 0) ? (offset.top + link.height()) : offset.top; + + if ($(this).is("[data-role='next']") && step.element) { + $(".popover.tour").remove(); + } if (step.busy) return; - if (!$(this).is("[data-role='next']")) { - clearTimeout(self.timer); - step.busy = true; - self.tour.end(); - self.endTour(callback); + if (!$(this).is("[data-role='next']") || !step.element) { + $('.popover.tour') + .animate({ + left: left, + top: top, + width: '1px', + height: '1px', + opacity: 0 + }, 1000, + function(){ + $(".popover.tour").remove(); + clearTimeout(self.timer); + step.busy = true; + self.tour.end(); + self.endTour(callback); + }); } }); From ae8f388dedc3ba1458b58c65a833e2220558e0de Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (Open ERP)" Date: Thu, 10 Apr 2014 14:59:01 +0530 Subject: [PATCH 2/3] [FIX]forgot to change variable name. bzr revid: kch@tinyerp.com-20140410092901-3422iz7nam26xr9c --- addons/website/static/src/js/website.tour.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index 32b7582a988..665853212af 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -299,8 +299,8 @@ website.Tour = openerp.Class.extend({ .on("click", function () { var help = $("#help-menu-button"); var offset = help.offset(); - var left = (offset.left > 0) ? (offset.left + link.width()) : offset.left; - var top = (link.height() > 0) ? (offset.top + link.height()) : offset.top; + var left = (offset.left > 0) ? (offset.left + help.width()) : offset.left; + var top = (help.height() > 0) ? (offset.top + help.height()) : offset.top; if ($(this).is("[data-role='next']") && step.element) { $(".popover.tour").remove(); From 67b413dba5a5aa7d52f58df975346284fed7bcd4 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (Open ERP)" Date: Fri, 11 Apr 2014 11:38:33 +0530 Subject: [PATCH 3/3] [IMP]improved code for increasing speed pf closing help as per usability review. bzr revid: kch@tinyerp.com-20140411060833-mjf3j2549ya2pre9 --- addons/website/static/src/js/website.tour.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index 665853212af..4a2767d958a 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -314,7 +314,7 @@ website.Tour = openerp.Class.extend({ width: '1px', height: '1px', opacity: 0 - }, 1000, + }, 800, function(){ $(".popover.tour").remove(); clearTimeout(self.timer);