From 639e93dcf714b7558dd5e737f2e39ce275e61a25 Mon Sep 17 00:00:00 2001
From: will <theappdev@protonmail.com>
Date: Fri, 5 Jul 2019 17:50:45 +0200
Subject: [PATCH 1/8] remove invalid css

---
 client/galaxy/scripts/ui/popupmenu.js   | 2 +-
 client/galaxy/style/scss/base.scss      | 1 -
 client/galaxy/style/scss/overrides.scss | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/galaxy/scripts/ui/popupmenu.js b/client/galaxy/scripts/ui/popupmenu.js
index 4b00f445105..53d9ea8b168 100644
--- a/client/galaxy/scripts/ui/popupmenu.js
+++ b/client/galaxy/scripts/ui/popupmenu.js
@@ -54,7 +54,7 @@ export function make_popupmenu(button_element, initial_options) {
                     );
                 }
             });
-            var wrapper = $("<div class='popmenu-wrapper' style='position: absolute;left: 0; top: -1000;'></div>")
+            var wrapper = $("<div class='popmenu-wrapper' style='position: absolute;left: 0;'></div>")
                 .append(menu_element)
                 .appendTo("body");
 
diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss
index cb5b7a3560c..9ded0fed8f9 100644
--- a/client/galaxy/style/scss/base.scss
+++ b/client/galaxy/style/scss/base.scss
@@ -746,7 +746,6 @@ button {
     padding-right: 14px;
     margin-bottom: 0;
     @include border-radius(14px);
-    max-width: auto;
     background: $brand-white;
 }
 .search-query:focus {
diff --git a/client/galaxy/style/scss/overrides.scss b/client/galaxy/style/scss/overrides.scss
index 456f65fc816..481e1143590 100644
--- a/client/galaxy/style/scss/overrides.scss
+++ b/client/galaxy/style/scss/overrides.scss
@@ -33,7 +33,6 @@ pre {
 }
 
 .dropdown-menu {
-    max-width: auto;
     .dropdown-item {
         text-decoration: none;
     }

From 6cb0a464d09e778a172725770ab4f5bc3226de5e Mon Sep 17 00:00:00 2001
From: will <theappdev@protonmail.com>
Date: Sat, 6 Jul 2019 09:24:40 +0200
Subject: [PATCH 2/8] Remove duplicate css properties

---
 client/galaxy/style/scss/autocomplete_tagging.scss | 1 -
 client/galaxy/style/scss/base.scss                 | 2 --
 client/galaxy/style/scss/frame.scss                | 2 --
 client/galaxy/style/scss/history.scss              | 1 -
 client/galaxy/style/scss/trackster.scss            | 1 -
 client/galaxy/style/scss/ui.scss                   | 1 -
 6 files changed, 8 deletions(-)

diff --git a/client/galaxy/style/scss/autocomplete_tagging.scss b/client/galaxy/style/scss/autocomplete_tagging.scss
index 8bae0fd2ccc..db169ee0b75 100644
--- a/client/galaxy/style/scss/autocomplete_tagging.scss
+++ b/client/galaxy/style/scss/autocomplete_tagging.scss
@@ -85,7 +85,6 @@
 
 .toggle-link {
     font-weight: normal;
-    padding: 0.3em;
     margin-bottom: 1em;
     width: 100%;
     padding: 0.2em 0em 0.2em 0em;
diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss
index 9ded0fed8f9..4a0bbe2a8e9 100644
--- a/client/galaxy/style/scss/base.scss
+++ b/client/galaxy/style/scss/base.scss
@@ -1347,8 +1347,6 @@ div.permissionContainer {
 .text-content {
     hr {
         display: block;
-        background: black;
-        color: black;
         width: 100%;
         height: 1px;
         border: none;
diff --git a/client/galaxy/style/scss/frame.scss b/client/galaxy/style/scss/frame.scss
index 382e8c9492a..ef956308d4a 100644
--- a/client/galaxy/style/scss/frame.scss
+++ b/client/galaxy/style/scss/frame.scss
@@ -147,8 +147,6 @@ $frame-default-border: $border-default-color;
             width: 16px;
             height: 16px;
             color: $brand-dark;
-            right: 0px;
-            bottom: 0px;
             text-align: center;
             line-height: 16px;
             border: 0px;
diff --git a/client/galaxy/style/scss/history.scss b/client/galaxy/style/scss/history.scss
index 2a569d750e7..8bea041c41e 100644
--- a/client/galaxy/style/scss/history.scss
+++ b/client/galaxy/style/scss/history.scss
@@ -514,7 +514,6 @@
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
-            max-height: 22px;
         }
         &.control-column-right {
             text-align: right;
diff --git a/client/galaxy/style/scss/trackster.scss b/client/galaxy/style/scss/trackster.scss
index ac15bd0b53c..5f06b7d1961 100644
--- a/client/galaxy/style/scss/trackster.scss
+++ b/client/galaxy/style/scss/trackster.scss
@@ -26,7 +26,6 @@ $separator-color: #888;
     padding: 0 0;
     color: #333;
     font-weight: bold;
-    background: #cccccc;
     display: inline-block;
     top: -2em;
     background: transparent;
diff --git a/client/galaxy/style/scss/ui.scss b/client/galaxy/style/scss/ui.scss
index e0fc091a557..8688b25bd28 100644
--- a/client/galaxy/style/scss/ui.scss
+++ b/client/galaxy/style/scss/ui.scss
@@ -154,7 +154,6 @@ $ui-margin-horizontal-large: $margin-v * 2;
             font-style: italic;
         }
         .ui-form-backdrop {
-            display: none;
             z-index: 10;
             position: absolute;
             top: 0px;

From 16d00271e0d4eb2e7a78c91458c18f32dee86b2e Mon Sep 17 00:00:00 2001
From: will <theappdev@protonmail.com>
Date: Sat, 6 Jul 2019 09:35:50 +0200
Subject: [PATCH 3/8] removed unmatched closing div tag

---
 client/galaxy/docs/bootstrap.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/galaxy/docs/bootstrap.md b/client/galaxy/docs/bootstrap.md
index d62f23def6f..3c8a48e9bb3 100644
--- a/client/galaxy/docs/bootstrap.md
+++ b/client/galaxy/docs/bootstrap.md
@@ -89,7 +89,6 @@ Disabled
        </div>
      </div>
    </div>
- </div>
 ```
 
 ```vue

From 80c61a1425fbb5f6f6bad58d5da441f2016427a7 Mon Sep 17 00:00:00 2001
From: will <theappdev@protonmail.com>
Date: Sat, 6 Jul 2019 09:38:18 +0200
Subject: [PATCH 4/8] fix missing closing tag in html

---
 client/galaxy/scripts/mvc/job/job-li.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/galaxy/scripts/mvc/job/job-li.js b/client/galaxy/scripts/mvc/job/job-li.js
index 731af00b3d0..dd2c3e265c3 100644
--- a/client/galaxy/scripts/mvc/job/job-li.js
+++ b/client/galaxy/scripts/mvc/job/job-li.js
@@ -154,7 +154,7 @@ JobListItemView.prototype.templates = (() => {
             '<span class="name"><%- view.tool.name %></span>',
             "</div>",
             '<div class="subtitle">',
-            '<span class="description"><%- view.tool.description %></span',
+            '<span class="description"><%- view.tool.description %></span>',
             '<span class="create-time">',
             " ",
             _l("Created"),
@@ -169,7 +169,7 @@ JobListItemView.prototype.templates = (() => {
     var subtitleTemplate = BASE_MVC.wrapTemplate(
         [
             '<div class="subtitle">',
-            '<span class="description"><%- view.tool.description %></span',
+            '<span class="description"><%- view.tool.description %></span>',
             //'<span class="create-time">',
             //    ' ', _l( 'Created' ), ': <%= new Date( job.create_time ).toString() %>, ',
             //'</span',

From 4945a27d54c5eb98e52d9384f2834b5bae5077c7 Mon Sep 17 00:00:00 2001
From: will <theappdev@protonmail.com>
Date: Sat, 6 Jul 2019 09:44:48 +0200
Subject: [PATCH 5/8] add missing required alt attributes on images

---
 client/galaxy/scripts/components/PluginList.vue                 | 2 +-
 client/galaxy/scripts/layout/masthead.js                        | 2 +-
 client/galaxy/scripts/mvc/tag.js                                | 2 +-
 .../galaxy/scripts/mvc/visualization/chart/views/description.js | 2 +-
 client/galaxy/scripts/mvc/workflow/workflow-view.js             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/galaxy/scripts/components/PluginList.vue b/client/galaxy/scripts/components/PluginList.vue
index 7acf1ff0533..2909e7e9439 100644
--- a/client/galaxy/scripts/components/PluginList.vue
+++ b/client/galaxy/scripts/components/PluginList.vue
@@ -14,7 +14,7 @@
                 <table v-if="match(plugin)">
                     <tr class="ui-thumbnails-item" @click="select(plugin)">
                         <td>
-                            <img v-if="plugin.logo" class="ui-thumbnails-image" :src="plugin.logo" />
+                            <img v-if="plugin.logo" alt="ui thumbnails" class="ui-thumbnails-image" :src="plugin.logo" />
                             <div v-else class="ui-thumbnails-icon fa fa-eye" />
                         </td>
                         <td>
diff --git a/client/galaxy/scripts/layout/masthead.js b/client/galaxy/scripts/layout/masthead.js
index 17413de98b4..dc41a0b738d 100644
--- a/client/galaxy/scripts/layout/masthead.js
+++ b/client/galaxy/scripts/layout/masthead.js
@@ -99,7 +99,7 @@ const View = Backbone.View.extend({
         return `
             <nav id="masthead" class="navbar navbar-expand justify-content-center navbar-dark">
                 <a class="navbar-brand">
-                    <img class="navbar-brand-image"/>
+                    <img alt="navigation brand image" class="navbar-brand-image"/>
                     <span class="navbar-brand-title"/>
                 </a>
                 <ul class="navbar-nav"/>
diff --git a/client/galaxy/scripts/mvc/tag.js b/client/galaxy/scripts/mvc/tag.js
index eb150542695..9cf9c119a70 100644
--- a/client/galaxy/scripts/mvc/tag.js
+++ b/client/galaxy/scripts/mvc/tag.js
@@ -117,7 +117,7 @@ var TagsEditor = Backbone.View.extend(baseMVC.LoggableMixin)
             });
             if (renderedArray.length === 0) {
                 // If there are no tags to render we just show the add-tag-button
-                renderedArray.push(`<img src=${addButton} class="add-tag-button" title="Add tags"/>`);
+                renderedArray.push(`<img alt="add tag button" src=${addButton} class="add-tag-button" title="Add tags"/>`);
             }
             return renderedArray.join(" ");
         },
diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/description.js b/client/galaxy/scripts/mvc/visualization/chart/views/description.js
index 7623cf3a66d..6362a6cd18e 100644
--- a/client/galaxy/scripts/mvc/visualization/chart/views/description.js
+++ b/client/galaxy/scripts/mvc/visualization/chart/views/description.js
@@ -28,7 +28,7 @@ export default Backbone.View.extend({
                     <table>
                     <tr>
                         <td class="charts-description-image-td">
-                            <img class="charts-description-image"/>
+                            <img alt="charts description" class="charts-description-image"/>
                         </td>
                         <td>
                             <div class="charts-description-title"/>
diff --git a/client/galaxy/scripts/mvc/workflow/workflow-view.js b/client/galaxy/scripts/mvc/workflow/workflow-view.js
index b6bde09ec82..eb5449e4268 100644
--- a/client/galaxy/scripts/mvc/workflow/workflow-view.js
+++ b/client/galaxy/scripts/mvc/workflow/workflow-view.js
@@ -771,7 +771,7 @@ export default Backbone.View.extend({
         var node = new Node(this, { element: $f });
         node.type = type;
         node.content_id = content_id;
-        var tmp = `<div><img height='16' align='middle' src='${getAppRoot()}static/images/loading_small_white_bg.gif'/> loading tool info...</div>`;
+        var tmp = `<div><img alt="loading" height='16' align='middle' src='${getAppRoot()}static/images/loading_small_white_bg.gif'/> loading tool info...</div>`;
         $f.find(".toolFormBody").append(tmp);
         // Fix width to computed width
         // Now add floats

From c7f5f998905706b5d13b426c58986ba81d24488c Mon Sep 17 00:00:00 2001
From: will <theappdev@protonmail.com>
Date: Sat, 6 Jul 2019 09:55:56 +0200
Subject: [PATCH 6/8] Simplify if statements

---
 client/galaxy/scripts/components/Tags/model.js           | 4 ++--
 client/galaxy/scripts/mvc/history/multi-panel.js         | 6 ++----
 client/galaxy/scripts/mvc/workflow/workflow-terminals.js | 8 +-------
 client/galaxy/scripts/viz/trackster/filters.js           | 6 ++----
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/client/galaxy/scripts/components/Tags/model.js b/client/galaxy/scripts/components/Tags/model.js
index a9dd7c68eae..821c1c0c009 100644
--- a/client/galaxy/scripts/components/Tags/model.js
+++ b/client/galaxy/scripts/components/Tags/model.js
@@ -50,8 +50,8 @@ function TagModel(props = {}) {
         enumerable: false,
         get: function() {
             if (!this.text.length) return false;
-            if (this.text == "name:") return false;
-            return true;
+            return this.text != "name:";
+
         }
     });
 }
diff --git a/client/galaxy/scripts/mvc/history/multi-panel.js b/client/galaxy/scripts/mvc/history/multi-panel.js
index 104bcbab12e..2ceb55dab29 100644
--- a/client/galaxy/scripts/mvc/history/multi-panel.js
+++ b/client/galaxy/scripts/mvc/history/multi-panel.js
@@ -94,10 +94,8 @@ var HistoryViewColumn = Backbone.View.extend(baseMVC.LoggableMixin).extend({
         if (columnRight < viewLeft) {
             return false;
         }
-        if (columnLeft > viewRight) {
-            return false;
-        }
-        return true;
+        return columnLeft <= viewRight;
+
     },
 
     /** shortcut to the panel */
diff --git a/client/galaxy/scripts/mvc/workflow/workflow-terminals.js b/client/galaxy/scripts/mvc/workflow/workflow-terminals.js
index 3c89c1aa6d1..ad6ca052eef 100644
--- a/client/galaxy/scripts/mvc/workflow/workflow-terminals.js
+++ b/client/galaxy/scripts/mvc/workflow/workflow-terminals.js
@@ -292,13 +292,7 @@ var BaseInputTerminal = Terminal.extend({
             inputFilled = false;
         } else {
             if (this.multiple) {
-                if (this._collectionAttached()) {
-                    // Can only attach one collection to multiple input
-                    // data parameter.
-                    inputFilled = true;
-                } else {
-                    inputFilled = false;
-                }
+                inputFilled = !!this._collectionAttached();
             } else {
                 inputFilled = true;
             }
diff --git a/client/galaxy/scripts/viz/trackster/filters.js b/client/galaxy/scripts/viz/trackster/filters.js
index 34309eeda8e..cb458fe3371 100644
--- a/client/galaxy/scripts/viz/trackster/filters.js
+++ b/client/galaxy/scripts/viz/trackster/filters.js
@@ -322,10 +322,8 @@ _.extend(NumberFilter.prototype, {
      * Returns true if filter can be applied to element.
      */
     applies_to: function(element) {
-        if (element.length > this.index) {
-            return true;
-        }
-        return false;
+        return element.length > this.index;
+
     },
     /**
      * Helper function: returns true if value in in filter's [low, high] range.

From 54c21d94b4a702f30f0162e0cafac4fe93ecf20f Mon Sep 17 00:00:00 2001
From: will <theappdev@protonmail.com>
Date: Sat, 6 Jul 2019 10:38:13 +0200
Subject: [PATCH 7/8] Remove redundant variable declarations

---
 .../scripts/entry/analysis/AnalysisRouter.js   |  3 +--
 .../layout/communication-server-view.js        |  3 +--
 .../scripts/mvc/collection/collection-model.js |  3 +--
 .../list-of-pairs-collection-creator.js        |  3 +--
 .../scripts/mvc/history/history-contents.js    |  3 +--
 .../galaxy/scripts/mvc/history/history-list.js |  3 +--
 .../galaxy/scripts/mvc/history/history-view.js |  3 +--
 .../galaxy/scripts/mvc/history/multi-panel.js  |  9 +++------
 client/galaxy/scripts/mvc/job/job-li.js        |  3 +--
 client/galaxy/scripts/mvc/lazy/lazy-limited.js |  3 +--
 .../mvc/library/library-foldertoolbar-view.js  |  6 ++----
 .../scripts/mvc/library/library-model.js       |  4 +---
 client/galaxy/scripts/mvc/list/list-item.js    |  4 +---
 client/galaxy/scripts/mvc/list/list-view.js    |  3 +--
 .../scripts/mvc/rules/rule-definitions.js      |  3 +--
 .../scripts/mvc/toolshed/repository-view.js    |  3 +--
 client/galaxy/scripts/mvc/toolshed/util.js     |  3 +--
 .../scripts/mvc/workflow/workflow-node.js      |  3 +--
 .../scripts/mvc/workflow/workflow-view-node.js |  6 ++----
 .../mvc/workflow/workflow-view-terminals.js    |  9 +++------
 .../qunit/tests/workflow_editor_tests.js       | 18 +++++-------------
 client/galaxy/scripts/reports/run_stats.js     | 16 ++++------------
 .../galaxy/scripts/ui/peek-column-selector.js  |  6 ++----
 client/galaxy/scripts/utils/installMonitor.js  |  3 +--
 24 files changed, 38 insertions(+), 85 deletions(-)

diff --git a/client/galaxy/scripts/entry/analysis/AnalysisRouter.js b/client/galaxy/scripts/entry/analysis/AnalysisRouter.js
index ddc58f00e5a..570bd3dc0c4 100644
--- a/client/galaxy/scripts/entry/analysis/AnalysisRouter.js
+++ b/client/galaxy/scripts/entry/analysis/AnalysisRouter.js
@@ -88,8 +88,7 @@ export const getAnalysisRouter = Galaxy =>
             const instance = Vue.extend(component);
             const container = document.createElement("div");
             this.page.display(container);
-            const vm = new instance(props).$mount(container);
-            return vm;
+            return new instance(props).$mount(container);
         },
 
         show_tours: function(tour_id) {
diff --git a/client/galaxy/scripts/layout/communication-server-view.js b/client/galaxy/scripts/layout/communication-server-view.js
index 1bd1f682300..d71930ebb79 100644
--- a/client/galaxy/scripts/layout/communication-server-view.js
+++ b/client/galaxy/scripts/layout/communication-server-view.js
@@ -92,13 +92,12 @@ export const CommunicationServerView = Backbone.View.extend({
 
     /**renders the chat icon as a nav item*/
     render: function() {
-        const navItem = {
+        return {
             id: "show-chat-online",
             icon: "fa-comment-o",
             tooltip: _l("Chat online"),
             visible: false,
             onclick: this.makeModalIframe
         };
-        return navItem;
     }
 });
diff --git a/client/galaxy/scripts/mvc/collection/collection-model.js b/client/galaxy/scripts/mvc/collection/collection-model.js
index 985407145d7..4f99ac3c0db 100644
--- a/client/galaxy/scripts/mvc/collection/collection-model.js
+++ b/client/galaxy/scripts/mvc/collection/collection-model.js
@@ -134,8 +134,7 @@ var DatasetDCE = DATASET_MODEL.DatasetAssociation.extend(
                     return `${getAppRoot()}api/datasets`;
                 }
                 const datasetId = this._getDatasetId();
-                const url = `${getAppRoot()}api/histories/${this.get("history_id")}/contents/${datasetId}`;
-                return url;
+                return `${getAppRoot()}api/histories/${this.get("history_id")}/contents/${datasetId}`;
             },
 
             _getDatasetId: function() {
diff --git a/client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js b/client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
index 7ff9a260697..15ec4654c2b 100644
--- a/client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
+++ b/client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
@@ -1491,8 +1491,7 @@ var PairedCollectionCreator = Backbone.View.extend(baseMVC.LoggableMixin)
             //this.debug( '_pairDragstart', ev, pair )
             // auto select the pair causing the event and move all selected
             pair.$el.addClass("selected");
-            var $selected = this.$(".paired-columns .dataset.selected");
-            this.$dragging = $selected;
+            this.$dragging = this.$(".paired-columns .dataset.selected");
         },
         /** drag communication with pair sub-views: dragend - remove the placeholder */
         _pairDragend: function(ev, pair) {
diff --git a/client/galaxy/scripts/mvc/history/history-contents.js b/client/galaxy/scripts/mvc/history/history-contents.js
index 54eb7757e80..bc362cc40ee 100644
--- a/client/galaxy/scripts/mvc/history/history-contents.js
+++ b/client/galaxy/scripts/mvc/history/history-contents.js
@@ -78,8 +78,7 @@ export var HistoryContents = _super.extend(BASE_MVC.LoggableMixin).extend({
                         history_id: this.history_id,
                         collection_id: historyContent.attributes.id
                     });
-                    var jobStatesSummary = this.jobStateSummariesCollection.get(jobSourceId);
-                    historyContent.jobStatesSummary = jobStatesSummary;
+                    historyContent.jobStatesSummary = this.jobStateSummariesCollection.get(jobSourceId);
                 }
             }
         });
diff --git a/client/galaxy/scripts/mvc/history/history-list.js b/client/galaxy/scripts/mvc/history/history-list.js
index e1db8645d43..6941d0c4b74 100644
--- a/client/galaxy/scripts/mvc/history/history-list.js
+++ b/client/galaxy/scripts/mvc/history/history-list.js
@@ -50,8 +50,7 @@ var HistoryGridView = GridView.extend({
                         $(`.delayed-value-datasets_by_state[data-id='${historyId}']`).html(stateHtml);
                         $(`.delayed-value-disk_size[data-id='${historyId}']`).html(req.nice_size);
                     };
-                    var xhr = $.ajax(options);
-                    return xhr;
+                    return $.ajax(options);
                 };
             })
         );
diff --git a/client/galaxy/scripts/mvc/history/history-view.js b/client/galaxy/scripts/mvc/history/history-view.js
index 4e96b1ff6f6..35c42388cf9 100644
--- a/client/galaxy/scripts/mvc/history/history-view.js
+++ b/client/galaxy/scripts/mvc/history/history-view.js
@@ -469,8 +469,7 @@ var HistoryView = _super.extend(
             // if sent two strings (and possibly details as 'options'), use those as message and title
             if (_.isString(model) && _.isString(xhr)) {
                 var message = model;
-                var title = xhr;
-                return ERROR_MODAL.errorModal(message, title, options);
+                return ERROR_MODAL.errorModal(message, xhr, options);
             }
             // bad gateway
             // TODO: possibly to global handler
diff --git a/client/galaxy/scripts/mvc/history/multi-panel.js b/client/galaxy/scripts/mvc/history/multi-panel.js
index 2ceb55dab29..276ec095870 100644
--- a/client/galaxy/scripts/mvc/history/multi-panel.js
+++ b/client/galaxy/scripts/mvc/history/multi-panel.js
@@ -436,8 +436,7 @@ var MultiPanelColumns = Backbone.View.extend(baseMVC.LoggableMixin).extend({
         // if sent two strings (and possibly details as 'options'), use those as message and title
         if (_.isString(model) && _.isString(xhr)) {
             var message = model;
-            var title = xhr;
-            return ERROR_MODAL.errorModal(message, title, options);
+            return ERROR_MODAL.errorModal(message, xhr, options);
         }
         // bad gateway
         // TODO: possibly to global handler
@@ -598,15 +597,13 @@ var MultiPanelColumns = Backbone.View.extend(baseMVC.LoggableMixin).extend({
             return this.sortedColumns();
         }
         return this.sortedColumns().filter((column, index) => {
-            var filtered = column.currentHistory || _.every(filters.map(filter => filter.call(column)));
-            return filtered;
+            return column.currentHistory || _.every(filters.map(filter => filter.call(column)));
         });
     },
 
     /** return array of Columns sorted to match the collection */
     sortedColumns: function() {
-        var sorted = this.collection.map((history, index) => this.columnMap[history.id]);
-        return sorted;
+        return this.collection.map((history, index) => this.columnMap[history.id]);
     },
 
     // ------------------------------------------------------------------------ render
diff --git a/client/galaxy/scripts/mvc/job/job-li.js b/client/galaxy/scripts/mvc/job/job-li.js
index dd2c3e265c3..b502226dadf 100644
--- a/client/galaxy/scripts/mvc/job/job-li.js
+++ b/client/galaxy/scripts/mvc/job/job-li.js
@@ -107,8 +107,7 @@ var JobListItemView = _super.extend(
                 return undefined;
             }
 
-            var subMatch = _.find(partialMatch.inputs, i => name.indexOf(i.name) !== -1);
-            return subMatch;
+            return _.find(partialMatch.inputs, i => name.indexOf(i.name) !== -1);
         },
 
         // ........................................................................ misc
diff --git a/client/galaxy/scripts/mvc/lazy/lazy-limited.js b/client/galaxy/scripts/mvc/lazy/lazy-limited.js
index 7acbe969a3e..03db71c53a0 100644
--- a/client/galaxy/scripts/mvc/lazy/lazy-limited.js
+++ b/client/galaxy/scripts/mvc/lazy/lazy-limited.js
@@ -55,8 +55,7 @@ export default Backbone.View.extend({
                 // TODO: View is unused here.
                 //var view = this.content_list[model.id];
                 if (!this.content_list[model.id]) {
-                    var content = this.new_content(model);
-                    this.content_list[model.id] = content;
+                    this.content_list[model.id] = this.new_content(model);
                     if (this._done()) {
                         break;
                     }
diff --git a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
index b3d5ec39d6d..5c0326cb2b3 100644
--- a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
+++ b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
@@ -212,8 +212,7 @@ var FolderToolbarView = Backbone.View.extend({
 
     fetchUserHistories: function() {
         this.histories = new mod_library_model.GalaxyHistories();
-        var promise = this.histories.fetch();
-        return promise;
+        return this.histories.fetch();
     },
 
     importAllIntoHistory: function() {
@@ -239,8 +238,7 @@ var FolderToolbarView = Backbone.View.extend({
     },
 
     createNewHistory: function(new_history_name) {
-        var promise = $.post(`${getAppRoot()}api/histories`, { name: new_history_name });
-        return promise;
+        return $.post(`${getAppRoot()}api/histories`, { name: new_history_name });
     },
 
     processImportToHistory: function(history_id, history_name) {
diff --git a/client/galaxy/scripts/mvc/library/library-model.js b/client/galaxy/scripts/mvc/library/library-model.js
index b1c91a25e40..3143f0b6c2e 100644
--- a/client/galaxy/scripts/mvc/library/library-model.js
+++ b/client/galaxy/scripts/mvc/library/library-model.js
@@ -51,9 +51,7 @@ var Libraries = Backbone.Collection.extend({
      */
     getVisible: function(show_deleted, filters) {
         filters = filters || [];
-        var filteredLibraries = new Libraries(this.filter(item => item.isVisible(show_deleted)));
-
-        return filteredLibraries;
+        return new Libraries(this.filter(item => item.isVisible(show_deleted)));
     },
 
     sortLibraries: function(sort_key, sort_order) {
diff --git a/client/galaxy/scripts/mvc/list/list-item.js b/client/galaxy/scripts/mvc/list/list-item.js
index 3f1d0b0430a..f4e1791c864 100644
--- a/client/galaxy/scripts/mvc/list/list-item.js
+++ b/client/galaxy/scripts/mvc/list/list-item.js
@@ -421,13 +421,11 @@ export var FoldoutListItemView = ListItemView.extend({
         var FoldoutClass = this._getFoldoutPanelClass(model);
         var options = this._getFoldoutPanelOptions(model);
 
-        var foldout = new FoldoutClass(
+        return new FoldoutClass(
             _.extend(options, {
                 model: model
             })
         );
-
-        return foldout;
     },
 
     /** Stub to return proper foldout panel class */
diff --git a/client/galaxy/scripts/mvc/list/list-view.js b/client/galaxy/scripts/mvc/list/list-view.js
index 69e0debbe9a..eabe0dc817f 100644
--- a/client/galaxy/scripts/mvc/list/list-view.js
+++ b/client/galaxy/scripts/mvc/list/list-view.js
@@ -367,8 +367,7 @@ var ListPanel = Backbone.View.extend(BASE_MVC.LoggableMixin).extend(
             // console.log( 'models filtered:', shownModels );
 
             panel.views = shownModels.map(itemModel => {
-                var view = panel._createItemView(itemModel);
-                return view;
+                return panel._createItemView(itemModel);
             });
 
             $list.empty();
diff --git a/client/galaxy/scripts/mvc/rules/rule-definitions.js b/client/galaxy/scripts/mvc/rules/rule-definitions.js
index e6fc8154036..23ccb754b8f 100644
--- a/client/galaxy/scripts/mvc/rules/rule-definitions.js
+++ b/client/galaxy/scripts/mvc/rules/rule-definitions.js
@@ -865,8 +865,7 @@ const applyRules = function(data, sources, columns, rules, headersPerRule = [])
     const colHeadersPerRule = Array.from(headersPerRule);
     let hasRuleError = false;
     for (var ruleIndex in rules) {
-        const ruleHeaders = colHeadersFor(data, columns);
-        colHeadersPerRule[ruleIndex] = ruleHeaders;
+        colHeadersPerRule[ruleIndex] = colHeadersFor(data, columns);
         const rule = rules[ruleIndex];
         rule.error = null;
         rule.warn = null;
diff --git a/client/galaxy/scripts/mvc/toolshed/repository-view.js b/client/galaxy/scripts/mvc/toolshed/repository-view.js
index b5ab7af65b5..80f9869efc8 100644
--- a/client/galaxy/scripts/mvc/toolshed/repository-view.js
+++ b/client/galaxy/scripts/mvc/toolshed/repository-view.js
@@ -320,10 +320,9 @@ var ToolShedRepositoryView = Backbone.View.extend({
     },
 
     selectedChangeset: function() {
-        var changeset = $("#changeset")
+        return $("#changeset")
             .find("option:selected")
             .val();
-        return changeset;
     },
 
     showToolTPSCreate: function(guid, changeset) {
diff --git a/client/galaxy/scripts/mvc/toolshed/util.js b/client/galaxy/scripts/mvc/toolshed/util.js
index eb43733f985..d11abbbf546 100644
--- a/client/galaxy/scripts/mvc/toolshed/util.js
+++ b/client/galaxy/scripts/mvc/toolshed/util.js
@@ -40,8 +40,7 @@ var addToQueue = metadata => {
 var queueLength = () => {
     if (window.localStorage.hasOwnProperty("repositories")) {
         var repo_queue = JSON.parse(window.localStorage.repositories);
-        var queue_length = Object.keys(repo_queue).length;
-        return queue_length;
+        return Object.keys(repo_queue).length;
     } else {
         return 0;
     }
diff --git a/client/galaxy/scripts/mvc/workflow/workflow-node.js b/client/galaxy/scripts/mvc/workflow/workflow-node.js
index 4ac55fb2815..a93b421df47 100644
--- a/client/galaxy/scripts/mvc/workflow/workflow-node.js
+++ b/client/galaxy/scripts/mvc/workflow/workflow-node.js
@@ -317,8 +317,7 @@ var Node = Backbone.Model.extend({
         var new_body = nodeView.newInputsDiv();
         var newTerminalViews = {};
         _.each(data.inputs, input => {
-            var terminalView = node.nodeView.addDataInput(input, new_body);
-            newTerminalViews[input.name] = terminalView;
+            newTerminalViews[input.name] = node.nodeView.addDataInput(input, new_body);
         });
         // Cleanup any leftover terminals
         _.each(_.difference(_.values(nodeView.terminalViews), _.values(newTerminalViews)), unusedView => {
diff --git a/client/galaxy/scripts/mvc/workflow/workflow-view-node.js b/client/galaxy/scripts/mvc/workflow/workflow-view-node.js
index 1eaa4d3d4f0..21fe17a89e1 100644
--- a/client/galaxy/scripts/mvc/workflow/workflow-view-node.js
+++ b/client/galaxy/scripts/mvc/workflow/workflow-view-node.js
@@ -91,21 +91,19 @@ export default Backbone.View.extend({
         } else if (output.parameter) {
             terminalViewClass = TerminalViews.OutputParameterTerminalView;
         }
-        const terminalView = new terminalViewClass({
+        return new terminalViewClass({
             node: this.node,
             output: output
         });
-        return terminalView;
     },
 
     outputViewforOutput: function(output, terminalView) {
         const outputViewClass = output.parameter ? DataViews.ParameterOutputView : DataViews.DataOutputView;
-        const outputView = new outputViewClass({
+        return new outputViewClass({
             output: output,
             terminalElement: terminalView.el,
             nodeView: this
         });
-        return outputView;
     },
 
     addDataOutput: function(output) {
diff --git a/client/galaxy/scripts/mvc/workflow/workflow-view-terminals.js b/client/galaxy/scripts/mvc/workflow/workflow-view-terminals.js
index 00be7196c0c..adf822fe38f 100644
--- a/client/galaxy/scripts/mvc/workflow/workflow-view-terminals.js
+++ b/client/galaxy/scripts/mvc/workflow/workflow-view-terminals.js
@@ -289,12 +289,11 @@ var OutputTerminalView = BaseOutputTerminalView.extend({
     terminalMappingViewClass: TerminalMappingView,
     terminalForOutput: function(output) {
         var type = output.extensions;
-        var terminal = new Terminals.OutputTerminal({
+        return new Terminals.OutputTerminal({
             element: this.el,
             datatypes: type,
             force_datatype: output.force_datatype
         });
-        return terminal;
     }
 });
 
@@ -304,14 +303,13 @@ var OutputCollectionTerminalView = BaseOutputTerminalView.extend({
     terminalForOutput: function(output) {
         var collection_type = output.collection_type;
         var collection_type_source = output.collection_type_source;
-        var terminal = new Terminals.OutputCollectionTerminal({
+        return new Terminals.OutputCollectionTerminal({
             element: this.el,
             collection_type: collection_type,
             collection_type_source: collection_type_source,
             datatypes: output.extensions,
             force_datatype: output.force_datatype
         });
-        return terminal;
     }
 });
 
@@ -319,11 +317,10 @@ var OutputParameterTerminalView = BaseOutputTerminalView.extend({
     terminalMappingClass: Terminals.TerminalMapping,
     terminalMappingViewClass: TerminalMappingView,
     terminalForOutput: function(output) {
-        var terminal = new Terminals.OutputCollectionTerminal({
+        return new Terminals.OutputCollectionTerminal({
             element: this.el,
             type: output.type
         });
-        return terminal;
     }
 });
 
diff --git a/client/galaxy/scripts/qunit/tests/workflow_editor_tests.js b/client/galaxy/scripts/qunit/tests/workflow_editor_tests.js
index 2ecfabd1c3d..77d2812c8a4 100644
--- a/client/galaxy/scripts/qunit/tests/workflow_editor_tests.js
+++ b/client/galaxy/scripts/qunit/tests/workflow_editor_tests.js
@@ -54,8 +54,7 @@ QUnit.module("Input terminal model test", {
     test_connector: function() {
         var outputTerminal = new Terminals.OutputTerminal({ datatypes: ["input"] });
         var inputTerminal = this.input_terminal;
-        var connector = new Connector(outputTerminal, inputTerminal);
-        return connector;
+        return new Connector(outputTerminal, inputTerminal);
     },
     with_test_connector: function(f) {
         this.test_connector();
@@ -557,9 +556,7 @@ QUnit.module("Node view ", {
             disableMapOver: function() {},
             mapOver: Terminals.NULL_COLLECTION_TYPE_DESCRIPTION
         };
-        var c = new Connector(outputTerminal, terminal);
-
-        return c;
+        return new Connector(outputTerminal, terminal);
     },
     connectAttachedMultiInputTerminal: function(inputType, outputType) {
         this.view.addDataInput({ name: "TestName", extensions: [inputType], multiple: true });
@@ -580,9 +577,7 @@ QUnit.module("Node view ", {
             disableMapOver: function() {},
             mapOver: new Terminals.CollectionTypeDescription("list")
         };
-        var c = new Connector(outputTerminal, terminal);
-
-        return c;
+        return new Connector(outputTerminal, terminal);
     },
     connectAttachedMappedOutput: function() {
         this.view.addDataInput({ name: "TestName", extensions: ["txt"], input_type: "dataset_collection" });
@@ -603,9 +598,7 @@ QUnit.module("Node view ", {
             disableMapOver: function() {},
             mapOver: new Terminals.CollectionTypeDescription("list")
         };
-        var c = new Connector(outputTerminal, terminal);
-
-        return c;
+        return new Connector(outputTerminal, terminal);
     }
 });
 
@@ -917,8 +910,7 @@ QUnit.module("terminal mapping logic", {
     },
     newNode: function() {
         var nodeEl = $("<div>")[0];
-        var node = new Node(create_app(), { element: nodeEl });
-        return node;
+        return new Node(create_app(), { element: nodeEl });
     },
     _addExistingOutput: function(terminal, output, connected) {
         var self = this;
diff --git a/client/galaxy/scripts/reports/run_stats.js b/client/galaxy/scripts/reports/run_stats.js
index 0c30bae7971..1a2ea951e13 100644
--- a/client/galaxy/scripts/reports/run_stats.js
+++ b/client/galaxy/scripts/reports/run_stats.js
@@ -178,9 +178,7 @@ export function create_chart(inp_data, name, time, title) {
             var m_x = margin.left;
             var m_y = margin.top + height;
             var l_x = m_x + width;
-            var l_y = m_y;
-
-            return `M${m_x} ${m_y} L ${l_x} ${l_y}`;
+            return `M${m_x} ${m_y} L ${l_x} ${m_y}`;
         });
 
     // Declare how high the y axis goes
@@ -212,9 +210,7 @@ export function create_chart(inp_data, name, time, title) {
             var axis = d3.select(`#y_${name}`).node();
             var left_pad = margin.left - axis.getBoundingClientRect().width - 5;
             var top_pad = margin.top + axis.getBoundingClientRect().height / 2 - 30;
-            var trans = `translate(${left_pad},${top_pad})rotate(-90)`;
-
-            return trans;
+            return `translate(${left_pad},${top_pad})rotate(-90)`;
         })
         .text("Number of Jobs");
 
@@ -625,9 +621,7 @@ export function create_histogram(inp_data, name, title) {
             var axis = d3.select(`#x_${name}`).node();
             var left_pad = margin.left + axis.getBoundingClientRect().width / 2 + 30;
             var top_pad = margin.top + height + axis.getBoundingClientRect().height + 10;
-            var trans = `translate(${left_pad},${top_pad})`;
-
-            return trans;
+            return `translate(${left_pad},${top_pad})`;
         })
         .text("ETA - hrs:mins");
 
@@ -654,9 +648,7 @@ export function create_histogram(inp_data, name, title) {
             var axis = d3.select(`#y_${name}`).node();
             var left_pad = margin.left - axis.getBoundingClientRect().width - 5;
             var top_pad = margin.top + axis.getBoundingClientRect().height / 2 - 30;
-            var trans = `translate(${left_pad},${top_pad})rotate(-90)`;
-
-            return trans;
+            return `translate(${left_pad},${top_pad})rotate(-90)`;
         })
         .text("Number of Jobs");
 
diff --git a/client/galaxy/scripts/ui/peek-column-selector.js b/client/galaxy/scripts/ui/peek-column-selector.js
index 0a8ce1838fa..ff65acd58b0 100644
--- a/client/galaxy/scripts/ui/peek-column-selector.js
+++ b/client/galaxy/scripts/ui/peek-column-selector.js
@@ -175,8 +175,7 @@ function buildSingleSelectCell(control, columnIndex) {
                 var eventData = {};
 
                 var key = $cell.parent().attr("id");
-                var val = $cell.data(COLUMN_INDEX_DATA_KEY);
-                eventData[key] = val;
+                eventData[key] = $cell.data(COLUMN_INDEX_DATA_KEY);
                 $cell.parents(".peek").trigger(CHANGE_EVENT, eventData);
             }
         });
@@ -209,8 +208,7 @@ function buildMultiSelectCell(control, columnIndex) {
             var eventData = {};
 
             var key = $cell.parent().attr("id");
-            var val = $.makeArray(selectedColumnIndeces);
-            eventData[key] = val;
+            eventData[key] = $.makeArray(selectedColumnIndeces);
             $cell.parents(".peek").trigger(CHANGE_EVENT, eventData);
         });
     }
diff --git a/client/galaxy/scripts/utils/installMonitor.js b/client/galaxy/scripts/utils/installMonitor.js
index 146fda09384..68479548ba9 100644
--- a/client/galaxy/scripts/utils/installMonitor.js
+++ b/client/galaxy/scripts/utils/installMonitor.js
@@ -102,8 +102,7 @@ export function showMonitorToggles() {
 // retrieve toggle list from the session storage
 function getToggles() {
     const json = sessionStorage.getItem("global_monitors");
-    const existinglist = json ? JSON.parse(json) : {};
-    return existinglist;
+    return json ? JSON.parse(json) : {};
 }
 
 // put the toggle list back in session storage

From a9257fafcdb14da89ff58e80b9812206efba57c2 Mon Sep 17 00:00:00 2001
From: will <theappdev@protonmail.com>
Date: Sat, 6 Jul 2019 15:16:13 +0200
Subject: [PATCH 8/8] Add descriptive comments

---
 .../scripts/mvc/library/library-foldertoolbar-view.js       | 6 ++++++
 client/galaxy/scripts/mvc/workflow/workflow-terminals.js    | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
index 5c0326cb2b3..3908f8c1487 100644
--- a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
+++ b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
@@ -210,6 +210,9 @@ var FolderToolbarView = Backbone.View.extend({
         }
     },
 
+    /**
+     * This function returns a promise
+     */
     fetchUserHistories: function() {
         this.histories = new mod_library_model.GalaxyHistories();
         return this.histories.fetch();
@@ -237,6 +240,9 @@ var FolderToolbarView = Backbone.View.extend({
         }
     },
 
+    /**
+     * This function returns a promise
+     */
     createNewHistory: function(new_history_name) {
         return $.post(`${getAppRoot()}api/histories`, { name: new_history_name });
     },
diff --git a/client/galaxy/scripts/mvc/workflow/workflow-terminals.js b/client/galaxy/scripts/mvc/workflow/workflow-terminals.js
index ad6ca052eef..fd82f330151 100644
--- a/client/galaxy/scripts/mvc/workflow/workflow-terminals.js
+++ b/client/galaxy/scripts/mvc/workflow/workflow-terminals.js
@@ -292,6 +292,8 @@ var BaseInputTerminal = Terminal.extend({
             inputFilled = false;
         } else {
             if (this.multiple) {
+                // Can only attach one collection to multiple input
+                // data parameter.
                 inputFilled = !!this._collectionAttached();
             } else {
                 inputFilled = true;