Skip to content

Commit 4866dc4

Browse files
codrut3codrut3
committed
Merge branch 'master' into ohlc_hover
2 parents 4c5405d + 19f3800 commit 4866dc4

File tree

187 files changed

+53920
-48046
lines changed

Some content is hidden

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

187 files changed

+53920
-48046
lines changed

‎.circleci/config.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ version: 2.0
1010
jobs:
1111
build:
1212
docker:
13-
- image: circleci/node:8.9.4
13+
- image: circleci/node:10.9.0
1414
working_directory: ~/plotly.js
1515
steps:
1616
- checkout
@@ -47,33 +47,25 @@ jobs:
4747
test-jasmine:
4848
docker:
4949
# need '-browsers' version to test in real (xvfb-wrapped) browsers
50-
- image: circleci/node:8.9.4-browsers
50+
- image: circleci/node:10.9.0-browsers
5151
working_directory: ~/plotly.js
5252
steps:
5353
- checkout
5454
- attach_workspace:
5555
at: ~/plotly.js
56-
- run:
57-
name: Set timezone to Alaska time (arbitrary timezone to test date logic)
58-
command: |
59-
sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
6056
- run:
6157
name: Run jasmine tests (batch 1)
6258
command: ./.circleci/test.sh jasmine
6359

6460
test-jasmine2:
6561
docker:
6662
# need '-browsers' version to test in real (xvfb-wrapped) browsers
67-
- image: circleci/node:8.9.4-browsers
63+
- image: circleci/node:10.9.0-browsers
6864
working_directory: ~/plotly.js
6965
steps:
7066
- checkout
7167
- attach_workspace:
7268
at: ~/plotly.js
73-
- run:
74-
name: Set timezone to Alaska time (arbitrary timezone to test date logic)
75-
command: |
76-
sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
7769
- run:
7870
name: Run jasmine tests (batch 2)
7971
command: ./.circleci/test.sh jasmine2
@@ -118,7 +110,7 @@ jobs:
118110

119111
test-syntax:
120112
docker:
121-
- image: circleci/node:8.9.4
113+
- image: circleci/node:10.9.0
122114
working_directory: ~/plotly.js
123115
steps:
124116
- checkout

‎.circleci/test.sh

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,62 @@
44
set +e
55
set +o pipefail
66

7+
ROOT=$(dirname $0)/..
78
EXIT_STATE=0
89
MAX_AUTO_RETRY=5
910

11+
log () {
12+
echo -e "\n$1"
13+
}
14+
1015
# inspired by https://unix.stackexchange.com/a/82602
1116
retry () {
12-
local n=0
17+
local n=1
1318

1419
until [ $n -ge $MAX_AUTO_RETRY ]; do
15-
"$@" && break
20+
"$@" --failFast && break
21+
log "run $n of $MAX_AUTO_RETRY failed, trying again ..."
1622
n=$[$n+1]
17-
echo ''
18-
echo run $n of $MAX_AUTO_RETRY failed, trying again ...
19-
echo ''
20-
sleep 15
2123
done
2224

2325
if [ $n -eq $MAX_AUTO_RETRY ]; then
26+
log "one last time, w/o failing fast"
27+
"$@" && n=0
28+
fi
29+
30+
if [ $n -eq $MAX_AUTO_RETRY ]; then
31+
log "all $n runs failed, moving on."
2432
EXIT_STATE=1
2533
fi
2634
}
2735

36+
# set timezone to Alaska time (arbitrary timezone to test date logic)
37+
set_tz () {
38+
sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
39+
export TZ='America/Anchorage'
40+
}
41+
2842
case $1 in
2943

3044
jasmine)
45+
set_tz
46+
3147
npm run test-jasmine -- --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
48+
retry npm run test-jasmine -- --tags=flaky --skip-tags=noCI
3249
npm run test-bundle || EXIT_STATE=$?
50+
3351
exit $EXIT_STATE
3452
;;
3553

3654
jasmine2)
37-
retry npm run test-jasmine -- --tags=gl --skip-tags=noCI,flaky
38-
retry npm run test-jasmine -- --tags=flaky --skip-tags=noCI
55+
set_tz
56+
57+
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=gl))
58+
59+
for s in ${SHARDS[@]}; do
60+
retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI
61+
done
62+
3963
exit $EXIT_STATE
4064
;;
4165

‎CHANGELOG.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,69 @@ 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.40.1] -- 2018-08-22
14+
15+
### Changed
16+
- Bump `browserify` to `v16` [#2923]
17+
- Bump `glslify` to `v6.2.1` [#2923]
18+
- Use `[email protected]` throughout code base [#2923]
19+
20+
### Fixed
21+
- Fix logic for hiding zero lines when they conflict with axis lines [#2936]
22+
- Fix `exponentformat` values `'e'` and `'E'` on log axes [#2921]
23+
- Fix dynamic layer ordering of `heatmap` and `carpet` traces [#2917]
24+
- Fix `Plotly.downloadImage` when using graph id or figure object
25+
as first argument [#2931]
26+
- Fix regl-based rendering when WebGL buffer dimensions don't match canvas
27+
dimensions [#2939]
28+
29+
## [1.40.0] -- 2018-08-16
30+
31+
### Added
32+
- Allow `contour`, `contourcarpet` and `histogram2dcontour` to have
33+
corresponding legend items using `showlegend` [#2891, #2914]
34+
- Add `scatterpolar` and `scatterpolargl` attributes `r0`, `dr`, `theta0` and
35+
`dtheta` [#2895]
36+
- Add layout attributes `piecolorway` and `extendpiecolors`
37+
for more control over `pie` colors [#2870]
38+
- Add splom attribute `dimensions[i].axis.type` to easily override axis type
39+
in splom-generated axes [#2899]
40+
- Add support for on-graph text in `scatterpolargl` traces [#2895]
41+
42+
### Changed
43+
- Use `derequire` browserify plugin to make bundling distributed npm package
44+
with browserify possible [#2905]
45+
- Speed up cartesian axis autorange edits (and thus double-click interactions) [#2823]
46+
- Do not clear WebGL context when `scattergl` graph has no `visible:true`
47+
traces, which speeds up e.g. legend interactions [#2860]
48+
- Compute data extremes per trace, which improves performance in some cases [#2860]
49+
- Use `<linearGradient>` to render filled colorbars [#2910, #2914]
50+
- Rename trace module `setPositions` methods `crossTraceCalc` [#2868]
51+
- Use `[email protected]` [#2863]
52+
53+
### Fixed
54+
- Fix scalar `marker.size` bounds in legend items [#2840]
55+
- Fix positioning of legend symbols for traces with fills [#2891]
56+
- Fix `scattergl` select -> double-click -> pan behavior [#2815]
57+
- Fix `scattergl` marker for IE11 [#2863]
58+
- Fix inheritance of explicit `pie` colors by later traces [#2870]
59+
- Fix layer ordering on graphs with multiple `contour` traces with heatmap
60+
coloring [#2891]
61+
- Fix layer ordering on `visible` toggling for `contour`-like traces [#2891]
62+
- Fix cases where colorbars would be drawn over its bounds [#2910]
63+
- Fix `tickwidth` edits on `ohlc` traces [#2823]
64+
- Fix labels on splom-generated axes with categorical data [#2899]
65+
- Fix handling of splom dimensions on axes of conflicting types [#2899]
66+
- Fix `splom` trace `visible` edits [#2860]
67+
- Fix `splom` select -> double-click -> pan behavior [#2899]
68+
- Fix `scatterpolargl` behavior during angular and radial drag interactions [#2888]
69+
- Fix handling of auto date ticks below our 100 microseconds limit [#2912]
70+
- Fix `scatter3d` attributes which had incorrectly labeled `textposition`
71+
and `textfont.family` as `arrayOk` and contained unimplemented `line.showscale`
72+
and `line.colorbar` [#2879]
73+
- Fix `scattergl` and `scatterpolargl` attribute declarations for `hoveron` [#2895]
74+
75+
1376
## [1.39.4] -- 2018-08-02
1477

1578
### Fixed

‎CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
3434
#### Prerequisites
3535

3636
- git
37-
- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
38-
versions starting from v4 should work. Upgrading and managing node versions
37+
- [node.js](https://nodejs.org/en/). We recommend using node.js v10.x, but all
38+
versions starting from v6 should work. Upgrading and managing node versions
3939
can be easily done using [`nvm`](https://github.com/creationix/nvm) or its
4040
Windows alternatives.
41-
- [`npm`](https://www.npmjs.com/) v5.x and up (which ships by default with
42-
node.js v8.x) to ensure that the
41+
- [`npm`](https://www.npmjs.com/) v6.x and up (which ships by default with
42+
node.js v10.x) to ensure that the
4343
[`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
4444
used and updated correctly.
4545

‎dist/README.md

Lines changed: 25 additions & 25 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.4.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.40.1.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.4.min.js
64+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.40.1.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.4.js
69+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.40.1.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.3 kB | 5.9 MB |
78+
| 5.7 MB | 2.7 MB | 812.5 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.1 kB | 247.9 kB |
101+
| 2.1 MB | 765.1 kB | 250 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.4.js |
110-
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.39.4.min.js |
109+
| Tagged | https://cdn.plot.ly/plotly-basic-1.40.1.js |
110+
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.40.1.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.7 kB | 282.3 kB |
147+
| 2.4 MB | 874.9 kB | 284.4 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.4.js |
156-
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.39.4.min.js |
155+
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.40.1.js |
156+
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.40.1.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.6 kB | 257 kB |
193+
| 2.2 MB | 788.2 kB | 259.1 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.4.js |
202-
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.39.4.min.js |
201+
| Tagged | https://cdn.plot.ly/plotly-geo-1.40.1.js |
202+
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.40.1.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.7 kB |
239+
| 3.2 MB | 1.3 MB | 406.6 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.4.js |
248-
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.39.4.min.js |
247+
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.40.1.js |
248+
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.40.1.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.3 kB |
285+
| 3.2 MB | 1.3 MB | 427.5 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.4.js |
294-
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.39.4.min.js |
293+
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.40.1.js |
294+
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.40.1.min.js |
295295

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

@@ -328,16 +328,16 @@ The `mapbox` partial bundle contains trace modules `scatter` and `scattermapbox`
328328

329329
| Raw size | Minified size | Minified + gzip size |
330330
|------|-----------------|------------------------|
331-
| 2.6 MB | 1.3 MB | 394.8 kB |
331+
| 2.7 MB | 1.3 MB | 396.8 kB |
332332

333333
#### CDN links
334334

335335
| Flavor | URL |
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.4.js |
340-
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.39.4.min.js |
339+
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.40.1.js |
340+
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.40.1.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.4 kB | 257 kB |
377+
| 2.2 MB | 795.2 kB | 258.9 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.4.js |
386-
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.39.4.min.js |
385+
| Tagged | https://cdn.plot.ly/plotly-finance-1.40.1.js |
386+
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.40.1.min.js |
387387

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

0 commit comments

Comments
 (0)