#5737 fix model width update method, handle tab switch in plotScope (…

…adjust width) (#5747)
twosigma · Jul 27, 2017 · 79cf154 · 79cf154
1 parent ca6f645
commit 79cf154
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/beakerx/js/src/Plot.js b/beakerx/js/src/Plot.js
@@ -54,7 +54,11 @@ var PlotView = widgets.DOMWidgetView.extend({
         default:
           that.initStandardPlot(plotModel);
           break;
-      } 
+      }
+
+      that.listenTo(that.model, 'beakerx-tabSelected', function() {
+        that._currentScope.adjustModelWidth();
+      });
     });
   },
 

diff --git a/beakerx/js/src/TableDisplay.js b/beakerx/js/src/TableDisplay.js
@@ -54,11 +54,11 @@ var TableDisplayView = widgets.DOMWidgetView.extend({
         that.showWarning(tableModel);
       }
       that.initTableDisplay(tableModel);
-    });
 
-    this.listenTo(this.model, 'beakerx-tabSelected', function() {
-      that._currentScope.adjustRedraw();
-    })
+      that.listenTo(that.model, 'beakerx-tabSelected', function() {
+        that._currentScope.adjustRedraw();
+      });
+    });
   },
 
   update: function() {

diff --git a/beakerx/js/src/plot/plotConverter.js b/beakerx/js/src/plot/plotConverter.js
@@ -738,7 +738,6 @@ define([
           item.elements.push(ele);
           newmodel.data.push(item);
         }
-        console.log("new model",model.rasters);
       }
       newmodel.yIncludeZero = yAxisSettings.yIncludeZero;
       newmodel.yRIncludeZero = yAxisRSettings.yIncludeZero;

diff --git a/beakerx/js/src/plot/plotScope.js b/beakerx/js/src/plot/plotScope.js
@@ -2250,13 +2250,17 @@ define([
     self.update();
 
     self.fillCellModelWithPlotMethods();
-    self.updateModelWidth(self.getPlotWithLegendWidth());
+    self.adjustModelWidth();
     self.emitSizeChange(true);
   };
 
+  PlotScope.prototype.adjustModelWidth = function() {
+    this.updateModelWidth(this.getPlotWithLegendWidth());
+  };
+
   PlotScope.prototype.getPlotWithLegendWidth = function() {
     var containerWidth = this.jqlegendcontainer.width();
-    var plotWidth = this.jqcontainer.width();
+    var plotWidth = this.plotSize.width;
     var legendWidth = this.jqlegendcontainer.find('.plot-legend').width();
 
     return (containerWidth < plotWidth ? containerWidth : plotWidth) - (legendWidth + this.layout.legendMargin + 2);