Merge remote-tracking branch 'origin/release_18.01' into usegalaxy

galaxyproject · Mar 12, 2018 · e12e773 · e12e773
2 parents 56b8ecd + 1a5f6a3
commit e12e773
Show file tree

Hide file tree

Showing 40 changed files with 2,351 additions and 1,021 deletions.
diff --git a/client/galaxy/scripts/mvc/grid/grid-template.js b/client/galaxy/scripts/mvc/grid/grid-template.js
@@ -92,8 +92,8 @@ export default {
         for (let column of options.columns) {
             if (column.visible) {
                 tmpl += `<th id="${column.key}-header">`;
-                if (column.href) {
-                    tmpl += `<a href="${column.href}" class="sort-link" sort_key="${column.key}">${column.label}</a>`;
+                if (column.sortable) {
+                    tmpl += `<a href="javascript:void(0)" class="sort-link" sort_key="${column.key}">${column.label}</a>`;
                 } else {
                     tmpl += column.label;
                 }

diff --git a/client/galaxy/scripts/mvc/ui/ui-select-genomespace.js b/client/galaxy/scripts/mvc/ui/ui-select-genomespace.js
@@ -26,24 +26,18 @@ var View = Backbone.View.extend({
         // create genomespace filepath textbox
         this.filename_textbox = new Ui.Input();
 
-        // create genomespace token textbox
-        this.token_textbox = new Ui.Input({
-            type: "password"
-        });
-
         // create elements
         this.setElement(this._template(options));
         this.$(".ui-gs-browse-button").append(this.browse_button.$el);
         this.$(".ui-gs-filename-textbox").append(this.filename_textbox.$el);
-        this.$(".ui-gs-token-textbox").append(this.token_textbox.$el);
     },
 
     /** Browse GenomeSpace */
     browseGenomeSpace: function(options) {
         var self = this;
         GenomespaceBrowser.openFileBrowser({
             successCallback: function(data) {
-                self.value(`${data.destination}^${data.token}`);
+                self.value(data.destination);
             }
         });
     },
@@ -56,15 +50,11 @@ var View = Backbone.View.extend({
             '<span class="ui-gs-browse-button" />' +
             '<span class="ui-gs-filename-textbox" />' +
             "</div>" +
-            '<div class="ui-gs-token-field">' +
-            '<span class=ui-gs-label"><div class="ui-gs-token-label">Token</div></span>' +
-            '<span class="ui-gs-token-textbox" />' +
-            "</div>" +
             "</div>"
         );
     },
 
-    /** Return/Set currently selected genomespace filename/token */
+    /** Return/Set currently selected genomespace filename */
     value: function(new_value) {
         // check if new_value is defined
         if (new_value !== undefined) {
@@ -76,15 +66,13 @@ var View = Backbone.View.extend({
 
     // get value
     _getValue: function() {
-        return `${this.filename_textbox.value()}^${this.token_textbox.value()}`;
+        return this.filename_textbox.value();
     },
 
     // set value
     _setValue: function(new_value) {
         if (new_value) {
-            var values = new_value.split("^");
-            this.filename_textbox.value(values[0]);
-            this.token_textbox.value(values[1]);
+            this.filename_textbox.value(new_value);
         }
         this.options.onchange && this.options.onchange(new_value);
     }

diff --git a/client/galaxy/scripts/utils/config.js b/client/galaxy/scripts/utils/config.js
@@ -1,6 +1,10 @@
 import * as _ from "libs/underscore";
+import * as Backbone from "libs/backbone";
 import util_mod from "viz/trackster/util";
-import config_mod from "utils/config";
+
+/* global $ */
+/* global Galaxy */
+
 /**
  * A configuration setting. Currently key is used as id.
  */
@@ -307,23 +311,22 @@ var ConfigSettingCollectionView = Backbone.View.extend({
                         // No propagation to avoid triggering document click (and tip hiding) above.
                         e.stopPropagation();
                     });
-
-                var // Icon for setting a new random color; behavior set below.
-                new_color_icon = $("<a href='javascript:void(0)'/>")
+                // Icon for setting a new random color; behavior set below.
+                var new_color_icon = $("<a href='javascript:void(0)'/>")
                     .addClass("icon-button arrow-circle")
                     .appendTo(container_div)
                     .attr("title", "Set new random color")
                     .tooltip();
 
-                var // Color picker in tool tip style.
-                tip = $("<div class='tooltip right' style='position: absolute;' />")
+                // Color picker in tool tip style.
+                var tip = $("<div class='tooltip right' style='position: absolute;' />")
                     .appendTo(container_div)
                     .hide();
 
-                var // Inner div for padding purposes
-                tip_inner = $("<div class='tooltip-inner' style='text-align: inherit'></div>").appendTo(tip);
+                // Inner div for padding purposes
+                var tip_inner = $("<div class='tooltip-inner' style='text-align: inherit'></div>").appendTo(tip);
 
-                var tip_arrow = $("<div class='tooltip-arrow'></div>").appendTo(tip);
+                $("<div class='tooltip-arrow'></div>").appendTo(tip);
 
                 var farb_obj = $.farbtastic(tip_inner, {
                     width: 100,