opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Dannon Baker
2015-01-30 17:22:38 -05:00
parent 4a98a7b538 4d0cd6ec41
commit a1a0db71a4
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/upload/upload-row.js
+2 -2
View File
@@ -69,7 +69,7 @@ return Backbone.View.extend({
css: 'genome',
onchange : function(genome) {
self.model.set('genome', genome);
self.app.updateGenome(genome);
self.app.updateGenome(genome, true);
},
data: self.app.list_genomes,
container: it.find('#genome'),
@@ -87,7 +87,7 @@ return Backbone.View.extend({
css: 'extension',
onchange : function(extension) {
self.model.set('extension', extension);
self.app.updateExtension(extension);
self.app.updateExtension(extension, true);
},
data: self.app.list_extensions,
container: it.find('#extension'),
client/galaxy/scripts/mvc/upload/upload-view.js
+6 -6
View File
@@ -585,20 +585,20 @@ return Backbone.View.extend({
},
// update extension for all models
updateExtension: function(extension) {
updateExtension: function(extension, defaults_only) {
var self = this;
this.collection.each(function(item) {
if (item.get('status') == 'init' && item.get('extension') == self.default_extension) {
if (item.get('status') == 'init' && (item.get('extension') == self.default_extension || !defaults_only)) {
item.set('extension', extension);
}
});
},
// update genome for all models
updateGenome: function(genome) {
updateGenome: function(genome, defaults_only) {
var self = this;
this.collection.each(function(item) {
if (item.get('status') == 'init' && item.get('genome') == self.default_genome) {
if (item.get('status') == 'init' && (item.get('genome') == self.default_genome || !defaults_only)) {
item.set('genome', genome);
}
});
@@ -724,10 +724,10 @@ return Backbone.View.extend({
'</table>' +
'</div>' +
'<div id="upload-header" class="upload-header">' +
'<span class="header-title">Type (default):</span>' +
'<span class="header-title">Type (set all):</span>' +
'<span id="header-extension"/>' +
'<span id="header-extension-info" class="upload-icon-button fa fa-search"/> ' +
'<span class="header-title">Genome (default):</span>' +
'<span class="header-title">Genome (set all):</span>' +
'<span id="header-genome"/>' +
'</div>';
}
static/scripts/mvc/upload/upload-row.js
+2 -2
View File
@@ -69,7 +69,7 @@ return Backbone.View.extend({
css: 'genome',
onchange : function(genome) {
self.model.set('genome', genome);
self.app.updateGenome(genome);
self.app.updateGenome(genome, true);
},
data: self.app.list_genomes,
container: it.find('#genome'),
@@ -87,7 +87,7 @@ return Backbone.View.extend({
css: 'extension',
onchange : function(extension) {
self.model.set('extension', extension);
self.app.updateExtension(extension);
self.app.updateExtension(extension, true);
},
data: self.app.list_extensions,
container: it.find('#extension'),
static/scripts/mvc/upload/upload-view.js
+6 -6
View File
@@ -585,20 +585,20 @@ return Backbone.View.extend({
},
// update extension for all models
updateExtension: function(extension) {
updateExtension: function(extension, defaults_only) {
var self = this;
this.collection.each(function(item) {
if (item.get('status') == 'init' && item.get('extension') == self.default_extension) {
if (item.get('status') == 'init' && (item.get('extension') == self.default_extension || !defaults_only)) {
item.set('extension', extension);
}
});
},
// update genome for all models
updateGenome: function(genome) {
updateGenome: function(genome, defaults_only) {
var self = this;
this.collection.each(function(item) {
if (item.get('status') == 'init' && item.get('genome') == self.default_genome) {
if (item.get('status') == 'init' && (item.get('genome') == self.default_genome || !defaults_only)) {
item.set('genome', genome);
}
});
@@ -724,10 +724,10 @@ return Backbone.View.extend({
'</table>' +
'</div>' +
'<div id="upload-header" class="upload-header">' +
'<span class="header-title">Type (default):</span>' +
'<span class="header-title">Type (set all):</span>' +
'<span id="header-extension"/>' +
'<span id="header-extension-info" class="upload-icon-button fa fa-search"/> ' +
'<span class="header-title">Genome (default):</span>' +
'<span class="header-title">Genome (set all):</span>' +
'<span id="header-genome"/>' +
'</div>';
}
static/scripts/packed/mvc/upload/upload-row.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/mvc/upload/upload-view.js
+1 -1
View File
File diff suppressed because one or more lines are too long