@@ -14,6 +14,7 @@ var Registry = require('../../registry');
1414var Lib = require ( '../../lib' ) ;
1515var Drawing = require ( '../drawing' ) ;
1616var Color = require ( '../color' ) ;
17+ var extractOpts = require ( '../colorscale/helpers' ) . extractOpts ;
1718
1819var subTypes = require ( '../../traces/scatter/subtypes' ) ;
1920var stylePie = require ( '../../traces/pie/style_one' ) ;
@@ -42,16 +43,6 @@ module.exports = function style(s, gd) {
4243 return constantItemSizing ? cst : Math . min ( v , max ) ;
4344 } ;
4445
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-
5546 s . each ( function ( d ) {
5647 var traceGroup = d3 . select ( this ) ;
5748
@@ -114,8 +105,9 @@ module.exports = function style(s, gd) {
114105 var showGradientFill = false ;
115106 var dMod , tMod ;
116107
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 ;
119111
120112 var fillGradient = function ( s ) {
121113 if ( s . size ( ) ) {
0 commit comments