@@ -17,27 +17,38 @@ var colorbarDefaults = require('../colorbar/defaults');
1717var isValidScale = require ( './scales' ) . isValid ;
1818var traceIs = require ( '../../registry' ) . traceIs ;
1919
20- function npMaybe ( outerCont , prefix ) {
20+ function npMaybe ( parentCont , prefix ) {
2121 var containerStr = prefix . slice ( 0 , prefix . length - 1 ) ;
2222 return prefix ?
23- Lib . nestedProperty ( outerCont , containerStr ) . get ( ) || { } :
24- outerCont ;
23+ Lib . nestedProperty ( parentCont , containerStr ) . get ( ) || { } :
24+ parentCont ;
2525}
2626
27- module . exports = function colorScaleDefaults ( outerContIn , outerContOut , layout , coerce , opts ) {
27+ /**
28+ * Colorscale / colorbar default handler
29+ *
30+ * @param {object } parentContIn : user (input) parent container (e.g. trace or layout coloraxis object)
31+ * @param {object } parentContOut : full parent container
32+ * @param {object } layout : (full) layout object
33+ * @param {fn } coerce : Lib.coerce wrapper
34+ * @param {object } opts :
35+ * - prefix {string} : attr string prefix to colorscale container from parent root
36+ * - cLetter {string} : 'c or 'z' color letter
37+ */
38+ module . exports = function colorScaleDefaults ( parentContIn , parentContOut , layout , coerce , opts ) {
2839 var prefix = opts . prefix ;
2940 var cLetter = opts . cLetter ;
30- var inTrace = '_module' in outerContOut ;
31- var containerIn = npMaybe ( outerContIn , prefix ) ;
32- var containerOut = npMaybe ( outerContOut , prefix ) ;
33- var template = npMaybe ( outerContOut . _template || { } , prefix ) || { } ;
41+ var inTrace = '_module' in parentContOut ;
42+ var containerIn = npMaybe ( parentContIn , prefix ) ;
43+ var containerOut = npMaybe ( parentContOut , prefix ) ;
44+ var template = npMaybe ( parentContOut . _template || { } , prefix ) || { } ;
3445
3546 // colorScaleDefaults wrapper called if-ever we need to reset the colorscale
3647 // attributes for containers that were linked to invalid color axes
3748 var thisFn = function ( ) {
38- delete outerContIn . coloraxis ;
39- delete outerContOut . coloraxis ;
40- return colorScaleDefaults ( outerContIn , outerContOut , layout , coerce , opts ) ;
49+ delete parentContIn . coloraxis ;
50+ delete parentContOut . coloraxis ;
51+ return colorScaleDefaults ( parentContIn , parentContOut , layout , coerce , opts ) ;
4152 } ;
4253
4354 if ( inTrace ) {
@@ -46,8 +57,8 @@ module.exports = function colorScaleDefaults(outerContIn, outerContOut, layout,
4657
4758 if ( colorAx ) {
4859 var colorbarVisuals = (
49- traceIs ( outerContOut , 'contour' ) &&
50- Lib . nestedProperty ( outerContOut , 'contours.coloring' ) . get ( )
60+ traceIs ( parentContOut , 'contour' ) &&
61+ Lib . nestedProperty ( parentContOut , 'contours.coloring' ) . get ( )
5162 ) || 'heatmap' ;
5263
5364 var stash = colorAxes [ colorAx ] ;
@@ -67,7 +78,7 @@ module.exports = function colorScaleDefaults(outerContIn, outerContOut, layout,
6778 // - colorbar visual 'type'
6879 // - colorbar options to help in Colorbar.draw
6980 // - list of colorScaleDefaults wrapper functions
70- colorAxes [ colorAx ] = [ colorbarVisuals , outerContOut , [ thisFn ] ] ;
81+ colorAxes [ colorAx ] = [ colorbarVisuals , parentContOut , [ thisFn ] ] ;
7182 }
7283 return ;
7384 }
0 commit comments