Skip to content

Commit e8ded39

Browse files
author
Jon M. Mease
committed
Merge remote-tracking branch 'upstream/master' into parcats
2 parents 273d2d0 + 7714aa6 commit e8ded39

File tree

414 files changed

+94642
-66874
lines changed

Some content is hidden

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

414 files changed

+94642
-66874
lines changed

.circleci/config.yml

+4-12
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

+32-8
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

BUILDING.md

-7
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ then simply run,
4040
browserify index.js > bundle.js
4141
```
4242

43-
to trim meta information (and thus save a few bytes), run:
44-
45-
46-
```
47-
browserify -t path/to/plotly.js/tasks/util/compress_attributes.js index.js > bundle.js
48-
```
49-
5043
## Angular CLI
5144

5245
Currently Angular CLI uses Webpack under the hood to bundle and build your Angular application.

CHANGELOG.md

+139
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,145 @@ 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.41.2] -- 2018-09-19
14+
15+
### Fixed
16+
- Fix two-sided zoombox -> double-click -> one-sided zoombox behavior [#3028]
17+
18+
19+
## [1.41.1] -- 2018-09-18
20+
21+
### Fixed
22+
- Bring back hover labels on "touch" hover (bug introduced in 1.29.0) [#2997]
23+
- Fix MathJax rendering in legends [#3018]
24+
- Fix fill and layering for multiple stack-groups and unstacked `scatter` traces [#3005]
25+
- Fix removal of `scatter` traces with set `stackgroup` [#3005]
26+
- Fix stacked area gap insertion edge case [#3017]
27+
- Fix zeroline logic for `splom`-generated axes [#3015]
28+
- Fix `error_x` and `error_y` on `scatter3d` w/o `error_z` [#3011]
29+
- Fix `scatter3d` error bars on log axes [#2992]
30+
- Fix `Plotly.react` when updating geo axis `dtick` [#3016]
31+
- Fix `polar.hole=1` case [#3021]
32+
- Fix handling of `polar.sector` that span more than 360 degrees [#3021]
33+
34+
35+
## [1.41.0] -- 2018-09-12
36+
37+
### Added
38+
- Enable selection by clicking on points via new layout attribute `clickmode`
39+
and flag `'select'` [#2944]
40+
- Add stacked area charts via new attributes `stackgroup` and `stackgaps` in
41+
`scatter` traces [#2960]
42+
- Add `barpolar` traces - which replace and augment `area` traces [#2954]
43+
- Add `polar.hole` to punch hole at the middle of polar subplot offsetting the
44+
start of the radial range [#2977, #2996]
45+
- Add an 'inner' radial axis drag box on polar subplots [#2977]
46+
- Add `{responsive: true}` plot config option [#2974]
47+
- Emit `plotly_webglcontextlost` event on WebGL context lost [#2986]
48+
- Support all numbered HTML entities (decimal and hex) in text elements [#2932]
49+
- Add Welsh (`cy`) locale [#2945]
50+
51+
### Changed
52+
- Attribute meta information is now stripped be stripped out of bundles (made
53+
with bundlers that support browserify transforms) by default [#1584]
54+
- Draw polar axis ticks above polar axis lines [#2977]
55+
- Improve ordering of trace hover labels for matching positions [#2960]
56+
- Speed polar subplot radial drag interactions [#2954]
57+
- Improve pseudo-html conversion performance [#2932]
58+
- Bump `regl-splom` requirement to `^1.0.4` [#2956]
59+
- Bump `glslify` requirement to `^6.3.1` [#2990]
60+
- Use `gl-text` instead of `@etpinard/gl-text` [#2956]
61+
62+
### Fixed
63+
- Fix `scatter` ordering in inner SVG `<g>` on some restyle calls [#2978]
64+
- Fix cartesian axis autorange edge cases [#2960]
65+
- Fix double-decoding of some HTML entities in text nodes [#2927]
66+
- Fix `scattergl` line traces rendered after non-line traces [#2990]
67+
- Fix legend positioning on graphs with very large margins [#2983]
68+
- Fix rendering of ternary subplots fix with `showticklabels: false` [#2993]
69+
- Fix show/hide updates of tick and tick labels on ternary subplots [#2993]
70+
- Fix handling of multi-selections in ternary subplots [#2944]
71+
- Fix `sankey` hover under `hovermode: false` [#2949]
72+
- Fix `sankey` positioning for non-default `domain.x` values [#2984]
73+
- Fix `type: 'date'` polar radial axes [#2954]
74+
- Fix send-to-cloud modebar buttons on graphs with typed arrays [#2995]
75+
- Fix handling of custom transforms that make their own data arrays in
76+
`Plotly.react`[#2973]
77+
- Fix missing violin and colorbar attributes in `gd._fullData` [#2850]
78+
79+
80+
## [1.40.1] -- 2018-08-22
81+
82+
### Changed
83+
- Bump `browserify` to `v16` [#2923]
84+
- Bump `glslify` to `v6.2.1` [#2923]
85+
- Use `[email protected]` throughout code base [#2923]
86+
87+
### Fixed
88+
- Fix logic for hiding zero lines when they conflict with axis lines [#2936]
89+
- Fix `exponentformat` values `'e'` and `'E'` on log axes [#2921]
90+
- Fix dynamic layer ordering of `heatmap` and `carpet` traces [#2917]
91+
- Fix `Plotly.downloadImage` when using graph id or figure object
92+
as first argument [#2931]
93+
- Fix regl-based rendering when WebGL buffer dimensions don't match canvas
94+
dimensions [#2939]
95+
96+
## [1.40.0] -- 2018-08-16
97+
98+
### Added
99+
- Allow `contour`, `contourcarpet` and `histogram2dcontour` to have
100+
corresponding legend items using `showlegend` [#2891, #2914]
101+
- Add `scatterpolar` and `scatterpolargl` attributes `r0`, `dr`, `theta0` and
102+
`dtheta` [#2895]
103+
- Add layout attributes `piecolorway` and `extendpiecolors`
104+
for more control over `pie` colors [#2870]
105+
- Add splom attribute `dimensions[i].axis.type` to easily override axis type
106+
in splom-generated axes [#2899]
107+
- Add support for on-graph text in `scatterpolargl` traces [#2895]
108+
109+
### Changed
110+
- Use `derequire` browserify plugin to make bundling distributed npm package
111+
with browserify possible [#2905]
112+
- Speed up cartesian axis autorange edits (and thus double-click interactions) [#2823]
113+
- Do not clear WebGL context when `scattergl` graph has no `visible:true`
114+
traces, which speeds up e.g. legend interactions [#2860]
115+
- Compute data extremes per trace, which improves performance in some cases [#2860]
116+
- Use `<linearGradient>` to render filled colorbars [#2910, #2914]
117+
- Rename trace module `setPositions` methods `crossTraceCalc` [#2868]
118+
- Use `[email protected]` [#2863]
119+
120+
### Fixed
121+
- Fix scalar `marker.size` bounds in legend items [#2840]
122+
- Fix positioning of legend symbols for traces with fills [#2891]
123+
- Fix `scattergl` select -> double-click -> pan behavior [#2815]
124+
- Fix `scattergl` marker for IE11 [#2863]
125+
- Fix inheritance of explicit `pie` colors by later traces [#2870]
126+
- Fix layer ordering on graphs with multiple `contour` traces with heatmap
127+
coloring [#2891]
128+
- Fix layer ordering on `visible` toggling for `contour`-like traces [#2891]
129+
- Fix cases where colorbars would be drawn over its bounds [#2910]
130+
- Fix `tickwidth` edits on `ohlc` traces [#2823]
131+
- Fix labels on splom-generated axes with categorical data [#2899]
132+
- Fix handling of splom dimensions on axes of conflicting types [#2899]
133+
- Fix `splom` trace `visible` edits [#2860]
134+
- Fix `splom` select -> double-click -> pan behavior [#2899]
135+
- Fix `scatterpolargl` behavior during angular and radial drag interactions [#2888]
136+
- Fix handling of auto date ticks below our 100 microseconds limit [#2912]
137+
- Fix `scatter3d` attributes which had incorrectly labeled `textposition`
138+
and `textfont.family` as `arrayOk` and contained unimplemented `line.showscale`
139+
and `line.colorbar` [#2879]
140+
- Fix `scattergl` and `scatterpolargl` attribute declarations for `hoveron` [#2895]
141+
142+
143+
## [1.39.4] -- 2018-08-02
144+
145+
### Fixed
146+
- Fix tenths of milliseconds handling in old numeric date data
147+
(bug introduced in 1.21.0) [#2847]
148+
- Fix `yaxis` overlaying `yaxis2` layouts
149+
(bug introduced in 1.39.3) [#2857]
150+
151+
13152
## [1.39.3] -- 2018-07-25
14153

15154
### Fixed

CONTRIBUTING.md

+4-4
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

0 commit comments

Comments
 (0)