File tree Expand file tree Collapse file tree 4 files changed +25
-17
lines changed Expand file tree Collapse file tree 4 files changed +25
-17
lines changed Original file line number Diff line number Diff line change 9
9
'use strict' ;
10
10
11
11
var ARROWPATHS = require ( './arrow_paths' ) ;
12
- var Cartesian = require ( '../../plots/cartesian' ) ;
13
12
var fontAttrs = require ( '../../plots/font_attributes' ) ;
13
+ var cartesianConstants = require ( '../../plots/cartesian/constants' ) ;
14
14
var extendFlat = require ( '../../lib/extend' ) . extendFlat ;
15
15
16
16
@@ -156,7 +156,7 @@ module.exports = {
156
156
valType : 'enumerated' ,
157
157
values : [
158
158
'paper' ,
159
- Cartesian . idRegex . x . toString ( )
159
+ cartesianConstants . idRegex . x . toString ( )
160
160
] ,
161
161
role : 'info' ,
162
162
description : [
@@ -199,7 +199,7 @@ module.exports = {
199
199
valType : 'enumerated' ,
200
200
values : [
201
201
'paper' ,
202
- Cartesian . idRegex . y . toString ( )
202
+ cartesianConstants . idRegex . y . toString ( )
203
203
] ,
204
204
role : 'info' ,
205
205
description : [
Original file line number Diff line number Diff line change 10
10
11
11
12
12
module . exports = {
13
+
14
+ idRegex : {
15
+ x : / ^ x ( [ 2 - 9 ] | [ 1 - 9 ] [ 0 - 9 ] + ) ? $ / ,
16
+ y : / ^ y ( [ 2 - 9 ] | [ 1 - 9 ] [ 0 - 9 ] + ) ? $ /
17
+ } ,
18
+
19
+ attrRegex : {
20
+ x : / ^ x a x i s ( [ 2 - 9 ] | [ 1 - 9 ] [ 0 - 9 ] + ) ? $ / ,
21
+ y : / ^ y a x i s ( [ 2 - 9 ] | [ 1 - 9 ] [ 0 - 9 ] + ) ? $ /
22
+ } ,
23
+
13
24
/**
14
25
* standardize all missing data in calcdata to use undefined
15
26
* never null or NaN.
Original file line number Diff line number Diff line change 12
12
var Lib = require ( '../../lib' ) ;
13
13
var Plots = require ( '../plots' ) ;
14
14
15
+ var constants = require ( './constants' ) ;
16
+
15
17
exports . name = 'cartesian' ;
16
18
17
19
exports . attr = [ 'xaxis' , 'yaxis' ] ;
18
20
19
21
exports . idRoot = [ 'x' , 'y' ] ;
20
22
21
- exports . attributes = require ( './attributes' ) ;
23
+ exports . idRegex = constants . idRegex ;
22
24
23
- exports . idRegex = {
24
- x : / ^ x ( [ 2 - 9 ] | [ 1 - 9 ] [ 0 - 9 ] + ) ? $ / ,
25
- y : / ^ y ( [ 2 - 9 ] | [ 1 - 9 ] [ 0 - 9 ] + ) ? $ /
26
- } ;
25
+ exports . attrRegex = constants . attrRegex ;
27
26
28
- exports . attrRegex = {
29
- x : / ^ x a x i s ( [ 2 - 9 ] | [ 1 - 9 ] [ 0 - 9 ] + ) ? $ / ,
30
- y : / ^ y a x i s ( [ 2 - 9 ] | [ 1 - 9 ] [ 0 - 9 ] + ) ? $ /
31
- } ;
27
+ exports . attributes = require ( './attributes' ) ;
32
28
33
29
exports . plot = function ( gd ) {
34
30
var fullLayout = gd . _fullLayout ,
Original file line number Diff line number Diff line change 8
8
9
9
'use strict' ;
10
10
11
- var Cartesian = require ( './index' ) ;
12
11
var fontAttrs = require ( '../font_attributes' ) ;
13
12
var colorAttrs = require ( '../../components/color/attributes' ) ;
14
13
var extendFlat = require ( '../../lib/extend' ) . extendFlat ;
15
14
var rangeSliderAttrs = require ( '../../components/rangeslider/attributes' ) ;
16
15
var rangeSelectorAttrs = require ( '../../components/rangeselector/attributes' ) ;
17
16
17
+ var constants = require ( './constants' ) ;
18
+
18
19
19
20
module . exports = {
20
21
color : {
@@ -402,8 +403,8 @@ module.exports = {
402
403
valType : 'enumerated' ,
403
404
values : [
404
405
'free' ,
405
- Cartesian . idRegex . x . toString ( ) ,
406
- Cartesian . idRegex . y . toString ( )
406
+ constants . idRegex . x . toString ( ) ,
407
+ constants . idRegex . y . toString ( )
407
408
] ,
408
409
role : 'info' ,
409
410
description : [
@@ -431,8 +432,8 @@ module.exports = {
431
432
valType : 'enumerated' ,
432
433
values : [
433
434
'free' ,
434
- Cartesian . idRegex . x . toString ( ) ,
435
- Cartesian . idRegex . y . toString ( )
435
+ constants . idRegex . x . toString ( ) ,
436
+ constants . idRegex . y . toString ( )
436
437
] ,
437
438
role : 'info' ,
438
439
description : [
You can’t perform that action at this time.
0 commit comments