Merge branch 'master' into dates-as-dates

Author: alexcjohnson

circle.yml

@@ -17,6 +17,7 @@ dependencies:
     - npm run cibuild
     - npm run pretest
     - eval $(node tasks/docker.js setup)
+    - npm ls
 
 test:
   override:

package.json

@@ -97,7 +97,7 @@
     "browserify-transform-tools": "^1.5.1",
     "deep-equal": "^1.0.1",
     "ecstatic": "^2.1.0",
-    "eslint": "^3.5.0",
+    "eslint": "^3.9.1",
     "falafel": "^2.0.0",
     "fs-extra": "^0.30.0",
     "fuse.js": "^2.2.0",

src/plot_api/plot_api.js

@@ -2005,7 +2005,7 @@ function _relayout(gd, aobj) {
              */
             else if(['hovermode', 'dragmode'].indexOf(ai) !== -1) flags.domodebar = true;
             else if(['hovermode', 'dragmode', 'height',
-                    'width', 'autosize'].indexOf(ai) === -1) {
+                'width', 'autosize'].indexOf(ai) === -1) {
                 flags.doplot = true;
             }
 
@@ -2258,7 +2258,6 @@ Plotly.animate = function(gd, frameOrGroupNameOrFrameList, animationOpts) {
                     frameOpts: frameOpts,
                     transitionOpts: transitionOpts,
                 };
-
                 if(i === frameList.length - 1) {
                     // The last frame in this .animate call stores the promise resolve
                     // and reject callbacks. This is how we ensure that the animation
@@ -2410,14 +2409,15 @@ Plotly.animate = function(gd, frameOrGroupNameOrFrameList, animationOpts) {
         } else if(isFrameArray) {
             for(i = 0; i < frameOrGroupNameOrFrameList.length; i++) {
                 var frameOrName = frameOrGroupNameOrFrameList[i];
-                if(typeof frameOrName === 'string') {
+                if(['number', 'string'].indexOf(typeof frameOrName) !== -1) {
+                    frameOrName = String(frameOrName);
                     // 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 {
+                } else if(Lib.isPlainObject(frameOrName)) {
                     frameList.push({
                         type: 'object',
                         data: setTransitionConfig(Lib.extendFlat({}, frameOrName))

src/plots/cartesian/tick_label_defaults.js

@@ -67,8 +67,8 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
  */
 function getShowAttrDflt(containerIn) {
     var showAttrsAll = ['showexponent',
-                        'showtickprefix',
-                        'showticksuffix'],
+            'showtickprefix',
+            'showticksuffix'],
         showAttrs = showAttrsAll.filter(function(a) {
             return containerIn[a] !== undefined;
         }),

src/plots/geo/set_scale.js

@@ -127,7 +127,7 @@ function makeRangeBox(lon0, lat0, lon1, lat1) {
     return {
         type: 'Polygon',
         coordinates: [
-          [ [lon0, lat0],
+            [ [lon0, lat0],
             [lon0, lat1],
             [lon0 + dlon4, lat1],
             [lon0 + 2 * dlon4, lat1],

src/plots/plots.js

@@ -1796,6 +1796,9 @@ plots.transition = function(gd, data, layout, traces, frameOpts, transitionOpts)
     }
 
     function completeTransition(callback) {
+        // Fail-safe against purged plot:
+        if(!gd._transitionData) return;
+
         flushCallbacks(gd._transitionData._interruptCallbacks);
 
         return Promise.resolve().then(function() {
@@ -1813,6 +1816,9 @@ plots.transition = function(gd, data, layout, traces, frameOpts, transitionOpts)
     }
 
     function interruptPreviousTransitions() {
+        // Fail-safe against purged plot:
+        if(!gd._transitionData) return;
+
         // If a transition is interrupted, set this to false. At the moment, the only thing that would
         // interrupt a transition is another transition, so that it will momentarily be set to true
         // again, but this determines whether autorange or dragbox work, so it's for the sake of

src/traces/contour/plot.js

@@ -320,7 +320,7 @@ function makePath(pi, loc, edgeflag) {
             // even # of pts - average central two
             else {
                 newpt = [(getpt(ptavg)[0] + getpt(ptavg + 1)[0]) / 2,
-                         (getpt(ptavg)[1] + getpt(ptavg + 1)[1]) / 2];
+                    (getpt(ptavg)[1] + getpt(ptavg + 1)[1]) / 2];
             }
 
             pts.splice(cnt2 + 1, cnt - cnt2 + 1, newpt);
@@ -458,12 +458,12 @@ function getInterpPx(pi, loc, step) {
     if(step[1]) {
         var dx = (pi.level - zxy) / (pi.z[locy][locx + 1] - zxy);
         return [xa.c2p((1 - dx) * pi.x[locx] + dx * pi.x[locx + 1], true),
-                ya.c2p(pi.y[locy], true)];
+            ya.c2p(pi.y[locy], true)];
     }
     else {
         var dy = (pi.level - zxy) / (pi.z[locy + 1][locx] - zxy);
         return [xa.c2p(pi.x[locx], true),
-                ya.c2p((1 - dy) * pi.y[locy] + dy * pi.y[locy + 1], true)];
+            ya.c2p((1 - dy) * pi.y[locy] + dy * pi.y[locy + 1], true)];
     }
 }
 

src/traces/surface/convert.js

@@ -151,8 +151,8 @@ function refine(coords) {
             var padImg = padField(coords[i]);
             var scaledImg = ndarray(new Float32Array(nsize), nshape);
             homography(scaledImg, padImg, [scaleF, 0, 0,
-                                              0, scaleF, 0,
-                                              0, 0, 1]);
+                0, scaleF, 0,
+                0, 0, 1]);
             coords[i] = scaledImg;
         }
 

test/jasmine/tests/animate_test.js

@@ -88,6 +88,14 @@ describe('Test animate API', function() {
 
         mockCopy = Lib.extendDeep({}, mock);
 
+        // ------------------------------------------------------------
+        // NB: TRANSITION IS FAKED
+        //
+        // This means that you should not expect `.animate` to actually
+        // modify the plot in any way in the tests below. For tests
+        // involvingnon-faked transitions, see the bottom of this file.
+        // ------------------------------------------------------------
+
         spyOn(Plots, 'transition').and.callFake(function() {
             // Transition's fake behavior is just to delay by the duration
             // and resolve:
@@ -579,3 +587,48 @@ describe('Test animate API', function() {
         });
     });
 });
+
+describe('Test animate API', function() {
+    'use strict';
+
+    var gd, mockCopy;
+
+    beforeEach(function(done) {
+        gd = createGraphDiv();
+        mockCopy = Lib.extendDeep({}, mock);
+        Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(function() {
+            return Plotly.addFrames(gd, mockCopy.frames);
+        }).then(done);
+    });
+
+    afterEach(function() {
+        Plotly.purge(gd);
+        destroyGraphDiv();
+    });
+
+    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);
+    });
+});

test/jasmine/tests/frame_api_test.js

@@ -60,6 +60,12 @@ describe('Test frame api', function() {
             }).catch(fail).then(done);
         });
 
+        it('casts names to strings', function(done) {
+            Plotly.addFrames(gd, [{name: 5}]).then(function() {
+                expect(Object.keys(h)).toEqual(['5']);
+            }).catch(fail).then(done);
+        });
+
         it('creates multiple unnamed frames at the same time', function(done) {
             Plotly.addFrames(gd, [{}, {}]).then(function() {
                 expect(f).toEqual([{name: 'frame 0'}, {name: 'frame 1'}]);