Skip to content

Commit ff7c994

Browse files
committed
put gl3d module in plots/gl3d/ :
- keep Gl3dLayout (for now) - merge Gl3dAxes into Gl3dLayout
1 parent 968257e commit ff7c994

File tree

13 files changed

+155
-388
lines changed

13 files changed

+155
-388
lines changed

src/gl3d/defaults/gl3daxes.js

Lines changed: 0 additions & 82 deletions
This file was deleted.

src/gl3d/lib/camera.js

Lines changed: 0 additions & 237 deletions
This file was deleted.

src/gl3d/attributes/gl3dlayout.js renamed to src/plots/gl3d/layout/attributes.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
'use strict';
22

3-
var Plotly = require('../../plotly');
4-
5-
var extendFlat = Plotly.Lib.extendFlat;
3+
var gl3dAxisAttrs = require('./axis_attributes');
4+
var extendFlat = require('../../../lib/extend').extendFlat;
65

76
function makeVector(x, y, z) {
87
return {
@@ -127,11 +126,9 @@ module.exports = {
127126
].join(' ')
128127
},
129128

130-
_nestedModules: {
131-
'xaxis': 'Gl3dAxes',
132-
'yaxis': 'Gl3dAxes',
133-
'zaxis': 'Gl3dAxes'
134-
},
129+
xaxis: gl3dAxisAttrs,
130+
yaxis: gl3dAxisAttrs,
131+
zaxis: gl3dAxisAttrs,
135132

136133
_deprecated: {
137134
cameraposition: {

src/gl3d/attributes/gl3daxes.js renamed to src/plots/gl3d/layout/axis_attributes.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
var Plotly = require('../../plotly');
1+
var axesAttrs = require('../../cartesian/attributes');
2+
var extendFlat = require('../../../lib/extend').extendFlat;
23

3-
var axesAttrs = Plotly.Axes.layoutAttributes;
4-
var extendFlat = Plotly.Lib.extendFlat;
54

65
module.exports = {
76
showspikes: {
@@ -54,7 +53,6 @@ module.exports = {
5453
showaxeslabels: {
5554
valType: 'boolean',
5655
role: 'info',
57-
dflt: 'rgba(204, 204, 204, 0.5)',
5856
dflt: true,
5957
description: 'Sets whether or not this axis is labeled'
6058
},

0 commit comments

Comments
 (0)