Skip to content

Commit

Permalink
Some misc cleanup in workflow-terminals.js
Browse files Browse the repository at this point in the history
  • Loading branch information
dannon committed Dec 8, 2017
1 parent 30bada4 commit d3d6658
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions client/galaxy/scripts/mvc/workflow/workflow-terminals.js
Expand Up @@ -8,10 +8,10 @@ function CollectionTypeDescription(collectionType) {

var NULL_COLLECTION_TYPE_DESCRIPTION = {
isCollection: false,
canMatch: function(other) {
canMatch: function() {
return false;
},
canMapOver: function(other) {
canMapOver: function() {
return false;
},
toString: function() {
Expand All @@ -30,13 +30,13 @@ var ANY_COLLECTION_TYPE_DESCRIPTION = {
canMatch: function(other) {
return NULL_COLLECTION_TYPE_DESCRIPTION !== other;
},
canMapOver: function(other) {
canMapOver: function() {
return false;
},
toString: function() {
return "AnyCollectionType[]";
},
append: function(otherCollectionType) {
append: function() {
throw "Cannot append to ANY_COLLECTION_TYPE_DESCRIPTION";
},
equal: function(other) {
Expand Down Expand Up @@ -143,7 +143,9 @@ var Terminal = Backbone.Model.extend({
},
destroyInvalidConnections: function() {
_.each(this.connectors, connector => {
connector && connector.destroyIfInvalid();
if (connector){
connector.destroyIfInvalid();
}
});
},
setMapOver: function(val) {
Expand Down Expand Up @@ -317,17 +319,17 @@ var BaseInputTerminal = Terminal.extend({
if (thisDatatype == "input") {
return true;
}
var cat_outputs = new Array();
var cat_outputs = [];
cat_outputs = cat_outputs.concat(other.datatypes);
if (other.node.post_job_actions) {
for (var pja_i in other.node.post_job_actions) {
var pja = other.node.post_job_actions[pja_i];
if (
pja.action_type == "ChangeDatatypeAction" &&
(pja.output_name == "" || pja.output_name == other.name) &&
(pja.output_name === "" || pja.output_name == other.name) &&
pja.action_arguments
) {
cat_outputs.push(pja.action_arguments["newtype"]);
cat_outputs.push(pja.action_arguments.newtype);
}
}
}
Expand Down

0 comments on commit d3d6658

Please sign in to comment.