@@ -15,6 +15,8 @@ var isNumeric = require('fast-isnumeric');
1515var hasHover = require ( 'has-hover' ) ;
1616
1717var Lib = require ( '../lib' ) ;
18+ var nestedProperty = Lib . nestedProperty ;
19+
1820var Events = require ( '../lib/events' ) ;
1921var Queue = require ( '../lib/queue' ) ;
2022
@@ -842,7 +844,7 @@ function getExtendProperties(gd, update, indices, maxPoints) {
842844 * instance that references the key and value for this particular trace.
843845 */
844846 trace = gd . data [ indices [ j ] ] ;
845- prop = Lib . nestedProperty ( trace , key ) ;
847+ prop = nestedProperty ( trace , key ) ;
846848
847849 /*
848850 * Target is the existing gd.data.trace.dataArray value like "x" or "marker.size"
@@ -1528,7 +1530,7 @@ function _restyle(gd, aobj, traces) {
15281530 var prefix = ai . substr ( 0 , ai . length - finalPart . length - 1 ) ;
15291531 var prefixDot = prefix ? prefix + '.' : '' ;
15301532 var innerContFull = prefix ?
1531- Lib . nestedProperty ( contFull , prefix ) . get ( ) : contFull ;
1533+ nestedProperty ( contFull , prefix ) . get ( ) : contFull ;
15321534
15331535 valObject = PlotSchema . getTraceValObject ( contFull , param . parts ) ;
15341536
@@ -1575,14 +1577,14 @@ function _restyle(gd, aobj, traces) {
15751577 Lib . swapAttrs ( cont , [ '?' , '?src' ] , 'values' , valuesTo ) ;
15761578
15771579 if ( oldVal === 'pie' ) {
1578- Lib . nestedProperty ( cont , 'marker.color' )
1579- . set ( Lib . nestedProperty ( cont , 'marker.colors' ) . get ( ) ) ;
1580+ nestedProperty ( cont , 'marker.color' )
1581+ . set ( nestedProperty ( cont , 'marker.colors' ) . get ( ) ) ;
15801582
15811583 // super kludgy - but if all pies are gone we won't remove them otherwise
15821584 fullLayout . _pielayer . selectAll ( 'g.trace' ) . remove ( ) ;
15831585 } else if ( Registry . traceIs ( cont , 'cartesian' ) ) {
1584- Lib . nestedProperty ( cont , 'marker.colors' )
1585- . set ( Lib . nestedProperty ( cont , 'marker.color' ) . get ( ) ) ;
1586+ nestedProperty ( cont , 'marker.colors' )
1587+ . set ( nestedProperty ( cont , 'marker.color' ) . get ( ) ) ;
15861588 }
15871589 }
15881590
@@ -1653,7 +1655,7 @@ function _restyle(gd, aobj, traces) {
16531655
16541656 // swap hovermode if set to "compare x/y data"
16551657 if ( ai === 'orientationaxes' ) {
1656- var hovermode = Lib . nestedProperty ( gd . layout , 'hovermode' ) ;
1658+ var hovermode = nestedProperty ( gd . layout , 'hovermode' ) ;
16571659 if ( hovermode . get ( ) === 'x' ) {
16581660 hovermode . set ( 'y' ) ;
16591661 } else if ( hovermode . get ( ) === 'y' ) {
@@ -1908,8 +1910,8 @@ function _relayout(gd, aobj) {
19081910 var pleafPlus = p . parts [ pend - 1 ] + '.' + pleaf ;
19091911 // trunk nodes (everything except the leaf)
19101912 var ptrunk = p . parts . slice ( 0 , pend ) . join ( '.' ) ;
1911- var parentIn = Lib . nestedProperty ( gd . layout , ptrunk ) . get ( ) ;
1912- var parentFull = Lib . nestedProperty ( fullLayout , ptrunk ) . get ( ) ;
1913+ var parentIn = nestedProperty ( gd . layout , ptrunk ) . get ( ) ;
1914+ var parentFull = nestedProperty ( fullLayout , ptrunk ) . get ( ) ;
19131915 var vOld = p . get ( ) ;
19141916
19151917 if ( vi === undefined ) continue ;
@@ -1954,20 +1956,20 @@ function _relayout(gd, aobj) {
19541956 // check autorange vs range
19551957 else if ( pleafPlus . match ( AX_RANGE_RE ) ) {
19561958 recordAlteredAxis ( pleafPlus ) ;
1957- Lib . nestedProperty ( fullLayout , ptrunk + '._inputRange' ) . set ( null ) ;
1959+ nestedProperty ( fullLayout , ptrunk + '._inputRange' ) . set ( null ) ;
19581960 }
19591961 else if ( pleafPlus . match ( AX_AUTORANGE_RE ) ) {
19601962 recordAlteredAxis ( pleafPlus ) ;
1961- Lib . nestedProperty ( fullLayout , ptrunk + '._inputRange' ) . set ( null ) ;
1962- var axFull = Lib . nestedProperty ( fullLayout , ptrunk ) . get ( ) ;
1963+ nestedProperty ( fullLayout , ptrunk + '._inputRange' ) . set ( null ) ;
1964+ var axFull = nestedProperty ( fullLayout , ptrunk ) . get ( ) ;
19631965 if ( axFull . _inputDomain ) {
19641966 // if we're autoranging and this axis has a constrained domain,
19651967 // reset it so we don't get locked into a shrunken size
19661968 axFull . _input . domain = axFull . _inputDomain . slice ( ) ;
19671969 }
19681970 }
19691971 else if ( pleafPlus . match ( AX_DOMAIN_RE ) ) {
1970- Lib . nestedProperty ( fullLayout , ptrunk + '._inputDomain' ) . set ( null ) ;
1972+ nestedProperty ( fullLayout , ptrunk + '._inputDomain' ) . set ( null ) ;
19711973 }
19721974
19731975 // toggling axis type between log and linear: we need to convert
@@ -2036,10 +2038,10 @@ function _relayout(gd, aobj) {
20362038 doextra ( ptrunk + '.autorange' , true ) ;
20372039 doextra ( ptrunk + '.range' , null ) ;
20382040 }
2039- Lib . nestedProperty ( fullLayout , ptrunk + '._inputRange' ) . set ( null ) ;
2041+ nestedProperty ( fullLayout , ptrunk + '._inputRange' ) . set ( null ) ;
20402042 }
20412043 else if ( pleaf . match ( AX_NAME_PATTERN ) ) {
2042- var fullProp = Lib . nestedProperty ( fullLayout , ai ) . get ( ) ,
2044+ var fullProp = nestedProperty ( fullLayout , ai ) . get ( ) ,
20432045 newType = ( vi || { } ) . type ;
20442046
20452047 // This can potentially cause strange behavior if the autotype is not
@@ -2116,7 +2118,7 @@ function _relayout(gd, aobj) {
21162118 // now we've collected component edits - execute them all together
21172119 for ( arrayStr in arrayEdits ) {
21182120 var finished = manageArrays . applyContainerArrayChanges ( gd ,
2119- Lib . nestedProperty ( layout , arrayStr ) , arrayEdits [ arrayStr ] , flags ) ;
2121+ nestedProperty ( layout , arrayStr ) , arrayEdits [ arrayStr ] , flags ) ;
21202122 if ( ! finished ) flags . plot = true ;
21212123 }
21222124
0 commit comments