Fix y-axis label for nvd3, fix duration

galaxyproject · Feb 11, 2018 · 719383f · 719383f
1 parent fa3d12a
commit 719383f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/config/plugins/visualizations/nvd3_bar/package.json b/config/plugins/visualizations/nvd3_bar/package.json
@@ -12,7 +12,7 @@
         "babel-preset-env": "^1.6.1",
         "backbone": "^1.3.3",
         "bootstrap": "^3.3.7",
-        "d3": "3.4.5",
+        "d3": "^3.4.5",
         "jquery": "^3.1.1",
         "nvd3": "^1.8.6",
         "parcel-bundler": "^1.4.1"

diff --git a/config/plugins/visualizations/nvd3_bar/src/nvd3.js b/config/plugins/visualizations/nvd3_bar/src/nvd3.js
@@ -23,7 +23,7 @@ var CommonWrapper = Backbone.View.extend({
         nv.addGraph(function() {
             try {
                 d3chart.xAxis.axisLabel(chart.settings.get("x_axis_label"));
-                d3chart.yAxis.axisLabel(chart.settings.get("y_axis_label")).axisLabelDistance(30);
+                d3chart.yAxis.axisLabel(chart.settings.get("y_axis_label"));
                 d3chart.options({ showControls: false });
                 if (d3chart.showLegend) {
                     d3chart.showLegend(chart.settings.get("show_legend") == "true");
@@ -40,6 +40,7 @@ var CommonWrapper = Backbone.View.extend({
                 d3chart.tooltip.contentGenerator(function(context) {
                     return "<h3>" + (context.data.tooltip || context.data.key) + "</h3>";
                 });
+                d3chart.duration(0);
                 if ($("#" + canvas_id).length > 0) {
                     var canvas = d3.select("#" + canvas_id);
                     canvas.datum(groups).call(d3chart);

diff --git a/config/plugins/visualizations/nvd3_bar/static/nvd3.js b/config/plugins/visualizations/nvd3_bar/static/nvd3.js