Skip to content

Commit 8260f1a

Browse files
etpinardetpinard
committed
Merge branch 'master' into scatter2d-ie
2 parents 08f23ca + 6a6d1dc commit 8260f1a

File tree

100 files changed

+1738
-1141
lines changed

Some content is hidden

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

100 files changed

+1738
-1141
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.39.4] -- 2018-08-02
14+
15+
### Fixed
16+
- Fix tenths of milliseconds handling in old numeric date data
17+
(bug introduced in 1.21.0) [#2847]
18+
- Fix `yaxis` overlaying `yaxis2` layouts
19+
(bug introduced in 1.39.3) [#2857]
20+
21+
1322
## [1.39.3] -- 2018-07-25
1423

1524
### Fixed

‎dist/README.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ You can grab the relevant MathJax files in `./dist/extras/mathjax/`.
3838
Plotly.js defaults to US English (en-US) and includes British English (en) in the standard bundle.
3939
Many other localizations are available - here is an example using Swiss-German (de-CH),
4040
see the contents of this directory for the full list.
41-
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.39.3.js
41+
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.39.4.js
4242
Note that the file names are all lowercase, even though the region is uppercase when you apply a locale.
4343

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

6262
It be can imported as minified javascript
6363
- using dist file `dist/plotly.min.js`
64-
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.39.3.min.js
64+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.39.4.min.js
6565

6666
or as raw javascript:
6767
- using the `plotly.js-dist` npm package (starting in `v1.39.0`)
6868
- using dist file `dist/plotly.js`
69-
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.39.3.js
69+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.39.4.js
7070
- using CommonJS with `require('plotly.js')`
7171

7272
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`
@@ -75,7 +75,7 @@ The main plotly.js bundle weights in at:
7575

7676
| plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
7777
|-----------|---------------|----------------------|---------------------|
78-
| 5.7 MB | 2.7 MB | 811.2 kB | 5.9 MB |
78+
| 5.7 MB | 2.7 MB | 811.3 kB | 5.9 MB |
7979

8080
## Partial bundles
8181

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

9999
| Raw size | Minified size | Minified + gzip size |
100100
|------|-----------------|------------------------|
101-
| 2.1 MB | 760 kB | 247.8 kB |
101+
| 2.1 MB | 760.1 kB | 247.9 kB |
102102

103103
#### CDN links
104104

105105
| Flavor | URL |
106106
| ------ | --- |
107107
| Latest | https://cdn.plot.ly/plotly-basic-latest.js |
108108
| Latest minified | https://cdn.plot.ly/plotly-basic-latest.min.js |
109-
| Tagged | https://cdn.plot.ly/plotly-basic-1.39.3.js |
110-
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.39.3.min.js |
109+
| Tagged | https://cdn.plot.ly/plotly-basic-1.39.4.js |
110+
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.39.4.min.js |
111111

112112
#### npm package (starting in `v1.39.0`)
113113

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

145145
| Raw size | Minified size | Minified + gzip size |
146146
|------|-----------------|------------------------|
147-
| 2.4 MB | 870.6 kB | 282.2 kB |
147+
| 2.4 MB | 870.7 kB | 282.3 kB |
148148

149149
#### CDN links
150150

151151
| Flavor | URL |
152152
| ------ | --- |
153153
| Latest | https://cdn.plot.ly/plotly-cartesian-latest.js |
154154
| Latest minified | https://cdn.plot.ly/plotly-cartesian-latest.min.js |
155-
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.39.3.js |
156-
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.39.3.min.js |
155+
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.39.4.js |
156+
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.39.4.min.js |
157157

158158
#### npm package (starting in `v1.39.0`)
159159

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

191191
| Raw size | Minified size | Minified + gzip size |
192192
|------|-----------------|------------------------|
193-
| 2.1 MB | 783.4 kB | 256.9 kB |
193+
| 2.1 MB | 783.6 kB | 257 kB |
194194

195195
#### CDN links
196196

197197
| Flavor | URL |
198198
| ------ | --- |
199199
| Latest | https://cdn.plot.ly/plotly-geo-latest.js |
200200
| Latest minified | https://cdn.plot.ly/plotly-geo-latest.min.js |
201-
| Tagged | https://cdn.plot.ly/plotly-geo-1.39.3.js |
202-
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.39.3.min.js |
201+
| Tagged | https://cdn.plot.ly/plotly-geo-1.39.4.js |
202+
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.39.4.min.js |
203203

204204
#### npm package (starting in `v1.39.0`)
205205

@@ -236,16 +236,16 @@ The `gl3d` partial bundle contains trace modules `scatter`, `scatter3d`, `surfac
236236

237237
| Raw size | Minified size | Minified + gzip size |
238238
|------|-----------------|------------------------|
239-
| 3.2 MB | 1.3 MB | 404.6 kB |
239+
| 3.2 MB | 1.3 MB | 404.7 kB |
240240

241241
#### CDN links
242242

243243
| Flavor | URL |
244244
| ------ | --- |
245245
| Latest | https://cdn.plot.ly/plotly-gl3d-latest.js |
246246
| Latest minified | https://cdn.plot.ly/plotly-gl3d-latest.min.js |
247-
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.39.3.js |
248-
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.39.3.min.js |
247+
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.39.4.js |
248+
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.39.4.min.js |
249249

250250
#### npm package (starting in `v1.39.0`)
251251

@@ -282,16 +282,16 @@ The `gl2d` partial bundle contains trace modules `scatter`, `scattergl`, `splom`
282282

283283
| Raw size | Minified size | Minified + gzip size |
284284
|------|-----------------|------------------------|
285-
| 3.2 MB | 1.3 MB | 426.2 kB |
285+
| 3.2 MB | 1.3 MB | 426.3 kB |
286286

287287
#### CDN links
288288

289289
| Flavor | URL |
290290
| ------ | --- |
291291
| Latest | https://cdn.plot.ly/plotly-gl2d-latest.js |
292292
| Latest minified | https://cdn.plot.ly/plotly-gl2d-latest.min.js |
293-
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.39.3.js |
294-
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.39.3.min.js |
293+
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.39.4.js |
294+
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.39.4.min.js |
295295

296296
#### npm package (starting in `v1.39.0`)
297297

@@ -336,8 +336,8 @@ The `mapbox` partial bundle contains trace modules `scatter` and `scattermapbox`
336336
| ------ | --- |
337337
| Latest | https://cdn.plot.ly/plotly-mapbox-latest.js |
338338
| Latest minified | https://cdn.plot.ly/plotly-mapbox-latest.min.js |
339-
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.39.3.js |
340-
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.39.3.min.js |
339+
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.39.4.js |
340+
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.39.4.min.js |
341341

342342
#### npm package (starting in `v1.39.0`)
343343

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

375375
| Raw size | Minified size | Minified + gzip size |
376376
|------|-----------------|------------------------|
377-
| 2.2 MB | 790.2 kB | 256.9 kB |
377+
| 2.2 MB | 790.4 kB | 257 kB |
378378

379379
#### CDN links
380380

381381
| Flavor | URL |
382382
| ------ | --- |
383383
| Latest | https://cdn.plot.ly/plotly-finance-latest.js |
384384
| Latest minified | https://cdn.plot.ly/plotly-finance-latest.min.js |
385-
| Tagged | https://cdn.plot.ly/plotly-finance-1.39.3.js |
386-
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.39.3.min.js |
385+
| Tagged | https://cdn.plot.ly/plotly-finance-1.39.4.js |
386+
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.39.4.min.js |
387387

388388
#### npm package (starting in `v1.39.0`)
389389

‎dist/plotly-basic.js

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (basic) v1.39.3
2+
* plotly.js (basic) v1.39.4
33
* Copyright 2012-2018, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -33102,7 +33102,7 @@ exports.svgAttrs = {
3310233102
'use strict';
3310333103

3310433104
// package version injected by `npm run preprocess`
33105-
exports.version = '1.39.3';
33105+
exports.version = '1.39.4';
3310633106

3310733107
// inject promise polyfill
3310833108
require('es6-promise').polyfill();
@@ -51886,9 +51886,12 @@ function makeSubplotData(gd) {
5188651886
var fullLayout = gd._fullLayout;
5188751887
var ids = fullLayout._subplots.cartesian;
5188851888
var len = ids.length;
51889-
var subplotData = new Array(len);
5189051889
var i, j, id, plotinfo, xa, ya;
5189151890

51891+
// split 'regular' and 'overlaying' subplots
51892+
var regulars = [];
51893+
var overlays = [];
51894+
5189251895
for(i = 0; i < len; i++) {
5189351896
id = ids[i];
5189451897
plotinfo = fullLayout._plots[id];
@@ -51902,25 +51905,35 @@ function makeSubplotData(gd) {
5190251905
plotinfo.overlays = [];
5190351906

5190451907
if(mainplot !== id && mainplotinfo) {
51905-
// link 'main plot' ref in overlaying plotinfo
5190651908
plotinfo.mainplot = mainplot;
5190751909
plotinfo.mainplotinfo = mainplotinfo;
51908-
// fill in list of overlaying subplots in 'main plot'
51909-
mainplotinfo.overlays.push(plotinfo);
51910+
overlays.push(id);
5191051911
} else {
5191151912
plotinfo.mainplot = undefined;
5191251913
plotinfo.mainPlotinfo = undefined;
51914+
regulars.push(id);
5191351915
}
5191451916
}
5191551917

51916-
// use info about axis layer and overlaying pattern
51917-
// to clean what need to be cleaned up in exit selection
51918+
// fill in list of overlaying subplots in 'main plot'
51919+
for(i = 0; i < overlays.length; i++) {
51920+
id = overlays[i];
51921+
plotinfo = fullLayout._plots[id];
51922+
plotinfo.mainplotinfo.overlays.push(plotinfo);
51923+
}
51924+
51925+
// put 'regular' subplot data before 'overlaying'
51926+
var subplotIds = regulars.concat(overlays);
51927+
var subplotData = new Array(len);
51928+
5191851929
for(i = 0; i < len; i++) {
51919-
id = ids[i];
51930+
id = subplotIds[i];
5192051931
plotinfo = fullLayout._plots[id];
5192151932
xa = plotinfo.xaxis;
5192251933
ya = plotinfo.yaxis;
5192351934

51935+
// use info about axis layer and overlaying pattern
51936+
// to clean what need to be cleaned up in exit selection
5192451937
var d = [id, xa.layer, ya.layer, xa.overlaying || '', ya.overlaying || ''];
5192551938
for(j = 0; j < plotinfo.overlays.length; j++) {
5192651939
d.push(plotinfo.overlays[j].id);
@@ -53611,7 +53624,14 @@ module.exports = function setConvert(ax, fullLayout) {
5361153624
// as (local) ms if that fails.
5361253625
var ms = dateTime2ms(v, calendar || ax.calendar);
5361353626
if(ms === BADNUM) {
53614-
if(isNumeric(v)) ms = dateTime2ms(new Date(+v));
53627+
if(isNumeric(v)) {
53628+
v = +v;
53629+
// keep track of tenths of ms, that `new Date` will drop
53630+
// same logic as in Lib.ms2DateTime
53631+
var msecTenths = Math.floor(Lib.mod(v + 0.05, 1) * 10);
53632+
var msRounded = Math.round(v - msecTenths / 10);
53633+
ms = dateTime2ms(new Date(msRounded)) + msecTenths / 10;
53634+
}
5361553635
else return BADNUM;
5361653636
}
5361753637
return ms;

‎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: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (cartesian) v1.39.3
2+
* plotly.js (cartesian) v1.39.4
33
* Copyright 2012-2018, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -33252,7 +33252,7 @@ exports.svgAttrs = {
3325233252
'use strict';
3325333253

3325433254
// package version injected by `npm run preprocess`
33255-
exports.version = '1.39.3';
33255+
exports.version = '1.39.4';
3325633256

3325733257
// inject promise polyfill
3325833258
require('es6-promise').polyfill();
@@ -52036,9 +52036,12 @@ function makeSubplotData(gd) {
5203652036
var fullLayout = gd._fullLayout;
5203752037
var ids = fullLayout._subplots.cartesian;
5203852038
var len = ids.length;
52039-
var subplotData = new Array(len);
5204052039
var i, j, id, plotinfo, xa, ya;
5204152040

52041+
// split 'regular' and 'overlaying' subplots
52042+
var regulars = [];
52043+
var overlays = [];
52044+
5204252045
for(i = 0; i < len; i++) {
5204352046
id = ids[i];
5204452047
plotinfo = fullLayout._plots[id];
@@ -52052,25 +52055,35 @@ function makeSubplotData(gd) {
5205252055
plotinfo.overlays = [];
5205352056

5205452057
if(mainplot !== id && mainplotinfo) {
52055-
// link 'main plot' ref in overlaying plotinfo
5205652058
plotinfo.mainplot = mainplot;
5205752059
plotinfo.mainplotinfo = mainplotinfo;
52058-
// fill in list of overlaying subplots in 'main plot'
52059-
mainplotinfo.overlays.push(plotinfo);
52060+
overlays.push(id);
5206052061
} else {
5206152062
plotinfo.mainplot = undefined;
5206252063
plotinfo.mainPlotinfo = undefined;
52064+
regulars.push(id);
5206352065
}
5206452066
}
5206552067

52066-
// use info about axis layer and overlaying pattern
52067-
// to clean what need to be cleaned up in exit selection
52068+
// fill in list of overlaying subplots in 'main plot'
52069+
for(i = 0; i < overlays.length; i++) {
52070+
id = overlays[i];
52071+
plotinfo = fullLayout._plots[id];
52072+
plotinfo.mainplotinfo.overlays.push(plotinfo);
52073+
}
52074+
52075+
// put 'regular' subplot data before 'overlaying'
52076+
var subplotIds = regulars.concat(overlays);
52077+
var subplotData = new Array(len);
52078+
5206852079
for(i = 0; i < len; i++) {
52069-
id = ids[i];
52080+
id = subplotIds[i];
5207052081
plotinfo = fullLayout._plots[id];
5207152082
xa = plotinfo.xaxis;
5207252083
ya = plotinfo.yaxis;
5207352084

52085+
// use info about axis layer and overlaying pattern
52086+
// to clean what need to be cleaned up in exit selection
5207452087
var d = [id, xa.layer, ya.layer, xa.overlaying || '', ya.overlaying || ''];
5207552088
for(j = 0; j < plotinfo.overlays.length; j++) {
5207652089
d.push(plotinfo.overlays[j].id);
@@ -53761,7 +53774,14 @@ module.exports = function setConvert(ax, fullLayout) {
5376153774
// as (local) ms if that fails.
5376253775
var ms = dateTime2ms(v, calendar || ax.calendar);
5376353776
if(ms === BADNUM) {
53764-
if(isNumeric(v)) ms = dateTime2ms(new Date(+v));
53777+
if(isNumeric(v)) {
53778+
v = +v;
53779+
// keep track of tenths of ms, that `new Date` will drop
53780+
// same logic as in Lib.ms2DateTime
53781+
var msecTenths = Math.floor(Lib.mod(v + 0.05, 1) * 10);
53782+
var msRounded = Math.round(v - msecTenths / 10);
53783+
ms = dateTime2ms(new Date(msRounded)) + msecTenths / 10;
53784+
}
5376553785
else return BADNUM;
5376653786
}
5376753787
return ms;

‎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.

0 commit comments

Comments
 (0)