Skip to content

Commit a7b700c

Browse files
author
hisham waleed karam
committed
Merge branch 'master' into mapbox-raster
2 parents f66aff3 + 7a1ed7b commit a7b700c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2053
-311
lines changed

Diff for: ‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ 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.48.1] -- 2019-05-30
14+
15+
### Fixed
16+
- Fix single-sample-point `histogram2d` traces with set bins settings [#3922]
17+
- Fix bingroup attributes for `histogram2dcontour` traces [#3922]
18+
- Fix hover label content on empty `histogram2d` bins [#3922]
19+
20+
1321
## [1.48.0] -- 2019-05-28
1422

1523
### Added

Diff for: ‎dist/README.md

+22-22
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.48.0.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.48.1.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.48.0.min.js
77+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.48.1.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.48.0.js
82+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.48.1.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`
@@ -88,7 +88,7 @@ The main plotly.js bundle weights in at:
8888

8989
| plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
9090
|-----------|---------------|----------------------|---------------------|
91-
| 6.4 MB | 2.9 MB | 892.6 kB | 6.7 MB |
91+
| 6.4 MB | 2.9 MB | 892.7 kB | 6.7 MB |
9292

9393
## Partial bundles
9494

@@ -111,16 +111,16 @@ The `basic` partial bundle contains trace modules `scatter`, `bar` and `pie`.
111111

112112
| Raw size | Minified size | Minified + gzip size |
113113
|------|-----------------|------------------------|
114-
| 2.3 MB | 831.8 kB | 272.8 kB |
114+
| 2.3 MB | 831.9 kB | 272.8 kB |
115115

116116
#### CDN links
117117

118118
| Flavor | URL |
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.48.0.js |
123-
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.48.0.min.js |
122+
| Tagged | https://cdn.plot.ly/plotly-basic-1.48.1.js |
123+
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.48.1.min.js |
124124

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

@@ -157,16 +157,16 @@ The `cartesian` partial bundle contains trace modules `scatter`, `bar`, `box`, `
157157

158158
| Raw size | Minified size | Minified + gzip size |
159159
|------|-----------------|------------------------|
160-
| 2.6 MB | 948.2 kB | 309.8 kB |
160+
| 2.6 MB | 948.3 kB | 309.8 kB |
161161

162162
#### CDN links
163163

164164
| Flavor | URL |
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.48.0.js |
169-
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.48.0.min.js |
168+
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.48.1.js |
169+
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.48.1.min.js |
170170

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

@@ -203,16 +203,16 @@ The `geo` partial bundle contains trace modules `scatter`, `scattergeo` and `cho
203203

204204
| Raw size | Minified size | Minified + gzip size |
205205
|------|-----------------|------------------------|
206-
| 2.3 MB | 845.3 kB | 278.9 kB |
206+
| 2.3 MB | 845.4 kB | 278.9 kB |
207207

208208
#### CDN links
209209

210210
| Flavor | URL |
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.48.0.js |
215-
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.48.0.min.js |
214+
| Tagged | https://cdn.plot.ly/plotly-geo-1.48.1.js |
215+
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.48.1.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.48.0.js |
261-
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.48.0.min.js |
260+
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.48.1.js |
261+
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.48.1.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.48.0.js |
307-
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.48.0.min.js |
306+
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.48.1.js |
307+
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.48.1.min.js |
308308

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

@@ -349,8 +349,8 @@ The `mapbox` partial bundle contains trace modules `scatter` and `scattermapbox`
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.48.0.js |
353-
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.48.0.min.js |
352+
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.48.1.js |
353+
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.48.1.min.js |
354354

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

@@ -387,16 +387,16 @@ The `finance` partial bundle contains trace modules `scatter`, `bar`, `histogram
387387

388388
| Raw size | Minified size | Minified + gzip size |
389389
|------|-----------------|------------------------|
390-
| 2.5 MB | 893.1 kB | 290.1 kB |
390+
| 2.5 MB | 893.2 kB | 290.2 kB |
391391

392392
#### CDN links
393393

394394
| Flavor | URL |
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.48.0.js |
399-
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.48.0.min.js |
398+
| Tagged | https://cdn.plot.ly/plotly-finance-1.48.1.js |
399+
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.48.1.min.js |
400400

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

Diff for: ‎dist/plotly-basic.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (basic) v1.48.0
2+
* plotly.js (basic) v1.48.1
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -34082,7 +34082,7 @@ exports.svgAttrs = {
3408234082
'use strict';
3408334083

3408434084
// package version injected by `npm run preprocess`
34085-
exports.version = '1.48.0';
34085+
exports.version = '1.48.1';
3408634086

3408734087
// inject promise polyfill
3408834088
_dereq_('es6-promise').polyfill();
@@ -62887,7 +62887,10 @@ function sortAxisCategoriesByValue(axList, gd) {
6288762887
if(fullTrace.visible !== true) continue;
6288862888

6288962889
var type = fullTrace.type;
62890-
if(Registry.traceIs(fullTrace, 'histogram')) delete fullTrace._autoBinFinished;
62890+
if(Registry.traceIs(fullTrace, 'histogram')) {
62891+
delete fullTrace._xautoBinFinished;
62892+
delete fullTrace._yautoBinFinished;
62893+
}
6289162894

6289262895
var cd = gd.calcdata[traceIndex];
6289362896
for(k = 0; k < cd.length; k++) {

Diff for: ‎dist/plotly-basic.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎dist/plotly-cartesian.js

+29-20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (cartesian) v1.48.0
2+
* plotly.js (cartesian) v1.48.1
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -34232,7 +34232,7 @@ exports.svgAttrs = {
3423234232
'use strict';
3423334233

3423434234
// package version injected by `npm run preprocess`
34235-
exports.version = '1.48.0';
34235+
exports.version = '1.48.1';
3423634236

3423734237
// inject promise polyfill
3423834238
_dereq_('es6-promise').polyfill();
@@ -63037,7 +63037,10 @@ function sortAxisCategoriesByValue(axList, gd) {
6303763037
if(fullTrace.visible !== true) continue;
6303863038

6303963039
var type = fullTrace.type;
63040-
if(Registry.traceIs(fullTrace, 'histogram')) delete fullTrace._autoBinFinished;
63040+
if(Registry.traceIs(fullTrace, 'histogram')) {
63041+
delete fullTrace._xautoBinFinished;
63042+
delete fullTrace._yautoBinFinished;
63043+
}
6304163044

6304263045
var cd = gd.calcdata[traceIndex];
6304363046
for(k = 0; k < cd.length; k++) {
@@ -74989,14 +74992,17 @@ module.exports = function makeBoundArray(trace, arrayIn, v0In, dvIn, numbricks,
7498974992
} else {
7499074993
var calendar = trace[ax._id.charAt(0) + 'calendar'];
7499174994

74992-
if(isArrayOrTypedArray(arrayIn) && arrayIn.length === 1) {
74993-
v0 = arrayIn[0];
74994-
} else if(v0In === undefined) {
74995-
v0 = 0;
74996-
} else if(isHist || ax.type === 'category' || ax.type === 'multicategory') {
74995+
if(isHist) {
7499774996
v0 = ax.r2c(v0In, 0, calendar);
7499874997
} else {
74999-
v0 = ax.d2c(v0In, 0, calendar);
74998+
if(isArrayOrTypedArray(arrayIn) && arrayIn.length === 1) {
74999+
v0 = arrayIn[0];
75000+
} else if(v0In === undefined) {
75001+
v0 = 0;
75002+
} else {
75003+
var fn = ax.type === 'log' ? ax.d2c : ax.r2c;
75004+
v0 = fn(v0In, 0, calendar);
75005+
}
7500075006
}
7500175007

7500275008
dv = dvIn || 1;
@@ -76241,8 +76247,8 @@ function calcAllAutoBins(gd, trace, pa, mainData, _overlayEdgeCase) {
7624176247

7624276248
// all but the first trace in this group has already been marked finished
7624376249
// clear this flag, so next time we run calc we will run autobin again
76244-
if(trace._autoBinFinished) {
76245-
delete trace._autoBinFinished;
76250+
if(trace['_' + mainData + 'autoBinFinished']) {
76251+
delete trace['_' + mainData + 'autoBinFinished'];
7624676252
} else {
7624776253
traces = binOpts.traces;
7624876254
var allPos = [];
@@ -76262,14 +76268,14 @@ function calcAllAutoBins(gd, trace, pa, mainData, _overlayEdgeCase) {
7626276268
pos0 = tracei['_' + mainDatai + 'pos0'] = pa.makeCalcdata(tracei, mainDatai);
7626376269

7626476270
allPos = Lib.concat(allPos, pos0);
76265-
delete tracei._autoBinFinished;
76271+
delete tracei['_' + mainData + 'autoBinFinished'];
7626676272

7626776273
if(trace.visible === true) {
7626876274
if(isFirstVisible) {
7626976275
isFirstVisible = false;
7627076276
} else {
7627176277
delete tracei._autoBin;
76272-
tracei._autoBinFinished = 1;
76278+
tracei['_' + mainData + 'autoBinFinished'] = 1;
7627376279
}
7627476280
if(Registry.traceIs(tracei, '2dMap')) {
7627576281
has2dMap = true;
@@ -76430,7 +76436,7 @@ function handleSingleValueOverlays(gd, trace, pa, mainData, binAttr) {
7643076436

7643176437
// so we can use this result when we get to tracei in the normal
7643276438
// course of events, mark it as done and put _pos0 back
76433-
tracei._autoBinFinished = 1;
76439+
tracei['_' + mainData + 'autoBinFinished'] = 1;
7643476440
tracei['_' + mainData + 'pos0'] = resulti[1];
7643576441

7643676442
if(isSingleValued) {
@@ -76681,7 +76687,8 @@ module.exports = function crossTraceDefaults(fullData, fullLayout) {
7668176687

7668276688
// TODO: this shouldn't be relinked as it's only used within calc
7668376689
// https://github.com/plotly/plotly.js/issues/749
76684-
delete traceOut._autoBinFinished;
76690+
delete traceOut._xautoBinFinished;
76691+
delete traceOut._yautoBinFinished;
7668576692

7668676693
// N.B. need to coerce *alignmentgroup* before *bingroup*, as traces
7668776694
// in same alignmentgroup "have to match"
@@ -77366,11 +77373,13 @@ function getRanges(edges, uniqueVals, gapLow, gapHigh, ax, calendar) {
7736677373
var i;
7736777374
var len = edges.length - 1;
7736877375
var out = new Array(len);
77369-
if(uniqueVals) {
77370-
for(i = 0; i < len; i++) out[i] = [uniqueVals[i], uniqueVals[i]];
77371-
} else {
77372-
var roundFn = getBinSpanLabelRound(gapLow, gapHigh, edges, ax, calendar);
77373-
for(i = 0; i < len; i++) out[i] = [roundFn(edges[i]), roundFn(edges[i + 1], true)];
77376+
var roundFn = getBinSpanLabelRound(gapLow, gapHigh, edges, ax, calendar);
77377+
77378+
for(i = 0; i < len; i++) {
77379+
var v = (uniqueVals || [])[i];
77380+
out[i] = v === undefined ?
77381+
[roundFn(edges[i]), roundFn(edges[i + 1], true)] :
77382+
[v, v];
7737477383
}
7737577384
return out;
7737677385
}

Diff for: ‎dist/plotly-cartesian.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎dist/plotly-finance.js

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (finance) v1.48.0
2+
* plotly.js (finance) v1.48.1
33
* Copyright 2012-2019, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -34166,7 +34166,7 @@ exports.svgAttrs = {
3416634166
'use strict';
3416734167

3416834168
// package version injected by `npm run preprocess`
34169-
exports.version = '1.48.0';
34169+
exports.version = '1.48.1';
3417034170

3417134171
// inject promise polyfill
3417234172
_dereq_('es6-promise').polyfill();
@@ -62971,7 +62971,10 @@ function sortAxisCategoriesByValue(axList, gd) {
6297162971
if(fullTrace.visible !== true) continue;
6297262972

6297362973
var type = fullTrace.type;
62974-
if(Registry.traceIs(fullTrace, 'histogram')) delete fullTrace._autoBinFinished;
62974+
if(Registry.traceIs(fullTrace, 'histogram')) {
62975+
delete fullTrace._xautoBinFinished;
62976+
delete fullTrace._yautoBinFinished;
62977+
}
6297562978

6297662979
var cd = gd.calcdata[traceIndex];
6297762980
for(k = 0; k < cd.length; k++) {
@@ -71959,8 +71962,8 @@ function calcAllAutoBins(gd, trace, pa, mainData, _overlayEdgeCase) {
7195971962

7196071963
// all but the first trace in this group has already been marked finished
7196171964
// clear this flag, so next time we run calc we will run autobin again
71962-
if(trace._autoBinFinished) {
71963-
delete trace._autoBinFinished;
71965+
if(trace['_' + mainData + 'autoBinFinished']) {
71966+
delete trace['_' + mainData + 'autoBinFinished'];
7196471967
} else {
7196571968
traces = binOpts.traces;
7196671969
var allPos = [];
@@ -71980,14 +71983,14 @@ function calcAllAutoBins(gd, trace, pa, mainData, _overlayEdgeCase) {
7198071983
pos0 = tracei['_' + mainDatai + 'pos0'] = pa.makeCalcdata(tracei, mainDatai);
7198171984

7198271985
allPos = Lib.concat(allPos, pos0);
71983-
delete tracei._autoBinFinished;
71986+
delete tracei['_' + mainData + 'autoBinFinished'];
7198471987

7198571988
if(trace.visible === true) {
7198671989
if(isFirstVisible) {
7198771990
isFirstVisible = false;
7198871991
} else {
7198971992
delete tracei._autoBin;
71990-
tracei._autoBinFinished = 1;
71993+
tracei['_' + mainData + 'autoBinFinished'] = 1;
7199171994
}
7199271995
if(Registry.traceIs(tracei, '2dMap')) {
7199371996
has2dMap = true;
@@ -72148,7 +72151,7 @@ function handleSingleValueOverlays(gd, trace, pa, mainData, binAttr) {
7214872151

7214972152
// so we can use this result when we get to tracei in the normal
7215072153
// course of events, mark it as done and put _pos0 back
72151-
tracei._autoBinFinished = 1;
72154+
tracei['_' + mainData + 'autoBinFinished'] = 1;
7215272155
tracei['_' + mainData + 'pos0'] = resulti[1];
7215372156

7215472157
if(isSingleValued) {
@@ -72399,7 +72402,8 @@ module.exports = function crossTraceDefaults(fullData, fullLayout) {
7239972402

7240072403
// TODO: this shouldn't be relinked as it's only used within calc
7240172404
// https://github.com/plotly/plotly.js/issues/749
72402-
delete traceOut._autoBinFinished;
72405+
delete traceOut._xautoBinFinished;
72406+
delete traceOut._yautoBinFinished;
7240372407

7240472408
// N.B. need to coerce *alignmentgroup* before *bingroup*, as traces
7240572409
// in same alignmentgroup "have to match"

Diff for: ‎dist/plotly-finance.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎dist/plotly-geo-assets.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)