When title isn't set, revert to the default -- otherwise display()'d contents without titles show up with the previous and incorrect titles.

client/galaxy/scripts/layout/page.js

@@ -21,6 +21,7 @@ define( [ 'layout/masthead', 'layout/panel', 'mvc/ui/ui-modal', 'utils/localizat
                     window.document.title = "Galaxy " + (window.Galaxy.config.brand ? " / " + window.Galaxy.config.brand : '') + " | " + _l(view.title);
                     view.allow_title_display = false;
                 } else {
+                    window.document.title = "Galaxy " + (window.Galaxy.config.brand ? " / " + window.Galaxy.config.brand : '');
                     view.allow_title_display = true;
                 }
                 self.center.display( view );

static/maps/layout/page.js.map

@@ -1 +1 @@
-{"version":3,"file":"page.js","sources":["../../src/layout/page.js"],"names":["define","Masthead","Panel","Modal","_l","View","Backbone","extend","el","className","_panelids","initialize","options","self","this","config","_","defaults","message_box_visible","message_box_content","message_box_class","show_inactivity_warning","inactivity_box_content","Galaxy","modal","display","view","title","window","document","brand","allow_title_display","center","router","Router","masthead","CenterPanel","$el","attr","html","_template","$","replaceWith","append","frame","$messagebox","$inactivebox","panels","each","panel_id","panel_class_name","charAt","toUpperCase","slice","panel_class","panel_instance","toString","SidePanel","id","render","history","start","root","pushState","remove","renderMessageBox","renderInactivityBox","renderPanels","_checkCommunicationServerOnline","content","level","addClass","toggle","show","removeClass","hide","verificationLink","text","panel","css","join","host","communication_server_host","port","communication_server_port","preferences","user","attributes","$chat_icon_element","indexOf","communication_server","ajax","url","success","error"],"mappings":"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"}
+{"version":3,"file":"page.js","sources":["../../src/layout/page.js"],"names":["define","Masthead","Panel","Modal","_l","View","Backbone","extend","el","className","_panelids","initialize","options","self","this","config","_","defaults","message_box_visible","message_box_content","message_box_class","show_inactivity_warning","inactivity_box_content","Galaxy","modal","display","view","title","window","document","brand","allow_title_display","center","router","Router","masthead","CenterPanel","$el","attr","html","_template","$","replaceWith","append","frame","$messagebox","$inactivebox","panels","each","panel_id","panel_class_name","charAt","toUpperCase","slice","panel_class","panel_instance","toString","SidePanel","id","render","history","start","root","pushState","remove","renderMessageBox","renderInactivityBox","renderPanels","_checkCommunicationServerOnline","content","level","addClass","toggle","show","removeClass","hide","verificationLink","text","panel","css","join","host","communication_server_host","port","communication_server_port","preferences","user","attributes","$chat_icon_element","indexOf","communication_server","ajax","url","success","error"],"mappings":"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"}

static/scripts/layout/page.js

@@ -1,2 +1,2 @@
-define(["layout/masthead","layout/panel","mvc/ui/ui-modal","utils/localization"],function(a,b,c,d){var e=Backbone.View.extend({el:"body",className:"full-content",_panelids:["left","right"],initialize:function(e){var f=this;this.config=_.defaults(e.config||{},{message_box_visible:!1,message_box_content:"",message_box_class:"info",show_inactivity_warning:!1,inactivity_box_content:""}),Galaxy.modal=this.modal=new c.View,Galaxy.display=this.display=function(a){a.title?(window.document.title="Galaxy "+(window.Galaxy.config.brand?" / "+window.Galaxy.config.brand:"")+" | "+d(a.title),a.allow_title_display=!1):a.allow_title_display=!0,f.center.display(a)},Galaxy.router=this.router=e.Router&&new e.Router(f,e),this.masthead=new a.View(this.config),this.center=new b.CenterPanel,this.$el.attr("scroll","no"),this.$el.html(this._template()),this.$("#masthead").replaceWith(this.masthead.$el),this.$("#center").append(this.center.$el),this.$el.append(this.masthead.frame.$el),this.$el.append(this.modal.$el),this.$messagebox=this.$("#messagebox"),this.$inactivebox=this.$("#inactivebox"),this.panels={},_.each(this._panelids,function(a){var c=a.charAt(0).toUpperCase()+a.slice(1),d=e[c];if(d){var g=new d(f,e);f[g.toString()]=g,f.panels[a]=new b.SidePanel({id:a,el:f.$("#"+a),view:g})}}),this.render(),this.router&&Backbone.history.start({root:Galaxy.root,pushState:!0})},render:function(){return $(".select2-hidden-accessible").remove(),this.masthead.render(),this.renderMessageBox(),this.renderInactivityBox(),this.renderPanels(),this._checkCommunicationServerOnline(),this},renderMessageBox:function(){if(this.config.message_box_visible){var a=this.config.message_box_content||"",b=this.config.message_box_class||"info";this.$el.addClass("has-message-box"),this.$messagebox.attr("class","panel-"+b+"-message").html(a).toggle(!!a).show()}else this.$el.removeClass("has-message-box"),this.$messagebox.hide();return this},renderInactivityBox:function(){if(this.config.show_inactivity_warning){var a=this.config.inactivity_box_content||"",b=$("<a/>").attr("href",Galaxy.root+"user/resend_verification").text("Resend verification");this.$el.addClass("has-inactivity-box"),this.$inactivebox.html(a+" ").append(b).toggle(!!a).show()}else this.$el.removeClass("has-inactivity-box"),this.$inactivebox.hide();return this},renderPanels:function(){var a=this;return _.each(this._panelids,function(b){var c=a.panels[b];c?c.render():(a.$("#center").css(b,0),a.$("#"+b).hide())}),this},_template:function(){return['<div id="everything">','<div id="background"/>','<div id="masthead"/>','<div id="messagebox"/>','<div id="inactivebox" class="panel-warning-message" />','<div id="left" />','<div id="center" class="inbound" />','<div id="right" />',"</div>",'<div id="dd-helper" />'].join("")},toString:function(){return"PageLayoutView"},_checkCommunicationServerOnline:function(){var a=window.Galaxy.config.communication_server_host,b=window.Galaxy.config.communication_server_port,c=window.Galaxy.user.attributes.preferences,d=$("#show-chat-online");c&&-1!=["1","true"].indexOf(c.communication_server)?$.ajax({url:a+":"+b}).success(function(){null!==window.Galaxy.user.id&&"hidden"===d.css("visibility")&&d.css("visibility","visible")}).error(function(){d.css("visibility","hidden")}):d.css("visibility","hidden")}});return{View:e}});
+define(["layout/masthead","layout/panel","mvc/ui/ui-modal","utils/localization"],function(a,b,c,d){var e=Backbone.View.extend({el:"body",className:"full-content",_panelids:["left","right"],initialize:function(e){var f=this;this.config=_.defaults(e.config||{},{message_box_visible:!1,message_box_content:"",message_box_class:"info",show_inactivity_warning:!1,inactivity_box_content:""}),Galaxy.modal=this.modal=new c.View,Galaxy.display=this.display=function(a){a.title?(window.document.title="Galaxy "+(window.Galaxy.config.brand?" / "+window.Galaxy.config.brand:"")+" | "+d(a.title),a.allow_title_display=!1):(window.document.title="Galaxy "+(window.Galaxy.config.brand?" / "+window.Galaxy.config.brand:""),a.allow_title_display=!0),f.center.display(a)},Galaxy.router=this.router=e.Router&&new e.Router(f,e),this.masthead=new a.View(this.config),this.center=new b.CenterPanel,this.$el.attr("scroll","no"),this.$el.html(this._template()),this.$("#masthead").replaceWith(this.masthead.$el),this.$("#center").append(this.center.$el),this.$el.append(this.masthead.frame.$el),this.$el.append(this.modal.$el),this.$messagebox=this.$("#messagebox"),this.$inactivebox=this.$("#inactivebox"),this.panels={},_.each(this._panelids,function(a){var c=a.charAt(0).toUpperCase()+a.slice(1),d=e[c];if(d){var g=new d(f,e);f[g.toString()]=g,f.panels[a]=new b.SidePanel({id:a,el:f.$("#"+a),view:g})}}),this.render(),this.router&&Backbone.history.start({root:Galaxy.root,pushState:!0})},render:function(){return $(".select2-hidden-accessible").remove(),this.masthead.render(),this.renderMessageBox(),this.renderInactivityBox(),this.renderPanels(),this._checkCommunicationServerOnline(),this},renderMessageBox:function(){if(this.config.message_box_visible){var a=this.config.message_box_content||"",b=this.config.message_box_class||"info";this.$el.addClass("has-message-box"),this.$messagebox.attr("class","panel-"+b+"-message").html(a).toggle(!!a).show()}else this.$el.removeClass("has-message-box"),this.$messagebox.hide();return this},renderInactivityBox:function(){if(this.config.show_inactivity_warning){var a=this.config.inactivity_box_content||"",b=$("<a/>").attr("href",Galaxy.root+"user/resend_verification").text("Resend verification");this.$el.addClass("has-inactivity-box"),this.$inactivebox.html(a+" ").append(b).toggle(!!a).show()}else this.$el.removeClass("has-inactivity-box"),this.$inactivebox.hide();return this},renderPanels:function(){var a=this;return _.each(this._panelids,function(b){var c=a.panels[b];c?c.render():(a.$("#center").css(b,0),a.$("#"+b).hide())}),this},_template:function(){return['<div id="everything">','<div id="background"/>','<div id="masthead"/>','<div id="messagebox"/>','<div id="inactivebox" class="panel-warning-message" />','<div id="left" />','<div id="center" class="inbound" />','<div id="right" />',"</div>",'<div id="dd-helper" />'].join("")},toString:function(){return"PageLayoutView"},_checkCommunicationServerOnline:function(){var a=window.Galaxy.config.communication_server_host,b=window.Galaxy.config.communication_server_port,c=window.Galaxy.user.attributes.preferences,d=$("#show-chat-online");c&&-1!=["1","true"].indexOf(c.communication_server)?$.ajax({url:a+":"+b}).success(function(){null!==window.Galaxy.user.id&&"hidden"===d.css("visibility")&&d.css("visibility","visible")}).error(function(){d.css("visibility","hidden")}):d.css("visibility","hidden")}});return{View:e}});
 //# sourceMappingURL=../../maps/layout/page.js.map