Fix no-redeclares in scripts/mvc

galaxyproject · Jan 15, 2019 · 56731df · 56731df
1 parent f0205d4
commit 56731df
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
@@ -296,17 +296,17 @@ var FolderToolbarView = Backbone.View.extend({
         var items_to_import = [];
         // prepare the dataset objects to be imported
         for (let i = checked_items.dataset_ids.length - 1; i >= 0; i--) {
-            var library_dataset_id = checked_items.dataset_ids[i];
-            var historyItem = new mod_library_model.HistoryItem();
+            let library_dataset_id = checked_items.dataset_ids[i];
+            let historyItem = new mod_library_model.HistoryItem();
             historyItem.url = `${historyItem.urlRoot + history_id}/contents`;
             historyItem.content = library_dataset_id;
             historyItem.source = "library";
             items_to_import.push(historyItem);
         }
         // prepare the folder objects to be imported
         for (let i = checked_items.folder_ids.length - 1; i >= 0; i--) {
-            var library_folder_id = checked_items.folder_ids[i];
-            var historyItem = new mod_library_model.HistoryItem();
+            let library_folder_id = checked_items.folder_ids[i];
+            let historyItem = new mod_library_model.HistoryItem();
             historyItem.url = `${historyItem.urlRoot + history_id}/contents`;
             historyItem.content = library_folder_id;
             historyItem.source = "library_folder";
@@ -719,7 +719,7 @@ var FolderToolbarView = Backbone.View.extend({
                 action: "adding_datasets"
             });
             if (selection_type === "folder") {
-                var full_source = `${options.source}_folder`;
+                let full_source = `${options.source}_folder`;
                 this.chainCallImportingFolders({
                     paths: paths,
                     preserve_dirs: preserve_dirs,
@@ -732,7 +732,7 @@ var FolderToolbarView = Backbone.View.extend({
                     tag_using_filenames: tag_using_filenames
                 });
             } else if (selection_type === "file") {
-                var full_source = `${options.source}_file`;
+                let full_source = `${options.source}_file`;
                 this.chainCallImportingUserdirFiles({
                     paths: paths,
                     file_type: file_type,

diff --git a/client/galaxy/scripts/mvc/rules/rule-definitions.js b/client/galaxy/scripts/mvc/rules/rule-definitions.js
@@ -862,7 +862,7 @@ const colHeadersFor = function(data, columns) {
 };
 
 const applyRules = function(data, sources, columns, rules, colHeadersPerRule) {
-    var colHeadersPerRule = colHeadersPerRule || [];
+    colHeadersPerRule = colHeadersPerRule || [];
     let hasRuleError = false;
     for (var ruleIndex in rules) {
         const ruleHeaders = colHeadersFor(data, columns);

diff --git a/client/galaxy/scripts/mvc/ui/ui-buttons.js b/client/galaxy/scripts/mvc/ui/ui-buttons.js
@@ -166,7 +166,7 @@ var ButtonCheck = Backbone.View.extend({
     },
 
     render: function(options) {
-        var options = this.model.attributes;
+        options = this.model.attributes;
         this.$el
             .addClass("ui-button-check")
             .css("display", options.visible ? "inline-block" : "none")

diff --git a/client/galaxy/scripts/mvc/workflow/workflow-connector.js b/client/galaxy/scripts/mvc/workflow/workflow-connector.js
@@ -107,16 +107,16 @@ $.extend(Connector.prototype, {
         var end_offsets = null;
         var num_offsets = 1;
         if (startRibbon) {
-            var start_offsets = [-6, -3, 0, 3, 6];
+            start_offsets = [-6, -3, 0, 3, 6];
             num_offsets = 5;
         } else {
-            var start_offsets = [0];
+            start_offsets = [0];
         }
         if (endRibbon) {
-            var end_offsets = [-6, -3, 0, 3, 6];
+            end_offsets = [-6, -3, 0, 3, 6];
             num_offsets = 5;
         } else {
-            var end_offsets = [0];
+            end_offsets = [0];
         }
         var connector = this;
         for (var i = 0; i < num_offsets; i++) {
@@ -151,9 +151,9 @@ $.extend(Connector.prototype, {
         offset_start,
         offset_end
     ) {
-        var offset_start = offset_start || 0;
-        var offset_end = offset_end || 0;
         var c = this.canvas.getContext("2d");
+        offset_start = offset_start || 0;
+        offset_end = offset_end || 0;
         c.lineCap = "round";
         c.strokeStyle = this.outer_color;
         c.lineWidth = outer_width;

diff --git a/client/galaxy/scripts/mvc/workflow/workflow-forms.js b/client/galaxy/scripts/mvc/workflow/workflow-forms.js
@@ -224,10 +224,10 @@ function _makeSection(output_id, label, options) {
     var node = options.node;
     var workflow = options.workflow;
 
-    for (var key in datatypes) {
+    for (let key in datatypes) {
         extensions.push({ 0: datatypes[key], 1: datatypes[key] });
     }
-    for (var key in node.input_terminals) {
+    for (let key in node.input_terminals) {
         name_label_map.push({ name: node.input_terminals[key].name, label: node.input_terminals[key].label });
     }
     var rename_help = _makeRenameHelp(name_label_map);