Skip to content

Commit 7ec0729

Browse files
etpinardetpinard
authored
Merge pull request #4202 from plotly/branch-v1.49.5
Plug back v1.49.5 onto master
2 parents be4e5a9 + 9705bb7 commit 7ec0729

24 files changed

+135
-86
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
1010
where X.Y.Z is the semver of most recent plotly.js release.
1111

1212

13+
## [1.49.5] -- 2019-09-18
14+
15+
### Fixed
16+
- Clear rejected promises from queue when calling `Plotly.react` [#4197]
17+
- Do not attempt to remove non-existing mapbox layout source and layers [#4197]
18+
- Invalid mapbox layout layers with blank-string tile entries [#4197]
19+
- Fix hover labels for `choroplethmapbox` with number `locations` items [#4197]
20+
21+
1322
## [1.49.4] -- 2019-08-22
1423

1524
### Fixed

‎dist/README.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object. This property must be set before the plotly.js script tag, for example:
5151
Plotly.js defaults to US English (en-US) and includes British English (en) in the standard bundle.
5252
Many other localizations are available - here is an example using Swiss-German (de-CH),
5353
see the contents of this directory for the full list.
54-
They are also available on our CDN as https://cdn.plot.ly/plotly-locale-de-ch-latest.js OR https://cdn.plot.ly/plotly-locale-de-ch-1.49.4.js
54+
They are also available on our CDN as https://cdn.plot.ly/plotly-locale-de-ch-latest.js OR https://cdn.plot.ly/plotly-locale-de-ch-1.49.5.js
5555
Note that the file names are all lowercase, even though the region is uppercase when you apply a locale.
5656

5757
*After* the plotly.js script tag, add:
@@ -74,12 +74,12 @@ The main plotly.js bundle includes all the official (non-beta) trace modules.
7474

7575
It be can imported as minified javascript
7676
- using dist file `dist/plotly.min.js`
77-
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.49.4.min.js
77+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.49.5.min.js
7878

7979
or as raw javascript:
8080
- using the `plotly.js-dist` npm package (starting in `v1.39.0`)
8181
- using dist file `dist/plotly.js`
82-
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.49.4.js
82+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.49.5.js
8383
- using CommonJS with `require('plotly.js')`
8484

8585
If you would like to have access to the attribute meta information (including attribute descriptions as on the [schema reference page](https://plot.ly/javascript/reference/)), use dist file `dist/plotly-with-meta.js`
@@ -119,8 +119,8 @@ The `basic` partial bundle contains trace modules `scatter`, `bar` and `pie`.
119119
| ------ | --- |
120120
| Latest | https://cdn.plot.ly/plotly-basic-latest.js |
121121
| Latest minified | https://cdn.plot.ly/plotly-basic-latest.min.js |
122-
| Tagged | https://cdn.plot.ly/plotly-basic-1.49.4.js |
123-
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.49.4.min.js |
122+
| Tagged | https://cdn.plot.ly/plotly-basic-1.49.5.js |
123+
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.49.5.min.js |
124124

125125
#### npm package (starting in `v1.39.0`)
126126

@@ -165,8 +165,8 @@ The `cartesian` partial bundle contains trace modules `scatter`, `bar`, `box`, `
165165
| ------ | --- |
166166
| Latest | https://cdn.plot.ly/plotly-cartesian-latest.js |
167167
| Latest minified | https://cdn.plot.ly/plotly-cartesian-latest.min.js |
168-
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.49.4.js |
169-
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.49.4.min.js |
168+
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.49.5.js |
169+
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.49.5.min.js |
170170

171171
#### npm package (starting in `v1.39.0`)
172172

@@ -211,8 +211,8 @@ The `geo` partial bundle contains trace modules `scatter`, `scattergeo` and `cho
211211
| ------ | --- |
212212
| Latest | https://cdn.plot.ly/plotly-geo-latest.js |
213213
| Latest minified | https://cdn.plot.ly/plotly-geo-latest.min.js |
214-
| Tagged | https://cdn.plot.ly/plotly-geo-1.49.4.js |
215-
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.49.4.min.js |
214+
| Tagged | https://cdn.plot.ly/plotly-geo-1.49.5.js |
215+
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.49.5.min.js |
216216

217217
#### npm package (starting in `v1.39.0`)
218218

@@ -257,8 +257,8 @@ The `gl3d` partial bundle contains trace modules `scatter`, `scatter3d`, `surfac
257257
| ------ | --- |
258258
| Latest | https://cdn.plot.ly/plotly-gl3d-latest.js |
259259
| Latest minified | https://cdn.plot.ly/plotly-gl3d-latest.min.js |
260-
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.49.4.js |
261-
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.49.4.min.js |
260+
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.49.5.js |
261+
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.49.5.min.js |
262262

263263
#### npm package (starting in `v1.39.0`)
264264

@@ -303,8 +303,8 @@ The `gl2d` partial bundle contains trace modules `scatter`, `scattergl`, `splom`
303303
| ------ | --- |
304304
| Latest | https://cdn.plot.ly/plotly-gl2d-latest.js |
305305
| Latest minified | https://cdn.plot.ly/plotly-gl2d-latest.min.js |
306-
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.49.4.js |
307-
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.49.4.min.js |
306+
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.49.5.js |
307+
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.49.5.min.js |
308308

309309
#### npm package (starting in `v1.39.0`)
310310

@@ -341,16 +341,16 @@ The `mapbox` partial bundle contains trace modules `scatter`, `scattermapbox`, `
341341

342342
| Raw size | Minified size | Minified + gzip size |
343343
|------|-----------------|------------------------|
344-
| 3.1 MB | 1.5 MB | 456.3 kB |
344+
| 3.1 MB | 1.5 MB | 456.4 kB |
345345

346346
#### CDN links
347347

348348
| Flavor | URL |
349349
| ------ | --- |
350350
| Latest | https://cdn.plot.ly/plotly-mapbox-latest.js |
351351
| Latest minified | https://cdn.plot.ly/plotly-mapbox-latest.min.js |
352-
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.49.4.js |
353-
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.49.4.min.js |
352+
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.49.5.js |
353+
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.49.5.min.js |
354354

355355
#### npm package (starting in `v1.39.0`)
356356

@@ -395,8 +395,8 @@ The `finance` partial bundle contains trace modules `scatter`, `bar`, `histogram
395395
| ------ | --- |
396396
| Latest | https://cdn.plot.ly/plotly-finance-latest.js |
397397
| Latest minified | https://cdn.plot.ly/plotly-finance-latest.min.js |
398-
| Tagged | https://cdn.plot.ly/plotly-finance-1.49.4.js |
399-
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.49.4.min.js |
398+
| Tagged | https://cdn.plot.ly/plotly-finance-1.49.5.js |
399+
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.49.5.min.js |
400400

401401
#### npm package (starting in `v1.39.0`)
402402

‎dist/plotly-basic.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (basic) v1.49.4
2+
* plotly.js (basic) v1.49.5
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -33991,7 +33991,7 @@ exports.svgAttrs = {
3399133991
'use strict';
3399233992

3399333993
// package version injected by `npm run preprocess`
33994-
exports.version = '1.49.4';
33994+
exports.version = '1.49.5';
3399533995

3399633996
// inject promise polyfill
3399733997
_dereq_('es6-promise').polyfill();
@@ -44433,6 +44433,7 @@ function react(gd, data, layout, config) {
4443344433
function addFrames() { return exports.addFrames(gd, frames); }
4443444434

4443544435
gd = Lib.getGraphDiv(gd);
44436+
helpers.clearPromiseQueue(gd);
4443644437

4443744438
var oldFullData = gd._fullData;
4443844439
var oldFullLayout = gd._fullLayout;

‎dist/plotly-basic.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-cartesian.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (cartesian) v1.49.4
2+
* plotly.js (cartesian) v1.49.5
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -34141,7 +34141,7 @@ exports.svgAttrs = {
3414134141
'use strict';
3414234142

3414334143
// package version injected by `npm run preprocess`
34144-
exports.version = '1.49.4';
34144+
exports.version = '1.49.5';
3414534145

3414634146
// inject promise polyfill
3414734147
_dereq_('es6-promise').polyfill();
@@ -44583,6 +44583,7 @@ function react(gd, data, layout, config) {
4458344583
function addFrames() { return exports.addFrames(gd, frames); }
4458444584

4458544585
gd = Lib.getGraphDiv(gd);
44586+
helpers.clearPromiseQueue(gd);
4458644587

4458744588
var oldFullData = gd._fullData;
4458844589
var oldFullLayout = gd._fullLayout;

‎dist/plotly-cartesian.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-finance.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (finance) v1.49.4
2+
* plotly.js (finance) v1.49.5
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -34111,7 +34111,7 @@ exports.svgAttrs = {
3411134111
'use strict';
3411234112

3411334113
// package version injected by `npm run preprocess`
34114-
exports.version = '1.49.4';
34114+
exports.version = '1.49.5';
3411534115

3411634116
// inject promise polyfill
3411734117
_dereq_('es6-promise').polyfill();
@@ -44553,6 +44553,7 @@ function react(gd, data, layout, config) {
4455344553
function addFrames() { return exports.addFrames(gd, frames); }
4455444554

4455544555
gd = Lib.getGraphDiv(gd);
44556+
helpers.clearPromiseQueue(gd);
4455644557

4455744558
var oldFullData = gd._fullData;
4455844559
var oldFullLayout = gd._fullLayout;

‎dist/plotly-finance.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-geo-assets.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-geo.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (geo) v1.49.4
2+
* plotly.js (geo) v1.49.5
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -34770,7 +34770,7 @@ exports.svgAttrs = {
3477034770
'use strict';
3477134771

3477234772
// package version injected by `npm run preprocess`
34773-
exports.version = '1.49.4';
34773+
exports.version = '1.49.5';
3477434774

3477534775
// inject promise polyfill
3477634776
_dereq_('es6-promise').polyfill();
@@ -45443,6 +45443,7 @@ function react(gd, data, layout, config) {
4544345443
function addFrames() { return exports.addFrames(gd, frames); }
4544445444

4544545445
gd = Lib.getGraphDiv(gd);
45446+
helpers.clearPromiseQueue(gd);
4544645447

4544745448
var oldFullData = gd._fullData;
4544845449
var oldFullLayout = gd._fullLayout;
@@ -70104,6 +70105,7 @@ function makeHoverInfo(pointData, trace, pt) {
7010470105
if(trace.hovertemplate) return;
7010570106

7010670107
var hoverinfo = pt.hi || trace.hoverinfo;
70108+
var loc = String(pt.loc);
7010770109

7010870110
var parts = (hoverinfo === 'all') ?
7010970111
attributes.hoverinfo.flags :
@@ -70118,10 +70120,10 @@ function makeHoverInfo(pointData, trace, pt) {
7011870120
var text = [];
7011970121

7012070122
if(hasIdAsNameLabel) {
70121-
pointData.nameOverride = pt.loc;
70123+
pointData.nameOverride = loc;
7012270124
} else {
7012370125
if(hasName) pointData.nameOverride = trace.name;
70124-
if(hasLocation) text.push(pt.loc);
70126+
if(hasLocation) text.push(loc);
7012570127
}
7012670128

7012770129
if(hasZ) {

0 commit comments

Comments
 (0)