opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Dannon Baker
2015-02-09 16:15:24 -05:00
parent 1319fe5f58 c6984b57d9
commit a101ee90ad
6 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/collection/paired-collection-creator.js
+18 -20
View File
@@ -14,7 +14,7 @@ TODO:
PROGRAMMATICALLY:
currPanel.once( 'rendered', function(){
currPanel.showSelectors();
currPanel.selectAllDatasets();
currPanel.selectAll();
_.last( currPanel.actionsPopup.options ).func();
});
@@ -31,17 +31,19 @@ var PairView = Backbone.View.extend( baseMVC.LoggableMixin ).extend({
this.pair = attributes.pair || {};
},
template : _.template([
'<span class="forward-dataset-name flex-column"><%= pair.forward.name %></span>',
'<span class="pair-name-column flex-column">',
'<span class="pair-name"><%= pair.name %></span>',
'</span>',
'<span class="reverse-dataset-name flex-column"><%= pair.reverse.name %></span>'
].join('')),
render : function(){
this.$el
.attr( 'draggable', true )
.data( 'pair', this.pair )
.html( _.template([
'<span class="forward-dataset-name flex-column"><%= pair.forward.name %></span>',
'<span class="pair-name-column flex-column">',
'<span class="pair-name"><%= pair.name %></span>',
'</span>',
'<span class="reverse-dataset-name flex-column"><%= pair.reverse.name %></span>'
].join(''), { pair: this.pair }))
.html( this.template({ pair: this.pair }) )
.addClass( 'flex-column-container' );
//TODO: would be good to get the unpair-btn into this view - but haven't found a way with css
@@ -536,18 +538,6 @@ var PairedCollectionCreator = Backbone.View.extend( baseMVC.LoggableMixin ).exte
return lcs || ( fwd.name + ' & ' + rev.name );
},
///** find datasets with fwdId and revID and pair them */
//_pairById : function( fwdId, revId, name ){
// var both = this.unpaired.filter( function( unpaired ){
// return unpaired.id === fwdId || unpaired.id === revId;
// }),
// fwd = both[0], rev = both[1];
// if( both[0].id === revId ){
// fwd = rev; rev = both[0];
// }
// return this._pair( fwd, rev, name );
//},
/** unpair a pair, removing it from paired, and adding the fwd,rev datasets back into unpaired */
_unpair : function( pair, options ){
options = options || {};
@@ -994,6 +984,7 @@ var PairedCollectionCreator = Backbone.View.extend( baseMVC.LoggableMixin ).exte
// footer
'change .remove-extensions' : function( ev ){ this.toggleExtensions(); },
'change .collection-name' : '_changeName',
'keydown .collection-name' : '_nameCheckForEnter',
'click .cancel-create' : function( ev ){
if( typeof this.oncancel === 'function' ){
this.oncancel.call( this );
@@ -1428,6 +1419,13 @@ var PairedCollectionCreator = Backbone.View.extend( baseMVC.LoggableMixin ).exte
this._validationWarning( 'name', !!this._getName() );
},
/** check for enter key press when in the collection name and submit */
_nameCheckForEnter : function( ev ){
if( ev.keyCode === 13 ){
this._clickCreate();
}
},
/** get the current collection name */
_getName : function(){
return _.escape( this.$( '.collection-name' ).val() );
client/galaxy/scripts/mvc/history/history-panel-edit.js
+9 -6
View File
@@ -311,12 +311,15 @@ var HistoryPanelEdit = _super.extend(
});
});
} else {
//Galaxy.modal.show({
// body : _l( 'No valid datasets were selected' ),
// buttons : {
// 'Ok': function(){ Galaxy.modal.hide(); }
// }
//});
Galaxy.modal.show({
title : _l( 'No valid datasets were selected' ),
body : _l([
'Use the checkboxes at the left of the dataset names to select them.',
'Selected datasets should be error-free and should have completed running.'
].join(' ')),
buttons : { 'Ok': function(){ Galaxy.modal.hide(); } },
closing_events: true
});
}
},
static/scripts/mvc/collection/paired-collection-creator.js
+18 -20
View File
@@ -14,7 +14,7 @@ TODO:
PROGRAMMATICALLY:
currPanel.once( 'rendered', function(){
currPanel.showSelectors();
currPanel.selectAllDatasets();
currPanel.selectAll();
_.last( currPanel.actionsPopup.options ).func();
});
@@ -31,17 +31,19 @@ var PairView = Backbone.View.extend( baseMVC.LoggableMixin ).extend({
this.pair = attributes.pair || {};
},
template : _.template([
'<span class="forward-dataset-name flex-column"><%= pair.forward.name %></span>',
'<span class="pair-name-column flex-column">',
'<span class="pair-name"><%= pair.name %></span>',
'</span>',
'<span class="reverse-dataset-name flex-column"><%= pair.reverse.name %></span>'
].join('')),
render : function(){
this.$el
.attr( 'draggable', true )
.data( 'pair', this.pair )
.html( _.template([
'<span class="forward-dataset-name flex-column"><%= pair.forward.name %></span>',
'<span class="pair-name-column flex-column">',
'<span class="pair-name"><%= pair.name %></span>',
'</span>',
'<span class="reverse-dataset-name flex-column"><%= pair.reverse.name %></span>'
].join(''), { pair: this.pair }))
.html( this.template({ pair: this.pair }) )
.addClass( 'flex-column-container' );
//TODO: would be good to get the unpair-btn into this view - but haven't found a way with css
@@ -536,18 +538,6 @@ var PairedCollectionCreator = Backbone.View.extend( baseMVC.LoggableMixin ).exte
return lcs || ( fwd.name + ' & ' + rev.name );
},
///** find datasets with fwdId and revID and pair them */
//_pairById : function( fwdId, revId, name ){
// var both = this.unpaired.filter( function( unpaired ){
// return unpaired.id === fwdId || unpaired.id === revId;
// }),
// fwd = both[0], rev = both[1];
// if( both[0].id === revId ){
// fwd = rev; rev = both[0];
// }
// return this._pair( fwd, rev, name );
//},
/** unpair a pair, removing it from paired, and adding the fwd,rev datasets back into unpaired */
_unpair : function( pair, options ){
options = options || {};
@@ -994,6 +984,7 @@ var PairedCollectionCreator = Backbone.View.extend( baseMVC.LoggableMixin ).exte
// footer
'change .remove-extensions' : function( ev ){ this.toggleExtensions(); },
'change .collection-name' : '_changeName',
'keydown .collection-name' : '_nameCheckForEnter',
'click .cancel-create' : function( ev ){
if( typeof this.oncancel === 'function' ){
this.oncancel.call( this );
@@ -1428,6 +1419,13 @@ var PairedCollectionCreator = Backbone.View.extend( baseMVC.LoggableMixin ).exte
this._validationWarning( 'name', !!this._getName() );
},
/** check for enter key press when in the collection name and submit */
_nameCheckForEnter : function( ev ){
if( ev.keyCode === 13 ){
this._clickCreate();
}
},
/** get the current collection name */
_getName : function(){
return _.escape( this.$( '.collection-name' ).val() );
static/scripts/mvc/history/history-panel-edit.js
+9 -6
View File
@@ -311,12 +311,15 @@ var HistoryPanelEdit = _super.extend(
});
});
} else {
//Galaxy.modal.show({
// body : _l( 'No valid datasets were selected' ),
// buttons : {
// 'Ok': function(){ Galaxy.modal.hide(); }
// }
//});
Galaxy.modal.show({
title : _l( 'No valid datasets were selected' ),
body : _l([
'Use the checkboxes at the left of the dataset names to select them.',
'Selected datasets should be error-free and should have completed running.'
].join(' ')),
buttons : { 'Ok': function(){ Galaxy.modal.hide(); } },
closing_events: true
});
}
},
static/scripts/packed/mvc/collection/paired-collection-creator.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/mvc/history/history-panel-edit.js
+1 -1
View File
File diff suppressed because one or more lines are too long