Merge branch 'release_16.01' into release_16.04

Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map
galaxyproject · Apr 13, 2016 · 87dbfee · 87dbfee
2 parents f03c037 + 1e3b3a1
commit 87dbfee
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/client/galaxy/scripts/layout/page.js b/client/galaxy/scripts/layout/page.js
@@ -28,9 +28,9 @@ var PageLayoutView = Backbone.View.extend( BaseMVC.LoggableMixin ).extend({
         // TODO: remove globals
         this.log( this + '.initialize:', options );
         _.extend( this, _.pick( options, this._panelIds ) );
-        this.options = _.defaults( _.omit( options, this._panelIds ), this.defaultOptions );
+        this.options = _.defaults( _.omit( options.config, this._panelIds ), this.defaultOptions );
         Galaxy.modal = this.modal = new Modal.View();
-        this.masthead = new Masthead.View( this.options.config );
+        this.masthead = new Masthead.View( this.options );
         this.$el.attr( 'scroll', 'no' );
         this.$el.html( this._template() );
         this.$el.append( this.masthead.frame.$el );

diff --git a/static/maps/layout/page.js.map b/static/maps/layout/page.js.map
diff --git a/static/scripts/bundled/analysis.bundled.js b/static/scripts/bundled/analysis.bundled.js
diff --git a/static/scripts/bundled/analysis.bundled.js.map b/static/scripts/bundled/analysis.bundled.js.map
diff --git a/static/scripts/bundled/libs.bundled.js b/static/scripts/bundled/libs.bundled.js
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/layout/page.js b/static/scripts/layout/page.js