use c2l instead of c2r

Author: archmoj

src/traces/bar/plot.js

@@ -647,15 +647,11 @@ function calcTexttemplate(fullLayout, cd, index, xa, ya) {
     }
 
     function formatLabel(u) {
-        if(pAxis.type === 'log') u = pAxis.c2r(u);
-
-        return tickText(pAxis, u, true).text;
+        return tickText(pAxis, pAxis.c2l(u), true).text;
     }
 
     function formatNumber(v) {
-        if(vAxis.type === 'log') v = vAxis.c2r(v);
-
-        return tickText(vAxis, +v, true).text;
+        return tickText(vAxis, vAxis.c2l(v), true).text;
     }
 
     var cdi = cd[index];

src/traces/scatter/format_labels.js

@@ -9,14 +9,8 @@ module.exports = function formatLabels(cdi, trace, fullLayout) {
     var xa = Axes.getFromTrace(mockGd, trace, 'x');
     var ya = Axes.getFromTrace(mockGd, trace, 'y');
 
-    var x = cdi.x;
-    var y = cdi.y;
-
-    if(xa.type === 'log') x = xa.c2r(x);
-    if(ya.type === 'log') y = ya.c2r(y);
-
-    labels.xLabel = Axes.tickText(xa, x, true).text;
-    labels.yLabel = Axes.tickText(ya, y, true).text;
+    labels.xLabel = Axes.tickText(xa, xa.c2l(cdi.x), true).text;
+    labels.yLabel = Axes.tickText(ya, ya.c2l(cdi.y), true).text;
 
     return labels;
 };