Merge pull request #1568 from plotly/fix-supply-transform-defaults

rreusser · web-flow · commit d3bd87f11712 · 2017-04-07T15:52:16.000-04:00
supplyTransformDefaults to fill in missing transformModules
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -828,14 +828,15 @@ plots.supplyTraceDefaults = function(traceIn, traceOutIndex, layout, traceInInde
             coerce('legendgroup');
         }
 
-        supplyTransformDefaults(traceIn, traceOut, layout);
+        plots.supplyTransformDefaults(traceIn, traceOut, layout);
     }
 
     return traceOut;
 };
 
-function supplyTransformDefaults(traceIn, traceOut, layout) {
+plots.supplyTransformDefaults = function(traceIn, traceOut, layout) {
     var globalTransforms = layout._globalTransforms || [];
+    var transformModules = layout._transformModules || [];
 
     if(!Array.isArray(traceIn.transforms) && globalTransforms.length === 0) return;
 
@@ -856,15 +857,15 @@ function supplyTransformDefaults(traceIn, traceOut, layout) {
             transformOut.type = type;
             transformOut._module = _module;
 
-            Lib.pushUnique(layout._transformModules, _module);
+            Lib.pushUnique(transformModules, _module);
         }
         else {
             transformOut = Lib.extendFlat({}, transformIn);
         }
 
         containerOut.push(transformOut);
     }
-}
+};
 
 function applyTransforms(fullTrace, fullData, layout, fullLayout) {
     var container = fullTrace.transforms,
diff --git a/test/jasmine/tests/plots_test.js b/test/jasmine/tests/plots_test.js
@@ -240,6 +240,20 @@ describe('Test Plots', function() {
         });
     });
 
+    describe('Plots.supplyTransformDefaults', function() {
+        it('should accept an empty layout when transforms present', function() {
+            var traceOut = {};
+            Plots.supplyTransformDefaults({}, traceOut, {
+                _globalTransforms: [{ type: 'filter'}]
+            });
+
+            // This isn't particularly interseting. More relevant is that
+            // the above supplyTransformDefaults call didn't fail due to
+            // missing transformModules data.
+            expect(traceOut.transforms.length).toEqual(1);
+        });
+    });
+
     describe('Plots.getSubplotIds', function() {
         var getSubplotIds = Plots.getSubplotIds;
 

Original file line number	Diff line number	Diff line change
`@@ -828,14 +828,15 @@ plots.supplyTraceDefaults = function(traceIn, traceOutIndex, layout, traceInInde`
`828`	`828`	`coerce('legendgroup');`
`829`	`829`	`}`
`830`	`830`
`831`		`- supplyTransformDefaults(traceIn, traceOut, layout);`
	`831`	`+ plots.supplyTransformDefaults(traceIn, traceOut, layout);`
`832`	`832`	`}`
`833`	`833`
`834`	`834`	`return traceOut;`
`835`	`835`	`};`
`836`	`836`
`837`		`-function supplyTransformDefaults(traceIn, traceOut, layout) {`
	`837`	`+plots.supplyTransformDefaults = function(traceIn, traceOut, layout) {`
`838`	`838`	`var globalTransforms = layout._globalTransforms \|\| [];`
	`839`	`+ var transformModules = layout._transformModules \|\| [];`
`839`	`840`
`840`	`841`	`if(!Array.isArray(traceIn.transforms) && globalTransforms.length === 0) return;`
`841`	`842`
`@@ -856,15 +857,15 @@ function supplyTransformDefaults(traceIn, traceOut, layout) {`
`856`	`857`	`transformOut.type = type;`
`857`	`858`	`transformOut._module = _module;`
`858`	`859`
`859`		`- Lib.pushUnique(layout._transformModules, _module);`
	`860`	`+ Lib.pushUnique(transformModules, _module);`
`860`	`861`	`}`
`861`	`862`	`else {`
`862`	`863`	`transformOut = Lib.extendFlat({}, transformIn);`
`863`	`864`	`}`
`864`	`865`
`865`	`866`	`containerOut.push(transformOut);`
`866`	`867`	`}`
`867`		`-}`
	`868`	`+};`
`868`	`869`
`869`	`870`	`function applyTransforms(fullTrace, fullData, layout, fullLayout) {`
`870`	`871`	`var container = fullTrace.transforms,`