linting / comment fixing

plotly · etpinard · Apr 12, 2016 · Mar 11, 2016 · Mar 13, 2016 · Mar 13, 2016
commit ee28402c274e1728f826d5090864f8da1621af19
diff --git a/src/components/dragelement/index.js b/src/components/dragelement/index.js
@@ -42,7 +42,7 @@ dragElement.getCursor = require('./cursor')
8000
;
 
 var unhover = require('./unhover');
 dragElement.unhover = unhover.wrapped;
-dragElement.unhover_raw = unhover.raw;
+dragElement.unhoverRaw = unhover.raw;
 
 dragElement.init = function init(options) {
     var gd = Lib.getPlotDiv(options.element) || {},

diff --git a/src/components/dragelement/unhover.js b/src/components/dragelement/unhover.js
@@ -28,7 +28,7 @@ unhover.wrapped = function(gd, evt, subplot) {
 
 
 // remove hover effects on mouse out, and emit unhover event
-unhover.raw = function unhover_raw(gd, evt) {
+unhover.raw = function unhoverRaw(gd, evt) {
     var fullLayout = gd._fullLayout;
     if(!evt) evt = {};
     if(evt.target &&

diff --git a/src/components/errorbars/plot.js b/src/components/errorbars/plot.js
@@ -22,6 +22,10 @@ module.exports = function plot(traces, plotinfo) {
 
     traces.each(function(d) {
         var trace = d[0].trace,
+            // || {} is in case the trace (specifically scatterternary)
+            // doesn't support error bars at all, but does go through
+            // the scatter.plot mechanics, which calls ErrorBars.plot
+            // internally
             xObj = trace.error_x || {},
             yObj = trace.error_y || {};
 

diff --git a/src/plots/cartesian/graph_interact.js b/src/plots/cartesian/graph_interact.js
@@ -313,22 +313,20 @@ function hover(gd, evt, subplot) {
                 .map(function(pi) { return pi.id; })),
 
         xaArray = subplots.map(function(spId) {
-            if(spId.substr(0,7) === 'ternary') {
-                return gd._fullLayout[spId]._ternary.xaxis;
-            }
+            var ternary = gd._fullLayout[spId]._ternary;
+            if(ternary) return ternary.xaxis;
             return Plotly.Axes.getFromId(gd, spId, 'x');
         }),
         yaArray = subplots.map(function(spId) {
-            if(spId.substr(0,7) === 'ternary') {
-                return gd._fullLayout[spId]._ternary.yaxis;
-            }
+            var ternary = gd._fullLayout[spId]._ternary;
+            if(ternary) return ternary.xaxis;
             return Plotly.Axes.getFromId(gd, spId, 'y');
         }),
         hovermode = evt.hovermode || fullLayout.hovermode;
 
     if(['x','y','closest'].indexOf(hovermode)===-1 || !gd.calcdata ||
             gd.querySelector('.zoombox') || gd._dragging) {
-        return dragElement.unhover_raw(gd, evt);
+        return dragElement.unhoverRaw(gd, evt);
     }
 
         // hoverData: the set of candidate points we've found to highlight
@@ -400,7 +398,7 @@ function hover(gd, evt, subplot) {
             // in case hover was called from mouseout into hovertext,
             // it's possible you're not actually over the plot anymore
             if(xpx<0 || xpx>dbb.width || ypx<0 || ypx>dbb.height) {
-                return dragElement.unhover_raw(gd,evt);
+                return dragElement.unhoverRaw(gd,evt);
             }
         }
         else {
@@ -419,7 +417,7 @@ function hover(gd, evt, subplot) {
 
         if(!isNumeric(xvalArray[0]) || !isNumeric(yvalArray[0])) {
             console.log('Plotly.Fx.hover failed', evt, gd);
-            return dragElement.unhover_raw(gd, evt);
+            return dragElement.unhoverRaw(gd, evt);
         }
     }
 
@@ -518,7 +516,7 @@ function hover(gd, evt, subplot) {
     }
 
     // nothing left: remove all labels and quit
-    if(hoverData.length===0) return dragElement.unhover_raw(gd,evt);
+    if(hoverData.length===0) return dragElement.unhoverRaw(gd,evt);
 
     // if there's more than one horz bar trace,
     // rotate the labels so they don't overlap

diff --git a/src/plots/gl3d/layout/axis_defaults.js b/src/plots/gl3d/layout/axis_defaults.js
@@ -57,13 +57,10 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, options) {
         if(coerce('showspikes')) {
             coerce('spikesides');
             coerce('spikethickness');
-            // TODO: this makes the default spikes #444 rather than
-            // #000, is that OK?
             coerce('spikecolor', containerOut.color);
         }
 
         coerce('showaxeslabels');
-        // TODO: relate backgroundcolor to common containerOut.color?
         if(coerce('showbackground')) coerce('backgroundcolor');
     }
 };
diff --git a/src/traces/scatter/line_shape_defaults.js b/src/traces/scatter/line_shape_defaults.js
@@ -10,7 +10,7 @@
 'use strict';
 
 
-// common to 'scatter', 'scatter3d', 'scattergeo' and 'scattergl'
+// common to 'scatter' and 'scatterternary'
 module.exports = function handleLineShapeDefaults(traceIn, traceOut, coerce) {
     var shape = coerce('line.shape');
     if(shape === 'spline') coerce('line.smoothing');

diff --git a/src/traces/scatterternary/attributes.js b/src/traces/scatterternary/attributes.js
@@ -35,7 +35,7 @@ module.exports = {
             'If `a`, `b`, and `c` are all provided, they need not be',
             'normalized, only the relative values matter. If only two',
             'arrays are provided they must be normalized to match',
-            '`ternary(i).sum`.'
+            '`ternary<i>.sum`.'
         ].join(' ')
     },
     c: {