Merge branch 'master' into fix-layout-animation

Conflicts: src/plots/plots.js test/jasmine/tests/animate_test.js
plotly · rreusser · Nov 10, 2016 · Nov 2, 2016 · Nov 8, 2016 · Nov 8, 2016
commit 133b9d65c8bbe9b8671e2f1e816df0e97f4f35b2
diff --git a/test/jasmine/tests/animate_test.js b/test/jasmine/tests/animate_test.js
@@ -588,7 +588,7 @@ describe('Test animate API', function() {
     });
 });
 
-describe('layout animation', function() {
+describe('Animate API details', function() {
     'use strict';
 
     var gd;
@@ -667,4 +667,30 @@ describe('layout animation', function() {
             }, dur);
         });
     });
+
+    it('does not fail if strings are not used', function(done) {
+        Plotly.addFrames(gd, [{name: 8, data: [{x: [8, 7, 6]}]}]).then(function() {
+            // Verify it was added as a string name:
+            expect(gd._transitionData._frameHash['8']).not.toBeUndefined();
+
+            // Transition using a number:
+            return Plotly.animate(gd, [8], {transition: {duration: 0}, frame: {duration: 0}});
+        }).then(function() {
+            // Confirm the result:
+            expect(gd.data[0].x).toEqual([8, 7, 6]);
+        }).catch(fail).then(done);
+    });
+
+    it('ignores null and undefined frames', function(done) {
+        var cnt = 0;
+        gd.on('plotly_animatingframe', function() {cnt++;});
+
+        Plotly.animate(gd, ['frame0', null, undefined], {transition: {duration: 0}, frame: {duration: 0}}).then(function() {
+            // Check only one animating was fired:
+            expect(cnt).toEqual(1);
+
+            // Check unused frames did not affect the current frame:
+            expect(gd._fullLayout._currentFrame).toEqual('frame0');
+        }).catch(fail).then(done);
+    });
 });