diff --git a/app/assets/javascripts/abraham/index.js b/app/assets/javascripts/abraham/index.js index 0a539eb..e028878 100644 --- a/app/assets/javascripts/abraham/index.js +++ b/app/assets/javascripts/abraham/index.js @@ -11,9 +11,10 @@ Abraham.startTour = function(tourName) { } }; Abraham.startNextIncompleteTour = function() { - if (Abraham.incompleteTours.length) { - Abraham.tours[Abraham.incompleteTours[0]].checkAndStart(); - } + for (const i in Abraham.incompleteTours) { + var tour_did_run = Abraham.tours[Abraham.incompleteTours[i]].checkAndStart(); + if(tour_did_run){ break; }; + }; }; document.addEventListener("DOMContentLoaded", Abraham.startNextIncompleteTour); diff --git a/app/views/application/_abraham.html.erb b/app/views/application/_abraham.html.erb index 05dac9f..058f3ec 100644 --- a/app/views/application/_abraham.html.erb +++ b/app/views/application/_abraham.html.erb @@ -69,6 +69,9 @@ if (tourMayStart) { start(); + return true; + } else { + return false; } } }(Abraham.tours["<%= tour_name %>"].start)