Skip to content

Commit 371b6d6

Browse files
committed
Merge branch 'master' into click-event-madness
2 parents 34551a1 + e8fd49d commit 371b6d6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fx.init = function(gd) {
7878

7979
if(fullLayout._hasGL3D || fullLayout._hasGeo || gd._context.staticPlot) return;
8080

81-
var subplots = Object.keys(fullLayout._plots).sort(function(a,b) {
81+
var subplots = Object.keys(fullLayout._plots || {}).sort(function(a,b) {
8282
// sort overlays last, then by x axis number, then y axis number
8383
if( (fullLayout._plots[a].mainplot && true) ===
8484
(fullLayout._plots[b].mainplot && true) ) {

test-dashboard/toolpanel-dashboard/ui.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ function createPlot (divId) {
3131
graphDiv.style.verticalAlign = 'top';
3232

3333
toolDiv.className = 'toolDiv';
34+
toolDiv.style.width = '500px';
3435

3536
containerDiv.appendChild(toolDiv);
3637
containerDiv.appendChild(graphDiv);
@@ -54,14 +55,14 @@ function createPlot (divId) {
5455

5556
graphDiv.toolPanel = toolPanel = new ToolPanel(Plotly, graphDiv, {
5657
standalone: true,
57-
popoverContainer: containerDiv
58+
popoverContainer: containerDiv,
59+
menuStyle: 'descriptive'
5860
});
5961

6062
window.toolPanel = graphDiv.toolPanel;
6163

6264
graphDiv.toolPanel.makeMenu({
63-
toolMenuContainer: toolDiv,
64-
menuStyle: 'narrow'
65+
toolMenuContainer: toolDiv
6566
});
6667

6768
toolPanel.createMenuMultiButton([

0 commit comments

Comments
 (0)