Merge branch 'master' into doeg-password-form

Author: doeg

shelly/plotlyjs/static/plotlyjs/src/graph_interact.js

@@ -78,7 +78,7 @@ fx.init = function(gd) {
 
     if(fullLayout._hasGL3D || fullLayout._hasGeo || gd._context.staticPlot) return;
 
-    var subplots = Object.keys(fullLayout._plots).sort(function(a,b) {
+    var subplots = Object.keys(fullLayout._plots || {}).sort(function(a,b) {
         // sort overlays last, then by x axis number, then y axis number
         if( (fullLayout._plots[a].mainplot && true) ===
                 (fullLayout._plots[b].mainplot && true) ) {

shelly/plotlyjs/static/plotlyjs/src/graph_obj.js

@@ -1923,6 +1923,13 @@ plots.purge = function(gd) {
     // note: we DO NOT remove _context because it doesn't change when we insert
     // a new plot, and may have been set outside of our scope.
 
+    // clean up the gl and geo containers
+    // TODO unify subplot creation/update with d3.selection.order
+    // and/or subplot ids
+    var fullLayout = gd._fullLayout || {};
+    if(fullLayout._glcontainer !== undefined) fullLayout._glcontainer.remove();
+    if(fullLayout._geocontainer !== undefined) fullLayout._geocontainer.remove();
+
     // data and layout
     delete gd.data;
     delete gd.layout;
@@ -1934,6 +1941,7 @@ plots.purge = function(gd) {
 
     delete gd.fid;
 
+
     delete gd.undoqueue; // action queue
     delete gd.undonum;
     delete gd.autoplay; // are we doing an action that doesn't go in undo queue?
@@ -3601,7 +3609,7 @@ plots.resize = function(gd) {
 
     if(gd._redrawTimer) clearTimeout(gd._redrawTimer);
 
-    gd._redrawTimer = setTimeout(function(){
+    gd._redrawTimer = setTimeout(function() {
         if((gd._fullLayout || {}).autosize) {
             // autosizing doesn't count as a change that needs saving
             var oldchanged = gd.changed;

test-dashboard/toolpanel-dashboard/ui.js

@@ -31,6 +31,7 @@ function createPlot (divId) {
     graphDiv.style.verticalAlign = 'top';
 
     toolDiv.className = 'toolDiv';
+    toolDiv.style.width = '500px';
 
     containerDiv.appendChild(toolDiv);
     containerDiv.appendChild(graphDiv);
@@ -54,14 +55,14 @@ function createPlot (divId) {
 
     graphDiv.toolPanel = toolPanel = new ToolPanel(Plotly, graphDiv, {
         standalone: true,
-        popoverContainer: containerDiv
+        popoverContainer: containerDiv,
+        menuStyle: 'descriptive'
     });
 
     window.toolPanel = graphDiv.toolPanel;
 
     graphDiv.toolPanel.makeMenu({
-        toolMenuContainer: toolDiv,
-        menuStyle: 'narrow'
+        toolMenuContainer: toolDiv
     });
 
     toolPanel.createMenuMultiButton([