Skip to content

Commit d88ee97

Browse files
committed
Merge branch 'master' into joyplots2
2 parents 401bcc8 + 112ab61 commit d88ee97

File tree

257 files changed

+5584
-4197
lines changed

Some content is hidden

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

257 files changed

+5584
-4197
lines changed

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"max-len": [0, 80],
3030
"brace-style": [0, "stroustrup", {"allowSingleLine": true}],
3131
"curly": [2, "multi-line"],
32-
"camelcase": [0, {"properties": "never"}],
32+
"camelcase": [2, {"properties": "never"}],
3333
"comma-spacing": [2, {"before": false, "after": true}],
3434
"comma-style": [2, "last"],
3535
"semi": [2],
@@ -63,6 +63,7 @@
6363
"no-shadow": [0, {"builtinGlobals": true}],
6464
"block-scoped-var": [2],
6565
"no-unused-vars": [2],
66+
"one-var": [2, {"initialized": "never"}],
6667
"no-undef-init": [2],
6768
"no-use-before-define": [2, "nofunc"],
6869
"no-loop-func": [2],

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ 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.43.1] -- 2018-12-21
14+
15+
### Fixed
16+
- Fix z-axis auto-type for cartesian + gl3d graphs (bug introduced in 1.43.0) [#3360]
17+
- Fix `multicategory` axis coordinate sorting [#3362]
18+
- Fix `multicategory` y-axes clearance [#3354]
19+
- Fix contour label clipPath segments for reversed axes [#3352]
20+
- Fix axis autorange on double-click on graph `fixedrange:true` [#3351]
21+
22+
1323
## [1.43.0] -- 2018-12-19
1424

1525
### Added

devtools/image_viewer/viewer.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ var path = require('path');
33

44
var d3 = require('d3');
55

6-
var $plotlist = document.getElementById('plot-list'),
7-
$toggles = document.getElementById('plot-toggles'),
8-
$images = document.getElementById('plot-images'),
9-
$mock = document.getElementById('plot-mock'),
10-
$toggleBaseline = document.createElement('button'),
11-
$toggleTest = document.createElement('button'),
12-
$toggleDiff = document.createElement('button'),
13-
$imgBaseline = document.createElement('img'),
14-
$imgTest = document.createElement('img'),
15-
$imgDiff = document.createElement('img');
6+
var $plotlist = document.getElementById('plot-list');
7+
var $toggles = document.getElementById('plot-toggles');
8+
var $images = document.getElementById('plot-images');
9+
var $mock = document.getElementById('plot-mock');
10+
var $toggleBaseline = document.createElement('button');
11+
var $toggleTest = document.createElement('button');
12+
var $toggleDiff = document.createElement('button');
13+
var $imgBaseline = document.createElement('img');
14+
var $imgTest = document.createElement('img');
15+
var $imgDiff = document.createElement('img');
1616

1717
$toggles.style.display = 'none';
1818
$images.style.display = 'none';
@@ -21,13 +21,13 @@ setupToggle($toggleBaseline, $imgBaseline, 'Baseline');
2121
setupToggle($toggleTest, $imgTest, 'Test');
2222
setupToggle($toggleDiff, $imgDiff, 'Diff');
2323

24-
var pathToRoot = path.join(__dirname, '../../'),
25-
pathToImageTest = path.join(pathToRoot, 'test/image'),
26-
pathToBuild = path.join(pathToRoot, 'build/'),
27-
dirMocks = path.join(pathToImageTest, 'mocks/'),
28-
dirBaseline = path.join(pathToImageTest, 'baselines/'),
29-
dirTest = path.join(pathToBuild, 'test_images/'),
30-
dirDiff = path.join(pathToBuild, 'test_images_diff/');
24+
var pathToRoot = path.join(__dirname, '../../');
25+
var pathToImageTest = path.join(pathToRoot, 'test/image');
26+
var pathToBuild = path.join(pathToRoot, 'build/');
27+
var dirMocks = path.join(pathToImageTest, 'mocks/');
28+
var dirBaseline = path.join(pathToImageTest, 'baselines/');
29+
var dirTest = path.join(pathToBuild, 'test_images/');
30+
var dirDiff = path.join(pathToBuild, 'test_images_diff/');
3131

3232
// N.B. brfs only understand hard-coded paths
3333
var imageNames = fs.readFileSync(

devtools/test_dashboard/devtools.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ searchBar.addEventListener('keyup', debounce(searchMocks, 250));
179179
function debounce(func, wait, immediate) {
180180
var timeout;
181181
return function() {
182-
var context = this, args = arguments;
182+
var context = this;
183+
var args = arguments;
183184
var later = function() {
184185
timeout = null;
185186
if(!immediate) func.apply(context, args);

dist/README.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object. This property must be set before the plotly.js script tag, for example:
5151
Plotly.js defaults to US English (en-US) and includes British English (en) in the standard bundle.
5252
Many other localizations are available - here is an example using Swiss-German (de-CH),
5353
see the contents of this directory for the full list.
54-
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.43.0.js
54+
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.43.1.js
5555
Note that the file names are all lowercase, even though the region is uppercase when you apply a locale.
5656

5757
*After* the plotly.js script tag, add:
@@ -74,12 +74,12 @@ The main plotly.js bundle includes all the official (non-beta) trace modules.
7474

7575
It be can imported as minified javascript
7676
- using dist file `dist/plotly.min.js`
77-
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.43.0.min.js
77+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.43.1.min.js
7878

7979
or as raw javascript:
8080
- using the `plotly.js-dist` npm package (starting in `v1.39.0`)
8181
- using dist file `dist/plotly.js`
82-
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.43.0.js
82+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.43.1.js
8383
- using CommonJS with `require('plotly.js')`
8484

8585
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`
@@ -88,7 +88,7 @@ The main plotly.js bundle weights in at:
8888

8989
| plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
9090
|-----------|---------------|----------------------|---------------------|
91-
| 6 MB | 2.8 MB | 843 kB | 6.2 MB |
91+
| 6 MB | 2.8 MB | 843.2 kB | 6.3 MB |
9292

9393
## Partial bundles
9494

@@ -111,16 +111,16 @@ The `basic` partial bundle contains trace modules `scatter`, `bar` and `pie`.
111111

112112
| Raw size | Minified size | Minified + gzip size |
113113
|------|-----------------|------------------------|
114-
| 2.3 MB | 805.9 kB | 263.4 kB |
114+
| 2.3 MB | 806.3 kB | 263.5 kB |
115115

116116
#### CDN links
117117

118118
| Flavor | URL |
119119
| ------ | --- |
120120
| Latest | https://cdn.plot.ly/plotly-basic-latest.js |
121121
| Latest minified | https://cdn.plot.ly/plotly-basic-latest.min.js |
122-
| Tagged | https://cdn.plot.ly/plotly-basic-1.43.0.js |
123-
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.43.0.min.js |
122+
| Tagged | https://cdn.plot.ly/plotly-basic-1.43.1.js |
123+
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.43.1.min.js |
124124

125125
#### npm package (starting in `v1.39.0`)
126126

@@ -157,16 +157,16 @@ The `cartesian` partial bundle contains trace modules `scatter`, `bar`, `box`, `
157157

158158
| Raw size | Minified size | Minified + gzip size |
159159
|------|-----------------|------------------------|
160-
| 2.6 MB | 918.8 kB | 299.1 kB |
160+
| 2.6 MB | 919.3 kB | 299.2 kB |
161161

162162
#### CDN links
163163

164164
| Flavor | URL |
165165
| ------ | --- |
166166
| Latest | https://cdn.plot.ly/plotly-cartesian-latest.js |
167167
| Latest minified | https://cdn.plot.ly/plotly-cartesian-latest.min.js |
168-
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.43.0.js |
169-
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.43.0.min.js |
168+
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.43.1.js |
169+
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.43.1.min.js |
170170

171171
#### npm package (starting in `v1.39.0`)
172172

@@ -203,16 +203,16 @@ The `geo` partial bundle contains trace modules `scatter`, `scattergeo` and `cho
203203

204204
| Raw size | Minified size | Minified + gzip size |
205205
|------|-----------------|------------------------|
206-
| 2.3 MB | 823.7 kB | 271.3 kB |
206+
| 2.3 MB | 824.1 kB | 271.4 kB |
207207

208208
#### CDN links
209209

210210
| Flavor | URL |
211211
| ------ | --- |
212212
| Latest | https://cdn.plot.ly/plotly-geo-latest.js |
213213
| Latest minified | https://cdn.plot.ly/plotly-geo-latest.min.js |
214-
| Tagged | https://cdn.plot.ly/plotly-geo-1.43.0.js |
215-
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.43.0.min.js |
214+
| Tagged | https://cdn.plot.ly/plotly-geo-1.43.1.js |
215+
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.43.1.min.js |
216216

217217
#### npm package (starting in `v1.39.0`)
218218

@@ -249,16 +249,16 @@ The `gl3d` partial bundle contains trace modules `scatter`, `scatter3d`, `surfac
249249

250250
| Raw size | Minified size | Minified + gzip size |
251251
|------|-----------------|------------------------|
252-
| 3.3 MB | 1.3 MB | 422.9 kB |
252+
| 3.3 MB | 1.3 MB | 423 kB |
253253

254254
#### CDN links
255255

256256
| Flavor | URL |
257257
| ------ | --- |
258258
| Latest | https://cdn.plot.ly/plotly-gl3d-latest.js |
259259
| Latest minified | https://cdn.plot.ly/plotly-gl3d-latest.min.js |
260-
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.43.0.js |
261-
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.43.0.min.js |
260+
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.43.1.js |
261+
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.43.1.min.js |
262262

263263
#### npm package (starting in `v1.39.0`)
264264

@@ -295,16 +295,16 @@ The `gl2d` partial bundle contains trace modules `scatter`, `scattergl`, `splom`
295295

296296
| Raw size | Minified size | Minified + gzip size |
297297
|------|-----------------|------------------------|
298-
| 3.4 MB | 1.4 MB | 440.9 kB |
298+
| 3.4 MB | 1.4 MB | 441 kB |
299299

300300
#### CDN links
301301

302302
| Flavor | URL |
303303
| ------ | --- |
304304
| Latest | https://cdn.plot.ly/plotly-gl2d-latest.js |
305305
| Latest minified | https://cdn.plot.ly/plotly-gl2d-latest.min.js |
306-
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.43.0.js |
307-
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.43.0.min.js |
306+
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.43.1.js |
307+
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.43.1.min.js |
308308

309309
#### npm package (starting in `v1.39.0`)
310310

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

342342
| Raw size | Minified size | Minified + gzip size |
343343
|------|-----------------|------------------------|
344-
| 2.8 MB | 1.3 MB | 409.1 kB |
344+
| 2.8 MB | 1.3 MB | 409.2 kB |
345345

346346
#### CDN links
347347

348348
| Flavor | URL |
349349
| ------ | --- |
350350
| Latest | https://cdn.plot.ly/plotly-mapbox-latest.js |
351351
| Latest minified | https://cdn.plot.ly/plotly-mapbox-latest.min.js |
352-
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.43.0.js |
353-
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.43.0.min.js |
352+
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.43.1.js |
353+
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.43.1.min.js |
354354

355355
#### npm package (starting in `v1.39.0`)
356356

@@ -387,16 +387,16 @@ The `finance` partial bundle contains trace modules `scatter`, `bar`, `histogram
387387

388388
| Raw size | Minified size | Minified + gzip size |
389389
|------|-----------------|------------------------|
390-
| 2.3 MB | 837.9 kB | 273.1 kB |
390+
| 2.4 MB | 838.3 kB | 273.2 kB |
391391

392392
#### CDN links
393393

394394
| Flavor | URL |
395395
| ------ | --- |
396396
| Latest | https://cdn.plot.ly/plotly-finance-latest.js |
397397
| Latest minified | https://cdn.plot.ly/plotly-finance-latest.min.js |
398-
| Tagged | https://cdn.plot.ly/plotly-finance-1.43.0.js |
399-
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.43.0.min.js |
398+
| Tagged | https://cdn.plot.ly/plotly-finance-1.43.1.js |
399+
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.43.1.min.js |
400400

401401
#### npm package (starting in `v1.39.0`)
402402

0 commit comments

Comments
 (0)