fix options default order to fix bug with improper page being rendered

also add missing comma for previous commit
galaxyproject · Oct 8, 2015 · 775ee33 · 775ee33
1 parent 39f5b7a
commit 775ee33
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/client/galaxy/scripts/mvc/library/library-librarylist-view.js b/client/galaxy/scripts/mvc/library/library-librarylist-view.js
@@ -32,7 +32,7 @@ var LibraryListView = Backbone.View.extend({
      * @param  {object} options an object with options
      */
     initialize : function( options ){
-        this.options = _.defaults( this.options || {}, this.defaults, options );
+        this.options = _.defaults( this.options || {}, options, this.defaults );
         var that = this;
         this.modal = null;
         // map of library model ids to library views = cache

diff --git a/client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js b/client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js
@@ -12,7 +12,7 @@ var LibraryToolbarView = Backbone.View.extend({
 
   defaults: {
     search_term: ''
-  }
+  },
 
   events: {
     'click #create_new_library_btn' : 'showLibraryModal',
@@ -22,7 +22,7 @@ var LibraryToolbarView = Backbone.View.extend({
   },
 
   initialize: function( options ){
-    this.options = _.defaults( this.options || {}, this.defaults, options );
+    this.options = _.defaults( this.options || {}, options, this.defaults );
     this.render();
   },
 

diff --git a/static/maps/mvc/library/library-librarylist-view.js.map b/static/maps/mvc/library/library-librarylist-view.js.map
diff --git a/static/maps/mvc/library/library-librarytoolbar-view.js.map b/static/maps/mvc/library/library-librarytoolbar-view.js.map