Opt for the other way of passing frame names while queueing

Author: rreusser

src/plot_api/plot_api.js

@@ -2203,7 +2203,7 @@ Plotly.animate = function(gd, frameOrGroupNameOrFrameList, animationOpts) {
 
                 if(frameList[i].type === 'byname') {
                     // If it's a named frame, compute it:
-                    computedFrame = Plots.computeFrame(gd, frameList[i].data.name);
+                    computedFrame = Plots.computeFrame(gd, frameList[i].name);
                 } else {
                     // Otherwise we must have been given a simple object, so treat
                     // the input itself as the computed frame.
@@ -2219,7 +2219,7 @@ Plotly.animate = function(gd, frameOrGroupNameOrFrameList, animationOpts) {
 
                 var nextFrame = {
                     frame: computedFrame,
-                    name: computedFrame.name,
+                    name: frameList[i].name,
                     frameOpts: frameOpts,
                     transitionOpts: transitionOpts,
                 };
@@ -2365,6 +2365,7 @@ Plotly.animate = function(gd, frameOrGroupNameOrFrameList, animationOpts) {
                 if(allFrames || frame.group === frameOrGroupNameOrFrameList) {
                     frameList.push({
                         type: 'byname',
+                        name: frame.name,
                         data: setTransitionConfig({name: frame.name})
                     });
                 }
@@ -2376,6 +2377,7 @@ Plotly.animate = function(gd, frameOrGroupNameOrFrameList, animationOpts) {
                     // In this case, there's an array and this frame is a string name:
                     frameList.push({
                         type: 'byname',
+                        name: frameOrName,
                         data: setTransitionConfig({name: frameOrName})
                     });
                 } else {

src/plots/plots.js

@@ -1286,7 +1286,7 @@ plots.computeFrame = function(gd, frameName) {
     }
 
     // A new object for the merged result:
-    var result = {name: frameName};
+    var result = {};
 
     // Merge, starting with the last and ending with the desired frame:
     while((framePtr = frameStack.pop())) {

test/jasmine/tests/animate_test.js

@@ -420,7 +420,7 @@ describe('Test animate API', function() {
                 transition: {duration: 1},
                 frame: {duration: 1}
             }).then(function() {
-                expect(frames).toEqual(['frame0', 'frame1', 'test', undefined]);
+                expect(frames).toEqual(['frame0', 'frame1', undefined, undefined]);
             }).catch(fail).then(done);
 
         });

test/jasmine/tests/compute_frame_test.js

@@ -61,7 +61,7 @@ describe('Test mergeFrames', function() {
 
         it('computes a single frame', function() {
             var computed = computeFrame(gd, 'frame1');
-            var expected = {name: 'frame1', data: [{x: [1, 2, 3], marker: {size: 8, color: 'red'}}], traces: [0]};
+            var expected = {data: [{x: [1, 2, 3], marker: {size: 8, color: 'red'}}], traces: [0]};
             expect(computed).toEqual(expected);
         });
 
@@ -82,9 +82,9 @@ describe('Test mergeFrames', function() {
             ];
 
             results = [
-                {name: 'frame0', traces: [0], data: [{marker: {size: 0}}]},
-                {name: 'frame1', traces: [0], data: [{marker: {size: 1}}]},
-                {name: 'frame2', traces: [0], data: [{marker: {size: 2}}]}
+                {traces: [0], data: [{marker: {size: 0}}]},
+                {traces: [0], data: [{marker: {size: 1}}]},
+                {traces: [0], data: [{marker: {size: 2}}]}
             ];
 
             Plotly.addFrames(gd, frames).then(done);
@@ -140,7 +140,6 @@ describe('Test mergeFrames', function() {
             Plotly.addFrames(gd, frames.map(clone));
 
             expect(computeFrame(gd, 'frame0')).toEqual({
-                name: 'frame0',
                 traces: [8, 2],
                 data: [
                     {marker: {size: 1}},
@@ -159,7 +158,6 @@ describe('Test mergeFrames', function() {
             Plotly.addFrames(gd, frames.map(clone));
 
             expect(computeFrame(gd, 'frame0')).toEqual({
-                name: 'frame0',
                 traces: [2],
                 data: [{marker: {size: 0}}]
             });
@@ -175,7 +173,6 @@ describe('Test mergeFrames', function() {
             Plotly.addFrames(gd, frames.map(clone));
 
             expect(computeFrame(gd, 'frame0')).toEqual({
-                name: 'frame0',
                 traces: [2, 8],
                 data: [
                     {marker: {size: 0}},
@@ -192,7 +189,6 @@ describe('Test mergeFrames', function() {
             Plotly.addFrames(gd, frames.map(clone));
 
             expect(computeFrame(gd, 'frame4')).toEqual({
-                name: 'frame4',
                 traces: [2, 8, 0, 1],
                 data: [
                     {marker: {size: 7}},
@@ -228,7 +224,6 @@ describe('Test mergeFrames', function() {
             var result = computeFrame(gd, 'frame0');
 
             expect(result).toEqual({
-                name: 'frame0',
                 layout: {margin: {l: 40}}
             });
         });