@@ -15,6 +15,8 @@ var isNumeric = require('fast-isnumeric');
15
15
var hasHover = require ( 'has-hover' ) ;
16
16
17
17
var Lib = require ( '../lib' ) ;
18
+ var nestedProperty = Lib . nestedProperty ;
19
+
18
20
var Events = require ( '../lib/events' ) ;
19
21
var Queue = require ( '../lib/queue' ) ;
20
22
@@ -842,7 +844,7 @@ function getExtendProperties(gd, update, indices, maxPoints) {
842
844
* instance that references the key and value for this particular trace.
843
845
*/
844
846
trace = gd . data [ indices [ j ] ] ;
845
- prop = Lib . nestedProperty ( trace , key ) ;
847
+ prop = nestedProperty ( trace , key ) ;
846
848
847
849
/*
848
850
* Target is the existing gd.data.trace.dataArray value like "x" or "marker.size"
@@ -1528,7 +1530,7 @@ function _restyle(gd, aobj, traces) {
1528
1530
var prefix = ai . substr ( 0 , ai . length - finalPart . length - 1 ) ;
1529
1531
var prefixDot = prefix ? prefix + '.' : '' ;
1530
1532
var innerContFull = prefix ?
1531
- Lib . nestedProperty ( contFull , prefix ) . get ( ) : contFull ;
1533
+ nestedProperty ( contFull , prefix ) . get ( ) : contFull ;
1532
1534
1533
1535
valObject = PlotSchema . getTraceValObject ( contFull , param . parts ) ;
1534
1536
@@ -1575,14 +1577,14 @@ function _restyle(gd, aobj, traces) {
1575
1577
Lib . swapAttrs ( cont , [ '?' , '?src' ] , 'values' , valuesTo ) ;
1576
1578
1577
1579
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 ( ) ) ;
1580
1582
1581
1583
// super kludgy - but if all pies are gone we won't remove them otherwise
1582
1584
fullLayout . _pielayer . selectAll ( 'g.trace' ) . remove ( ) ;
1583
1585
} 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 ( ) ) ;
1586
1588
}
1587
1589
}
1588
1590
@@ -1653,7 +1655,7 @@ function _restyle(gd, aobj, traces) {
1653
1655
1654
1656
// swap hovermode if set to "compare x/y data"
1655
1657
if ( ai === 'orientationaxes' ) {
1656
- var hovermode = Lib . nestedProperty ( gd . layout , 'hovermode' ) ;
1658
+ var hovermode = nestedProperty ( gd . layout , 'hovermode' ) ;
1657
1659
if ( hovermode . get ( ) === 'x' ) {
1658
1660
hovermode . set ( 'y' ) ;
1659
1661
} else if ( hovermode . get ( ) === 'y' ) {
@@ -1908,8 +1910,8 @@ function _relayout(gd, aobj) {
1908
1910
var pleafPlus = p . parts [ pend - 1 ] + '.' + pleaf ;
1909
1911
// trunk nodes (everything except the leaf)
1910
1912
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 ( ) ;
1913
1915
var vOld = p . get ( ) ;
1914
1916
1915
1917
if ( vi === undefined ) continue ;
@@ -1954,20 +1956,20 @@ function _relayout(gd, aobj) {
1954
1956
// check autorange vs range
1955
1957
else if ( pleafPlus . match ( AX_RANGE_RE ) ) {
1956
1958
recordAlteredAxis ( pleafPlus ) ;
1957
- Lib . nestedProperty ( fullLayout , ptrunk + '._inputRange' ) . set ( null ) ;
1959
+ nestedProperty ( fullLayout , ptrunk + '._inputRange' ) . set ( null ) ;
1958
1960
}
1959
1961
else if ( pleafPlus . match ( AX_AUTORANGE_RE ) ) {
1960
1962
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 ( ) ;
1963
1965
if ( axFull . _inputDomain ) {
1964
1966
// if we're autoranging and this axis has a constrained domain,
1965
1967
// reset it so we don't get locked into a shrunken size
1966
1968
axFull . _input . domain = axFull . _inputDomain . slice ( ) ;
1967
1969
}
1968
1970
}
1969
1971
else if ( pleafPlus . match ( AX_DOMAIN_RE ) ) {
1970
- Lib . nestedProperty ( fullLayout , ptrunk + '._inputDomain' ) . set ( null ) ;
1972
+ nestedProperty ( fullLayout , ptrunk + '._inputDomain' ) . set ( null ) ;
1971
1973
}
1972
1974
1973
1975
// toggling axis type between log and linear: we need to convert
@@ -2036,10 +2038,10 @@ function _relayout(gd, aobj) {
2036
2038
doextra ( ptrunk + '.autorange' , true ) ;
2037
2039
doextra ( ptrunk + '.range' , null ) ;
2038
2040
}
2039
- Lib . nestedProperty ( fullLayout , ptrunk + '._inputRange' ) . set ( null ) ;
2041
+ nestedProperty ( fullLayout , ptrunk + '._inputRange' ) . set ( null ) ;
2040
2042
}
2041
2043
else if ( pleaf . match ( AX_NAME_PATTERN ) ) {
2042
- var fullProp = Lib . nestedProperty ( fullLayout , ai ) . get ( ) ,
2044
+ var fullProp = nestedProperty ( fullLayout , ai ) . get ( ) ,
2043
2045
newType = ( vi || { } ) . type ;
2044
2046
2045
2047
// This can potentially cause strange behavior if the autotype is not
@@ -2116,7 +2118,7 @@ function _relayout(gd, aobj) {
2116
2118
// now we've collected component edits - execute them all together
2117
2119
for ( arrayStr in arrayEdits ) {
2118
2120
var finished = manageArrays . applyContainerArrayChanges ( gd ,
2119
- Lib . nestedProperty ( layout , arrayStr ) , arrayEdits [ arrayStr ] , flags ) ;
2121
+ nestedProperty ( layout , arrayStr ) , arrayEdits [ arrayStr ] , flags ) ;
2120
2122
if ( ! finished ) flags . plot = true ;
2121
2123
}
2122
2124
0 commit comments