Config.js fixes; it was trying to import itself and not use it.

galaxyproject · Mar 6, 2018 · 4bca4a0 · 4bca4a0
1 parent f0df326
commit 4bca4a0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
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,

diff --git a/client/galaxy/scripts/viz/trackster/painters.js b/client/galaxy/scripts/viz/trackster/painters.js
@@ -144,6 +144,7 @@ class Painter {
     constructor(data, view_start, view_end, prefs, mode) {
         // Data and data properties
         this.data = data;
+        this.default_prefs = {};
         // View
         this.view_start = view_start;
         this.view_end = view_end;
@@ -416,7 +417,6 @@ class FeaturePainter extends Painter {
             connector_color: "#FFF"
         };
     }
-
     get_required_height(rows_required, width) {
         // y_scale is the height per row
         var required_height = this.get_row_height();