Merge branch 'master' into mapbox-style-better-docs

.gitignore

@@ -2,7 +2,6 @@ node_modules
 
 build/*
 !build/plotcss.js
-!build/ploticon.js
 !build/README.md
 
 npm-debug.log*

.npmignore

@@ -1,6 +1,5 @@
 build/*
 !build/plotcss.js
-!build/ploticon.js
 !build/README.md
 
 devtools

package.json

@@ -108,7 +108,7 @@
     "regl-splom": "^1.0.7",
     "right-now": "^1.0.0",
     "robust-orientation": "^1.1.3",
-    "sane-topojson": "^3.0.1",
+    "sane-topojson": "^4.0.0",
     "strongly-connected-components": "^1.0.1",
     "superscript-text": "^1.0.0",
     "svg-path-sdf": "^1.1.3",
@@ -159,7 +159,6 @@
     "run-series": "^1.1.8",
     "through2": "^3.0.1",
     "true-case-path": "^1.0.3",
-    "watchify": "^3.11.1",
-    "xml2js": "^0.4.19"
+    "watchify": "^3.11.1"
   }
 }

src/components/colorscale/attributes.js

@@ -194,7 +194,7 @@ module.exports = function colorScaleAttrs(context, opts) {
             ' rgb, rgba, hex, hsl, hsv, or named color string.',
             ' At minimum, a mapping for the lowest (0) and highest (1)',
             ' values are required. For example,',
-            ' `[[0, \'rgb(0,0,255)\', [1, \'rgb(255,0,0)\']]`.',
+            ' `[[0, \'rgb(0,0,255)\'], [1, \'rgb(255,0,0)\']]`.',
             ' To control the bounds of the colorscale in color space,',
             ' use', minmaxFull, '.',
             ' Alternatively, `colorscale` may be a palette name string',

src/components/fx/hovertemplate_attributes.js

@@ -8,6 +8,8 @@
 
 'use strict';
 
+var FORMAT_LINK = require('../../constants/docs').FORMAT_LINK;
+
 module.exports = function(opts, extra) {
     opts = opts || {};
     extra = extra || {};
@@ -37,7 +39,8 @@ module.exports = function(opts, extra) {
             'Note that this will override `hoverinfo`.',
             'Variables are inserted using %{variable}, for example "y: %{y}".',
             'Numbers are formatted using d3-format\'s syntax %{variable:d3-format}, for example "Price: %{y:$.2f}".',
-            'See https://github.com/d3/d3-format/blob/master/README.md#locale_format for details on the formatting syntax.',
+            FORMAT_LINK,
+            'for details on the formatting syntax.',
             'The variables available in `hovertemplate` are the ones emitted as event data described at this link https://plot.ly/javascript/plotlyjs-events/#event-data.',
             'Additionally, every attributes that can be specified per-point (the ones that are `arrayOk: true`) are available.',
             descPart,

src/components/modebar/buttons.js

@@ -12,7 +12,7 @@ var Registry = require('../../registry');
 var Plots = require('../../plots/plots');
 var axisIds = require('../../plots/cartesian/axis_ids');
 var Lib = require('../../lib');
-var Icons = require('../../../build/ploticon');
+var Icons = require('../../fonts/ploticon');
 
 var _ = Lib._;
 
@@ -89,6 +89,15 @@ modeBarButtons.sendDataToCloud = {
     }
 };
 
+modeBarButtons.editInChartStudio = {
+    name: 'editInChartStudio',
+    title: function(gd) { return _(gd, 'Edit in Chart Studio'); },
+    icon: Icons.pencil,
+    click: function(gd) {
+        Plots.sendDataToCloud(gd);
+    }
+};
+
 modeBarButtons.zoom2d = {
     name: 'zoom2d',
     title: function(gd) { return _(gd, 'Zoom'); },

src/components/modebar/manage.js

@@ -59,22 +59,20 @@ module.exports = function manageModeBar(gd) {
     } else if(!context.displayModeBar && context.watermark) {
         buttonGroups = [];
     } else {
-        buttonGroups = getButtonGroups(
-            gd,
-            context.modeBarButtonsToRemove,
-            context.modeBarButtonsToAdd,
-            context.showSendToCloud
-        );
+        buttonGroups = getButtonGroups(gd);
     }
 
     if(modeBar) modeBar.update(gd, buttonGroups);
     else fullLayout._modeBar = createModeBar(gd, buttonGroups);
 };
 
 // logic behind which buttons are displayed by default
-function getButtonGroups(gd, buttonsToRemove, buttonsToAdd, showSendToCloud) {
+function getButtonGroups(gd) {
     var fullLayout = gd._fullLayout;
     var fullData = gd._fullData;
+    var context = gd._context;
+    var buttonsToRemove = context.modeBarButtonsToRemove;
+    var buttonsToAdd = context.modeBarButtonsToAdd;
 
     var hasCartesian = fullLayout._has('cartesian');
     var hasGL3D = fullLayout._has('gl3d');
@@ -106,7 +104,8 @@ function getButtonGroups(gd, buttonsToRemove, buttonsToAdd, showSendToCloud) {
 
     // buttons common to all plot types
     var commonGroup = ['toImage'];
-    if(showSendToCloud) commonGroup.push('sendDataToCloud');
+    if(context.showEditInChartStudio) commonGroup.push('editInChartStudio');
+    else if(context.showSendToCloud) commonGroup.push('sendDataToCloud');
     addGroup(commonGroup);
 
     var zoomGroup = [];

src/components/modebar/modebar.js

@@ -13,7 +13,7 @@ var d3 = require('d3');
 var isNumeric = require('fast-isnumeric');
 
 var Lib = require('../../lib');
-var Icons = require('../../../build/ploticon');
+var Icons = require('../../fonts/ploticon');
 var Parser = new DOMParser();
 
 /**

src/constants/docs.js

@@ -0,0 +1,14 @@
+/**
+* Copyright 2012-2019, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+module.exports = {
+    FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md#d3_format',
+    DATE_FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Formatting.md#format'
+};

src/core.js

@@ -66,7 +66,7 @@ register([
 ]);
 
 // plot icons
-exports.Icons = require('../build/ploticon');
+exports.Icons = require('./fonts/ploticon');
 
 // unofficial 'beta' plot methods, use at your own risk
 exports.Plots = require('./plots/plots');

build/ploticon.js → src/fonts/ploticon.js

@@ -1,3 +1,11 @@
+/**
+* Copyright 2012-2019, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
 'use strict';
 
 module.exports = {
@@ -121,6 +129,12 @@ module.exports = {
         'path': 'M512 409c0-57-46-104-103-104-57 0-104 47-104 104 0 57 47 103 104 103 57 0 103-46 103-103z m-327-39l92 0 0 92-92 0z m-185 0l92 0 0 92-92 0z m370-186l92 0 0 93-92 0z m0-184l92 0 0 92-92 0z',
         'transform': 'matrix(1.5 0 0 -1.5 0 850)'
     },
+    'pencil': {
+        'width': 1792,
+        'height': 1792,
+        'path': 'M491 1536l91-91-235-235-91 91v107h128v128h107zm523-928q0-22-22-22-10 0-17 7l-542 542q-7 7-7 17 0 22 22 22 10 0 17-7l542-542q7-7 7-17zm-54-192l416 416-832 832h-416v-416zm683 96q0 53-37 90l-166 166-416-416 166-165q36-38 90-38 53 0 91 38l235 234q37 39 37 91z',
+        'transform': 'matrix(1 0 0 1 0 1)'
+    },
     'newplotlylogo': {
         'name': 'newplotlylogo',
         'svg': '<svg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 132 132\'><defs><style>.cls-1 {fill: #119dff;} .cls-2 {fill: #25fefd;} .cls-3 {fill: #fff;}</style></defs><title>plotly-logomark</title><g id=\'symbol\'><rect class=\'cls-1\' width=\'132\' height=\'132\' rx=\'6\' ry=\'6\'/><circle class=\'cls-2\' cx=\'78\' cy=\'54\' r=\'6\'/><circle class=\'cls-2\' cx=\'102\' cy=\'30\' r=\'6\'/><circle class=\'cls-2\' cx=\'78\' cy=\'30\' r=\'6\'/><circle class=\'cls-2\' cx=\'54\' cy=\'30\' r=\'6\'/><circle class=\'cls-2\' cx=\'30\' cy=\'30\' r=\'6\'/><circle class=\'cls-2\' cx=\'30\' cy=\'54\' r=\'6\'/><path class=\'cls-3\' d=\'M30,72a6,6,0,0,0-6,6v24a6,6,0,0,0,12,0V78A6,6,0,0,0,30,72Z\'/><path class=\'cls-3\' d=\'M78,72a6,6,0,0,0-6,6v24a6,6,0,0,0,12,0V78A6,6,0,0,0,78,72Z\'/><path class=\'cls-3\' d=\'M54,48a6,6,0,0,0-6,6v48a6,6,0,0,0,12,0V54A6,6,0,0,0,54,48Z\'/><path class=\'cls-3\' d=\'M102,48a6,6,0,0,0-6,6v48a6,6,0,0,0,12,0V54A6,6,0,0,0,102,48Z\'/></g></svg>'