Merge branch 'master' into add-text-to-shapes

Author: emilykl

.eslintrc

@@ -55,6 +55,7 @@
     "no-floating-decimal": [2],
     "space-infix-ops": [2, {"int32Hint": true}],
     "quotes": [2, "single"],
+    "quote-props": ["error", "as-needed"],
     "dot-notation": [2],
     "dot-location": [2, "property"],
     "operator-linebreak": [2, "after"],

devtools/regl_codegen/server.js

@@ -207,9 +207,17 @@ function handleCodegen(data) {
     var pathToReglCodegenSrc = constants.pathToReglCodegenSrc;
     var pathToReglPrecompiledSrc = path.join(constants.pathToSrc, 'traces', trace, 'regl_precompiled.js');
 
-    var header = '\'use strict\';\n';
+    var header = [
+        '\'use strict\';',
+        '',
+    ].join('\n');
     var imports = '';
-    var exports = '\nmodule.exports = {\n';
+    var exports = [
+        '',
+        '/* eslint-disable quote-props */',
+        'module.exports = {',
+        '',
+    ].join('\n');
     var varId = 0;
 
     Object.entries(generated).forEach(function(kv) {

devtools/test_dashboard/server.js

@@ -9,8 +9,6 @@ var minimist = require('minimist');
 var constants = require('../../tasks/util/constants');
 var config = require('../../webpack.config.js');
 config.optimization = { minimize: false };
-config.mode = 'development';
-config.devtool = 'eval';
 
 var args = minimist(process.argv.slice(2), {});
 var PORT = args.port || 3000;
@@ -20,6 +18,12 @@ var mathjax3chtml = args.mathjax3chtml;
 
 if(strict) config.entry = './lib/index-strict.js';
 
+if(!strict) {
+    config.mode = 'development';
+    config.devtool = 'eval';
+}
+
+
 // mock list
 getMockFiles()
     .then(readFiles)

draftlogs/6442_fix.md

@@ -0,0 +1 @@
+ - Avoid overlap of point and axis hover labels for `hovermode: 'x'|'y'` [[#6442](https://github.com/plotly/plotly.js/pull/6442)]

draftlogs/6481_add.md

@@ -0,0 +1 @@
+ - Add `labelalias` to various axes namely cartesian, gl3d, polar, smith, ternary, carpet, indicator and colorbar [[#6481](https://github.com/plotly/plotly.js/pull/6481)]

lib/locales/.eslintrc

@@ -0,0 +1,6 @@
+{
+  "extends": "../.eslintrc",
+  "rules": {
+    "quote-props": ["error", "consistent"]
+  }
+}

src/components/annotations/draw_arrow_head.js

@@ -127,7 +127,7 @@ module.exports = function drawArrowHead(el3, ends, options) {
 
         d3.select(el.parentNode).append('path')
             .attr({
-                'class': el3.attr('class'),
+                class: el3.attr('class'),
                 d: arrowHeadStyle.path,
                 transform:
                     strTranslate(p.x, p.y) +

src/components/calendars/index.js

@@ -97,23 +97,23 @@ var DFLTRANGE = {
  */
 var UNKNOWN = '##';
 var d3ToWorldCalendars = {
-    'd': {'0': 'dd', '-': 'd'}, // 2-digit or unpadded day of month
-    'e': {'0': 'd', '-': 'd'}, // alternate, always unpadded day of month
-    'a': {'0': 'D', '-': 'D'}, // short weekday name
-    'A': {'0': 'DD', '-': 'DD'}, // full weekday name
-    'j': {'0': 'oo', '-': 'o'}, // 3-digit or unpadded day of the year
-    'W': {'0': 'ww', '-': 'w'}, // 2-digit or unpadded week of the year (Monday first)
-    'm': {'0': 'mm', '-': 'm'}, // 2-digit or unpadded month number
-    'b': {'0': 'M', '-': 'M'}, // short month name
-    'B': {'0': 'MM', '-': 'MM'}, // full month name
-    'y': {'0': 'yy', '-': 'yy'}, // 2-digit year (map unpadded to zero-padded)
-    'Y': {'0': 'yyyy', '-': 'yyyy'}, // 4-digit year (map unpadded to zero-padded)
-    'U': UNKNOWN, // Sunday-first week of the year
-    'w': UNKNOWN, // day of the week [0(sunday),6]
+    d: {0: 'dd', '-': 'd'}, // 2-digit or unpadded day of month
+    e: {0: 'd', '-': 'd'}, // alternate, always unpadded day of month
+    a: {0: 'D', '-': 'D'}, // short weekday name
+    A: {0: 'DD', '-': 'DD'}, // full weekday name
+    j: {0: 'oo', '-': 'o'}, // 3-digit or unpadded day of the year
+    W: {0: 'ww', '-': 'w'}, // 2-digit or unpadded week of the year (Monday first)
+    m: {0: 'mm', '-': 'm'}, // 2-digit or unpadded month number
+    b: {0: 'M', '-': 'M'}, // short month name
+    B: {0: 'MM', '-': 'MM'}, // full month name
+    y: {0: 'yy', '-': 'yy'}, // 2-digit year (map unpadded to zero-padded)
+    Y: {0: 'yyyy', '-': 'yyyy'}, // 4-digit year (map unpadded to zero-padded)
+    U: UNKNOWN, // Sunday-first week of the year
+    w: UNKNOWN, // day of the week [0(sunday),6]
     // combined format, we replace the date part with the world-calendar version
     // and the %X stays there for d3 to handle with time parts
-    'c': {'0': 'D M d %X yyyy', '-': 'D M d %X yyyy'},
-    'x': {'0': 'mm/dd/yyyy', '-': 'mm/dd/yyyy'}
+    c: {0: 'D M d %X yyyy', '-': 'D M d %X yyyy'},
+    x: {0: 'mm/dd/yyyy', '-': 'mm/dd/yyyy'}
 };
 
 function worldCalFmt(fmt, x, calendar) {

src/components/color/index.js

@@ -75,13 +75,13 @@ color.contrast = function(cstr, lightAmount, darkAmount) {
 
 color.stroke = function(s, c) {
     var tc = tinycolor(c);
-    s.style({'stroke': color.tinyRGB(tc), 'stroke-opacity': tc.getAlpha()});
+    s.style({stroke: color.tinyRGB(tc), 'stroke-opacity': tc.getAlpha()});
 };
 
 color.fill = function(s, c) {
     var tc = tinycolor(c);
     s.style({
-        'fill': color.tinyRGB(tc),
+        fill: color.tinyRGB(tc),
         'fill-opacity': tc.getAlpha()
     });
 };

src/components/colorbar/attributes.js

@@ -168,6 +168,7 @@ module.exports = overrideAll({
     tickcolor: axesAttrs.tickcolor,
     ticklabelstep: axesAttrs.ticklabelstep,
     showticklabels: axesAttrs.showticklabels,
+    labelalias: axesAttrs.labelalias,
     tickfont: fontAttrs({
         description: 'Sets the color bar\'s tick label font'
     }),