Fixes from first review pass

Author: rreusser

src/components/drawing/index.js

@@ -62,10 +62,10 @@ drawing.translatePoint = function(d, sel, xa, ya) {
     else sel.remove();
 };
 
-drawing.translatePoints = function(s, xa, ya, trace, transitionConfig) {
+drawing.translatePoints = function(s, xa, ya, trace) {
     s.each(function(d) {
         var sel = d3.select(this);
-        drawing.translatePoint(d, sel, xa, ya, trace, transitionConfig);
+        drawing.translatePoint(d, sel, xa, ya, trace);
     });
 };
 

src/components/errorbars/plot.js

@@ -13,16 +13,13 @@ var d3 = require('d3');
 var isNumeric = require('fast-isnumeric');
 
 var subTypes = require('../../traces/scatter/subtypes');
-var styleError = require('./style');
-
 
 module.exports = function plot(traces, plotinfo, transitionConfig) {
     var isNew;
     var xa = plotinfo.x(),
         ya = plotinfo.y();
 
-    transitionConfig = transitionConfig || {};
-    var hasAnimation = isNumeric(transitionConfig.duration) && transitionConfig.duration > 0;
+    var hasAnimation = transitionConfig && transitionConfig.duration > 0;
 
     traces.each(function(d) {
         var trace = d[0].trace,
@@ -35,8 +32,8 @@ module.exports = function plot(traces, plotinfo, transitionConfig) {
 
         var keyFunc;
 
-        if(trace.identifier) {
-            keyFunc = function(d) {return d.identifier;};
+        if(trace.ids) {
+            keyFunc = function(d) {return d.id;};
         }
 
         var sparse = (
@@ -70,7 +67,7 @@ module.exports = function plot(traces, plotinfo, transitionConfig) {
 
             var path;
 
-            if(yObj.visible && isNumeric(coords.x) &&
+            if(yObj.visible && isNumeric(coords.y) &&
                     isNumeric(coords.yh) &&
                     isNumeric(coords.ys)) {
                 var yw = yObj.width;
@@ -93,8 +90,7 @@ module.exports = function plot(traces, plotinfo, transitionConfig) {
                     yerror = yerror
                         .transition()
                             .duration(transitionConfig.duration)
-                            .ease(transitionConfig.ease)
-                            .delay(transitionConfig.delay);
+                            .ease(transitionConfig.ease);
                 }
 
                 yerror.attr('d', path);
@@ -122,15 +118,12 @@ module.exports = function plot(traces, plotinfo, transitionConfig) {
                     xerror = xerror
                         .transition()
                             .duration(transitionConfig.duration)
-                            .ease(transitionConfig.ease)
-                            .delay(transitionConfig.delay);
+                            .ease(transitionConfig.ease);
                 }
 
                 xerror.attr('d', path);
             }
         });
-
-        d3.select(this).call(styleError);
     });
 };
 

src/lib/index.js

@@ -660,128 +660,3 @@ lib.numSeparate = function(value, separators, separatethousands) {
 
     return x1 + x2;
 };
-
-/*
- * Compute a keyframe. Merge a keyframe into its base frame(s) and
- * expand properties.
- *
- * @param {object} frameLookup
- *      An object containing frames keyed by name (i.e. gd._transitionData._frameHash)
- * @param {string} frame
- *      The name of the keyframe to be computed
- *
- * Returns: a new object with the merged content
- */
-lib.computeFrame = function(frameLookup, frameName) {
-    var i, traceIndices, traceIndex, expandedObj, destIndex, copy;
-
-    var framePtr = frameLookup[frameName];
-
-    // Return false if the name is invalid:
-    if(!framePtr) {
-        return false;
-    }
-
-    var frameStack = [framePtr];
-    var frameNameStack = [framePtr.name];
-
-    // Follow frame pointers:
-    while((framePtr = frameLookup[framePtr.baseFrame])) {
-        // Avoid infinite loops:
-        if(frameNameStack.indexOf(framePtr.name) !== -1) break;
-
-        frameStack.push(framePtr);
-        frameNameStack.push(framePtr.name);
-    }
-
-    // A new object for the merged result:
-    var result = {};
-
-    // Merge, starting with the last and ending with the desired frame:
-    while((framePtr = frameStack.pop())) {
-        if(framePtr.layout) {
-            copy = lib.extendDeepNoArrays({}, framePtr.layout);
-            expandedObj = lib.expandObjectPaths(copy);
-            result.layout = lib.extendDeepNoArrays(result.layout || {}, expandedObj);
-        }
-
-        if(framePtr.data) {
-            if(!result.data) {
-                result.data = [];
-            }
-            traceIndices = framePtr.traceIndices;
-
-            if(!traceIndices) {
-                // If not defined, assume serial order starting at zero
-                traceIndices = [];
-                for(i = 0; i < framePtr.data.length; i++) {
-                    traceIndices[i] = i;
-                }
-            }
-
-            if(!result.traceIndices) {
-                result.traceIndices = [];
-            }
-
-            for(i = 0; i < framePtr.data.length; i++) {
-                // Loop through this frames data, find out where it should go,
-                // and merge it!
-                traceIndex = traceIndices[i];
-                if(traceIndex === undefined || traceIndex === null) {
-                    continue;
-                }
-
-                destIndex = result.traceIndices.indexOf(traceIndex);
-                if(destIndex === -1) {
-                    destIndex = result.data.length;
-                    result.traceIndices[destIndex] = traceIndex;
-                }
-
-                copy = lib.extendDeepNoArrays({}, framePtr.data[i]);
-                expandedObj = lib.expandObjectPaths(copy);
-                result.data[destIndex] = lib.extendDeepNoArrays(result.data[destIndex] || {}, expandedObj);
-            }
-        }
-    }
-
-    return result;
-};
-
-/**
- * Interleaves separate trace updates (frames) into a restyle command.
- * Attributes not specified in both traces are set to `undefined` so that
- * they are not altered by restyle. Object paths are *not* expanded.
- *
- * @example
- * lib.interleaveTraceUpdates([{x: [1]}, {x: [2]}])
- * // returns {x: [[1], [2]]}
- *
- * @param   {array} traces       the trace updates to be interleaved
- *
- * @return  {object}    an object contianing the interleaved properties
- */
-lib.interleaveTraceUpdates = function(traces) {
-    var i, j, k, prop, trace, props;
-    var n = traces.length;
-    var output = {};
-
-    for(i = 0; i < traces.length; i++) {
-        trace = traces[i];
-        props = Object.keys(trace);
-        for(j = 0; j < props.length; j++) {
-            prop = props[j];
-            if(!output[prop]) {
-                // If not present, allocate a new array:
-                output[prop] = [];
-
-                // Explicitly fill this array with undefined:
-                for(k = 0; k < n; k++) {
-                    output[prop][k] = undefined;
-                }
-            }
-            output[prop][i] = traces[i][prop];
-        }
-    }
-
-    return output;
-};

src/plot_api/plot_api.js

@@ -2545,7 +2545,7 @@ Plotly.transition = function(gd, data, layout, traceIndices, transitionConfig) {
     // Select which traces will be updated:
     if(isNumeric(traceIndices)) traceIndices = [traceIndices];
     else if(!Array.isArray(traceIndices) || !traceIndices.length) {
-        traceIndices = gd._fullData.map(function(v, i) {return i;});
+        traceIndices = gd.data.map(function(v, i) { return i; });
     }
 
     if(traceIndices.length > dataLength) {
@@ -2586,8 +2586,6 @@ Plotly.transition = function(gd, data, layout, traceIndices, transitionConfig) {
         // transitions:
         Plots.supplyDefaults(gd);
 
-        //Plotly.Axes.saveRangeInitial(gd, true);
-
         // This step fies the .xaxis and .yaxis references that otherwise
         // aren't updated by the supplyDefaults step:
         var subplots = Plotly.Axes.getSubplots(gd);
@@ -2690,12 +2688,12 @@ Plotly.transition = function(gd, data, layout, traceIndices, transitionConfig) {
                 return Plotly.redraw(gd);
             }
         }).then(function() {
-            gd.emit('plotly_endtransition', []);
+            gd.emit('plotly_transitioned', []);
         });
     }
 
     function interruptPreviousTransitions() {
-        gd.emit('plotly_interrupttransition', []);
+        gd.emit('plotly_transitioninterrupted', []);
 
         return executeCallbacks(gd._transitionData._interruptCallbacks);
     }
@@ -2713,24 +2711,17 @@ Plotly.transition = function(gd, data, layout, traceIndices, transitionConfig) {
             for(var ai in data[i]) {
                 thisUpdate[ai] = [data[i][ai]];
             }
-
-            /*restyleList.push((function(md, data, traces) {
-                return function() {
-                    return Plotly.restyle(gd, data, traces);
-                };
-            }(module, thisUpdate, [traceIdx])));*/
         }
     }
 
     var seq = [Plots.previousPromises, interruptPreviousTransitions, prepareTransitions, executeTransitions];
-    //seq = seq.concat(restyleList);
 
     var plotDone = Lib.syncOrAsync(seq, gd);
 
     if(!plotDone || !plotDone.then) plotDone = Promise.resolve();
 
     return plotDone.then(function() {
-        gd.emit('plotly_begintransition', []);
+        gd.emit('plotly_transitioning', []);
         return gd;
     });
 };

src/plots/cartesian/transition_axes.js

@@ -119,7 +119,7 @@ module.exports = function transitionAxes(gd, newLayout, transitionConfig, makeOn
                 obji = objArray[i];
                 if((activeAxIds.indexOf(obji.xref) !== -1) ||
                     (activeAxIds.indexOf(obji.yref) !== -1)) {
-                    module.draw(gd, i);
+                    module.drawOne(gd, i);
                 }
             }
         }
@@ -235,37 +235,37 @@ module.exports = function transitionAxes(gd, newLayout, transitionConfig, makeOn
     }
 
     function transitionComplete() {
-        var attrs = {};
+        var aobj = {};
         for(var i = 0; i < updatedAxisIds.length; i++) {
             var axi = gd._fullLayout[updates[updatedAxisIds[i]].axisName];
             var to = updates[updatedAxisIds[i]].to;
-            attrs[axi._name + '.range[0]'] = to[0];
-            attrs[axi._name + '.range[1]'] = to[1];
+            aobj[axi._name + '.range[0]'] = to[0];
+            aobj[axi._name + '.range[1]'] = to[1];
 
             axi.range = to.slice();
         }
 
         // Signal that this transition has completed:
         onComplete && onComplete();
 
-        return Plotly.relayout(gd, attrs).then(function() {
+        return Plotly.relayout(gd, aobj).then(function() {
             for(var i = 0; i < affectedSubplots.length; i++) {
                 unsetSubplotTransform(affectedSubplots[i]);
             }
         });
     }
 
     function transitionInterrupt() {
-        var attrs = {};
+        var aobj = {};
         for(var i = 0; i < updatedAxisIds.length; i++) {
             var axi = gd._fullLayout[updatedAxisIds[i] + 'axis'];
-            attrs[axi._name + '.range[0]'] = axi.range[0];
-            attrs[axi._name + '.range[1]'] = axi.range[1];
+            aobj[axi._name + '.range[0]'] = axi.range[0];
+            aobj[axi._name + '.range[1]'] = axi.range[1];
 
             axi.range = axi._r.slice();
         }
 
-        return Plotly.relayout(gd, attrs).then(function() {
+        return Plotly.relayout(gd, aobj).then(function() {
             for(var i = 0; i < affectedSubplots.length; i++) {
                 unsetSubplotTransform(affectedSubplots[i]);
             }