@@ -14,6 +14,7 @@ var Registry = require('../../registry');
14
14
var Lib = require ( '../../lib' ) ;
15
15
var Drawing = require ( '../drawing' ) ;
16
16
var Color = require ( '../color' ) ;
17
+ var extractOpts = require ( '../colorscale/helpers' ) . extractOpts ;
17
18
18
19
var subTypes = require ( '../../traces/scatter/subtypes' ) ;
19
20
var stylePie = require ( '../../traces/pie/style_one' ) ;
@@ -42,16 +43,6 @@ module.exports = function style(s, gd) {
42
43
return constantItemSizing ? cst : Math . min ( v , max ) ;
43
44
} ;
44
45
45
- var getColorscale = function ( trace ) {
46
- var coloraxis = trace . coloraxis ;
47
- return ( coloraxis ? fullLayout [ coloraxis ] : trace ) . colorscale ;
48
- } ;
49
-
50
- var getReversescale = function ( trace ) {
51
- var coloraxis = trace . coloraxis ;
52
- return ( coloraxis ? fullLayout [ coloraxis ] : trace ) . reversescale ;
53
- } ;
54
-
55
46
s . each ( function ( d ) {
56
47
var traceGroup = d3 . select ( this ) ;
57
48
@@ -114,8 +105,9 @@ module.exports = function style(s, gd) {
114
105
var showGradientFill = false ;
115
106
var dMod , tMod ;
116
107
117
- var colorscale = getColorscale ( trace ) ;
118
- var reversescale = getReversescale ( trace ) ;
108
+ var cOpts = extractOpts ( trace ) ;
109
+ var colorscale = cOpts . colorscale ;
110
+ var reversescale = cOpts . reversescale ;
119
111
120
112
var fillGradient = function ( s ) {
121
113
if ( s . size ( ) ) {
0 commit comments