Skip to content

Commit 00138aa

Browse files
alexcjohnsonalexcjohnson
committed
Merge branch 'master' into dates-as-dates
2 parents 9e27955 + 6b2c16a commit 00138aa

Some content is hidden

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

73 files changed

+85988
-13049
lines changed

‎CHANGELOG.md

+29
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,35 @@ 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.18.0] -- 2016-10-13
14+
15+
### Added
16+
- Add `ohlc` and `candlestick` trace types [#1020]
17+
- Add slider layout component [#986, #1029]
18+
- Add filter and groupby transforms [#936, #978]
19+
- Add support for all cartesian trace types and subplot configuration in
20+
range slider range plots [#946, #1017]
21+
- Add update menus `'buttons'` type, `direction` and `showactive` options [#974]
22+
- Add `pad` attributes to update menus for more intuitive positioning [#989]
23+
- Add `plotly_hover`, `plotly_click` and `plotly_unhover` event emitters
24+
on gl2d subplot [#994]
25+
- Make `'text'` mode scatter traces animatable [#1011]
26+
- Add picking for `'line'` mode scattergeo traces [#1004]
27+
- Add support for `fill: 'toself'` in scattergeo traces [#1004]
28+
29+
### Changed
30+
- Allow null / undefined frames in `Plotly.addFrames`[#1013]
31+
32+
### Fixed
33+
- Allow range sliders to properly relayout [#962]
34+
- Fix handling of `NaN` gaps in range slider range plots [#946, #1017]
35+
- Properly skip over `NaN`s in scattergeo data arrays [#1004]
36+
- Fix handling graph div with style `visibility: inherit` [#990]
37+
- Fix `Plotly.update` for updates that require a full data + layout replot [#971]
38+
- Let update menus use `Plotly.update` method value [#972]
39+
- Fix tickfont relayout call on 3D subplot [#982]
40+
41+
1342
## [1.17.3] -- 2016-09-21
1443

1544
### Fixed

‎dist/README.md

+40-21
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-plotly-latest.min.js OR https://cdn.plot.ly/plotly-plotly-1.17.3.min.js
40+
- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.min.js OR https://cdn.plot.ly/plotly-plotly-1.18.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-plotly-latest.js OR https://cdn.plot.ly/plotly-plotly-1.17.3.js
44+
- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.js OR https://cdn.plot.ly/plotly-plotly-1.18.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 MB | 1.7 MB | 515.7 kB | 4.1 MB |
53+
| 4 MB | 1.7 MB | 524.4 kB | 4.2 MB |
5454

5555
## Partial bundles
5656

@@ -62,6 +62,7 @@ Starting in `v1.15.0`, plotly.js also ships with several _partial_ bundles:
6262
- [gl3d](#plotlyjs-gl3d)
6363
- [gl2d](#plotlyjs-gl2d)
6464
- [mapbox](#plotlyjs-mapbox)
65+
- [finance](#plotlyjs-finance)
6566

6667
### plotly.js basic
6768

@@ -73,13 +74,13 @@ The `basic` partial bundle contains the `scatter`, `bar` and `pie` trace modules
7374
| dist bundle (minified) | `dist/plotly-basic.min.js` |
7475
| CDN URL (latest) | https://cdn.plot.ly/plotly-basic-latest.js |
7576
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-basic-latest.min.js |
76-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.17.3.js |
77-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.17.3.min.js |
77+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.18.0.js |
78+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.18.0.min.js |
7879
| CommonJS | `require('plotly.js/lib/index-basic')` |
7980

8081
| Raw size | Minified size | Minified + gzip size |
8182
|------|-----------------|------------------------|
82-
| 1.5 MB | 576.1 kB | 188.2 kB |
83+
| 1.5 MB | 593.8 kB | 192.4 kB |
8384

8485
### plotly.js cartesian
8586

@@ -91,13 +92,13 @@ The `cartesian` partial bundle contains the `scatter`, `bar`, `box`, `heatmap`,
9192
| dist bundle (minified) | `dist/plotly-cartesian.min.js` |
9293
| CDN URL (latest) | https://cdn.plot.ly/plotly-cartesian-latest.js |
9394
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-cartesian-latest.min.js |
94-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.17.3.js |
95-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.17.3.min.js |
95+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.18.0.js |
96+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.18.0.min.js |
9697
| CommonJS | `require('plotly.js/lib/index-cartesian')` |
9798

9899
| Raw size | Minified size | Minified + gzip size |
99100
|------|-----------------|------------------------|
100-
| 1.7 MB | 645.8 kB | 209.2 kB |
101+
| 1.7 MB | 663.6 kB | 213.5 kB |
101102

102103
### plotly.js geo
103104

@@ -109,13 +110,13 @@ The `geo` partial bundle contains the `scatter`, `scattergeo` and `choropleth` t
109110
| dist bundle (minified) | `dist/plotly-geo.min.js` |
110111
| CDN URL (latest) | https://cdn.plot.ly/plotly-geo-latest.js |
111112
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-geo-latest.min.js |
112-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.17.3.js |
113-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.17.3.min.js |
113+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.18.0.js |
114+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.18.0.min.js |
114115
| CommonJS | `require('plotly.js/lib/index-geo')` |
115116

116117
| Raw size | Minified size | Minified + gzip size |
117118
|------|-----------------|------------------------|
118-
| 1.5 MB | 605.5 kB | 199.1 kB |
119+
| 1.6 MB | 625.2 kB | 204.2 kB |
119120

120121
### plotly.js gl3d
121122

@@ -127,13 +128,13 @@ The `gl3d` partial bundle contains the `scatter`, `scatter3d`, `surface` and `me
127128
| dist bundle (minified) | `dist/plotly-gl3d.min.js` |
128129
| CDN URL (latest) | https://cdn.plot.ly/plotly-gl3d-latest.js |
129130
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-gl3d-latest.min.js |
130-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.17.3.js |
131-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.17.3.min.js |
131+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.18.0.js |
132+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.18.0.min.js |
132133
| CommonJS | `require('plotly.js/lib/index-gl3d')` |
133134

134135
| Raw size | Minified size | Minified + gzip size |
135136
|------|-----------------|------------------------|
136-
| 2.4 MB | 1013 kB | 318.4 kB |
137+
| 2.4 MB | 1 MB | 322.7 kB |
137138

138139
### plotly.js gl2d
139140

@@ -145,13 +146,13 @@ The `gl2d` partial bundle contains the `scatter`, `scattergl`, `pointcloud`, `he
145146
| dist bundle (minified) | `dist/plotly-gl2d.min.js` |
146147
| CDN URL (latest) | https://cdn.plot.ly/plotly-gl2d-latest.js |
147148
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-gl2d-latest.min.js |
148-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.17.3.js |
149-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.17.3.min.js |
149+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.18.0.js |
150+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.18.0.min.js |
150151
| CommonJS | `require('plotly.js/lib/index-gl2d')` |
151152

152153
| Raw size | Minified size | Minified + gzip size |
153154
|------|-----------------|------------------------|
154-
| 2.1 MB | 899.7 kB | 283.7 kB |
155+
| 2.2 MB | 919.9 kB | 288.3 kB |
155156

156157
### plotly.js mapbox
157158

@@ -163,13 +164,31 @@ The `mapbox` partial bundle contains the `scatter` and `scattermapbox` trace mod
163164
| dist bundle (minified) | `dist/plotly-mapbox.min.js` |
164165
| CDN URL (latest) | https://cdn.plot.ly/plotly-mapbox-latest.js |
165166
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-mapbox-latest.min.js |
166-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.17.3.js |
167-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.17.3.min.js |
167+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.18.0.js |
168+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.18.0.min.js |
168169
| CommonJS | `require('plotly.js/lib/index-mapbox')` |
169170

170171
| Raw size | Minified size | Minified + gzip size |
171172
|------|-----------------|------------------------|
172-
| 2.5 MB | 1 MB | 306.5 kB |
173+
| 2.5 MB | 1 MB | 310.9 kB |
174+
175+
### plotly.js finance
176+
177+
The `finance` partial bundle contains the `scatter`, `bar`, `histogram`, `pie`, `ohlc` and `candlestick` trace modules.
178+
179+
| Way to import | Location |
180+
|---------------|----------|
181+
| dist bundle | `dist/plotly-finance.js` |
182+
| dist bundle (minified) | `dist/plotly-finance.min.js` |
183+
| CDN URL (latest) | https://cdn.plot.ly/plotly-finance-latest.js |
184+
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-finance-latest.min.js |
185+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-finance-1.18.0.js |
186+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-finance-1.18.0.min.js |
187+
| CommonJS | `require('plotly.js/lib/index-finance')` |
188+
189+
| Raw size | Minified size | Minified + gzip size |
190+
|------|-----------------|------------------------|
191+
| 1.6 MB | 618.1 kB | 199 kB |
173192

174193
----------------
175194

‎dist/extras/request_animation_frame.js

+36-23
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,41 @@
1515

1616
// MIT license
1717

18+
(function(){
19+
20+
'use strict';
1821

19-
'use strict';
20-
21-
if(!Date.now) {
22-
Date.now = function() { return new Date().getTime(); };
23-
}
24-
25-
var vendors = ['webkit', 'moz'];
26-
for(var i = 0; i < vendors.length && !window.requestAnimationFrame; ++i) {
27-
var vp = vendors[i];
28-
window.requestAnimationFrame = window[vp + 'RequestAnimationFrame'];
29-
window.cancelAnimationFrame = (window[vp + 'CancelAnimationFrame'] ||
30-
window[vp + 'CancelRequestAnimationFrame']);
31-
}
32-
if(/iP(ad|hone|od).*OS 6/.test(window.navigator.userAgent) || // iOS6 is buggy
33-
!window.requestAnimationFrame || !window.cancelAnimationFrame) {
22+
if(!Date.now) {
23+
Date.now = function() { return (new Date()).getTime(); };
24+
}
25+
26+
var vendors = ['webkit', 'moz'];
27+
var i = 0;
28+
var l = vendors.length;
29+
var vp;
3430
var lastTime = 0;
35-
window.requestAnimationFrame = function(callback) {
36-
var now = Date.now();
37-
var nextTime = Math.max(lastTime + 16, now);
38-
return setTimeout(function() { callback(lastTime = nextTime); },
39-
nextTime - now);
40-
};
41-
window.cancelAnimationFrame = clearTimeout;
42-
}
31+
32+
for(; i < l && !window.requestAnimationFrame; ++i) {
33+
vp = vendors[i];
34+
window.requestAnimationFrame = window[vp + 'RequestAnimationFrame'];
35+
window.cancelAnimationFrame = (window[vp + 'CancelAnimationFrame'] ||
36+
window[vp + 'CancelRequestAnimationFrame']);
37+
}
38+
39+
if(/iP(ad|hone|od).*OS 6/.test(window.navigator.userAgent) || // iOS6 is buggy
40+
!window.requestAnimationFrame || !window.cancelAnimationFrame) {
41+
window.requestAnimationFrame = function(callback) {
42+
var now = Date.now();
43+
var nextTime = Math.max(lastTime + 16, now);
44+
return setTimeout(function() { callback(lastTime = nextTime); },
45+
nextTime - now);
46+
};
47+
window.cancelAnimationFrame = clearTimeout;
48+
}
49+
50+
vendors = null;
51+
i = null;
52+
l = null;
53+
vp = null;
54+
55+
}());

0 commit comments

Comments
 (0)