minor adjustments to markup; improve logging; repack

galaxyproject · Mar 25, 2016 · ce1b9ae · ce1b9ae
1 parent 87ea37c
commit ce1b9ae
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 21 deletions.
diff --git a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
@@ -245,12 +245,11 @@ var FolderToolbarView = Backbone.View.extend({
    */
   importAllIntoHistory : function (){
     this.modal.disableButton('Import');
-    var new_history_name = $('input[name=history_name]').val();
+    var new_history_name = this.modal.$('input[name=history_name]').val();
     var that = this;
     if (new_history_name !== ''){
       $.post( Galaxy.root + 'api/histories', {name: new_history_name})
         .done(function( new_history ) {
-          console.log(new_history.name);
           that.options.last_used_history_id = new_history.id;
           that.processImportToHistory(new_history.id, new_history.name);
         })
@@ -644,7 +643,7 @@ var FolderToolbarView = Backbone.View.extend({
         this.modal.$el.find( '.modal-body' ).html( template( { history_name : options.history_name } ) );
         break;
       default:
-        console.error( 'Wrong action specified.')
+        Galaxy.emit.error( 'Wrong action specified.', 'datalibs');
         break;
     }
 
@@ -925,8 +924,8 @@ var FolderToolbarView = Backbone.View.extend({
               } else if (item.type === 'file' || item.model_class === 'LibraryDataset'){
                 updated_item = new mod_library_model.Item( item );
               } else {
-                console.error('Unknown library item type found.');
-                console.error(item.type || item.model_class);
+                Galaxy.emit.error('Unknown library item type found.', 'datalibs');
+                Galaxy.emit.error(item.type || item.model_class, 'datalibs');
               }
               Galaxy.libraries.folderListView.collection.add( updated_item );
             }

diff --git a/static/maps/mvc/library/library-dataset-view.js.map b/static/maps/mvc/library/library-dataset-view.js.map
diff --git a/static/maps/mvc/library/library-foldertoolbar-view.js.map b/static/maps/mvc/library/library-foldertoolbar-view.js.map
diff --git a/static/scripts/mvc/library/library-dataset-view.js b/static/scripts/mvc/library/library-dataset-view.js
diff --git a/static/scripts/mvc/library/library-foldertoolbar-view.js b/static/scripts/mvc/library/library-foldertoolbar-view.js
diff --git a/static/style/blue/base.css b/static/style/blue/base.css
diff --git a/static/style/blue/library.css b/static/style/blue/library.css