Skip to content

Commit 210ff6d

Browse files
committed
modebar: don't require Plotly
1 parent d625f01 commit 210ff6d

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

src/components/modebar/buttons.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
'use strict';
1111

1212
var Plotly = require('../../plotly');
13+
var Plots = require('../../plots/plots');
14+
var Axes = require('../../plots/cartesian/axes');
1315
var Lib = require('../../lib');
1416
var downloadImage = require('../../snapshot/download');
1517
var Icons = require('../../../build/ploticon');
@@ -72,7 +74,7 @@ modeBarButtons.sendDataToCloud = {
7274
title: 'Save and edit plot in cloud',
7375
icon: Icons.disk,
7476
click: function(gd) {
75-
Plotly.Plots.sendDataToCloud(gd);
77+
Plots.sendDataToCloud(gd);
7678
}
7779
};
7880

@@ -181,7 +183,7 @@ function handleCartesian(gd, ev) {
181183
var mag = (val === 'in') ? 0.5 : 2,
182184
r0 = (1 + mag) / 2,
183185
r1 = (1 - mag) / 2,
184-
axList = Plotly.Axes.list(gd, null, true);
186+
axList = Axes.list(gd, null, true);
185187

186188
var ax, axName;
187189

@@ -263,7 +265,7 @@ function handleDrag3d(gd, ev) {
263265
attr = button.getAttribute('data-attr'),
264266
val = button.getAttribute('data-val') || true,
265267
fullLayout = gd._fullLayout,
266-
sceneIds = Plotly.Plots.getSubplotIds(fullLayout, 'gl3d'),
268+
sceneIds = Plots.getSubplotIds(fullLayout, 'gl3d'),
267269
layoutUpdate = {};
268270

269271
var parts = attr.split('.');
@@ -295,7 +297,7 @@ function handleCamera3d(gd, ev) {
295297
var button = ev.currentTarget,
296298
attr = button.getAttribute('data-attr'),
297299
fullLayout = gd._fullLayout,
298-
sceneIds = Plotly.Plots.getSubplotIds(fullLayout, 'gl3d');
300+
sceneIds = Plots.getSubplotIds(fullLayout, 'gl3d');
299301

300302
for(var i = 0; i < sceneIds.length; i++) {
301303
var sceneId = sceneIds[i],
@@ -327,7 +329,7 @@ function handleHover3d(gd, ev) {
327329
val = button._previousVal || false,
328330
layout = gd.layout,
329331
fullLayout = gd._fullLayout,
330-
sceneIds = Plotly.Plots.getSubplotIds(fullLayout, 'gl3d');
332+
sceneIds = Plots.getSubplotIds(fullLayout, 'gl3d');
331333

332334
var axes = ['xaxis', 'yaxis', 'zaxis'],
333335
spikeAttrs = ['showspikes', 'spikesides', 'spikethickness', 'spikecolor'];
@@ -415,7 +417,7 @@ function handleGeo(gd, ev) {
415417
attr = button.getAttribute('data-attr'),
416418
val = button.getAttribute('data-val') || true,
417419
fullLayout = gd._fullLayout,
418-
geoIds = Plotly.Plots.getSubplotIds(fullLayout, 'geo');
420+
geoIds = Plots.getSubplotIds(fullLayout, 'geo');
419421

420422
for(var i = 0; i < geoIds.length; i++) {
421423
var geo = fullLayout[geoIds[i]]._geo;

src/components/modebar/manage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
'use strict';
1111

12-
var Plotly = require('../../plotly');
12+
var Axes = require('../../plots/cartesian/axes');
1313
var scatterSubTypes = require('../../traces/scatter/subtypes');
1414

1515
var createModeBar = require('./');
@@ -148,7 +148,7 @@ function getButtonGroups(gd, buttonsToRemove, buttonsToAdd) {
148148
}
149149

150150
function areAllAxesFixed(fullLayout) {
151-
var axList = Plotly.Axes.list({_fullLayout: fullLayout}, null, true);
151+
var axList = Axes.list({_fullLayout: fullLayout}, null, true);
152152
var allFixed = true;
153153

154154
for(var i = 0; i < axList.length; i++) {

0 commit comments

Comments
 (0)