Change layout update to use new logic

rreusser · rreusser · commit 891af3b20238 · 2016-10-25T09:23:00.000-04:00
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -1418,6 +1418,8 @@ plots.extendObjectWithContainers = function(dest, src, containerPaths) {
             for(j = 0; j < srcContainer.length; j++) {
                 destContainer[j] = plots.extendObjectWithContainers(destContainer[j], srcContainer[j]);
             }
+
+            destProp.set(destContainer);
         }
     }
 
@@ -1510,7 +1512,7 @@ plots.transition = function(gd, data, layout, traces, frameOpts, transitionOpts)
             delete layoutUpdate[attr].range;
         }
 
-        Lib.extendDeepNoArrays(gd.layout, layoutUpdate);
+        plots.extendLayout(gd.layout, layoutUpdate);
 
         // Supply defaults after applying the incoming properties. Note that any attempt
         // to simplify this step and reduce the amount of work resulted in the reconstruction

Original file line number	Diff line number	Diff line change
`@@ -1418,6 +1418,8 @@ plots.extendObjectWithContainers = function(dest, src, containerPaths) {`
`1418`	`1418`	`for(j = 0; j < srcContainer.length; j++) {`
`1419`	`1419`	`destContainer[j] = plots.extendObjectWithContainers(destContainer[j], srcContainer[j]);`
`1420`	`1420`	`}`
	`1421`	`+`
	`1422`	`+ destProp.set(destContainer);`
`1421`	`1423`	`}`
`1422`	`1424`	`}`
`1423`	`1425`
`@@ -1510,7 +1512,7 @@ plots.transition = function(gd, data, layout, traces, frameOpts, transitionOpts)`
`1510`	`1512`	`delete layoutUpdate[attr].range;`
`1511`	`1513`	`}`
`1512`	`1514`
`1513`		`- Lib.extendDeepNoArrays(gd.layout, layoutUpdate);`
	`1515`	`+ plots.extendLayout(gd.layout, layoutUpdate);`
`1514`	`1516`
`1515`	`1517`	`// Supply defaults after applying the incoming properties. Note that any attempt`
`1516`	`1518`	`// to simplify this step and reduce the amount of work resulted in the reconstruction`