Skip to content

Commit 162068e

Browse files
rpaskowitzrpaskowitz
committed
Merge branch 'master' into dropline
2 parents 17d815c + b4318ad commit 162068e

File tree

153 files changed

+30489
-17112
lines changed

Some content is hidden

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

153 files changed

+30489
-17112
lines changed

‎CHANGELOG.md

+61
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,67 @@ 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.25.2] -- 2017-03-31
14+
15+
### Fixed
16+
- rm `const` token from dist bundles that depend on `big-rat`,
17+
see https://github.com/rat-nest/big-rat/pull/4 for more details.
18+
19+
20+
## [1.25.1] -- 2017-03-28
21+
22+
### Fixed
23+
- Fix `restyle` for `scattergl` traces with array `marker.size` (bug introduced
24+
in `1.25.0`) [#1521]
25+
- Fix `relayout` for `histogram2dcontour` traces [#1520]
26+
- Do not unnecessary mutate `parcoords` full trace objects when computing
27+
line color and colorscale [#1509, #1508]
28+
- Do not unnecessary coerce trace opacity in `parcoords` traces [#1506]
29+
30+
31+
## [1.25.0] -- 2017-03-20
32+
33+
### Added
34+
- Double click handler on legend items to isolate 1 traces / group on graph
35+
[#1432]
36+
37+
### Changed
38+
- Use signed distance fields (SDF) method to render heterogeneous `scattergl`
39+
traces improving performance [#1398]
40+
- Improve first-render performance in `scattergl` traces by only creating
41+
visible objects [#1444]
42+
- Use `color-rgba` instead of `tinycolor2` to convert plotly color definitions to
43+
WebGL buffers improving performance for gl3d and gl2d traces [#1443]
44+
- Bump `uglify-js` minifier to version `2.8.12` [#1450]
45+
46+
### Fixed
47+
- Fix 3D trace ordering on visibility toggle [#1466]
48+
- Fix gl2d trace ordering on visibility toggle [#1444]
49+
- Fix autorange routine for bar traces [#1475]
50+
- Fix shapes and images referencing a missing subplot [#1481]
51+
- Ensure array attributes can be restyled in all situations [#1488]
52+
- Fix XYZ-column-to-2D-z convert routine for columns containing nulls [#1491]
53+
- Fix range slider display when anchored to log axes [#1472]
54+
- Make sure all trace types can be deleted from range sliders [#1472]
55+
- Let the `parcoords` object tree be garbage collected on `restyle` [#1479]
56+
- Bring back support for histogram colorscales (bug introduced in `1.21.3`)
57+
[#1500]
58+
- Support all axis types for clicktoshow annotations [#1497]
59+
- Fix 3D margin relayout calls (bug introduced in `1.24.1`) [#1494]
60+
- Fix `relayout` when trying to update empty axis containers (bug introduced in
61+
`1.24.0`) [#1494]
62+
63+
64+
## [1.24.2] -- 2017-03-10
65+
66+
### Fixed
67+
- Fix removal of last annotation or shape [#1451]
68+
- Fix shape and image clip path removal [#1453]
69+
- Fix overdrawing of data-referenced images [#1453]
70+
- Make handling of `layer: 'below'` shape more robust [#1453]
71+
- Allow multiple `parcoords` dimensions with the same label [#1457]
72+
73+
1374
## [1.24.1] -- 2017-03-07
1475

1576
### Fixed

‎CONTRIBUTING.md

+33-4
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ Both jasmine and image tests are run on
104104
[CircleCI](https://circleci.com/gh/plotly/plotly.js) on every push to this
105105
repo.
106106

107+
### Jasmine tests
108+
107109
Jasmine tests are run in a browser using
108110
[karma](https://github.com/karma-runner/karma). To run them locally:
109111

@@ -114,17 +116,44 @@ npm run test-jasmine
114116
To run a specific suite, use:
115117

116118
```
117-
npm run test-jasmine -- tests/<suite>.js
119+
npm run test-jasmine -- <suite>
120+
```
121+
122+
where the `<suite>` corresponds to the suite's file name as found in
123+
[`test/jasmine/tests/`](https://github.com/plotly/plotly.js/tree/master/test/jasmine/tests).
124+
125+
You can also test multiple suites at a time, for example:
126+
127+
```
128+
npm run test-jasmine -- bar axes scatter
129+
```
130+
131+
which will run tests in the `bar_test.js`, `axes_test.js` and `scatter_test.js`
132+
suites.
133+
134+
To turn off the `autoWatch` / auto-bundle / multiple run mode:
135+
136+
```
137+
npm run test-jasmine -- <suite> --nowatch
118138
```
119139

120-
where the `<suite>` corresponds to the suite's file name as found in [`test/jasmine/tests/`](https://github.com/plotly/plotly.js/tree/master/test/jasmine/tests). In certain situations, you may find that the default reporting is not verbose enough to pin down the source of the failing test. In this situation, you may wish to use [karma-verbose-reporter](https://www.npmjs.com/package/karma-verbose-reporter). You can use it without adding as a dev dependency by running:
140+
In certain situations, you may find that the default reporting is not verbose
141+
enough to pin down the source of the failing test. In this situation, you may
142+
wish to use
143+
[karma-verbose-reporter](https://www.npmjs.com/package/karma-verbose-reporter):
121144

122145
```
123-
npm install karma-verbose-reporter
146+
npm run test-jasmine -- <suite> --verbose
124147
```
125148

126-
and adding `reporters: ['verbose']` to the corresponding karma configuration file. (You should disable the `progress` reporter when using `verbose`.)
149+
For more info on the karma / jasmine CLI:
150+
151+
```
152+
npm run test-jasmine -- --help
153+
npm run test-jasmine -- --info
154+
```
127155

156+
### Image pixel comparison tests
128157

129158
Image pixel comparison tests are run in a docker container. For more
130159
information on how to run them locally, please refer to [image test

‎README.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
[![circle ci](https://circleci.com/gh/plotly/plotly.js.png?&style=shield&circle-token=1f42a03b242bd969756fc3e53ede204af9b507c0)](https://circleci.com/gh/plotly/plotly.js)
55

66
Built on top of [d3.js](http://d3js.org/) and [stack.gl](http://stack.gl/),
7-
plotly.js is a high-level, declarative charting library. plotly.js ships with 20
8-
chart types, including 3D charts, statistical graphs, and SVG maps.
7+
plotly.js is a high-level, declarative charting library. plotly.js ships with over 20
8+
chart types, including scientific charts, 3D graphs, statistical charts, SVG maps, financial charts,
9+
and more.
10+
11+
<p align="center">
12+
<a href="https://www.plot.ly/javascript" target="_blank">
13+
<img src="https://raw.githubusercontent.com/cldougl/plot_images/add_r_img/plotly_2017.png">
14+
</a></p>
915

1016
[Contact us](https://plot.ly/products/consulting-and-oem/) for Plotly.js consulting, dashboard development, application integration, and feature additions.
1117

‎dist/README.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ The main plotly.js bundle includes all the official (non-beta) trace modules.
3737

3838
It be can imported as minified javascript
3939
- using dist file `dist/plotly.min.js`
40-
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.24.1.min.js
40+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.25.2.min.js
4141

4242
or as raw javascript:
4343
- using dist file `dist/plotly.js`
44-
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.24.1.js
44+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.25.2.js
4545
- using CommonJS with `require('plotly.js')`
4646

4747
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`
@@ -50,7 +50,7 @@ The main plotly.js bundle weights in at:
5050

5151
| plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
5252
|-----------|---------------|----------------------|---------------------|
53-
| 4.9 MB | 2 MB | 606 kB | 5 MB |
53+
| 4.9 MB | 2 MB | 612.5 kB | 5.1 MB |
5454

5555
## Partial bundles
5656

@@ -74,13 +74,13 @@ The `basic` partial bundle contains the `scatter`, `bar` and `pie` trace modules
7474
| dist bundle (minified) | `dist/plotly-basic.min.js` |
7575
| CDN URL (latest) | https://cdn.plot.ly/plotly-basic-latest.js |
7676
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-basic-latest.min.js |
77-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.24.1.js |
78-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.24.1.min.js |
77+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.25.2.js |
78+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.25.2.min.js |
7979
| CommonJS | `require('plotly.js/lib/index-basic')` |
8080

8181
| Raw size | Minified size | Minified + gzip size |
8282
|------|-----------------|------------------------|
83-
| 1.7 MB | 630.6 kB | 205 kB |
83+
| 1.7 MB | 631.6 kB | 205.2 kB |
8484

8585
### plotly.js cartesian
8686

@@ -92,13 +92,13 @@ The `cartesian` partial bundle contains the `scatter`, `bar`, `box`, `heatmap`,
9292
| dist bundle (minified) | `dist/plotly-cartesian.min.js` |
9393
| CDN URL (latest) | https://cdn.plot.ly/plotly-cartesian-latest.js |
9494
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-cartesian-latest.min.js |
95-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.24.1.js |
96-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.24.1.min.js |
95+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.25.2.js |
96+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.25.2.min.js |
9797
| CommonJS | `require('plotly.js/lib/index-cartesian')` |
9898

9999
| Raw size | Minified size | Minified + gzip size |
100100
|------|-----------------|------------------------|
101-
| 1.9 MB | 704.8 kB | 227.4 kB |
101+
| 1.9 MB | 706 kB | 227.5 kB |
102102

103103
### plotly.js geo
104104

@@ -110,13 +110,13 @@ The `geo` partial bundle contains the `scatter`, `scattergeo` and `choropleth` t
110110
| dist bundle (minified) | `dist/plotly-geo.min.js` |
111111
| CDN URL (latest) | https://cdn.plot.ly/plotly-geo-latest.js |
112112
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-geo-latest.min.js |
113-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.24.1.js |
114-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.24.1.min.js |
113+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.25.2.js |
114+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.25.2.min.js |
115115
| CommonJS | `require('plotly.js/lib/index-geo')` |
116116

117117
| Raw size | Minified size | Minified + gzip size |
118118
|------|-----------------|------------------------|
119-
| 1.7 MB | 653.9 kB | 213.7 kB |
119+
| 1.7 MB | 654.9 kB | 213.8 kB |
120120

121121
### plotly.js gl3d
122122

@@ -128,13 +128,13 @@ The `gl3d` partial bundle contains the `scatter`, `scatter3d`, `surface` and `me
128128
| dist bundle (minified) | `dist/plotly-gl3d.min.js` |
129129
| CDN URL (latest) | https://cdn.plot.ly/plotly-gl3d-latest.js |
130130
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-gl3d-latest.min.js |
131-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.24.1.js |
132-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.24.1.min.js |
131+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.25.2.js |
132+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.25.2.min.js |
133133
| CommonJS | `require('plotly.js/lib/index-gl3d')` |
134134

135135
| Raw size | Minified size | Minified + gzip size |
136136
|------|-----------------|------------------------|
137-
| 2.5 MB | 1 MB | 336.5 kB |
137+
| 2.6 MB | 1.1 MB | 342.8 kB |
138138

139139
### plotly.js gl2d
140140

@@ -146,13 +146,13 @@ The `gl2d` partial bundle contains the `scatter`, `scattergl`, `pointcloud`, `he
146146
| dist bundle (minified) | `dist/plotly-gl2d.min.js` |
147147
| CDN URL (latest) | https://cdn.plot.ly/plotly-gl2d-latest.js |
148148
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-gl2d-latest.min.js |
149-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.24.1.js |
150-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.24.1.min.js |
149+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.25.2.js |
150+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.25.2.min.js |
151151
| CommonJS | `require('plotly.js/lib/index-gl2d')` |
152152

153153
| Raw size | Minified size | Minified + gzip size |
154154
|------|-----------------|------------------------|
155-
| 2.6 MB | 1.1 MB | 341.4 kB |
155+
| 2.7 MB | 1.1 MB | 349 kB |
156156

157157
### plotly.js mapbox
158158

@@ -164,13 +164,13 @@ The `mapbox` partial bundle contains the `scatter` and `scattermapbox` trace mod
164164
| dist bundle (minified) | `dist/plotly-mapbox.min.js` |
165165
| CDN URL (latest) | https://cdn.plot.ly/plotly-mapbox-latest.js |
166166
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-mapbox-latest.min.js |
167-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.24.1.js |
168-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.24.1.min.js |
167+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.25.2.js |
168+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.25.2.min.js |
169169
| CommonJS | `require('plotly.js/lib/index-mapbox')` |
170170

171171
| Raw size | Minified size | Minified + gzip size |
172172
|------|-----------------|------------------------|
173-
| 2.7 MB | 1 MB | 318.4 kB |
173+
| 2.7 MB | 1 MB | 318.1 kB |
174174

175175
### plotly.js finance
176176

@@ -182,13 +182,13 @@ The `finance` partial bundle contains the `scatter`, `bar`, `histogram`, `pie`,
182182
| dist bundle (minified) | `dist/plotly-finance.min.js` |
183183
| CDN URL (latest) | https://cdn.plot.ly/plotly-finance-latest.js |
184184
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-finance-latest.min.js |
185-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-finance-1.24.1.js |
186-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-finance-1.24.1.min.js |
185+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-finance-1.25.2.js |
186+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-finance-1.25.2.min.js |
187187
| CommonJS | `require('plotly.js/lib/index-finance')` |
188188

189189
| Raw size | Minified size | Minified + gzip size |
190190
|------|-----------------|------------------------|
191-
| 1.7 MB | 657.5 kB | 212.6 kB |
191+
| 1.7 MB | 658.4 kB | 212.7 kB |
192192

193193
----------------
194194

0 commit comments

Comments
 (0)