Merge pull request #3214 from dannon/tour_routing

Tour routing tweaks, allows us to drop the model out of menu

client/galaxy/scripts/apps/analysis.js

@@ -78,7 +78,7 @@ window.app = function app( options, bootstrapped ){
 
     // .................................................... routes
     /**  */
-    var router = new ( Backbone.Router.extend({
+    Galaxy.router = new ( Backbone.Router.extend({
         // TODO: not many client routes at this point - fill and remove from server.
         // since we're at root here, this may be the last to be routed entirely on the client.
         initialize : function( options ){

client/galaxy/scripts/layout/menu.js

@@ -1,5 +1,5 @@
 /** Masthead Collection **/
-define(['mvc/tours', 'layout/generic-nav-view', 'mvc/webhooks'], function( Tours, GenericNav, Webhooks ) {
+define(['layout/generic-nav-view', 'mvc/webhooks'], function( GenericNav, Webhooks ) {
 var Collection = Backbone.Collection.extend({
     model: Backbone.Model.extend({
         defaults: {
@@ -176,8 +176,8 @@ var Collection = Backbone.Collection.extend({
                     title   : 'Interactive Tours',
                     url     : 'tours',
                     onclick : function(){
-                        if (Galaxy.app){
-                            Galaxy.app.display(new Tours.ToursView());
+                        if (Galaxy.router){
+                            Galaxy.router.navigate('tours', {'trigger': true});
                         } else {
                             // Redirect and use clientside routing to go to tour index
                             window.location = Galaxy.root + "tours";

static/scripts/bundled/login.bundled.js

@@ -1,2 +1,2 @@
-webpackJsonp([4],[function(e,r,n){(function(e){var r=n(1),a=r,i=n(58).GalaxyApp,o=n(10),t=n(5),l=n(60);window.app=function(n,c){window.Galaxy=new i(n,c),Galaxy.debug("login app");var d=encodeURI(n.redirect);if(!n.show_welcome_with_login){var w=r.param({use_panels:"True",redirect:d});return void(window.location.href=Galaxy.root+"user/login?"+w)}var p=new l.PageLayoutView(e.extend(n,{el:"body",center:new o.CenterPanel({el:"#center"}),right:new o.RightPanel({title:t("Login required"),el:"#right"})}));a(function(){var e=r.param({redirect:d}),a=Galaxy.root+"user/login?"+e;p.render(),p.center.$("#galaxy_main").prop("src",n.welcome_url),p.right.$(".unified-panel-body").css("overflow","hidden").html('<iframe src="'+a+'" frameborder="0" style="width: 100%; height: 100%;"/>')})}}).call(r,n(2))}]);
+webpackJsonp([4],[function(e,r,n){(function(e){var r=n(1),a=r,i=n(57).GalaxyApp,o=n(10),t=n(5),l=n(59);window.app=function(n,c){window.Galaxy=new i(n,c),Galaxy.debug("login app");var d=encodeURI(n.redirect);if(!n.show_welcome_with_login){var w=r.param({use_panels:"True",redirect:d});return void(window.location.href=Galaxy.root+"user/login?"+w)}var p=new l.PageLayoutView(e.extend(n,{el:"body",center:new o.CenterPanel({el:"#center"}),right:new o.RightPanel({title:t("Login required"),el:"#right"})}));a(function(){var e=r.param({redirect:d}),a=Galaxy.root+"user/login?"+e;p.render(),p.center.$("#galaxy_main").prop("src",n.welcome_url),p.right.$(".unified-panel-body").css("overflow","hidden").html('<iframe src="'+a+'" frameborder="0" style="width: 100%; height: 100%;"/>')})}}).call(r,n(2))}]);
 //# sourceMappingURL=login.bundled.js.map