Clientside routing for tour kickoff, swapping from ?tour_id=foo appro…

…ach.

client/galaxy/scripts/apps/analysis.js

@@ -100,11 +100,16 @@ window.app = function app( options, bootstrapped ){
             '(/)' : 'home',
             // TODO: remove annoying 'root' from root urls
             '(/)root*' : 'home',
-            '(/)tours' : 'show_tours',
+            '(/)tours(/:tour_id)' : 'show_tours',
         },
 
-        show_tours : function( params ){
-            centerPanel.display( new Tours.ToursView() );
+        show_tours : function( tour_id ){
+            if (tour_id){
+                Tours.giveTour(tour_id);
+            }
+            else{
+                centerPanel.display( new Tours.ToursView() );
+            }
         },
 
         /**  */

client/galaxy/scripts/mvc/tours.js

@@ -101,7 +101,7 @@ define(['libs/bootstrap-tour'],function(BootstrapTour) {
                 "<ul>",
                 '<% _.each(tours, function(tour) { %>',
                     '<li>',
-                        '<a href="#" class="tourItem" data-tour.id=<%- tour.id %>>',
+                        '<a href="#/tours/<%- tour.id %>" class="tourItem" data-tour.id=<%- tour.id %>>',
                             '<%- tour.attributes.name || tour.id %>',
                         '</a>',
                         ' - <%- tour.attributes.description || "No description given." %>',

client/galaxy/scripts/onload.js

@@ -166,39 +166,15 @@ $(document).ready( function() {
         return anchor;
     });
 
-    try{
-        // So, depending on what elements your tour is hooked to, this may not
-        // work on some pages with some rendered content because of view
-        // rendering delays.
-        // Another option is to present an icon for 'continue-tour' somewhere?
-        var urlparms = QUERY_STRING.parse(location.search.slice(1));
-        if (urlparms.tour_id){
-            var tour_id = urlparms.tour_id;
-            delete urlparms.tour_id;
-            var url = $(location).attr('href');
-            var repacked_url_args = _.map(Object.getOwnPropertyNames(urlparms), function(k) { return "?" + [k, urlparms[k]].join('='); }).join('&');
-            url = window.location.href.split('?')[0];
-            if (repacked_url_args !== "?"){
-                url = url + repacked_url_args;
-            }
-            history.pushState(null, null, url);
-            TOURS.giveTour(tour_id);
+    var et = JSON.parse(sessionStorage.getItem('activeGalaxyTour'));
+    if (et){
+        et = TOURS.hooked_tour_from_data(et);
+        if (et && et.steps){
+            var tour = new Tour(_.extend({
+                steps: et.steps,
+            }, TOURS.tour_opts));
+            tour.init();
+            tour.restart();
         }
-        else{
-            var et = JSON.parse(sessionStorage.getItem('activeGalaxyTour'));
-            if (et){
-                et = TOURS.hooked_tour_from_data(et);
-                if (et && et.steps){
-                    var tour = new Tour(_.extend({
-                        steps: et.steps,
-                    }, TOURS.tour_opts));
-                    tour.init();
-                    tour.restart();
-                }
-            }
-        }
-    }
-    catch(ex){
-        console.log("Tour loading failure, you'll need to restart the tour manually." + ex);
     }
 });