Skip to content

Commit bb34df2

Browse files
committed
Merge branch 'master' into filter-preservegaps
2 parents 3f15c73 + ef0946c commit bb34df2

File tree

207 files changed

+54630
-14635
lines changed

Some content is hidden

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

207 files changed

+54630
-14635
lines changed

CHANGELOG.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,51 @@ 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.26.0] -- 2017-04-18
14+
15+
### Added
16+
- Carpets plots with new trace types: `carpet`, `scattercarpet` and
17+
`contourcarpet` [#1595, #1596]
18+
- Axis constraints with new cartesian and gl2d axis attributes `scaleanchor` and
19+
`scaleratio` [#1522]
20+
- Annotations `width`, `height`, `valign` and `xshift` and `yshift` attributes
21+
[#1551, #1590]
22+
- Hover text over annotations with `hovertext` and `hoverlabel` attributes
23+
[#1573, #1590]
24+
- Add `hovertext` attribute to trace types that can show `text` values on graph
25+
to allow setting hover text independently [#1523]
26+
- Add `spikes` interactions functionality to cartesian subplots [#1461]
27+
- Pass mouse DOM mouse event during `plotly_click`, `plotly_hover` and
28+
`plotly_unhover` [#1505]
29+
- Add `visible` attribute to cartesian and gl3d axes to easily make them
30+
disappear [#1595, #1599]
31+
- Make `deleteFrames(gd)` delete all frames [#1531]
32+
33+
### Changed
34+
- Lock down `gl-plot3d` and `matrix-camera-controller` dependencies to include
35+
latest memory management improvements [#1570]
36+
- Performance improvements for `category` axes [#1544]
37+
- Skip overhead for `showLink` config option is false [#1557]
38+
- Optimize scatter trace sorting on updates [#1555]
39+
- Lock down `gl-scatter2d-sdf` dependency to `1.3.4` while waiting for bug fix
40+
there [#1572]
41+
42+
### Fixed
43+
- Fix bar sizes of traces with (x,y) `NaN` items [#1519]
44+
- Fix handling of `NaN` items in array-ok attributes for `scattergeo` and
45+
`scattermapbox` traces [#1538, #1564]
46+
- Fix hover label position for `bar` traces with set `width` [#1527]
47+
- Fix `restyle` for attribute containers [#1536]
48+
- Fix `restyle` exception for `scattergl` traces with no `y` data [#1567]
49+
- Fix animation of text nodes that contain `<br>`s [#1602]
50+
- Fix `toImage` for mapbox subplots when access token is set in the config
51+
options [#1598]
52+
- Emit `plotly_hover` on `pie` traces when `hoverinfo: 'none'` [#1505]
53+
- Pass trace info during `plotly_click` on `pie` traces [#1505]
54+
- Pass through the wheel event if the scrollbar is at the very top or bottom
55+
[#1588]
56+
57+
1358
## [1.25.2] -- 2017-03-31
1459

1560
### Fixed

build/ploticon.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,11 @@ module.exports = {
114114
'path': 'm0 850l0-143 143 0 0 143-143 0z m286 0l0-143 143 0 0 143-143 0z m285 0l0-143 143 0 0 143-143 0z m286 0l0-143 143 0 0 143-143 0z m-857-286l0-143 143 0 0 143-143 0z m857 0l0-143 143 0 0 143-143 0z m-857-285l0-143 143 0 0 143-143 0z m857 0l0-143 143 0 0 143-143 0z m-857-286l0-143 143 0 0 143-143 0z m286 0l0-143 143 0 0 143-143 0z m285 0l0-143 143 0 0 143-143 0z m286 0l0-143 143 0 0 143-143 0z',
115115
'ascent': 850,
116116
'descent': -150
117+
},
118+
'spikeline': {
119+
'width': 1000,
120+
'path': 'M512 409c0-57-46-104-103-104-57 0-104 47-104 104 0 57 47 103 104 103 57 0 103-46 103-103z m-327-39l92 0 0 92-92 0z m-185 0l92 0 0 92-92 0z m370-186l92 0 0 93-92 0z m0-184l92 0 0 92-92 0z',
121+
'ascent': 850,
122+
'descent': -150
117123
}
118124
};

dist/README.md

Lines changed: 24 additions & 24 deletions
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.25.2.min.js
40+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.26.0.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.25.2.js
44+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.26.0.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 | 612.5 kB | 5.1 MB |
53+
| 5.2 MB | 2.1 MB | 632.9 kB | 5.3 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.25.2.js |
78-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.25.2.min.js |
77+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.26.0.js |
78+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.26.0.min.js |
7979
| CommonJS | `require('plotly.js/lib/index-basic')` |
8080

8181
| Raw size | Minified size | Minified + gzip size |
8282
|------|-----------------|------------------------|
83-
| 1.7 MB | 631.6 kB | 205.2 kB |
83+
| 1.7 MB | 646.2 kB | 210.3 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.25.2.js |
96-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.25.2.min.js |
95+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.26.0.js |
96+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.26.0.min.js |
9797
| CommonJS | `require('plotly.js/lib/index-cartesian')` |
9898

9999
| Raw size | Minified size | Minified + gzip size |
100100
|------|-----------------|------------------------|
101-
| 1.9 MB | 706 kB | 227.5 kB |
101+
| 1.9 MB | 721.2 kB | 232.8 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.25.2.js |
114-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.25.2.min.js |
113+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.26.0.js |
114+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.26.0.min.js |
115115
| CommonJS | `require('plotly.js/lib/index-geo')` |
116116

117117
| Raw size | Minified size | Minified + gzip size |
118118
|------|-----------------|------------------------|
119-
| 1.7 MB | 654.9 kB | 213.8 kB |
119+
| 1.7 MB | 669.1 kB | 218.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.25.2.js |
132-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.25.2.min.js |
131+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.26.0.js |
132+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.26.0.min.js |
133133
| CommonJS | `require('plotly.js/lib/index-gl3d')` |
134134

135135
| Raw size | Minified size | Minified + gzip size |
136136
|------|-----------------|------------------------|
137-
| 2.6 MB | 1.1 MB | 342.8 kB |
137+
| 2.6 MB | 1.1 MB | 348 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.25.2.js |
150-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.25.2.min.js |
149+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.26.0.js |
150+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.26.0.min.js |
151151
| CommonJS | `require('plotly.js/lib/index-gl2d')` |
152152

153153
| Raw size | Minified size | Minified + gzip size |
154154
|------|-----------------|------------------------|
155-
| 2.7 MB | 1.1 MB | 349 kB |
155+
| 2.7 MB | 1.1 MB | 354.7 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.25.2.js |
168-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.25.2.min.js |
167+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.26.0.js |
168+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.26.0.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.1 kB |
173+
| 2.8 MB | 1.1 MB | 323.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.25.2.js |
186-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-finance-1.25.2.min.js |
185+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-finance-1.26.0.js |
186+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-finance-1.26.0.min.js |
187187
| CommonJS | `require('plotly.js/lib/index-finance')` |
188188

189189
| Raw size | Minified size | Minified + gzip size |
190190
|------|-----------------|------------------------|
191-
| 1.7 MB | 658.4 kB | 212.7 kB |
191+
| 1.8 MB | 673.1 kB | 217.8 kB |
192192

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

dist/npm-ls.json

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,12 @@
11
{
22
"name": "plotly.js",
3-
"version": "1.25.2",
3+
"version": "1.26.0",
44
"dependencies": {
55
"3d-view": {
66
"version": "2.0.0",
77
"from": "3d-view@>=2.0.0 <3.0.0",
88
"resolved": "https://registry.npmjs.org/3d-view/-/3d-view-2.0.0.tgz",
99
"dependencies": {
10-
"matrix-camera-controller": {
11-
"version": "2.1.1",
12-
"from": "matrix-camera-controller@>=2.1.1 <3.0.0",
13-
"resolved": "https://registry.npmjs.org/matrix-camera-controller/-/matrix-camera-controller-2.1.1.tgz",
14-
"dependencies": {
15-
"gl-vec3": {
16-
"version": "1.0.3",
17-
"from": "gl-vec3@>=1.0.3 <2.0.0",
18-
"resolved": "https://registry.npmjs.org/gl-vec3/-/gl-vec3-1.0.3.tgz"
19-
},
20-
"mat4-interpolate": {
21-
"version": "1.0.4",
22-
"from": "mat4-interpolate@>=1.0.3 <2.0.0",
23-
"resolved": "https://registry.npmjs.org/mat4-interpolate/-/mat4-interpolate-1.0.4.tgz",
24-
"dependencies": {
25-
"mat4-decompose": {
26-
"version": "1.0.4",
27-
"from": "mat4-decompose@>=1.0.3 <2.0.0",
28-
"resolved": "https://registry.npmjs.org/mat4-decompose/-/mat4-decompose-1.0.4.tgz"
29-
},
30-
"mat4-recompose": {
31-
"version": "1.0.4",
32-
"from": "mat4-recompose@>=1.0.3 <2.0.0",
33-
"resolved": "https://registry.npmjs.org/mat4-recompose/-/mat4-recompose-1.0.4.tgz"
34-
},
35-
"quat-slerp": {
36-
"version": "1.0.1",
37-
"from": "quat-slerp@>=1.0.0 <2.0.0",
38-
"resolved": "https://registry.npmjs.org/quat-slerp/-/quat-slerp-1.0.1.tgz",
39-
"dependencies": {
40-
"gl-quat": {
41-
"version": "1.0.0",
42-
"from": "gl-quat@>=1.0.0 <2.0.0",
43-
"resolved": "https://registry.npmjs.org/gl-quat/-/gl-quat-1.0.0.tgz"
44-
}
45-
}
46-
}
47-
}
48-
}
49-
}
50-
},
5110
"orbit-camera-controller": {
5211
"version": "4.0.0",
5312
"from": "orbit-camera-controller@>=4.0.0 <5.0.0",
@@ -279,11 +238,6 @@
279238
}
280239
}
281240
},
282-
"arraytools": {
283-
"version": "1.1.2",
284-
"from": "arraytools@>=1.0.0 <2.0.0",
285-
"resolved": "https://registry.npmjs.org/arraytools/-/arraytools-1.1.2.tgz"
286-
},
287241
"color-rgba": {
288242
"version": "1.1.0",
289243
"from": "color-rgba@>=1.0.4 <2.0.0",
@@ -1128,6 +1082,11 @@
11281082
"from": "colormap@>=2.1.0 <3.0.0",
11291083
"resolved": "https://registry.npmjs.org/colormap/-/colormap-2.2.0.tgz",
11301084
"dependencies": {
1085+
"arraytools": {
1086+
"version": "1.1.2",
1087+
"from": "arraytools@>=1.1.2 <2.0.0",
1088+
"resolved": "https://registry.npmjs.org/arraytools/-/arraytools-1.1.2.tgz"
1089+
},
11311090
"clone": {
11321091
"version": "1.0.2",
11331092
"from": "clone@>=1.0.2 <2.0.0",
@@ -1253,9 +1212,9 @@
12531212
}
12541213
},
12551214
"gl-plot3d": {
1256-
"version": "1.5.3",
1257-
"from": "gl-plot3d@>=1.5.2 <2.0.0",
1258-
"resolved": "https://registry.npmjs.org/gl-plot3d/-/gl-plot3d-1.5.3.tgz",
1215+
"version": "1.5.4",
1216+
"from": "gl-plot3d@1.5.4",
1217+
"resolved": "https://registry.npmjs.org/gl-plot3d/-/gl-plot3d-1.5.4.tgz",
12591218
"dependencies": {
12601219
"3d-view-controls": {
12611220
"version": "2.2.0",
@@ -2513,7 +2472,7 @@
25132472
},
25142473
"esutils": {
25152474
"version": "2.0.2",
2516-
"from": "esutils@>=2.0.2 <3.0.0",
2475+
"from": "esutils@^2.0.2",
25172476
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
25182477
}
25192478
}
@@ -2611,6 +2570,47 @@
26112570
}
26122571
}
26132572
},
2573+
"matrix-camera-controller": {
2574+
"version": "2.1.3",
2575+
"from": "matrix-camera-controller@latest",
2576+
"resolved": "https://registry.npmjs.org/matrix-camera-controller/-/matrix-camera-controller-2.1.3.tgz",
2577+
"dependencies": {
2578+
"gl-vec3": {
2579+
"version": "1.0.3",
2580+
"from": "gl-vec3@>=1.0.3 <2.0.0",
2581+
"resolved": "https://registry.npmjs.org/gl-vec3/-/gl-vec3-1.0.3.tgz"
2582+
},
2583+
"mat4-interpolate": {
2584+
"version": "1.0.4",
2585+
"from": "mat4-interpolate@>=1.0.3 <2.0.0",
2586+
"resolved": "https://registry.npmjs.org/mat4-interpolate/-/mat4-interpolate-1.0.4.tgz",
2587+
"dependencies": {
2588+
"mat4-decompose": {
2589+
"version": "1.0.4",
2590+
"from": "mat4-decompose@>=1.0.3 <2.0.0",
2591+
"resolved": "https://registry.npmjs.org/mat4-decompose/-/mat4-decompose-1.0.4.tgz"
2592+
},
2593+
"mat4-recompose": {
2594+
"version": "1.0.4",
2595+
"from": "mat4-recompose@>=1.0.3 <2.0.0",
2596+
"resolved": "https://registry.npmjs.org/mat4-recompose/-/mat4-recompose-1.0.4.tgz"
2597+
},
2598+
"quat-slerp": {
2599+
"version": "1.0.1",
2600+
"from": "quat-slerp@>=1.0.0 <2.0.0",
2601+
"resolved": "https://registry.npmjs.org/quat-slerp/-/quat-slerp-1.0.1.tgz",
2602+
"dependencies": {
2603+
"gl-quat": {
2604+
"version": "1.0.0",
2605+
"from": "gl-quat@>=1.0.0 <2.0.0",
2606+
"resolved": "https://registry.npmjs.org/gl-quat/-/gl-quat-1.0.0.tgz"
2607+
}
2608+
}
2609+
}
2610+
}
2611+
}
2612+
}
2613+
},
26142614
"mouse-change": {
26152615
"version": "1.4.0",
26162616
"from": "mouse-change@>=1.4.0 <2.0.0",

0 commit comments

Comments
 (0)