diff --git a/src/core/js/tour.js b/src/core/js/tour.js index 76be46d1543720d6d6fb9121ad52370558d3a7e8..723a46cc6580dc39e4c42c55f9034fe3337521fb 100644 --- a/src/core/js/tour.js +++ b/src/core/js/tour.js @@ -345,6 +345,9 @@ var tour = new function() { if (typeof this.config.href === "undefined") { this.config.href = "/"; } + if (typeof this.config.id === "undefined") { + this.config.id = "tour-ps"+this.parent_set.idx+"-p"+this.idx + } } _activate_by_id(id) { @@ -410,6 +413,7 @@ var tour = new function() { this.parent_set._activate() $(this.button).show(); + console.log(this.button.classList) this.button.dispatchEvent(tour.open_page_event) //$(this.button).click(); } @@ -431,7 +435,10 @@ var tour = new function() { this.active = false; $(this.button).hide(); $(this.button).popover("hide"); + console.log("in deactivate page") + console.log("remove f tour open") $(this.button).toggleClass("caosdb-f-tour-open-page", false); + console.log(this.button.classList) } } @@ -695,7 +702,6 @@ var tour = new function() { } else { this.dispatchEvent(tour.open_page_event); } - $(this).toggleClass("caosdb-f-tour-open-page"); // clicks on the tour button should not trigger any other action e.preventDefault(); @@ -703,10 +709,16 @@ var tour = new function() { }); button[0].addEventListener("close.tour.page", function() { + console.log("in close event cb") + console.log(button.classList) + $(button).toggleClass("caosdb-f-tour-open-page"); button.popover("hide"); }); button[0].addEventListener("open.tour.page", function() { + console.log("in open event cb") + console.log(button.classList) + $(button).toggleClass("caosdb-f-tour-open-page"); var p_id = button.popover("show")[0].getAttribute("aria-describedby"); var popover = $("#" + p_id); @@ -717,11 +729,19 @@ var tour = new function() { } }); $("#" + p_id).find("button[data-role=next]").on("click", function(e) { - page.get_next().activate(); + var pn= page.get_next() + pn.activate(); + if (($("#"+pn.config.id)).length==0){ + window.location=pn.config.href + } //page.get_next().button.dispatchEvent(tour.open_page_event); }); $("#" + p_id).find("button[data-role=prev]").on("click", function(e) { - page.get_previous().activate(); + var pp= page.get_previous() + pp.activate(); + if (($("#"+pp.config.id)).length==0){ + window.location=pp.config.href + } //page.get_next().button.dispatchEvent(tour.open_page_event); }); });