@@ -19,33 +19,33 @@ var colorDfltRgba = rgba(colorDflt);
1919var opacityDflt = 1 ;
2020
2121function calculateColor ( colorIn , opacityIn ) {
22- var colorOut = colorIn ;
23- colorOut [ 3 ] *= opacityIn ;
24- return colorOut ;
22+ var colorOut = colorIn ;
23+ colorOut [ 3 ] *= opacityIn ;
24+ return colorOut ;
2525}
2626
2727function validateColor ( colorIn ) {
28- if ( isNumeric ( colorIn ) ) return colorDfltRgba ;
28+ if ( isNumeric ( colorIn ) ) return colorDfltRgba ;
2929
30- var colorOut = rgba ( colorIn ) ;
30+ var colorOut = rgba ( colorIn ) ;
3131
32- return colorOut . length ? colorOut : colorDfltRgba ;
32+ return colorOut . length ? colorOut : colorDfltRgba ;
3333}
3434
3535function validateOpacity ( opacityIn ) {
36- return isNumeric ( opacityIn ) ? opacityIn : opacityDflt ;
36+ return isNumeric ( opacityIn ) ? opacityIn : opacityDflt ;
3737}
3838
3939function formatColor ( containerIn , opacityIn , len ) {
40- var colorIn = containerIn . color ,
41- isArrayColorIn = Array . isArray ( colorIn ) ,
42- isArrayOpacityIn = Array . isArray ( opacityIn ) ,
43- colorOut = [ ] ;
40+ var colorIn = containerIn . color ,
41+ isArrayColorIn = Array . isArray ( colorIn ) ,
42+ isArrayOpacityIn = Array . isArray ( opacityIn ) ,
43+ colorOut = [ ] ;
4444
45- var sclFunc , getColor , getOpacity , colori , opacityi ;
45+ var sclFunc , getColor , getOpacity , colori , opacityi ;
4646
47- if ( containerIn . colorscale !== undefined ) {
48- sclFunc = Colorscale . makeColorScaleFunc (
47+ if ( containerIn . colorscale !== undefined ) {
48+ sclFunc = Colorscale . makeColorScaleFunc (
4949 Colorscale . extractScale (
5050 containerIn . colorscale ,
5151 containerIn . cmin ,
0 commit comments