',
+ '
',
+
+ '
',
+ '<% if( history.name ){ %>',
+ '
<%= history.name %>
',
+ '<% } %>',
+ '
',
+
+ '
',
+ '<% if( history.nice_size ){ %>',
+ '
<%= history.nice_size %>
',
+ '<% } %>',
+ '
',
+ '
',
+
+ '<% if( history.deleted ){ %>',
+ '
',
+ _l( 'You are currently viewing a deleted history!' ),
+ '
',
+ '<% } %>',
+
+ '
',
+ '<% if( history.message ){ %>',
+ // should already be localized
+ '
<%= history.message %>
',
+ '<% } %>',
+ '
',
+
+ '
',
+ _l( 'You are over your disk quota' ), '. ',
+ _l( 'Tool execution is on hold until your disk usage drops below your allocated quota' ), '.',
+ '
',
+
+ '
',
+ '
',
+ '
',
+ '
',
+ '', _l( 'All' ), ' ',
+ '', _l( 'None' ), ' ',
+ '
',
+ '',
+ '
',
+ '
'
- * @param {Object} initiallyExpanded
- * @param {Boolean} show_deleted whether to show deleted HDAs (overrides stored)
- * @param {Boolean} show_hidden
- * @see PersistentStorage
- */
- _setUpWebStorage : function( initiallyExpanded, show_deleted, show_hidden ){
- //this.log( '_setUpWebStorage', initiallyExpanded, show_deleted, show_hidden );
- this.storage = new HistoryPrefs({
- id: HistoryPrefs.historyStorageKey( this.model.get( 'id' ) )
- });
-
- // expanded Hdas is a map of hda.ids -> a boolean repr'ing whether this hda's body is already expanded
- // store any pre-expanded ids passed in
- if( _.isObject( initiallyExpanded ) ){
- this.storage.set( 'exandedHdas', initiallyExpanded );
- }
-
- // get the show_deleted/hidden settings giving priority to values passed in, using web storage otherwise
- // if the page has specifically requested show_deleted/hidden, these will be either true or false
- // (as opposed to undefined, null) - and we give priority to that setting
- if( _.isBoolean( show_deleted ) ){
- this.storage.set( 'show_deleted', show_deleted );
- }
- if( _.isBoolean( show_hidden ) ){
- this.storage.set( 'show_hidden', show_hidden );
- }
-
- this.trigger( 'new-storage', this.storage, this );
- this.log( this + ' (init\'d) storage:', this.storage.get() );
- return this;
- },
-
- // ------------------------------------------------------------------------ history/hda event listening
- /** listening for history and HDA events */
- _setUpModelEventHandlers : function(){
- // ---- hdas
- // bind events from the model's hda collection
- // note: don't listen to the hdas for errors, history will pass that to us
- //this.model.contents.on( 'reset', this.addAll, this );
- this.model.contents.on( 'add', this.addContentView, this );
-
- // on a model error - bounce it up to the panel and remove it from the model
- this.model.on( 'error error:contents', function( model, xhr, options, msg ){
- this.errorHandler( model, xhr, options, msg );
- }, this );
- return this;
- },
-
- // ------------------------------------------------------------------------ panel rendering
- /** Render urls, historyPanel body, and hdas (if any are shown)
- * @fires: rendered when the panel is attached and fully visible
- * @see Backbone.View#render
- */
- render : function( speed, callback ){
- this.log( 'render:', speed, callback );
- // send a speed of 0 to have no fade in/out performed
- speed = ( speed === undefined )?( this.fxSpeed ):( speed );
- var panel = this,
- $newRender;
-
- // handle the possibility of no model (can occur if fetching the model returns an error)
- if( this.model ){
- $newRender = this.renderModel();
- } else {
- $newRender = this.renderWithoutModel();
- }
-
- // fade out existing, swap with the new, fade in, set up behaviours
- $( panel ).queue( 'fx', [
- function( next ){
- if( speed && panel.$el.is( ':visible' ) ){
- panel.$el.fadeOut( speed, next );
- } else {
- next();
- }
- },
- function( next ){
- // swap over from temp div newRender
- panel.$el.empty();
- if( $newRender ){
- panel.$el.append( $newRender.children() );
- }
- next();
- },
- function( next ){
- if( speed && !panel.$el.is( ':visible' ) ){
- panel.$el.fadeIn( speed, next );
- } else {
- next();
- }
- },
- function( next ){
- //TODO: ideally, these would be set up before the fade in (can't because of async save text)
- if( callback ){ callback.call( this ); }
- panel.trigger( 'rendered', this );
- next();
- }
- ]);
- return this;
- },
-
- /** render without history data
- * @returns {jQuery} dom fragment with message container only
- */
- renderWithoutModel : function( ){
- // we'll always need the message container
- var $newRender = $( '
' ),
- $msgContainer = $( '
' ).addClass( 'message-container' )
- .css({ 'margin': '4px' });
- return $newRender.append( $msgContainer );
- },
-
- /** render with history data
- * @returns {jQuery} dom fragment as temporary container to be swapped out later
- */
- renderModel : function( ){
- // tmp div for final swap in render
- var $newRender = $( '
' );
-
- // render based on anonymity, set up behaviors
- $newRender.append( ReadOnlyHistoryPanel.templates.historyPanel( this.model.toJSON() ) );
- this.$emptyMessage( $newRender ).text( this.emptyMsg );
- // search and select available to both anon/logged-in users
- $newRender.find( '.history-secondary-actions' ).prepend( this._renderSearchButton() );
-
- this._setUpBehaviours( $newRender );
-
- // render hda views (if any and any shown (show_deleted/hidden)
- this.renderHdas( $newRender );
- return $newRender;
- },
-
- /** render the empty/none-found message */
- _renderEmptyMsg : function( $whereTo ){
- var panel = this,
- $emptyMsg = panel.$emptyMessage( $whereTo );
-
- if( !_.isEmpty( panel.hdaViews ) ){
- $emptyMsg.hide();
-
- } else if( panel.searchFor ){
- $emptyMsg.text( panel.noneFoundMsg ).show();
-
- } else {
- $emptyMsg.text( panel.emptyMsg ).show();
- }
- return this;
- },
-
- /** button for opening search */
- _renderSearchButton : function( $where ){
- return faIconButton({
- title : _l( 'Search datasets' ),
- classes : 'history-search-btn',
- faIcon : 'fa-search'
- });
- },
-
- /** Set up HistoryPanel js/widget behaviours */
- _setUpBehaviours : function( $where ){
- //TODO: these should be either sub-MVs, or handled by events
- $where = $where || this.$el;
- $where.find( '[title]' ).tooltip({ placement: 'bottom' });
- this._setUpSearchInput( $where.find( '.history-search-controls .history-search-input' ) );
- return this;
- },
-
- // ------------------------------------------------------------------------ sub-$element shortcuts
- /** the scroll container for this panel - can be $el, $el.parent(), or grandparent depending on context */
- $container : function(){
- return ( this.findContainerFn )?( this.findContainerFn.call( this ) ):( this.$el.parent() );
- },
- /** where hdaViews are attached */
- $datasetsList : function( $where ){
- return ( $where || this.$el ).find( '.datasets-list' );
- },
- /** container where panel messages are attached */
- $messages : function( $where ){
- return ( $where || this.$el ).find( '.message-container' );
- },
- /** the message displayed when no hdaViews can be shown (no hdas, none matching search) */
- $emptyMessage : function( $where ){
- return ( $where || this.$el ).find( '.empty-history-message' );
- },
-
- // ------------------------------------------------------------------------ hda sub-views
- /** Set up/render a view for each HDA to be shown, init with model and listeners.
- * HDA views are cached to the map this.hdaViews (using the model.id as key).
- * @param {jQuery} $whereTo what dom element to prepend the HDA views to
- * @returns the number of visible hda views
- */
- renderHdas : function( $whereTo ){
- $whereTo = $whereTo || this.$el;
- var panel = this,
- newHdaViews = {},
- // only render the shown hdas
- //TODO: switch to more general filtered pattern
- visibleHdas = this.model.contents.getVisible(
- this.storage.get( 'show_deleted' ),
- this.storage.get( 'show_hidden' ),
- this.filters
- );
- //this.log( 'renderHdas, visibleHdas:', visibleHdas, $whereTo );
-//TODO: prepend to sep div, add as one
-
- this.$datasetsList( $whereTo ).empty();
-
- if( visibleHdas.length ){
- visibleHdas.each( function( hda ){
- // render it (NOTE: reverse order, newest on top (prepend))
- var hdaId = hda.id,
- hdaView = panel._createContentView( hda );
- newHdaViews[ hdaId ] = hdaView;
- // persist selection
- if( _.contains( panel.selectedHdaIds, hdaId ) ){
- hdaView.selected = true;
- }
- panel.attachContentView( hdaView.render(), $whereTo );
- });
- }
- this.hdaViews = newHdaViews;
- this._renderEmptyMsg( $whereTo );
- return this.hdaViews;
- },
-
- /** Create an HDA view for the given HDA and set up listeners (but leave attachment for addHdaView)
- * @param {HistoryDatasetAssociation} hda
- */
- _createContentView : function( content ){
- var ContentClass = this._getContentClass( content ),
- options = _.extend( this._getContentOptions( content ), {
- model : content
- }),
- contentView = new ContentClass( options );
- this._setUpHdaListeners( contentView );
- return contentView;
- },
-
- _getContentClass : function( content ){
- var contentType = content.get( "history_content_type" );
- switch( contentType ){
- case 'dataset':
- return this.HDAViewClass;
- case 'dataset_collection':
- return this.HDCAViewClass;
- }
- throw new TypeError( 'Unknown history_content_type: ' + contentType );
- },
-
- _getContentOptions : function( content ){
- return {
- linkTarget : this.linkTarget,
- expanded : !!this.storage.get( 'expandedHdas' )[ content.id ],
- //draggable : true,
- hasUser : this.model.ownedByCurrUser(),
- logger : this.logger
- };
- },
-
- /** Set up HistoryPanel listeners for HDAView events. Currently binds:
- * HDAView#body-visible, HDAView#body-hidden to store expanded states
- * @param {HDAView} hdaView HDAView (base or edit) to listen to
- */
- _setUpHdaListeners : function( hdaView ){
- var panel = this;
- hdaView.on( 'error', function( model, xhr, options, msg ){
- panel.errorHandler( model, xhr, options, msg );
- });
- // maintain a list of hdas whose bodies are expanded
- hdaView.on( 'expanded', function( view ){
- panel.storage.addExpandedHda( view.model );
- });
- hdaView.on( 'collapsed', function( view ){
- panel.storage.removeExpandedHda( view.model );
- });
- return this;
- },
-
- /** attach an hdaView to the panel */
- attachContentView : function( hdaView, $whereTo ){
- $whereTo = $whereTo || this.$el;
- var $datasetsList = this.$datasetsList( $whereTo );
- $datasetsList.prepend( hdaView.$el );
- return this;
- },
-
- /** Add an hda view to the panel for the given hda
- * @param {HistoryDatasetAssociation} hda
- */
- addContentView : function( hda ){
- this.log( 'add.' + this, hda );
- var panel = this;
-
- // don't add the view if it wouldn't be visible accrd. to current settings
- if( !hda.isVisible( this.storage.get( 'show_deleted' ), this.storage.get( 'show_hidden' ) ) ){
- return panel;
- }
-
- // create and prepend to current el, if it was empty fadeout the emptyMsg first
- $({}).queue([
- function fadeOutEmptyMsg( next ){
- var $emptyMsg = panel.$emptyMessage();
- if( $emptyMsg.is( ':visible' ) ){
- $emptyMsg.fadeOut( panel.fxSpeed, next );
- } else {
- next();
- }
- },
- function createAndPrepend( next ){
- var hdaView = panel._createContentView( hda );
- panel.hdaViews[ hda.id ] = hdaView;
- hdaView.render().$el.hide();
- panel.scrollToTop();
- panel.attachContentView( hdaView );
- hdaView.$el.slideDown( panel.fxSpeed );
- }
- ]);
- return panel;
- },
-
-//TODO: removeHdaView?
- /** Set up/render a view for each HDA to be shown, init with model and listeners.
- * HDA views are cached to the map this.hdaViews (using the model.id as key).
- * @param {jQuery} $whereTo what dom element to prepend the HDA views to
- * @returns the number of visible hda views
- */
- views : function( at ){
- var panel = this,
- visibleHdas = this.model.contents.getVisible(
- this.storage.get( 'show_deleted' ),
- this.storage.get( 'show_hidden' ),
- this.filters
- );
- if( at !== undefined ){
- return panel.hdaViews[ visibleHdas.at( at ).id ];
- }
- return visibleHdas.map( function( hda ){
- return panel.hdaViews[ hda.id ];
- });
- },
-
- /** convenience alias to the model. Updates the hda list only (not the history) */
- refreshContents : function( detailIds, options ){
- if( this.model ){
- return this.model.refresh( detailIds, options );
- }
- // may have callbacks - so return an empty promise
- return $.when();
- },
-
- ///** use underscore's findWhere to find a view where the model matches the terms
- // * note: finds and returns the _first_ matching
- // */
- //findHdaView : function( terms ){
- // if( !this.model || !this.model.contents.length ){ return undefined; }
- // var model = this.model.contents.findWhere( terms );
- // return ( model )?( this.hdaViews[ model.id ] ):( undefined );
- //},
-
- hdaViewRange : function( viewA, viewB ){
- if( viewA === viewB ){ return [ viewA ]; }
- //TODO: would probably be better if we cache'd the views as an ordered list (as well as a map)
- var panel = this,
- withinSet = false,
- set = [];
- this.model.contents.getVisible(
- this.storage.get( 'show_deleted' ),
- this.storage.get( 'show_hidden' ),
- this.filters
- ).each( function( hda ){
- //console.debug( 'checking: ', hda.get( 'name' ) );
- if( withinSet ){
- //console.debug( '\t\t adding: ', hda.get( 'name' ) );
- set.push( panel.hdaViews[ hda.id ] );
- if( hda === viewA.model || hda === viewB.model ){
- //console.debug( '\t found last: ', hda.get( 'name' ) );
- withinSet = false;
- }
- } else {
- if( hda === viewA.model || hda === viewB.model ){
- //console.debug( 'found first: ', hda.get( 'name' ) );
- withinSet = true;
- set.push( panel.hdaViews[ hda.id ] );
- }
- }
- });
- return set;
- },
-
- // ------------------------------------------------------------------------ panel events
- /** event map */
- events : {
- // allow (error) messages to be clicked away
-//TODO: switch to common close (X) idiom
- 'click .message-container' : 'clearMessages',
- 'click .history-search-btn' : 'toggleSearchControls'
- },
-
- /** Collapse all hda bodies and clear expandedHdas in the storage */
- collapseAllHdaBodies : function(){
- _.each( this.hdaViews, function( item ){
- item.collapse();
- });
- this.storage.set( 'expandedHdas', {} );
- return this;
- },
-
- /** Handle the user toggling the deleted visibility by:
- * (1) storing the new value in the persistent storage
- * (2) re-rendering the history
- * @returns {Boolean} new show_deleted setting
- */
- toggleShowDeleted : function( show ){
- show = ( show !== undefined )?( show ):( !this.storage.get( 'show_deleted' ) );
- this.storage.set( 'show_deleted', show );
- this.renderHdas();
- return this.storage.get( 'show_deleted' );
- },
-
- /** Handle the user toggling the deleted visibility by:
- * (1) storing the new value in the persistent storage
- * (2) re-rendering the history
- * @returns {Boolean} new show_hidden setting
- */
- toggleShowHidden : function( show ){
- show = ( show !== undefined )?( show ):( !this.storage.get( 'show_hidden' ) );
- this.storage.set( 'show_hidden', show );
- this.renderHdas();
- return this.storage.get( 'show_hidden' );
- },
-
- // ........................................................................ hda search & filters
- /** render a search input for filtering datasets shown
- * (see the search section in the HDA model for implementation of the actual searching)
- * return will start the search
- * esc will clear the search
- * clicking the clear button will clear the search
- * uses searchInput in ui.js
- */
- _setUpSearchInput : function( $where ){
- var panel = this,
- inputSelector = '.history-search-input';
-
- function onFirstSearch( searchFor ){
- //this.log( 'onFirstSearch', searchFor, panel );
- if( panel.model.contents.haveDetails() ){
- panel.searchHdas( searchFor );
- return;
- }
- panel.$el.find( inputSelector ).searchInput( 'toggle-loading' );
- panel.model.contents.fetchAllDetails({ silent: true })
- .always( function(){
- panel.$el.find( inputSelector ).searchInput( 'toggle-loading' );
- })
- .done( function(){
- panel.searchHdas( searchFor );
- });
- }
- $where.searchInput({
- initialVal : panel.searchFor,
- name : 'history-search',
- placeholder : 'search datasets',
- classes : 'history-search',
- onfirstsearch : onFirstSearch,
- onsearch : _.bind( this.searchHdas, this ),
- onclear : _.bind( this.clearHdaSearch, this )
- });
- return $where;
- },
- /** toggle showing/hiding the search controls (rendering first on the initial show)
- * @param {Event or Number} eventOrSpeed variadic - if number the speed of the show/hide effect
- * @param {boolean} show force show/hide with T/F
- */
- toggleSearchControls : function( eventOrSpeed, show ){
- var $searchControls = this.$el.find( '.history-search-controls' ),
- speed = ( jQuery.type( eventOrSpeed ) === 'number' )?( eventOrSpeed ):( this.fxSpeed );
- show = ( show !== undefined )?( show ):( !$searchControls.is( ':visible' ) );
- if( show ){
- $searchControls.slideDown( speed, function(){
- $( this ).find( 'input' ).focus();
- });
- } else {
- $searchControls.slideUp( speed );
- }
- return show;
- },
-
- /** filter hda view list to those that contain the searchFor terms
- * (see the search section in the HDA model for implementation of the actual searching)
- */
- searchHdas : function( searchFor ){
- //note: assumes hda details are loaded
- //this.log( 'onSearch', searchFor, this );
- var panel = this;
- this.searchFor = searchFor;
- this.filters = [ function( hda ){ return hda.matchesAll( panel.searchFor ); } ];
- this.trigger( 'search:searching', searchFor, this );
- this.renderHdas();
- return this;
- },
-
- /** clear the search filters and show all views that are normally shown */
- clearHdaSearch : function( searchFor ){
- //this.log( 'onSearchClear', this );
- this.searchFor = '';
- this.filters = [];
- this.trigger( 'search:clear', this );
- this.renderHdas();
- return this;
- },
-
- // ........................................................................ loading indicator
- /** hide the panel and display a loading indicator (in the panel's parent) when history model's are switched */
- _showLoadingIndicator : function( msg, speed, callback ){
- speed = ( speed !== undefined )?( speed ):( this.fxSpeed );
- if( !this.indicator ){
- this.indicator = new LoadingIndicator( this.$el, this.$el.parent() );
- }
- if( !this.$el.is( ':visible' ) ){
- this.indicator.show( 0, callback );
- } else {
- this.$el.fadeOut( speed );
- this.indicator.show( msg, speed, callback );
- }
- },
-
- /** hide the loading indicator */
- _hideLoadingIndicator : function( speed, callback ){
- speed = ( speed !== undefined )?( speed ):( this.fxSpeed );
- if( this.indicator ){
- this.indicator.hide( speed, callback );
- }
- },
-
- // ........................................................................ (error) messages
- /** Display a message in the top of the panel.
- * @param {String} type type of message ('done', 'error', 'warning')
- * @param {String} msg the message to display
- * @param {Object or HTML} modal contents displayed when the user clicks 'details' in the message
- */
- displayMessage : function( type, msg, details ){
- //precondition: msgContainer must have been rendered even if there's no model
- var panel = this;
- //this.log( 'displayMessage', type, msg, details );
-
- this.scrollToTop();
- var $msgContainer = this.$messages(),
- $msg = $( '
' ).addClass( type + 'message' ).html( msg );
- //this.log( ' ', $msgContainer );
-
- if( !_.isEmpty( details ) ){
- var $detailsLink = $( 'Details ' )
- .click( function(){
- Galaxy.modal.show( panel._messageToModalOptions( type, msg, details ) );
- return false;
- });
- $msg.append( ' ', $detailsLink );
- }
- return $msgContainer.html( $msg );
- },
-
- /** convert msg and details into modal options usable by Galaxy.modal */
- _messageToModalOptions : function( type, msg, details ){
- // only error is fleshed out here
- var panel = this,
- $modalBody = $( '
' ),
- options = { title: 'Details' };
-
- //TODO: to some util library
- function objToTable( obj ){
- obj = _.omit( obj, _.functions( obj ) );
- return [
- '',
- _.map( obj, function( val, key ){
- val = ( _.isObject( val ) )?( objToTable( val ) ):( val );
- return '' + key + ' '
- + '' + val + '
'
- ].join( '' );
- }
-
- if( _.isObject( details ) ){
- options.body = $modalBody.append( objToTable( details ) );
-
- } else {
- options.body = $modalBody.html( details );
- }
- options.buttons = {
- 'Ok': function(){
- Galaxy.modal.hide();
- panel.clearMessages();
- }
- //TODO: if( type === 'error' ){ options.buttons[ 'Report this error' ] = function(){} }
- };
- return options;
- },
-
- /** Remove all messages from the panel.
- */
- clearMessages : function(){
- this.$messages().empty();
- return this;
- },
-
- // ........................................................................ scrolling
- /** get the current scroll position of the panel in its parent */
- scrollPosition : function(){
- return this.$container().scrollTop();
- },
-
- /** set the current scroll position of the panel in its parent */
- scrollTo : function( pos ){
- this.$container().scrollTop( pos );
- return this;
- },
-
- /** Scrolls the panel to the top. */
- scrollToTop : function(){
- this.$container().scrollTop( 0 );
- return this;
- },
-
- /** Scrolls the panel to show the HDA with the given id.
- * @param {String} id the id of HDA to scroll into view
- * @returns {HistoryPanel} the panel
- */
- scrollToId : function( id ){
- // do nothing if id not found
- if( ( !id ) || ( !this.hdaViews[ id ] ) ){
- return this;
- }
- var view = this.hdaViews[ id ];
- //this.scrollIntoView( $viewEl.offset().top );
- this.scrollTo( view.el.offsetTop );
- return this;
- },
-
- /** Scrolls the panel to show the HDA with the given hid.
- * @param {Integer} hid the hid of HDA to scroll into view
- * @returns {HistoryPanel} the panel
- */
- scrollToHid : function( hid ){
- var hda = this.model.contents.getByHid( hid );
- // do nothing if hid not found
- if( !hda ){ return this; }
- return this.scrollToId( hda.id );
- },
-
- // ........................................................................ misc
- print : function(){
- var panel = this;
- panel.debug( this );
- _.each( this.hdaViews, function( view, id ){
- panel.debug( '\t ' + id, view );
- });
- },
-
- /** Return a string rep of the history */
- toString : function(){
- return 'ReadOnlyHistoryPanel(' + (( this.model )?( this.model.get( 'name' )):( '' )) + ')';
- }
-});
-//------------------------------------------------------------------------------ TEMPLATES
-var _panelTemplate = [
- '',
- '
',
-
- '
',
- '<% if( history.name ){ %>',
- '
<%= history.name %>
',
- '<% } %>',
- '
',
-
- '
',
- '<% if( history.nice_size ){ %>',
- '
<%= history.nice_size %>
',
- '<% } %>',
- '
',
- '
',
-
- '<% if( history.deleted ){ %>',
- '
',
- _l( 'You are currently viewing a deleted history!' ),
- '
',
- '<% } %>',
-
- '
',
- '<% if( history.message ){ %>',
- // should already be localized
- '
<%= history.message %>
',
- '<% } %>',
- '
',
-
- '
',
- _l( 'You are over your disk quota' ), '. ',
- _l( 'Tool execution is on hold until your disk usage drops below your allocated quota' ), '.',
- '
',
-
- '
',
- '
',
- '
',
- '
',
- '', _l( 'All' ), ' ',
- '', _l( 'None' ), ' ',
- '
',
- '',
- '
',
- '
',
- '',
- _l( 'This history is empty' ),
- '
'
-].join( '' );
-
-ReadOnlyHistoryPanel.templates = {
- historyPanel : function( historyJSON ){
- return _.template( _panelTemplate, historyJSON, { variable: 'history' });
- }
-};
-
-
-//==============================================================================
- return {
- ReadOnlyHistoryPanel: ReadOnlyHistoryPanel
- };
-});
diff --git a/static/scripts/packed/mvc/collection/collection-li-edit.js b/static/scripts/packed/mvc/collection/collection-li-edit.js
new file mode 100644
index 00000000000..5b0a5888a64
--- /dev/null
+++ b/static/scripts/packed/mvc/collection/collection-li-edit.js
@@ -0,0 +1 @@
+define(["mvc/collection/collection-li","utils/localization"],function(b,a){var c=b.DCListItemView;var d=c.extend({toString:function(){var e=(this.model)?(this.model+""):("(no model)");return"DCEListItemEdit("+e+")"}});return{DCEListItemEdit:d}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/collection/collection-li.js b/static/scripts/packed/mvc/collection/collection-li.js
new file mode 100644
index 00000000000..9d566f2aac8
--- /dev/null
+++ b/static/scripts/packed/mvc/collection/collection-li.js
@@ -0,0 +1 @@
+define(["mvc/dataset/dataset-li","mvc/base-mvc","utils/localization"],function(h,d,f){var c=d.ListItemView;var a=c.extend({className:c.prototype.className+" dataset-collection",fxSpeed:"fast",initialize:function(i){if(i.logger){this.logger=this.model.logger=i.logger}this.log(this+"(DCListItemView).initialize:",i);c.prototype.initialize.call(this,i)},expand:function(){var i=this;return i._fetchModelDetails().always(function(){i.trigger("expanded",i)})},_renderSubtitle:function(){var i=$('
');switch(this.model.get("collection_type")){case"list":return i.text(f("a list of datasets"));case"paired":return i.text(f("a pair of datasets"));case"list:paired":return i.text(f("a list of paired datasets"))}return i},toString:function(){var i=(this.model)?(this.model+""):("(no model)");return"DCListItemView("+i+")"}});a.prototype.templates=(function(){var i=d.wrapTemplate(['','
','<%- collection.element_identifier || collection.name %> ',"
",'
',"
','
','<%- element.element_identifier %> ',"
",'
',"
','
','
','<%- element.element_identifier %> ',"
","
").append(this.templates.panel(i));this._setUpBehaviours(h);this.renderContents(h);return h},_setUpBehaviours:function(h){h=h||this.$el;h.find("[title]").tooltip({placement:"bottom"});return this},$container:function(){return(this.findContainerFn)?(this.findContainerFn.call(this)):(this.$el.parent())},$datasetsList:function(h){return(h||this.$el).find(".datasets-list")},renderContents:function(i){i=i||this.$el;this.warn(this+".renderContents:, model:",this.model);var h=this,k={},j=this.model.getVisibleContents();this.log("renderContents, visibleContents:",j,i);this.$datasetsList(i).empty();if(j&&j.length){j.each(function(m){var n=m.id,l=h._createContentView(m);k[n]=l;h._attachContentView(l.render(),i)})}this.contentViews=k;return this.contentViews},_createContentView:function(j){var i=null,h=this._getContentClass(j);this.debug("ContentClass:",h);this.debug("content:",j);i=new h({model:j,linkTarget:this.linkTarget,hasUser:this.hasUser,logger:this.logger});this.debug("contentView:",i);this._setUpContentListeners(i);return i},_getContentClass:function(h){this.debug(this+"._getContentClass:",h);this.debug("DCEViewClass:",this.DCEViewClass);switch(h.get("element_type")){case"hda":return this.DCEViewClass;case"dataset_collection":return this.DCEViewClass}throw new TypeError("Unknown element type:",h.get("element_type"))},_setUpContentListeners:function(i){var h=this;if(i.model.get("element_type")==="dataset_collection"){i.on("expanded",function(j){h.info("expanded",j);h._addCollectionPanel(j)})}},_addCollectionPanel:function(j){var k=this,h=j.model;this.debug("collection panel (stack), collectionView:",j);this.debug("collection panel (stack), collectionModel:",h);var i=new c({model:h,parentName:this.model.get("name")});k.panelStack.push(i);k.$(".controls").add(".datasets-list").hide();k.$el.append(i.$el);i.on("close",function(){k.render();j.collapse();k.panelStack.pop()});if(!i.model.hasDetails()){var l=i.model.fetch();l.done(function(){i.render()})}else{i.render()}},_attachContentView:function(j,i){i=i||this.$el;var h=this.$datasetsList(i);h.append(j.$el);return this},events:{"click .navigation .back":"close"},close:function(h){this.$el.remove();this.trigger("close")},toString:function(){return"CollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});d.templates=d.prototype.templates=(function(){var h=_.template(['','
",'
','
<%- collection.name || collection.element_identifier %>
','
','<% if( collection.type === "list" ){ %>',e("a list of datasets"),'<% } else if( collection.type === "paired" ){ %>',e("a pair of datasets"),'<% } else if( collection.type === "list:paired" ){ %>',e("a list of paired datasets"),"<% } %>","
","
","
'].join(""));return{panel:function(i){return h({_l:e,collection:i})}}}());var b=d.extend({DCEViewClass:f.DatasetDCEBaseView,toString:function(){return"ListCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});var c=b.extend({toString:function(){return"PairCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});var g=d.extend({DCEViewClass:f.NestedDCDCEBaseView,toString:function(){return"ListOfPairsCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});return{CollectionPanel:d,ListCollectionPanel:b,PairCollectionPanel:c,ListOfPairsCollectionPanel:g}});
\ No newline at end of file
+define(["mvc/collection/collection-model","mvc/collection/collection-li","mvc/base-mvc","utils/localization"],function(h,f,a,e){var d=Backbone.View.extend(a.LoggableMixin).extend({tagName:"div",className:"dataset-collection-panel",fxSpeed:"fast",DatasetDCEViewClass:f.DatasetDCEListItemView,NestedDCDCEViewClass:f.NestedDCDCEListItemView,initialize:function(i){i=i||{};if(i.logger){this.logger=i.logger}this.log(this+".initialize:",i);this.linkTarget=i.linkTarget||"_blank";this.hasUser=i.hasUser;this.panelStack=[];this.parentName=i.parentName;window.collectionPanel=this},_setUpListeners:function(){this.on("all",function(i){this.log(this+"",arguments)},this);return this},_setUpModelEventHandlers:function(){return this},render:function(k,l){this.log("render:",k,l);k=(k===undefined)?(this.fxSpeed):(k);var i=this,j;if(!this.model){return this}j=this.renderModel();$(i).queue("fx",[function(m){if(k&&i.$el.is(":visible")){i.$el.fadeOut(k,m)}else{m()}},function(m){i.$el.empty();if(j){i.$el.append(j.children())}m()},function(m){if(k&&!i.$el.is(":visible")){i.$el.fadeIn(k,m)}else{m()}},function(m){if(l){l.call(this)}i.trigger("rendered",this);m()}]);return this},renderModel:function(){var k=this.model.get("collection_type")||this.model.object.get("collection_type"),j=_.extend(this.model.toJSON(),{parentName:this.parentName,type:k}),i=$("
").append(this.templates.panel(j));this._setUpBehaviours(i);this.renderContents(i);return i},_setUpBehaviours:function(i){i=i||this.$el;i.find("[title]").tooltip({placement:"bottom"});return this},$container:function(){return(this.findContainerFn)?(this.findContainerFn.call(this)):(this.$el.parent())},$datasetsList:function(i){return(i||this.$el).find(".datasets-list")},renderContents:function(j){j=j||this.$el;this.warn(this+".renderContents:, model:",this.model);var i=this,l={},k=this.model.getVisibleContents();this.$datasetsList(j).empty();if(k&&k.length){k.each(function(n){var o=n.id,m=i._createContentView(n);l[o]=m;i._attachContentView(m.render(),j)})}this.contentViews=l;return this.contentViews},_createContentView:function(k){var j=null,i=this._getContentClass(k);j=new i({model:k,linkTarget:this.linkTarget,hasUser:this.hasUser,logger:this.logger});this._setUpContentListeners(j);return j},_getContentClass:function(i){switch(i.get("element_type")){case"hda":return this.DatasetDCEViewClass;case"dataset_collection":return this.NestedDCDCEViewClass}throw new TypeError("Unknown element type:",i.get("element_type"))},_setUpContentListeners:function(j){var i=this;if(j.model.get("element_type")==="dataset_collection"){j.on("expanded",function(k){i.info("expanded",k);i._addCollectionPanel(k)})}},_addCollectionPanel:function(k){var l=this,i=k.model;var j=new c({model:i,parentName:this.model.get("name"),linkTarget:this.linkTarget});l.panelStack.push(j);l.$(".controls").add(".datasets-list").hide();l.$el.append(j.$el);j.on("close",function(){l.render();k.collapse();l.panelStack.pop()});if(!j.model.hasDetails()){var m=j.model.fetch();m.done(function(){j.render()})}else{j.render()}},_attachContentView:function(k,j){j=j||this.$el;var i=this.$datasetsList(j);i.append(k.$el);return this},events:{"click .navigation .back":"close"},close:function(i){this.$el.remove();this.trigger("close")},toString:function(){return"CollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});d.templates=d.prototype.templates=(function(){var i=_.template(['','
",'
','
<%- collection.name || collection.element_identifier %>
','
','<% if( collection.type === "list" ){ %>',e("a list of datasets"),'<% } else if( collection.type === "paired" ){ %>',e("a pair of datasets"),'<% } else if( collection.type === "list:paired" ){ %>',e("a list of paired datasets"),"<% } %>","
","
","
'].join(""));return{panel:function(j){return i({_l:e,collection:j})}}}());var b=d.extend({DatasetDCEViewClass:f.DatasetDCEListItemView,toString:function(){return"ListCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});var c=b.extend({toString:function(){return"PairCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});var g=d.extend({NestedDCDCEViewClass:f.NestedDCDCEListItemView,toString:function(){return"ListOfPairsCollectionPanel("+((this.model)?(this.model.get("name")):(""))+")"}});return{CollectionPanel:d,ListCollectionPanel:b,PairCollectionPanel:c,ListOfPairsCollectionPanel:g}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/collection/dataset-collection-base.js b/static/scripts/packed/mvc/collection/dataset-collection-base.js
deleted file mode 100644
index 5e44e0f2fe4..00000000000
--- a/static/scripts/packed/mvc/collection/dataset-collection-base.js
+++ /dev/null
@@ -1 +0,0 @@
-define(["mvc/dataset/dataset-list-element","mvc/base-mvc","utils/localization"],function(g,c,d){var b=c.ListItemView;var a=b.extend({className:b.prototype.className+" dataset-collection",fxSpeed:"fast",initialize:function(i){if(i.logger){this.logger=this.model.logger=i.logger}this.log("DCBaseView.initialize:",i);b.prototype.initialize.call(this,i)},expand:function(){var i=this;return i._fetchModelDetails().always(function(){i.trigger("expanded",i)})},_renderSubtitle:function(){var i=$('
');switch(this.model.get("collection_type")){case"list":return i.text(d("a list of datasets"));case"paired":return i.text(d("a pair of datasets"));case"list:paired":return i.text(d("a list of paired datasets"))}return i},toString:function(){var i=(this.model)?(this.model+""):("(no model)");return"DCBaseView("+i+")"}});a.prototype.templates=(function(){var i=c.wrapTemplate(['','
','<%- collection.element_identifier || collection.name %> ',"
",'
',"
','
','<%- element.element_identifier %> ',"
",'
',"
','
','
','<%- element.element_identifier %> ',"
","
','
','
','<%- collection.hid %> ','<%- collection.name %> ',"
",'
',"
? ').attr("href",this.model.urls.edit).attr("target",this.linkTarget);j.find(".dbkey .value").replaceWith(k)}},events:_.extend(_.clone(f.prototype.events),{"click .undelete-link":function(j){this.model.undelete();return false},"click .purge-link":"_confirmPurge"}),_confirmPurge:function c(j){this.model.purge();return false},toString:function(){var j=(this.model)?(this.model+""):("(no model)");return"HDAEditView("+j+")"}});i.prototype.templates=(function(){var k=_.extend({},f.prototype.templates.warnings,{failed_metadata:h.wrapTemplate(['<% if( dataset.state === "failed_metadata" ){ %>','","<% } %>"],"dataset"),deleted:h.wrapTemplate(["<% if( dataset.deleted && !dataset.purged ){ %>",'',b("This dataset has been deleted"),'
',b("Undelete it")," ","<% if( view.purgeAllowed ){ %>",'
',b("Permanently remove it from disk")," ","<% } %>","
">',' ","<% } else { %>",'","<% } %>"],"visualizations");return _.extend({},f.prototype.templates,{warnings:k,visualizations:j})}());return{DatasetListItemEdit:i}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/dataset/dataset-list-element.js b/static/scripts/packed/mvc/dataset/dataset-li.js
similarity index 100%
rename from static/scripts/packed/mvc/dataset/dataset-list-element.js
rename to static/scripts/packed/mvc/dataset/dataset-li.js
diff --git a/static/scripts/packed/mvc/dataset/dataset-model.js b/static/scripts/packed/mvc/dataset/dataset-model.js
index 0d15452e1b7..121a1e1de44 100644
--- a/static/scripts/packed/mvc/dataset/dataset-model.js
+++ b/static/scripts/packed/mvc/dataset/dataset-model.js
@@ -1 +1 @@
-define(["mvc/dataset/states","mvc/base-mvc","utils/localization"],function(a,b,c){var f=b.SearchableModelMixin;var e=Backbone.Model.extend(b.LoggableMixin).extend(b.mixin(f,{defaults:{state:a.NEW,deleted:false,purged:false,name:"(unnamed dataset)",accessible:true,data_type:"",file_ext:"",file_size:0,meta_files:[],misc_blurb:"",misc_info:"",tags:[]},initialize:function(h,g){this.debug("Dataset.initialize",h,g);if(!this.get("accessible")){this.set("state",a.NOT_VIEWABLE)}this.urls=this._generateUrls();this._setUpListeners()},_generateUrls:function(){var h=this.get("id");if(!h){return{}}var g={purge:"datasets/"+h+"/purge_async",display:"datasets/"+h+"/display/?preview=True",edit:"datasets/"+h+"/edit",download:"datasets/"+h+"/display?to_ext="+this.get("file_ext"),report_error:"dataset/errors?id="+h,rerun:"tool_runner/rerun?id="+h,show_params:"datasets/"+h+"/show_params",visualization:"visualization",meta_download:"dataset/get_metadata_file?hda_id="+h+"&metadata_name="};if(galaxy_config&&galaxy_config.root){_.each(g,function(i,j){g[i]=galaxy_config.root+j})}this.urls=g;return g},_setUpListeners:function(){this.on("change:state",function(h,g){this.log(this+" has changed state:",h,g);if(this.inReadyState()){this.trigger("state:ready",h,g,this.previous("state"))}});this.on("change:id change:file_ext",function(g){this._generateUrls()})},toJSON:function(){var g=Backbone.Model.prototype.toJSON.call(this);return _.extend(g,{urls:this.urls})},isDeletedOrPurged:function(){return(this.get("deleted")||this.get("purged"))},inReadyState:function(){var g=_.contains(a.READY_STATES,this.get("state"));return(this.isDeletedOrPurged()||g)},hasDetails:function(){return _.has(this.attributes,"genome_build")},hasData:function(){return(this.get("file_size")>0)},"delete":function(g){if(this.get("deleted")){return jQuery.when()}return this.save({deleted:true},g)},undelete:function(g){if(!this.get("deleted")||this.get("purged")){return jQuery.when()}return this.save({deleted:false},g)},purge:function d(g){if(this.get("purged")){return jQuery.when()}g=g||{};g.url=this.urls.purge;var h=this,i=jQuery.ajax(g);i.done(function(l,j,k){h.set({deleted:true,purged:true})});i.fail(function(n,j,m){var k=c("Unable to purge dataset");var l=("Removal of datasets by users is not allowed in this Galaxy instance");if(n.responseJSON&&n.responseJSON.error){k=n.responseJSON.error}else{if(n.responseText.indexOf(l)!==-1){k=l}}n.responseText=k;h.trigger("error",h,n,g,c(k),{error:k})});return i},searchAttributes:["name","file_ext","genome_build","misc_blurb","misc_info","annotation","tags"],searchAliases:{title:"name",format:"file_ext",database:"genome_build",blurb:"misc_blurb",description:"misc_blurb",info:"misc_info",tag:"tags"},toString:function(){var g=this.get("id")||"";if(this.get("name")){g='"'+this.get("name")+'",'+g}return"Dataset("+g+")"}}));return{DatasetAssociation:e}});
\ No newline at end of file
+define(["mvc/dataset/states","mvc/base-mvc","utils/localization"],function(a,b,c){var f=b.SearchableModelMixin;var e=Backbone.Model.extend(b.LoggableMixin).extend(b.mixin(f,{defaults:{state:a.NEW,deleted:false,purged:false,name:"(unnamed dataset)",accessible:true,data_type:"",file_ext:"",file_size:0,meta_files:[],misc_blurb:"",misc_info:"",tags:[]},initialize:function(h,g){this.debug("Dataset.initialize",h,g);if(!this.get("accessible")){this.set("state",a.NOT_VIEWABLE)}this.urls=this._generateUrls();this._setUpListeners()},_generateUrls:function(){var i=this.get("id");if(!i){return{}}var h={purge:"datasets/"+i+"/purge_async",display:"datasets/"+i+"/display/?preview=True",edit:"datasets/"+i+"/edit",download:"datasets/"+i+"/display?to_ext="+this.get("file_ext"),report_error:"dataset/errors?id="+i,rerun:"tool_runner/rerun?id="+i,show_params:"datasets/"+i+"/show_params",visualization:"visualization",meta_download:"dataset/get_metadata_file?hda_id="+i+"&metadata_name="};var g=(galaxy_config&&galaxy_config.root)?(galaxy_config.root):("/");_.each(h,function(k,j){h[j]=g+k});this.urls=h;return h},_setUpListeners:function(){this.on("change:state",function(h,g){this.log(this+" has changed state:",h,g);if(this.inReadyState()){this.trigger("state:ready",h,g,this.previous("state"))}});this.on("change:id change:file_ext",function(g){this._generateUrls()})},toJSON:function(){var g=Backbone.Model.prototype.toJSON.call(this);return _.extend(g,{urls:this.urls})},isDeletedOrPurged:function(){return(this.get("deleted")||this.get("purged"))},inReadyState:function(){var g=_.contains(a.READY_STATES,this.get("state"));return(this.isDeletedOrPurged()||g)},hasDetails:function(){return _.has(this.attributes,"genome_build")},hasData:function(){return(this.get("file_size")>0)},"delete":function(g){if(this.get("deleted")){return jQuery.when()}return this.save({deleted:true},g)},undelete:function(g){if(!this.get("deleted")||this.get("purged")){return jQuery.when()}return this.save({deleted:false},g)},purge:function d(g){if(this.get("purged")){return jQuery.when()}g=g||{};g.url=this.urls.purge;var h=this,i=jQuery.ajax(g);i.done(function(l,j,k){h.set({deleted:true,purged:true})});i.fail(function(n,j,m){var k=c("Unable to purge dataset");var l=("Removal of datasets by users is not allowed in this Galaxy instance");if(n.responseJSON&&n.responseJSON.error){k=n.responseJSON.error}else{if(n.responseText.indexOf(l)!==-1){k=l}}n.responseText=k;h.trigger("error",h,n,g,c(k),{error:k})});return i},searchAttributes:["name","file_ext","genome_build","misc_blurb","misc_info","annotation","tags"],searchAliases:{title:"name",format:"file_ext",database:"genome_build",blurb:"misc_blurb",description:"misc_blurb",info:"misc_info",tag:"tags"},toString:function(){var g=this.get("id")||"";if(this.get("name")){g='"'+this.get("name")+'",'+g}return"Dataset("+g+")"}}));return{DatasetAssociation:e}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/dataset/editable-dataset-list-element.js b/static/scripts/packed/mvc/dataset/editable-dataset-list-element.js
deleted file mode 100644
index 0166fe501c5..00000000000
--- a/static/scripts/packed/mvc/dataset/editable-dataset-list-element.js
+++ /dev/null
@@ -1 +0,0 @@
-define(["mvc/dataset/states","mvc/dataset/dataset-list-element","mvc/tags","mvc/annotations","mvc/base-mvc","utils/localization"],function(h,e,f,a,i,b){var g=e.DatasetListItemView;var d=g.extend({initialize:function(j){g.prototype.initialize.call(this,j);this.hasUser=j.hasUser;this.purgeAllowed=j.purgeAllowed||false;this.tagsEditorShown=j.tagsEditorShown||false;this.annotationEditorShown=j.annotationEditorShown||false},_renderPrimaryActions:function(){var j=g.prototype._renderPrimaryActions.call(this);if(this.model.get("state")===h.NOT_VIEWABLE){return j}return g.prototype._renderPrimaryActions.call(this).concat([this._renderEditButton(),this._renderDeleteButton()])},_renderEditButton:function(){if((this.model.get("state")===h.DISCARDED)||(!this.model.get("accessible"))){return null}var l=this.model.get("purged"),j=this.model.get("deleted"),k={title:b("Edit attributes"),href:this.model.urls.edit,target:this.linkTarget,faIcon:"fa-pencil",classes:"edit-btn"};if(j||l){k.disabled=true;if(l){k.title=b("Cannot edit attributes of datasets removed from disk")}else{if(j){k.title=b("Undelete dataset to edit attributes")}}}else{if(_.contains([h.UPLOAD,h.NEW],this.model.get("state"))){k.disabled=true;k.title=b("This dataset is not yet editable")}}return faIconButton(k)},_renderDeleteButton:function(){if((!this.model.get("accessible"))){return null}var j=this,k=this.model.isDeletedOrPurged();return faIconButton({title:!k?b("Delete"):b("Dataset is already deleted"),disabled:k,faIcon:"fa-times",classes:"delete-btn",onclick:function(){j.$el.find(".icon-btn.delete-btn").trigger("mouseout");j.model["delete"]()}})},_renderDetails:function(){var j=g.prototype._renderDetails.call(this),k=this.model.get("state");if(!this.model.isDeletedOrPurged()&&_.contains([h.OK,h.FAILED_METADATA],k)){this._renderTags(j);this._renderAnnotation(j);this._makeDbkeyEditLink(j)}this._setUpBehaviors(j);return j},_renderSecondaryActions:function(){var j=g.prototype._renderSecondaryActions.call(this);switch(this.model.get("state")){case h.UPLOAD:case h.NEW:case h.NOT_VIEWABLE:return j;case h.ERROR:j.unshift(this._renderErrButton());return j.concat([this._renderRerunButton()]);case h.OK:case h.FAILED_METADATA:return j.concat([this._renderRerunButton(),this._renderVisualizationsButton()])}return j.concat([this._renderRerunButton()])},_renderErrButton:function(){return faIconButton({title:b("View or report this error"),href:this.model.urls.report_error,classes:"report-error-btn",target:this.linkTarget,faIcon:"fa-bug"})},_renderRerunButton:function(){return faIconButton({title:b("Run this job again"),href:this.model.urls.rerun,classes:"rerun-btn",target:this.linkTarget,faIcon:"fa-refresh"})},_renderVisualizationsButton:function(){var j=this.model.get("visualizations");if((this.model.isDeletedOrPurged())||(!this.hasUser)||(!this.model.hasData())||(_.isEmpty(j))){return null}if(!_.isObject(j[0])){this.warn("Visualizations have been switched off");return null}var k=$(this.templates.visualizations(j,this));this._addScratchBookFn(k.find(".visualization-link").addBack(".visualization-link"));return k},_addScratchBookFn:function(j){j.click(function(k){if(Galaxy.frame&&Galaxy.frame.active){Galaxy.frame.add({title:"Visualization",type:"url",content:$(this).attr("href")});k.preventDefault();k.stopPropagation()}})},_renderTags:function(j){if(!this.hasUser){return}var k=this;this.tagsEditor=new f.TagsEditor({model:this.model,el:j.find(".tags-display"),onshowFirstTime:function(){this.render()},onshow:function(){k.tagsEditorShown=true},onhide:function(){k.tagsEditorShown=false},$activator:faIconButton({title:b("Edit dataset tags"),classes:"tag-btn",faIcon:"fa-tags"}).appendTo(j.find(".actions .right"))});if(this.tagsEditorShown){this.tagsEditor.toggle(true)}},_renderAnnotation:function(j){if(!this.hasUser){return}var k=this;this.annotationEditor=new a.AnnotationEditor({model:this.model,el:j.find(".annotation-display"),onshowFirstTime:function(){this.render()},onshow:function(){k.annotationEditorShown=true},onhide:function(){k.annotationEditorShown=false},$activator:faIconButton({title:b("Edit dataset annotation"),classes:"annotate-btn",faIcon:"fa-comment"}).appendTo(j.find(".actions .right"))});if(this.annotationEditorShown){this.annotationEditor.toggle(true)}},_makeDbkeyEditLink:function(j){if(this.model.get("metadata_dbkey")==="?"&&!this.model.isDeletedOrPurged()){var k=$('? ').attr("href",this.model.urls.edit).attr("target",this.linkTarget);j.find(".dbkey .value").replaceWith(k)}},events:_.extend(_.clone(g.prototype.events),{"click .undelete-link":function(j){this.model.undelete();return false},"click .purge-link":"_confirmPurge"}),_confirmPurge:function c(j){this.model.purge();return false},toString:function(){var j=(this.model)?(this.model+""):("(no model)");return"HDAEditView("+j+")"}});d.prototype.templates=(function(){var k=_.extend({},g.prototype.templates.warnings,{failed_metadata:i.wrapTemplate(['<% if( dataset.state === "failed_metadata" ){ %>','","<% } %>"],"dataset"),deleted:i.wrapTemplate(["<% if( dataset.deleted && !dataset.purged ){ %>",'',b("This dataset has been deleted"),'
',b("Undelete it")," ","<% if( view.purgeAllowed ){ %>",'
',b("Permanently remove it from disk")," ","<% } %>","
">',' ","<% } else { %>",'","<% } %>"],"visualizations");return _.extend({},g.prototype.templates,{warnings:k,visualizations:j})}());return{EditableDatasetListItemView:d}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/dataset/hda-base.js b/static/scripts/packed/mvc/dataset/hda-base.js
deleted file mode 100644
index c80fab31c1e..00000000000
--- a/static/scripts/packed/mvc/dataset/hda-base.js
+++ /dev/null
@@ -1 +0,0 @@
-define(["mvc/dataset/dataset-list-element","mvc/base-mvc","utils/localization"],function(e,b,c){var d=e.DatasetListItemView;var a=d.extend({initialize:function(f,g){d.prototype.initialize.call(this,f,g)},className:d.prototype.className+" history-content",toString:function(){var f=(this.model)?(this.model+""):("(no model)");return"HDABaseView("+f+")"}});a.prototype.templates=(function(){var g=b.wrapTemplate(['','
','
','<%- dataset.hid %> ','<%- dataset.name %> ',"
","
',c("This dataset has been hidden"),"
","<% } %>"],"dataset")});return _.extend({},d.prototype.templates,{titleBar:g,warnings:f})}());return{HDABaseView:a}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/dataset/hda-edit.js b/static/scripts/packed/mvc/dataset/hda-edit.js
deleted file mode 100644
index 230955a9fa5..00000000000
--- a/static/scripts/packed/mvc/dataset/hda-edit.js
+++ /dev/null
@@ -1 +0,0 @@
-define(["mvc/dataset/editable-dataset-list-element","mvc/dataset/hda-base","mvc/base-mvc","utils/localization"],function(e,a,b,c){var d=e.EditableDatasetListItemView;var f=d.extend({className:d.prototype.className+" history-content",events:_.extend(_.clone(d.prototype.events),{"click .unhide-link":function(g){this.model.unhide();return false}}),toString:function(){var g=(this.model)?(this.model+""):("(no model)");return"HDAEditView("+g+")"}});f.prototype.templates=(function(){var g=_.extend({},d.prototype.templates.warnings,{hidden:b.wrapTemplate(["<% if( !dataset.visible ){ %>",'","<% } %>"],"dataset")});return _.extend({},d.prototype.templates,{titleBar:a.HDABaseView.prototype.templates.titleBar,warnings:g})}());return{HDAEditView:f}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/dataset/hda-model.js b/static/scripts/packed/mvc/dataset/hda-model.js
deleted file mode 100644
index dd3139bcb60..00000000000
--- a/static/scripts/packed/mvc/dataset/hda-model.js
+++ /dev/null
@@ -1 +0,0 @@
-define(["mvc/dataset/dataset-model","mvc/history/history-content-base","mvc/base-mvc","utils/localization"],function(e,g,b,c){var f=e.DatasetAssociation,d=g.HistoryContentMixin;var a=f.extend(b.mixin(d,{constructor:function(i,h){d.constructor.call(this,i,h)},defaults:_.extend({},f.prototype.defaults,d.defaults,{model_class:"HistoryDatasetAssociation"}),initialize:function(h,i){f.prototype.initialize.call(this,h,i);d.initialize.call(this,h,i)},toString:function(){var h=this.get("id")||"";if(this.get("name")){h=this.get("hid")+' :"'+this.get("name")+'",'+h}return"HDA("+h+")"}}));return{HistoryDatasetAssociation:a}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/history/annotated-history-panel.js b/static/scripts/packed/mvc/history/annotated-history-panel.js
deleted file mode 100644
index 7e851c16f58..00000000000
--- a/static/scripts/packed/mvc/history/annotated-history-panel.js
+++ /dev/null
@@ -1 +0,0 @@
-define(["mvc/dataset/hda-base","mvc/history/readonly-history-panel","utils/localization"],function(a,c,b){var e=c.ReadOnlyHistoryPanel;var d=e.extend({className:"annotated-history-panel",HDAViewClass:a.HDABaseView,renderModel:function(){this.$el.addClass(this.className);var h=e.prototype.renderModel.call(this),f=this.$datasetsList(h),g=$("").addClass("datasets-list datasets-table");g.append(f.children());f.replaceWith(g);h.find(".history-subtitle").after(this.renderHistoryAnnotation());h.find(".history-search-btn").hide();h.find(".history-controls").after(h.find(".history-search-controls").show());return h},renderHistoryAnnotation:function(){var f=this.model.get("annotation");if(!f){return null}return $(['',f,"
"].join(""))},renderHdas:function(g){g=g||this.$el;var f=e.prototype.renderHdas.call(this,g);this.$datasetsList(g).prepend($("',b("load your own data")," ",b(" or "),'',b("get data from an external source")," "].join(""));j.find(".uploader-link").click(function(n){Galaxy.upload._eventShow(n)});j.find(".get-data-link").click(function(n){m.parent().scrollTop(0);m.find('span:contains("Get Data")').click()});j.show()}else{g.prototype._renderEmptyMsg.call(this,l)}return this},toggleSearchControls:function(k,j){var l=g.prototype.toggleSearchControls.call(this,k,j);this.preferences.set("searching",l)},_renderTags:function(j){var k=this;g.prototype._renderTags.call(this,j);if(this.preferences.get("tagsEditorShown")){this.tagsEditor.toggle(true)}this.tagsEditor.on("hiddenUntilActivated:shown hiddenUntilActivated:hidden",function(l){k.preferences.set("tagsEditorShown",l.hidden)})},_renderAnnotation:function(j){var k=this;g.prototype._renderAnnotation.call(this,j);if(this.preferences.get("annotationEditorShown")){this.annotationEditor.toggle(true)}this.annotationEditor.on("hiddenUntilActivated:shown hiddenUntilActivated:hidden",function(l){k.preferences.set("annotationEditorShown",l.hidden)})},_setUpHdaListeners:function(k){g.prototype._setUpHdaListeners.call(this,k);var j=this;if(k instanceof j.HDCAViewClass){k.off("expanded");k.on("expanded",function(l){this.info("expanded",l);j._addCollectionPanel(l)});k.off("collapsed")}},_addCollectionPanel:function(l){var m=this,j=l.model;this.debug("history panel (stack), collectionModel:",j);var k=new (this._getCollectionPanelClass(j))({model:j,HDAViewClass:this.HDAViewClass,parentName:this.model.get("name")});m.panelStack.push(k);m.$(".history-controls").add(".datasets-list").hide();m.$el.append(k.$el);k.on("close",function(){m.render();l.collapse();m.panelStack.pop()});if(!k.model.hasDetails()){var n=k.model.fetch();n.done(function(){k.render()})}else{k.render()}},_getCollectionPanelClass:function(j){switch(j.get("collection_type")){case"list":return a.ListCollectionPanel;case"paired":return a.PairCollectionPanel;case"list:paired":return a.ListOfPairsCollectionPanel}throw new TypeError("Uknown collection_type: "+j.get("collection_type"))},addContentView:function(j){if(this.panelStack.length){return this}return g.prototype.addContentView.call(this,j)},connectToQuotaMeter:function(j){if(!j){return this}this.listenTo(j,"quota:over",this.showQuotaMessage);this.listenTo(j,"quota:under",this.hideQuotaMessage);this.on("rendered rendered:initial",function(){if(j&&j.isOverQuota()){this.showQuotaMessage()}});return this},showQuotaMessage:function(){var j=this.$el.find(".quota-message");if(j.is(":hidden")){j.slideDown(this.fxSpeed)}},hideQuotaMessage:function(){var j=this.$el.find(".quota-message");if(!j.is(":hidden")){j.slideUp(this.fxSpeed)}},connectToOptionsMenu:function(j){if(!j){return this}this.on("new-storage",function(l,k){if(j&&l){j.findItemByHtml(b("Include Deleted Datasets")).checked=l.get("show_deleted");j.findItemByHtml(b("Include Hidden Datasets")).checked=l.get("show_hidden")}});return this},toString:function(){return"CurrentHistoryPanel("+((this.model)?(this.model.get("name")):(""))+")"}});return{CurrentHistoryPanel:i}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/history/hda-li-edit.js b/static/scripts/packed/mvc/history/hda-li-edit.js
new file mode 100644
index 00000000000..85b44bf7ae5
--- /dev/null
+++ b/static/scripts/packed/mvc/history/hda-li-edit.js
@@ -0,0 +1 @@
+define(["mvc/dataset/dataset-li-edit","mvc/history/hda-li","mvc/base-mvc","utils/localization"],function(b,d,a,c){var e=b.DatasetListItemEdit;var f=e.extend({className:e.prototype.className+" history-content",events:_.extend(_.clone(e.prototype.events),{"click .unhide-link":function(g){this.model.unhide();return false}}),toString:function(){var g=(this.model)?(this.model+""):("(no model)");return"HDAListItemEdit("+g+")"}});f.prototype.templates=(function(){var g=_.extend({},e.prototype.templates.warnings,{hidden:a.wrapTemplate(["<% if( !dataset.visible ){ %>",'","<% } %>"],"dataset")});return _.extend({},e.prototype.templates,{titleBar:d.HDAListItemView.prototype.templates.titleBar,warnings:g})}());return{HDAListItemEdit:f}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/history/hda-li.js b/static/scripts/packed/mvc/history/hda-li.js
new file mode 100644
index 00000000000..319f90d6e14
--- /dev/null
+++ b/static/scripts/packed/mvc/history/hda-li.js
@@ -0,0 +1 @@
+define(["mvc/dataset/dataset-li","mvc/base-mvc","utils/localization"],function(e,a,c){var d=e.DatasetListItemView;var b=d.extend({initialize:function(f,g){d.prototype.initialize.call(this,f,g)},className:d.prototype.className+" history-content",toString:function(){var f=(this.model)?(this.model+""):("(no model)");return"HDAListItemView("+f+")"}});b.prototype.templates=(function(){var g=a.wrapTemplate(['','
','
','<%- dataset.hid %> ','<%- dataset.name %> ',"
","
',c("This dataset has been hidden"),"
","<% } %>"],"dataset")});return _.extend({},d.prototype.templates,{titleBar:g,warnings:f})}());return{HDAListItemView:b}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/history/hda-model.js b/static/scripts/packed/mvc/history/hda-model.js
new file mode 100644
index 00000000000..c7849b6877f
--- /dev/null
+++ b/static/scripts/packed/mvc/history/hda-model.js
@@ -0,0 +1 @@
+define(["mvc/dataset/dataset-model","mvc/history/history-content-model","mvc/base-mvc","utils/localization"],function(e,g,b,c){var f=e.DatasetAssociation,d=g.HistoryContentMixin;var a=f.extend(b.mixin(d,{constructor:function(i,h){d.constructor.call(this,i,h)},defaults:_.extend({},f.prototype.defaults,d.defaults,{model_class:"HistoryDatasetAssociation"}),initialize:function(h,i){f.prototype.initialize.call(this,h,i);d.initialize.call(this,h,i)},toString:function(){var h=this.get("id")||"";if(this.get("name")){h=this.get("hid")+' :"'+this.get("name")+'",'+h}return"HDA("+h+")"}}));return{HistoryDatasetAssociation:a}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/history/hdca-li-edit.js b/static/scripts/packed/mvc/history/hdca-li-edit.js
new file mode 100644
index 00000000000..85453474dad
--- /dev/null
+++ b/static/scripts/packed/mvc/history/hdca-li-edit.js
@@ -0,0 +1 @@
+define(["mvc/dataset/states","mvc/history/hdca-li","utils/localization"],function(a,e,b){var c=e.HDCAListItemView;var d=c.extend({_renderPrimaryActions:function(){this.log(this+"._renderPrimaryActions");return c.prototype._renderPrimaryActions.call(this).concat([this._renderDeleteButton()])},_renderDeleteButton:function(){var g=this,f=this.model.get("deleted");return faIconButton({title:f?b("Dataset collection is already deleted"):b("Delete"),classes:"delete-btn",faIcon:"fa-times",disabled:f,onclick:function(){g.$el.find(".icon-btn.delete-btn").trigger("mouseout");g.model["delete"]()}})},toString:function(){var f=(this.model)?(this.model+""):("(no model)");return"HDCAListItemEdit("+f+")"}});return{HDCAListItemEdit:d}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/history/hdca-li.js b/static/scripts/packed/mvc/history/hdca-li.js
new file mode 100644
index 00000000000..7a0bf881a33
--- /dev/null
+++ b/static/scripts/packed/mvc/history/hdca-li.js
@@ -0,0 +1 @@
+define(["mvc/dataset/states","mvc/collection/collection-li","mvc/base-mvc","utils/localization"],function(a,e,c,d){var f=e.DCListItemView;var b=f.extend({className:f.prototype.className+" history-content",_swapNewRender:function(g){f.prototype._swapNewRender.call(this,g);var h=this.model.get("state")||a.OK;this.$el.addClass("state-"+h);return this.$el},toString:function(){var g=(this.model)?(this.model+""):("(no model)");return"HDCAListItemView("+g+")"}});b.prototype.templates=(function(){var g=c.wrapTemplate(['','
','
','<%- collection.hid %> ','<%- collection.name %> ',"
",'
',"
',f,"
"].join(""))},renderHdas:function(g){g=g||this.$el;var f=d.prototype.renderHdas.call(this,g);this.$datasetsList(g).prepend($("',d("load your own data")," ",d(" or "),'',d("get data from an external source")," "].join(""));i.find(".uploader-link").click(function(m){Galaxy.upload._eventShow(m)});i.find(".get-data-link").click(function(m){l.parent().scrollTop(0);l.find('span:contains("Get Data")').click()});i.show()}else{e.prototype._renderEmptyMsg.call(this,k)}return this},toggleSearchControls:function(j,i){var k=e.prototype.toggleSearchControls.call(this,j,i);this.preferences.set("searching",k)},_renderTags:function(i){var j=this;e.prototype._renderTags.call(this,i);if(this.preferences.get("tagsEditorShown")){this.tagsEditor.toggle(true)}this.tagsEditor.on("hiddenUntilActivated:shown hiddenUntilActivated:hidden",function(k){j.preferences.set("tagsEditorShown",k.hidden)})},_renderAnnotation:function(i){var j=this;e.prototype._renderAnnotation.call(this,i);if(this.preferences.get("annotationEditorShown")){this.annotationEditor.toggle(true)}this.annotationEditor.on("hiddenUntilActivated:shown hiddenUntilActivated:hidden",function(k){j.preferences.set("annotationEditorShown",k.hidden)})},_setUpHdaListeners:function(j){e.prototype._setUpHdaListeners.call(this,j);var i=this;if(j instanceof i.HDCAViewClass){j.off("expanded");j.on("expanded",function(k){this.info("expanded",k);i._addCollectionPanel(k)});j.off("collapsed")}},_addCollectionPanel:function(k){var l=this,i=k.model;this.debug("history panel (stack), collectionModel:",i);var j=new (this._getCollectionPanelClass(i))({model:i,HDAViewClass:this.HDAViewClass,parentName:this.model.get("name"),linkTarget:this.linkTarget});l.panelStack.push(j);l.$(".history-controls").add(".datasets-list").hide();l.$el.append(j.$el);j.on("close",function(){l.render();k.collapse();l.panelStack.pop()});if(!j.model.hasDetails()){var m=j.model.fetch();m.done(function(){j.render()})}else{j.render()}},_getCollectionPanelClass:function(i){switch(i.get("collection_type")){case"list":return f.ListCollectionPanel;case"paired":return f.PairCollectionPanel;case"list:paired":return f.ListOfPairsCollectionPanel}throw new TypeError("Uknown collection_type: "+i.get("collection_type"))},addContentView:function(i){if(this.panelStack.length){return this}return e.prototype.addContentView.call(this,i)},connectToQuotaMeter:function(i){if(!i){return this}this.listenTo(i,"quota:over",this.showQuotaMessage);this.listenTo(i,"quota:under",this.hideQuotaMessage);this.on("rendered rendered:initial",function(){if(i&&i.isOverQuota()){this.showQuotaMessage()}});return this},showQuotaMessage:function(){var i=this.$el.find(".quota-message");if(i.is(":hidden")){i.slideDown(this.fxSpeed)}},hideQuotaMessage:function(){var i=this.$el.find(".quota-message");if(!i.is(":hidden")){i.slideUp(this.fxSpeed)}},connectToOptionsMenu:function(i){if(!i){return this}this.on("new-storage",function(k,j){if(i&&k){i.findItemByHtml(d("Include Deleted Datasets")).checked=k.get("show_deleted");i.findItemByHtml(d("Include Hidden Datasets")).checked=k.get("show_hidden")}});return this},toString:function(){return"CurrentHistoryPanel("+((this.model)?(this.model.get("name")):(""))+")"}});return{CurrentHistoryPanel:a}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/history/history-panel-edit.js b/static/scripts/packed/mvc/history/history-panel-edit.js
new file mode 100644
index 00000000000..1f6f41374fe
--- /dev/null
+++ b/static/scripts/packed/mvc/history/history-panel-edit.js
@@ -0,0 +1 @@
+define(["mvc/history/history-panel","mvc/history/history-contents","mvc/dataset/states","mvc/history/hda-model","mvc/history/hda-li-edit","mvc/history/hdca-li-edit","mvc/tags","mvc/annotations","utils/localization"],function(f,h,k,d,c,g,j,a,b){var i=f.ReadOnlyHistoryPanel;var e=i.extend({HDAViewClass:c.HDAListItemEdit,HDCAViewClass:g.HDCAListItemEdit,initialize:function(l){l=l||{};this.selectedHdaIds=[];this.lastSelectedViewId=null;this.tagsEditor=null;this.annotationEditor=null;this.purgeAllowed=l.purgeAllowed||false;this.selecting=l.selecting||false;this.annotationEditorShown=l.annotationEditorShown||false;this.tagsEditorShown=l.tagsEditorShown||false;i.prototype.initialize.call(this,l)},_setUpModelEventHandlers:function(){i.prototype._setUpModelEventHandlers.call(this);this.model.on("change:nice_size",this.updateHistoryDiskSize,this);this.model.contents.on("change:deleted",this._handleHdaDeletionChange,this);this.model.contents.on("change:visible",this._handleHdaVisibleChange,this);this.model.contents.on("change:purged",function(l){this.model.fetch()},this)},renderModel:function(){var l=$("
");l.append(e.templates.historyPanel(this.model.toJSON()));this.$emptyMessage(l).text(this.emptyMsg);if(Galaxy&&Galaxy.currUser&&Galaxy.currUser.id&&Galaxy.currUser.id===this.model.get("user_id")){this._renderTags(l);this._renderAnnotation(l)}l.find(".history-secondary-actions").prepend(this._renderSelectButton());l.find(".history-dataset-actions").toggle(this.selecting);l.find(".history-secondary-actions").prepend(this._renderSearchButton());this._setUpBehaviours(l);this.renderHdas(l);return l},_renderTags:function(l){var m=this;this.tagsEditor=new j.TagsEditor({model:this.model,el:l.find(".history-controls .tags-display"),onshowFirstTime:function(){this.render()},onshow:function(){m.toggleHDATagEditors(true,m.fxSpeed)},onhide:function(){m.toggleHDATagEditors(false,m.fxSpeed)},$activator:faIconButton({title:b("Edit history tags"),classes:"history-tag-btn",faIcon:"fa-tags"}).appendTo(l.find(".history-secondary-actions"))})},_renderAnnotation:function(l){var m=this;this.annotationEditor=new a.AnnotationEditor({model:this.model,el:l.find(".history-controls .annotation-display"),onshowFirstTime:function(){this.render()},onshow:function(){m.toggleHDAAnnotationEditors(true,m.fxSpeed)},onhide:function(){m.toggleHDAAnnotationEditors(false,m.fxSpeed)},$activator:faIconButton({title:b("Edit history annotation"),classes:"history-annotate-btn",faIcon:"fa-comment"}).appendTo(l.find(".history-secondary-actions"))})},_renderSelectButton:function(l){return faIconButton({title:b("Operations on multiple datasets"),classes:"history-select-btn",faIcon:"fa-check-square-o"})},_setUpBehaviours:function(l){l=l||this.$el;i.prototype._setUpBehaviours.call(this,l);if(!this.model){return}this._setUpDatasetActionsPopup(l);if((!Galaxy.currUser||Galaxy.currUser.isAnonymous())||(Galaxy.currUser.id!==this.model.get("user_id"))){return}var m=this;l.find(".history-name").attr("title",b("Click to rename history")).tooltip({placement:"bottom"}).make_text_editable({on_finish:function(n){var o=m.model.get("name");if(n&&n!==o){m.$el.find(".history-name").text(n);m.model.save({name:n}).fail(function(){m.$el.find(".history-name").text(m.model.previous("name"))})}else{m.$el.find(".history-name").text(o)}}})},_setUpDatasetActionsPopup:function(l){var m=this,n=[{html:b("Hide datasets"),func:function(){var o=d.HistoryDatasetAssociation.prototype.hide;m.getSelectedHdaCollection().ajaxQueue(o)}},{html:b("Unhide datasets"),func:function(){var o=d.HistoryDatasetAssociation.prototype.unhide;m.getSelectedHdaCollection().ajaxQueue(o)}},{html:b("Delete datasets"),func:function(){var o=d.HistoryDatasetAssociation.prototype["delete"];m.getSelectedHdaCollection().ajaxQueue(o)}},{html:b("Undelete datasets"),func:function(){var o=d.HistoryDatasetAssociation.prototype.undelete;m.getSelectedHdaCollection().ajaxQueue(o)}}];if(m.purgeAllowed){n.push({html:b("Permanently delete datasets"),func:function(){if(confirm(b("This will permanently remove the data in your datasets. Are you sure?"))){var o=d.HistoryDatasetAssociation.prototype.purge;m.getSelectedHdaCollection().ajaxQueue(o)}}})}n.push({html:b("Build Dataset List (Experimental)"),func:function(){m.getSelectedHdaCollection().promoteToHistoryDatasetCollection(m.model,"list")}});n.push({html:b("Build Dataset Pair (Experimental)"),func:function(){m.getSelectedHdaCollection().promoteToHistoryDatasetCollection(m.model,"paired")}});n.push({html:b("Build List of Dataset Pairs (Experimental)"),func:_.bind(m._showPairedCollectionModal,m)});return new PopupMenu(l.find(".history-dataset-action-popup-btn"),n)},_showPairedCollectionModal:function(){var l=this,m=l.getSelectedHdaCollection().toJSON().filter(function(n){return n.history_content_type==="dataset"&&n.state===k.OK});if(m.length){require(["mvc/collection/paired-collection-creator"],function(n){window.creator=n.pairedCollectionCreatorModal(m,{historyId:l.model.id})})}else{}},_handleHdaDeletionChange:function(l){if(l.get("deleted")&&!this.storage.get("show_deleted")){this.removeHdaView(this.hdaViews[l.id])}},_handleHdaVisibleChange:function(l){if(l.hidden()&&!this.storage.get("show_hidden")){this.removeHdaView(this.hdaViews[l.id])}},_getContentOptions:function(m){var l=i.prototype._getContentOptions.call(this,m);_.extend(l,{selectable:this.selecting,purgeAllowed:this.purgeAllowed,tagsEditorShown:(this.tagsEditor&&!this.tagsEditor.hidden),annotationEditorShown:(this.annotationEditor&&!this.annotationEditor.hidden)});return l},_setUpHdaListeners:function(m){var l=this;i.prototype._setUpHdaListeners.call(this,m);m.on("selected",function(p,o){if(!o){return}var n=[];if((o.shiftKey)&&(l.lastSelectedViewId&&_.has(l.hdaViews,l.lastSelectedViewId))){var r=l.hdaViews[l.lastSelectedViewId];n=l.selectDatasetRange(p,r).map(function(s){return s.model.id})}else{var q=p.model.id;l.lastSelectedViewId=q;n=[q]}l.selectedHdaIds=_.union(l.selectedHdaIds,n)});m.on("de-selected",function(o,n){var p=o.model.id;l.selectedHdaIds=_.without(l.selectedHdaIds,p)})},toggleHDATagEditors:function(l){var m=arguments;_.each(this.hdaViews,function(n){if(n.tagsEditor){n.tagsEditor.toggle.apply(n.tagsEditor,m)}})},toggleHDAAnnotationEditors:function(l){var m=arguments;_.each(this.hdaViews,function(n){if(n.annotationEditor){n.annotationEditor.toggle.apply(n.annotationEditor,m)}})},removeHdaView:function(m){if(!m){return}var l=this;m.$el.fadeOut(l.fxSpeed,function(){m.off();m.remove();delete l.hdaViews[m.model.id];if(_.isEmpty(l.hdaViews)){l.trigger("empty-history",l);l._renderEmptyMsg()}})},events:_.extend(_.clone(i.prototype.events),{"click .history-select-btn":"toggleSelectors","click .history-select-all-datasets-btn":"selectAllDatasets","click .history-deselect-all-datasets-btn":"deselectAllDatasets"}),updateHistoryDiskSize:function(){this.$el.find(".history-size").text(this.model.get("nice_size"))},showSelectors:function(l){l=(l!==undefined)?(l):(this.fxSpeed);this.selecting=true;this.$(".history-dataset-actions").slideDown(l);_.each(this.hdaViews,function(m){m.showSelector()});this.selectedHdaIds=[];this.lastSelectedViewId=null},hideSelectors:function(l){l=(l!==undefined)?(l):(this.fxSpeed);this.selecting=false;this.$(".history-dataset-actions").slideUp(l);_.each(this.hdaViews,function(m){m.hideSelector()});this.selectedHdaIds=[];this.lastSelectedViewId=null},toggleSelectors:function(){if(!this.selecting){this.showSelectors()}else{this.hideSelectors()}},selectAllDatasets:function(l){_.each(this.hdaViews,function(m){m.select(l)})},deselectAllDatasets:function(l){this.lastSelectedViewId=null;_.each(this.hdaViews,function(m){m.deselect(l)})},selectDatasetRange:function(n,m){var l=this.hdaViewRange(n,m);_.each(l,function(o){o.select()});return l},getSelectedHdaViews:function(){return _.filter(this.hdaViews,function(l){return l.selected})},getSelectedHdaCollection:function(){return new h.HistoryContents(_.map(this.getSelectedHdaViews(),function(l){return l.model}),{historyId:this.model.id})},toString:function(){return"HistoryPanel("+((this.model)?(this.model.get("name")):(""))+")"}});return{HistoryPanel:e}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/history/history-panel.js b/static/scripts/packed/mvc/history/history-panel.js
index 0ef2095ef63..a8911dc2f70 100644
--- a/static/scripts/packed/mvc/history/history-panel.js
+++ b/static/scripts/packed/mvc/history/history-panel.js
@@ -1 +1 @@
-define(["mvc/dataset/states","mvc/dataset/hda-model","mvc/dataset/hda-base","mvc/dataset/hda-edit","mvc/dataset/dataset-list-element","mvc/dataset/editable-dataset-list-element","mvc/collection/dataset-collection-base","mvc/collection/dataset-collection-edit","mvc/collection/hdca-base","mvc/collection/hdca-edit","mvc/history/history-contents","mvc/history/readonly-history-panel","mvc/tags","mvc/annotations","utils/localization"],function(p,h,j,g,m,f,e,q,a,k,l,c,o,b,d){var n=c.ReadOnlyHistoryPanel;var i=n.extend({HDAViewClass:g.HDAEditView,HDCAViewClass:k.HDCAEditView,initialize:function(r){r=r||{};this.selectedHdaIds=[];this.lastSelectedViewId=null;this.tagsEditor=null;this.annotationEditor=null;this.purgeAllowed=r.purgeAllowed||false;this.selecting=r.selecting||false;this.annotationEditorShown=r.annotationEditorShown||false;this.tagsEditorShown=r.tagsEditorShown||false;n.prototype.initialize.call(this,r)},_setUpModelEventHandlers:function(){n.prototype._setUpModelEventHandlers.call(this);this.model.on("change:nice_size",this.updateHistoryDiskSize,this);this.model.contents.on("change:deleted",this._handleHdaDeletionChange,this);this.model.contents.on("change:visible",this._handleHdaVisibleChange,this);this.model.contents.on("change:purged",function(r){this.model.fetch()},this)},renderModel:function(){var r=$("
");r.append(i.templates.historyPanel(this.model.toJSON()));this.$emptyMessage(r).text(this.emptyMsg);if(Galaxy&&Galaxy.currUser&&Galaxy.currUser.id&&Galaxy.currUser.id===this.model.get("user_id")){this._renderTags(r);this._renderAnnotation(r)}r.find(".history-secondary-actions").prepend(this._renderSelectButton());r.find(".history-dataset-actions").toggle(this.selecting);r.find(".history-secondary-actions").prepend(this._renderSearchButton());this._setUpBehaviours(r);this.renderHdas(r);return r},_renderTags:function(r){var s=this;this.tagsEditor=new o.TagsEditor({model:this.model,el:r.find(".history-controls .tags-display"),onshowFirstTime:function(){this.render()},onshow:function(){s.toggleHDATagEditors(true,s.fxSpeed)},onhide:function(){s.toggleHDATagEditors(false,s.fxSpeed)},$activator:faIconButton({title:d("Edit history tags"),classes:"history-tag-btn",faIcon:"fa-tags"}).appendTo(r.find(".history-secondary-actions"))})},_renderAnnotation:function(r){var s=this;this.annotationEditor=new b.AnnotationEditor({model:this.model,el:r.find(".history-controls .annotation-display"),onshowFirstTime:function(){this.render()},onshow:function(){s.toggleHDAAnnotationEditors(true,s.fxSpeed)},onhide:function(){s.toggleHDAAnnotationEditors(false,s.fxSpeed)},$activator:faIconButton({title:d("Edit history annotation"),classes:"history-annotate-btn",faIcon:"fa-comment"}).appendTo(r.find(".history-secondary-actions"))})},_renderSelectButton:function(r){return faIconButton({title:d("Operations on multiple datasets"),classes:"history-select-btn",faIcon:"fa-check-square-o"})},_setUpBehaviours:function(r){r=r||this.$el;n.prototype._setUpBehaviours.call(this,r);if(!this.model){return}this._setUpDatasetActionsPopup(r);if((!Galaxy.currUser||Galaxy.currUser.isAnonymous())||(Galaxy.currUser.id!==this.model.get("user_id"))){return}var s=this;r.find(".history-name").attr("title",d("Click to rename history")).tooltip({placement:"bottom"}).make_text_editable({on_finish:function(t){var u=s.model.get("name");if(t&&t!==u){s.$el.find(".history-name").text(t);s.model.save({name:t}).fail(function(){s.$el.find(".history-name").text(s.model.previous("name"))})}else{s.$el.find(".history-name").text(u)}}})},_setUpDatasetActionsPopup:function(r){var s=this,t=[{html:d("Hide datasets"),func:function(){var u=h.HistoryDatasetAssociation.prototype.hide;s.getSelectedHdaCollection().ajaxQueue(u)}},{html:d("Unhide datasets"),func:function(){var u=h.HistoryDatasetAssociation.prototype.unhide;s.getSelectedHdaCollection().ajaxQueue(u)}},{html:d("Delete datasets"),func:function(){var u=h.HistoryDatasetAssociation.prototype["delete"];s.getSelectedHdaCollection().ajaxQueue(u)}},{html:d("Undelete datasets"),func:function(){var u=h.HistoryDatasetAssociation.prototype.undelete;s.getSelectedHdaCollection().ajaxQueue(u)}}];if(s.purgeAllowed){t.push({html:d("Permanently delete datasets"),func:function(){if(confirm(d("This will permanently remove the data in your datasets. Are you sure?"))){var u=h.HistoryDatasetAssociation.prototype.purge;s.getSelectedHdaCollection().ajaxQueue(u)}}})}t.push({html:d("Build Dataset List (Experimental)"),func:function(){s.getSelectedHdaCollection().promoteToHistoryDatasetCollection(s.model,"list")}});t.push({html:d("Build Dataset Pair (Experimental)"),func:function(){s.getSelectedHdaCollection().promoteToHistoryDatasetCollection(s.model,"paired")}});t.push({html:d("Build List of Dataset Pairs (Experimental)"),func:_.bind(s._showPairedCollectionModal,s)});return new PopupMenu(r.find(".history-dataset-action-popup-btn"),t)},_showPairedCollectionModal:function(){var r=this,s=r.getSelectedHdaCollection().toJSON().filter(function(t){return t.history_content_type==="dataset"&&t.state===p.OK});if(s.length){require(["mvc/collection/paired-collection-creator"],function(t){window.creator=t.pairedCollectionCreatorModal(s,{historyId:r.model.id})})}else{}},_handleHdaDeletionChange:function(r){if(r.get("deleted")&&!this.storage.get("show_deleted")){this.removeHdaView(this.hdaViews[r.id])}},_handleHdaVisibleChange:function(r){if(r.hidden()&&!this.storage.get("show_hidden")){this.removeHdaView(this.hdaViews[r.id])}},_getContentOptions:function(s){var r=n.prototype._getContentOptions.call(this,s);_.extend(r,{selectable:this.selecting,purgeAllowed:this.purgeAllowed,tagsEditorShown:(this.tagsEditor&&!this.tagsEditor.hidden),annotationEditorShown:(this.annotationEditor&&!this.annotationEditor.hidden)});return r},_setUpHdaListeners:function(s){var r=this;n.prototype._setUpHdaListeners.call(this,s);s.on("selected",function(v,u){if(!u){return}var t=[];if((u.shiftKey)&&(r.lastSelectedViewId&&_.has(r.hdaViews,r.lastSelectedViewId))){var x=r.hdaViews[r.lastSelectedViewId];t=r.selectDatasetRange(v,x).map(function(y){return y.model.id})}else{var w=v.model.id;r.lastSelectedViewId=w;t=[w]}r.selectedHdaIds=_.union(r.selectedHdaIds,t)});s.on("de-selected",function(u,t){var v=u.model.id;r.selectedHdaIds=_.without(r.selectedHdaIds,v)})},toggleHDATagEditors:function(r){var s=arguments;_.each(this.hdaViews,function(t){if(t.tagsEditor){t.tagsEditor.toggle.apply(t.tagsEditor,s)}})},toggleHDAAnnotationEditors:function(r){var s=arguments;_.each(this.hdaViews,function(t){if(t.annotationEditor){t.annotationEditor.toggle.apply(t.annotationEditor,s)}})},removeHdaView:function(s){if(!s){return}var r=this;s.$el.fadeOut(r.fxSpeed,function(){s.off();s.remove();delete r.hdaViews[s.model.id];if(_.isEmpty(r.hdaViews)){r.trigger("empty-history",r);r._renderEmptyMsg()}})},events:_.extend(_.clone(n.prototype.events),{"click .history-select-btn":"toggleSelectors","click .history-select-all-datasets-btn":"selectAllDatasets","click .history-deselect-all-datasets-btn":"deselectAllDatasets"}),updateHistoryDiskSize:function(){this.$el.find(".history-size").text(this.model.get("nice_size"))},showSelectors:function(r){r=(r!==undefined)?(r):(this.fxSpeed);this.selecting=true;this.$(".history-dataset-actions").slideDown(r);_.each(this.hdaViews,function(s){s.showSelector()});this.selectedHdaIds=[];this.lastSelectedViewId=null},hideSelectors:function(r){r=(r!==undefined)?(r):(this.fxSpeed);this.selecting=false;this.$(".history-dataset-actions").slideUp(r);_.each(this.hdaViews,function(s){s.hideSelector()});this.selectedHdaIds=[];this.lastSelectedViewId=null},toggleSelectors:function(){if(!this.selecting){this.showSelectors()}else{this.hideSelectors()}},selectAllDatasets:function(r){_.each(this.hdaViews,function(s){s.select(r)})},deselectAllDatasets:function(r){this.lastSelectedViewId=null;_.each(this.hdaViews,function(s){s.deselect(r)})},selectDatasetRange:function(t,s){var r=this.hdaViewRange(t,s);_.each(r,function(u){u.select()});return r},getSelectedHdaViews:function(){return _.filter(this.hdaViews,function(r){return r.selected})},getSelectedHdaCollection:function(){return new l.HistoryContents(_.map(this.getSelectedHdaViews(),function(r){return r.model}),{historyId:this.model.id})},toString:function(){return"HistoryPanel("+((this.model)?(this.model.get("name")):(""))+")"}});return{HistoryPanel:i}});
\ No newline at end of file
+define(["mvc/history/history-model","mvc/history/hda-li","mvc/history/hdca-li","mvc/user/user-model","mvc/base-mvc","utils/localization"],function(e,b,a,f,k,d){var i=k.SessionStorageModel.extend({defaults:{expandedHdas:{},show_deleted:false,show_hidden:false},addExpandedHda:function(m){var n="expandedHdas";this.save(n,_.extend(this.get(n),_.object([m.id],[m.get("id")])))},removeExpandedHda:function(m){var n="expandedHdas";this.save(n,_.omit(this.get(n),m.id))},toString:function(){return"HistoryPrefs("+this.id+")"}});i.storageKeyPrefix="history:";i.historyStorageKey=function g(m){if(!m){throw new Error("HistoryPrefs.historyStorageKey needs valid id: "+m)}return(i.storageKeyPrefix+m)};i.get=function c(m){return new i({id:i.historyStorageKey(m)})};i.clearAll=function h(n){for(var m in sessionStorage){if(m.indexOf(i.storageKeyPrefix)===0){sessionStorage.removeItem(m)}}};var j=Backbone.View.extend(k.LoggableMixin).extend({HDAViewClass:b.HDAListItemView,HDCAViewClass:a.HDCAListItemView,tagName:"div",className:"history-panel",fxSpeed:"fast",emptyMsg:d("This history is empty"),noneFoundMsg:d("No matching datasets found"),initialize:function(m){m=m||{};if(m.logger){this.logger=m.logger}this.log(this+".initialize:",m);this.linkTarget=m.linkTarget||"_blank";this.fxSpeed=_.has(m,"fxSpeed")?(m.fxSpeed):(this.fxSpeed);this.filters=[];this.searchFor="";this.findContainerFn=m.findContainerFn;this.hdaViews={};this.indicator=new LoadingIndicator(this.$el);this._setUpListeners();var n=_.pick(m,"initiallyExpanded","show_deleted","show_hidden");this.setModel(this.model,n,false);if(m.onready){m.onready.call(this)}},_setUpListeners:function(){this.on("error",function(n,q,m,p,o){this.errorHandler(n,q,m,p,o)});this.on("loading-history",function(){this._showLoadingIndicator("loading history...",40)});this.on("loading-done",function(){this._hideLoadingIndicator(40);if(_.isEmpty(this.hdaViews)){this.trigger("empty-history",this)}});this.once("rendered",function(){this.trigger("rendered:initial",this);return false});if(this.logger){this.on("all",function(m){this.log(this+"",arguments)},this)}return this},errorHandler:function(o,r,n,q,p){this.error(o,r,n,q,p);if(r&&r.status===0&&r.readyState===0){}else{if(r&&r.status===502){}else{var m=this._parseErrorMessage(o,r,n,q,p);if(!this.$messages().is(":visible")){this.once("rendered",function(){this.displayMessage("error",m.message,m.details)})}else{this.displayMessage("error",m.message,m.details)}}}},_parseErrorMessage:function(p,t,o,s,r){var n=Galaxy.currUser,m={message:this._bePolite(s),details:{user:(n instanceof f.User)?(n.toJSON()):(n+""),source:(p instanceof Backbone.Model)?(p.toJSON()):(p+""),xhr:t,options:(t)?(_.omit(o,"xhr")):(o)}};_.extend(m.details,r||{});if(t&&_.isFunction(t.getAllResponseHeaders)){var q=t.getAllResponseHeaders();q=_.compact(q.split("\n"));q=_.map(q,function(u){return u.split(": ")});m.details.xhr.responseHeaders=_.object(q)}return m},_bePolite:function(m){m=m||d("An error occurred while getting updates from the server");return m+". "+d("Please contact a Galaxy administrator if the problem persists")+"."},loadHistoryWithHDADetails:function(o,n,m,q){var p=function(r){return _.values(i.get(r.id).get("expandedHdas"))};return this.loadHistory(o,n,m,q,p)},loadHistory:function(p,o,n,s,q){var m=this;o=o||{};m.trigger("loading-history",m);var r=e.History.getHistoryData(p,{historyFn:n,hdaFn:s,hdaDetailIds:o.initiallyExpanded||q});return m._loadHistoryFromXHR(r,o).fail(function(v,t,u){m.trigger("error",m,v,o,d("An error was encountered while "+t),{historyId:p,history:u||{}})}).always(function(){m.trigger("loading-done",m)})},_loadHistoryFromXHR:function(o,n){var m=this;o.then(function(p,q){m.JSONToModel(p,q,n)});o.fail(function(q,p){m.render()});return o},JSONToModel:function(p,m,n){this.log("JSONToModel:",p,m,n);n=n||{};var o=new e.History(p,m,n);this.setModel(o);return this},setModel:function(n,m,o){m=m||{};o=(o!==undefined)?(o):(true);this.log("setModel:",n,m,o);this.freeModel();this.selectedHdaIds=[];if(n){this.model=n;if(this.logger){this.model.logger=this.logger}this._setUpWebStorage(m.initiallyExpanded,m.show_deleted,m.show_hidden);this._setUpModelEventHandlers();this.trigger("new-model",this)}if(o){this.render()}return this},freeModel:function(){if(this.model){this.model.clearUpdateTimeout();this.stopListening(this.model);this.stopListening(this.model.contents)}this.freeHdaViews();return this},freeHdaViews:function(){this.hdaViews={};return this},_setUpWebStorage:function(n,m,o){this.storage=new i({id:i.historyStorageKey(this.model.get("id"))});if(_.isObject(n)){this.storage.set("exandedHdas",n)}if(_.isBoolean(m)){this.storage.set("show_deleted",m)}if(_.isBoolean(o)){this.storage.set("show_hidden",o)}this.trigger("new-storage",this.storage,this);this.log(this+" (init'd) storage:",this.storage.get());return this},_setUpModelEventHandlers:function(){this.model.contents.on("add",this.addContentView,this);this.model.on("error error:contents",function(n,p,m,o){this.errorHandler(n,p,m,o)},this);return this},render:function(o,p){this.log("render:",o,p);o=(o===undefined)?(this.fxSpeed):(o);var m=this,n;if(this.model){n=this.renderModel()}else{n=this.renderWithoutModel()}$(m).queue("fx",[function(q){if(o&&m.$el.is(":visible")){m.$el.fadeOut(o,q)}else{q()}},function(q){m.$el.empty();if(n){m.$el.append(n.children())}q()},function(q){if(o&&!m.$el.is(":visible")){m.$el.fadeIn(o,q)}else{q()}},function(q){if(p){p.call(this)}m.trigger("rendered",this);q()}]);return this},renderWithoutModel:function(){var m=$("
"),n=$("
").addClass("message-container").css({margin:"4px"});return m.append(n)},renderModel:function(){var m=$("
");m.append(j.templates.historyPanel(this.model.toJSON()));this.$emptyMessage(m).text(this.emptyMsg);m.find(".history-secondary-actions").prepend(this._renderSearchButton());this._setUpBehaviours(m);this.renderHdas(m);return m},_renderEmptyMsg:function(o){var n=this,m=n.$emptyMessage(o);if(!_.isEmpty(n.hdaViews)){m.hide()}else{if(n.searchFor){m.text(n.noneFoundMsg).show()}else{m.text(n.emptyMsg).show()}}return this},_renderSearchButton:function(m){return faIconButton({title:d("Search datasets"),classes:"history-search-btn",faIcon:"fa-search"})},_setUpBehaviours:function(m){m=m||this.$el;m.find("[title]").tooltip({placement:"bottom"});this._setUpSearchInput(m.find(".history-search-controls .history-search-input"));return this},$container:function(){return(this.findContainerFn)?(this.findContainerFn.call(this)):(this.$el.parent())},$datasetsList:function(m){return(m||this.$el).find(".datasets-list")},$messages:function(m){return(m||this.$el).find(".message-container")},$emptyMessage:function(m){return(m||this.$el).find(".empty-history-message")},renderHdas:function(n){n=n||this.$el;var m=this,p={},o=this.model.contents.getVisible(this.storage.get("show_deleted"),this.storage.get("show_hidden"),this.filters);this.$datasetsList(n).empty();if(o.length){o.each(function(r){var q=r.id,s=m._createContentView(r);p[q]=s;if(_.contains(m.selectedHdaIds,q)){s.selected=true}m.attachContentView(s.render(),n)})}this.hdaViews=p;this._renderEmptyMsg(n);return this.hdaViews},_createContentView:function(p){var n=this._getContentClass(p),m=_.extend(this._getContentOptions(p),{model:p}),o=new n(m);this._setUpHdaListeners(o);return o},_getContentClass:function(m){var n=m.get("history_content_type");switch(n){case"dataset":return this.HDAViewClass;case"dataset_collection":return this.HDCAViewClass}throw new TypeError("Unknown history_content_type: "+n)},_getContentOptions:function(m){return{linkTarget:this.linkTarget,expanded:!!this.storage.get("expandedHdas")[m.id],hasUser:this.model.ownedByCurrUser(),logger:this.logger}},_setUpHdaListeners:function(n){var m=this;n.on("error",function(p,r,o,q){m.errorHandler(p,r,o,q)});n.on("expanded",function(o){m.storage.addExpandedHda(o.model)});n.on("collapsed",function(o){m.storage.removeExpandedHda(o.model)});return this},attachContentView:function(o,n){n=n||this.$el;var m=this.$datasetsList(n);m.prepend(o.$el);return this},addContentView:function(p){this.log("add."+this,p);var n=this;if(!p.isVisible(this.storage.get("show_deleted"),this.storage.get("show_hidden"))){return n}$({}).queue([function o(r){var q=n.$emptyMessage();if(q.is(":visible")){q.fadeOut(n.fxSpeed,r)}else{r()}},function m(q){var r=n._createContentView(p);n.hdaViews[p.id]=r;r.render().$el.hide();n.scrollToTop();n.attachContentView(r);r.$el.slideDown(n.fxSpeed)}]);return n},views:function(m){var n=this,o=this.model.contents.getVisible(this.storage.get("show_deleted"),this.storage.get("show_hidden"),this.filters);if(m!==undefined){return n.hdaViews[o.at(m).id]}return o.map(function(p){return n.hdaViews[p.id]})},refreshContents:function(n,m){if(this.model){return this.model.refresh(n,m)}return $.when()},hdaViewRange:function(p,o){if(p===o){return[p]}var m=this,n=false,q=[];this.model.contents.getVisible(this.storage.get("show_deleted"),this.storage.get("show_hidden"),this.filters).each(function(r){if(n){q.push(m.hdaViews[r.id]);if(r===p.model||r===o.model){n=false}}else{if(r===p.model||r===o.model){n=true;q.push(m.hdaViews[r.id])}}});return q},events:{"click .message-container":"clearMessages","click .history-search-btn":"toggleSearchControls"},collapseAllHdaBodies:function(){_.each(this.hdaViews,function(m){m.collapse()});this.storage.set("expandedHdas",{});return this},toggleShowDeleted:function(m){m=(m!==undefined)?(m):(!this.storage.get("show_deleted"));this.storage.set("show_deleted",m);this.renderHdas();return this.storage.get("show_deleted")},toggleShowHidden:function(m){m=(m!==undefined)?(m):(!this.storage.get("show_hidden"));this.storage.set("show_hidden",m);this.renderHdas();return this.storage.get("show_hidden")},_setUpSearchInput:function(n){var o=this,p=".history-search-input";function m(q){if(o.model.contents.haveDetails()){o.searchHdas(q);return}o.$el.find(p).searchInput("toggle-loading");o.model.contents.fetchAllDetails({silent:true}).always(function(){o.$el.find(p).searchInput("toggle-loading")}).done(function(){o.searchHdas(q)})}n.searchInput({initialVal:o.searchFor,name:"history-search",placeholder:"search datasets",classes:"history-search",onfirstsearch:m,onsearch:_.bind(this.searchHdas,this),onclear:_.bind(this.clearHdaSearch,this)});return n},toggleSearchControls:function(o,m){var n=this.$el.find(".history-search-controls"),p=(jQuery.type(o)==="number")?(o):(this.fxSpeed);m=(m!==undefined)?(m):(!n.is(":visible"));if(m){n.slideDown(p,function(){$(this).find("input").focus()})}else{n.slideUp(p)}return m},searchHdas:function(m){var n=this;this.searchFor=m;this.filters=[function(o){return o.matchesAll(n.searchFor)}];this.trigger("search:searching",m,this);this.renderHdas();return this},clearHdaSearch:function(m){this.searchFor="";this.filters=[];this.trigger("search:clear",this);this.renderHdas();return this},_showLoadingIndicator:function(n,m,o){m=(m!==undefined)?(m):(this.fxSpeed);if(!this.indicator){this.indicator=new LoadingIndicator(this.$el,this.$el.parent())}if(!this.$el.is(":visible")){this.indicator.show(0,o)}else{this.$el.fadeOut(m);this.indicator.show(n,m,o)}},_hideLoadingIndicator:function(m,n){m=(m!==undefined)?(m):(this.fxSpeed);if(this.indicator){this.indicator.hide(m,n)}},displayMessage:function(r,s,q){var o=this;this.scrollToTop();var p=this.$messages(),m=$("
").addClass(r+"message").html(s);if(!_.isEmpty(q)){var n=$('Details ').click(function(){Galaxy.modal.show(o._messageToModalOptions(r,s,q));return false});m.append(" ",n)}return p.html(m)},_messageToModalOptions:function(q,s,p){var m=this,r=$("
"),o={title:"Details"};function n(t){t=_.omit(t,_.functions(t));return["",_.map(t,function(v,u){v=(_.isObject(v))?(n(v)):(v);return''+u+' '+v+"
"].join("")}if(_.isObject(p)){o.body=r.append(n(p))}else{o.body=r.html(p)}o.buttons={Ok:function(){Galaxy.modal.hide();m.clearMessages()}};return o},clearMessages:function(){this.$messages().empty();return this},scrollPosition:function(){return this.$container().scrollTop()},scrollTo:function(m){this.$container().scrollTop(m);return this},scrollToTop:function(){this.$container().scrollTop(0);return this},scrollToId:function(n){if((!n)||(!this.hdaViews[n])){return this}var m=this.hdaViews[n];this.scrollTo(m.el.offsetTop);return this},scrollToHid:function(m){var n=this.model.contents.getByHid(m);if(!n){return this}return this.scrollToId(n.id)},print:function(){var m=this;m.debug(this);_.each(this.hdaViews,function(n,o){m.debug("\t "+o,n)})},toString:function(){return"ReadOnlyHistoryPanel("+((this.model)?(this.model.get("name")):(""))+")"}});var l=['','
",'
',"<% if( history.name ){ %>",'
<%= history.name %>
',"<% } %>","
",'
',"<% if( history.nice_size ){ %>",'
<%= history.nice_size %>
',"<% } %>",'
',"
","<% if( history.deleted ){ %>",'
',d("You are currently viewing a deleted history!"),"
","<% } %>",'
',"<% if( history.message ){ %>",'
<%= history.message %>
',"<% } %>","
",'
',d("You are over your disk quota"),". ",d("Tool execution is on hold until your disk usage drops below your allocated quota"),".","
",'
','
','
','
','',d("All")," ",'',d("None")," ","
",'","
","
','',d("This history is empty"),"
"].join("");j.templates={historyPanel:function(m){return _.template(l,m,{variable:"history"})}};return{ReadOnlyHistoryPanel:j}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/history/readonly-history-panel.js b/static/scripts/packed/mvc/history/readonly-history-panel.js
deleted file mode 100644
index 7bc6cb9954c..00000000000
--- a/static/scripts/packed/mvc/history/readonly-history-panel.js
+++ /dev/null
@@ -1 +0,0 @@
-define(["mvc/history/history-model","mvc/collection/hdca-base","mvc/dataset/dataset-list-element","mvc/dataset/hda-base","mvc/user/user-model","mvc/base-mvc","utils/localization"],function(d,a,k,i,e,l,c){var h=l.SessionStorageModel.extend({defaults:{expandedHdas:{},show_deleted:false,show_hidden:false},addExpandedHda:function(n){var o="expandedHdas";this.save(o,_.extend(this.get(o),_.object([n.id],[n.get("id")])))},removeExpandedHda:function(n){var o="expandedHdas";this.save(o,_.omit(this.get(o),n.id))},toString:function(){return"HistoryPrefs("+this.id+")"}});h.storageKeyPrefix="history:";h.historyStorageKey=function f(n){if(!n){throw new Error("HistoryPrefs.historyStorageKey needs valid id: "+n)}return(h.storageKeyPrefix+n)};h.get=function b(n){return new h({id:h.historyStorageKey(n)})};h.clearAll=function g(o){for(var n in sessionStorage){if(n.indexOf(h.storageKeyPrefix)===0){sessionStorage.removeItem(n)}}};var j=Backbone.View.extend(l.LoggableMixin).extend({HDAViewClass:k.DatasetListItemView,HDCAViewClass:a.HDCABaseView,tagName:"div",className:"history-panel",fxSpeed:"fast",emptyMsg:c("This history is empty"),noneFoundMsg:c("No matching datasets found"),initialize:function(n){n=n||{};if(n.logger){this.logger=n.logger}this.log(this+".initialize:",n);this.linkTarget=n.linkTarget||"_blank";this.fxSpeed=_.has(n,"fxSpeed")?(n.fxSpeed):(this.fxSpeed);this.filters=[];this.searchFor="";this.findContainerFn=n.findContainerFn;this.hdaViews={};this.indicator=new LoadingIndicator(this.$el);this._setUpListeners();var o=_.pick(n,"initiallyExpanded","show_deleted","show_hidden");this.setModel(this.model,o,false);if(n.onready){n.onready.call(this)}},_setUpListeners:function(){this.on("error",function(o,r,n,q,p){this.errorHandler(o,r,n,q,p)});this.on("loading-history",function(){this._showLoadingIndicator("loading history...",40)});this.on("loading-done",function(){this._hideLoadingIndicator(40);if(_.isEmpty(this.hdaViews)){this.trigger("empty-history",this)}});this.once("rendered",function(){this.trigger("rendered:initial",this);return false});if(this.logger){this.on("all",function(n){this.log(this+"",arguments)},this)}return this},errorHandler:function(p,s,o,r,q){this.error(p,s,o,r,q);if(s&&s.status===0&&s.readyState===0){}else{if(s&&s.status===502){}else{var n=this._parseErrorMessage(p,s,o,r,q);if(!this.$messages().is(":visible")){this.once("rendered",function(){this.displayMessage("error",n.message,n.details)})}else{this.displayMessage("error",n.message,n.details)}}}},_parseErrorMessage:function(q,u,p,t,s){var o=Galaxy.currUser,n={message:this._bePolite(t),details:{user:(o instanceof e.User)?(o.toJSON()):(o+""),source:(q instanceof Backbone.Model)?(q.toJSON()):(q+""),xhr:u,options:(u)?(_.omit(p,"xhr")):(p)}};_.extend(n.details,s||{});if(u&&_.isFunction(u.getAllResponseHeaders)){var r=u.getAllResponseHeaders();r=_.compact(r.split("\n"));r=_.map(r,function(v){return v.split(": ")});n.details.xhr.responseHeaders=_.object(r)}return n},_bePolite:function(n){n=n||c("An error occurred while getting updates from the server");return n+". "+c("Please contact a Galaxy administrator if the problem persists")+"."},loadHistoryWithHDADetails:function(p,o,n,r){var q=function(s){return _.values(h.get(s.id).get("expandedHdas"))};return this.loadHistory(p,o,n,r,q)},loadHistory:function(q,p,o,t,r){var n=this;p=p||{};n.trigger("loading-history",n);var s=d.History.getHistoryData(q,{historyFn:o,hdaFn:t,hdaDetailIds:p.initiallyExpanded||r});return n._loadHistoryFromXHR(s,p).fail(function(w,u,v){n.trigger("error",n,w,p,c("An error was encountered while "+u),{historyId:q,history:v||{}})}).always(function(){n.trigger("loading-done",n)})},_loadHistoryFromXHR:function(p,o){var n=this;p.then(function(q,r){n.JSONToModel(q,r,o)});p.fail(function(r,q){n.render()});return p},JSONToModel:function(q,n,o){this.log("JSONToModel:",q,n,o);o=o||{};var p=new d.History(q,n,o);this.setModel(p);return this},setModel:function(o,n,p){n=n||{};p=(p!==undefined)?(p):(true);this.log("setModel:",o,n,p);this.freeModel();this.selectedHdaIds=[];if(o){this.model=o;if(this.logger){this.model.logger=this.logger}this._setUpWebStorage(n.initiallyExpanded,n.show_deleted,n.show_hidden);this._setUpModelEventHandlers();this.trigger("new-model",this)}if(p){this.render()}return this},freeModel:function(){if(this.model){this.model.clearUpdateTimeout();this.stopListening(this.model);this.stopListening(this.model.contents)}this.freeHdaViews();return this},freeHdaViews:function(){this.hdaViews={};return this},_setUpWebStorage:function(o,n,p){this.storage=new h({id:h.historyStorageKey(this.model.get("id"))});if(_.isObject(o)){this.storage.set("exandedHdas",o)}if(_.isBoolean(n)){this.storage.set("show_deleted",n)}if(_.isBoolean(p)){this.storage.set("show_hidden",p)}this.trigger("new-storage",this.storage,this);this.log(this+" (init'd) storage:",this.storage.get());return this},_setUpModelEventHandlers:function(){this.model.contents.on("add",this.addContentView,this);this.model.on("error error:contents",function(o,q,n,p){this.errorHandler(o,q,n,p)},this);return this},render:function(p,q){this.log("render:",p,q);p=(p===undefined)?(this.fxSpeed):(p);var n=this,o;if(this.model){o=this.renderModel()}else{o=this.renderWithoutModel()}$(n).queue("fx",[function(r){if(p&&n.$el.is(":visible")){n.$el.fadeOut(p,r)}else{r()}},function(r){n.$el.empty();if(o){n.$el.append(o.children())}r()},function(r){if(p&&!n.$el.is(":visible")){n.$el.fadeIn(p,r)}else{r()}},function(r){if(q){q.call(this)}n.trigger("rendered",this);r()}]);return this},renderWithoutModel:function(){var n=$("
"),o=$("
").addClass("message-container").css({margin:"4px"});return n.append(o)},renderModel:function(){var n=$("
");n.append(j.templates.historyPanel(this.model.toJSON()));this.$emptyMessage(n).text(this.emptyMsg);n.find(".history-secondary-actions").prepend(this._renderSearchButton());this._setUpBehaviours(n);this.renderHdas(n);return n},_renderEmptyMsg:function(p){var o=this,n=o.$emptyMessage(p);if(!_.isEmpty(o.hdaViews)){n.hide()}else{if(o.searchFor){n.text(o.noneFoundMsg).show()}else{n.text(o.emptyMsg).show()}}return this},_renderSearchButton:function(n){return faIconButton({title:c("Search datasets"),classes:"history-search-btn",faIcon:"fa-search"})},_setUpBehaviours:function(n){n=n||this.$el;n.find("[title]").tooltip({placement:"bottom"});this._setUpSearchInput(n.find(".history-search-controls .history-search-input"));return this},$container:function(){return(this.findContainerFn)?(this.findContainerFn.call(this)):(this.$el.parent())},$datasetsList:function(n){return(n||this.$el).find(".datasets-list")},$messages:function(n){return(n||this.$el).find(".message-container")},$emptyMessage:function(n){return(n||this.$el).find(".empty-history-message")},renderHdas:function(o){o=o||this.$el;var n=this,q={},p=this.model.contents.getVisible(this.storage.get("show_deleted"),this.storage.get("show_hidden"),this.filters);this.$datasetsList(o).empty();if(p.length){p.each(function(s){var r=s.id,t=n._createContentView(s);q[r]=t;if(_.contains(n.selectedHdaIds,r)){t.selected=true}n.attachContentView(t.render(),o)})}this.hdaViews=q;this._renderEmptyMsg(o);return this.hdaViews},_createContentView:function(q){var o=this._getContentClass(q),n=_.extend(this._getContentOptions(q),{model:q}),p=new o(n);this._setUpHdaListeners(p);return p},_getContentClass:function(n){var o=n.get("history_content_type");switch(o){case"dataset":return this.HDAViewClass;case"dataset_collection":return this.HDCAViewClass}throw new TypeError("Unknown history_content_type: "+o)},_getContentOptions:function(n){return{linkTarget:this.linkTarget,expanded:!!this.storage.get("expandedHdas")[n.id],hasUser:this.model.ownedByCurrUser(),logger:this.logger}},_setUpHdaListeners:function(o){var n=this;o.on("error",function(q,s,p,r){n.errorHandler(q,s,p,r)});o.on("expanded",function(p){n.storage.addExpandedHda(p.model)});o.on("collapsed",function(p){n.storage.removeExpandedHda(p.model)});return this},attachContentView:function(p,o){o=o||this.$el;var n=this.$datasetsList(o);n.prepend(p.$el);return this},addContentView:function(q){this.log("add."+this,q);var o=this;if(!q.isVisible(this.storage.get("show_deleted"),this.storage.get("show_hidden"))){return o}$({}).queue([function p(s){var r=o.$emptyMessage();if(r.is(":visible")){r.fadeOut(o.fxSpeed,s)}else{s()}},function n(r){var s=o._createContentView(q);o.hdaViews[q.id]=s;s.render().$el.hide();o.scrollToTop();o.attachContentView(s);s.$el.slideDown(o.fxSpeed)}]);return o},views:function(n){var o=this,p=this.model.contents.getVisible(this.storage.get("show_deleted"),this.storage.get("show_hidden"),this.filters);if(n!==undefined){return o.hdaViews[p.at(n).id]}return p.map(function(q){return o.hdaViews[q.id]})},refreshContents:function(o,n){if(this.model){return this.model.refresh(o,n)}return $.when()},hdaViewRange:function(q,p){if(q===p){return[q]}var n=this,o=false,r=[];this.model.contents.getVisible(this.storage.get("show_deleted"),this.storage.get("show_hidden"),this.filters).each(function(s){if(o){r.push(n.hdaViews[s.id]);if(s===q.model||s===p.model){o=false}}else{if(s===q.model||s===p.model){o=true;r.push(n.hdaViews[s.id])}}});return r},events:{"click .message-container":"clearMessages","click .history-search-btn":"toggleSearchControls"},collapseAllHdaBodies:function(){_.each(this.hdaViews,function(n){n.collapse()});this.storage.set("expandedHdas",{});return this},toggleShowDeleted:function(n){n=(n!==undefined)?(n):(!this.storage.get("show_deleted"));this.storage.set("show_deleted",n);this.renderHdas();return this.storage.get("show_deleted")},toggleShowHidden:function(n){n=(n!==undefined)?(n):(!this.storage.get("show_hidden"));this.storage.set("show_hidden",n);this.renderHdas();return this.storage.get("show_hidden")},_setUpSearchInput:function(o){var p=this,q=".history-search-input";function n(r){if(p.model.contents.haveDetails()){p.searchHdas(r);return}p.$el.find(q).searchInput("toggle-loading");p.model.contents.fetchAllDetails({silent:true}).always(function(){p.$el.find(q).searchInput("toggle-loading")}).done(function(){p.searchHdas(r)})}o.searchInput({initialVal:p.searchFor,name:"history-search",placeholder:"search datasets",classes:"history-search",onfirstsearch:n,onsearch:_.bind(this.searchHdas,this),onclear:_.bind(this.clearHdaSearch,this)});return o},toggleSearchControls:function(p,n){var o=this.$el.find(".history-search-controls"),q=(jQuery.type(p)==="number")?(p):(this.fxSpeed);n=(n!==undefined)?(n):(!o.is(":visible"));if(n){o.slideDown(q,function(){$(this).find("input").focus()})}else{o.slideUp(q)}return n},searchHdas:function(n){var o=this;this.searchFor=n;this.filters=[function(p){return p.matchesAll(o.searchFor)}];this.trigger("search:searching",n,this);this.renderHdas();return this},clearHdaSearch:function(n){this.searchFor="";this.filters=[];this.trigger("search:clear",this);this.renderHdas();return this},_showLoadingIndicator:function(o,n,p){n=(n!==undefined)?(n):(this.fxSpeed);if(!this.indicator){this.indicator=new LoadingIndicator(this.$el,this.$el.parent())}if(!this.$el.is(":visible")){this.indicator.show(0,p)}else{this.$el.fadeOut(n);this.indicator.show(o,n,p)}},_hideLoadingIndicator:function(n,o){n=(n!==undefined)?(n):(this.fxSpeed);if(this.indicator){this.indicator.hide(n,o)}},displayMessage:function(s,t,r){var p=this;this.scrollToTop();var q=this.$messages(),n=$("
").addClass(s+"message").html(t);if(!_.isEmpty(r)){var o=$('Details ').click(function(){Galaxy.modal.show(p._messageToModalOptions(s,t,r));return false});n.append(" ",o)}return q.html(n)},_messageToModalOptions:function(r,t,q){var n=this,s=$("
"),p={title:"Details"};function o(u){u=_.omit(u,_.functions(u));return["",_.map(u,function(w,v){w=(_.isObject(w))?(o(w)):(w);return''+v+' '+w+"
"].join("")}if(_.isObject(q)){p.body=s.append(o(q))}else{p.body=s.html(q)}p.buttons={Ok:function(){Galaxy.modal.hide();n.clearMessages()}};return p},clearMessages:function(){this.$messages().empty();return this},scrollPosition:function(){return this.$container().scrollTop()},scrollTo:function(n){this.$container().scrollTop(n);return this},scrollToTop:function(){this.$container().scrollTop(0);return this},scrollToId:function(o){if((!o)||(!this.hdaViews[o])){return this}var n=this.hdaViews[o];this.scrollTo(n.el.offsetTop);return this},scrollToHid:function(n){var o=this.model.contents.getByHid(n);if(!o){return this}return this.scrollToId(o.id)},print:function(){var n=this;n.debug(this);_.each(this.hdaViews,function(o,p){n.debug("\t "+p,o)})},toString:function(){return"ReadOnlyHistoryPanel("+((this.model)?(this.model.get("name")):(""))+")"}});var m=['','
",'
',"<% if( history.name ){ %>",'
<%= history.name %>
',"<% } %>","
",'
',"<% if( history.nice_size ){ %>",'
<%= history.nice_size %>
',"<% } %>",'
',"
","<% if( history.deleted ){ %>",'
',c("You are currently viewing a deleted history!"),"
","<% } %>",'
',"<% if( history.message ){ %>",'
<%= history.message %>
',"<% } %>","
",'
',c("You are over your disk quota"),". ",c("Tool execution is on hold until your disk usage drops below your allocated quota"),".","
",'
','
','
','
','',c("All")," ",'',c("None")," ","
",'","
","
','',c("This history is empty"),"
"].join("");j.templates={historyPanel:function(n){return _.template(m,n,{variable:"history"})}};return{ReadOnlyHistoryPanel:j}});
\ No newline at end of file
diff --git a/templates/webapps/galaxy/history/display.mako b/templates/webapps/galaxy/history/display.mako
index e7c601334a6..5ab2db1042a 100644
--- a/templates/webapps/galaxy/history/display.mako
+++ b/templates/webapps/galaxy/history/display.mako
@@ -53,7 +53,7 @@
require.config({
baseUrl : "${h.url_for( '/static/scripts' )}"
- })([ 'mvc/history/annotated-history-panel' ], function( panelMod ){
+ })([ 'mvc/history/history-panel-annotated' ], function( panelMod ){
// history module is already in the dpn chain from the panel. We can re-scope it here.
var historyModel = require( 'mvc/history/history-model' ),
history = new historyModel.History( historyJSON, hdaJSON, {
diff --git a/templates/webapps/galaxy/history/display_structured.mako b/templates/webapps/galaxy/history/display_structured.mako
index df2a29d571b..70c6ea05e8c 100644
--- a/templates/webapps/galaxy/history/display_structured.mako
+++ b/templates/webapps/galaxy/history/display_structured.mako
@@ -143,12 +143,11 @@
## load edit views for each of the hdas