Skip to content

Commit 9a065b3

Browse files
etpinardetpinard
committed
Merge branch 'master' into relayout-annotations-mutation-guard
2 parents f59750a + fd032af commit 9a065b3

Some content is hidden

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

41 files changed

+356
-117
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ 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.23.2] -- 2017-02-15
14+
15+
### Changed
16+
- Bower installs now fetch un-minified `dist/plotly.js` bundle [#1373]
17+
- Add package to packagist repository [#1375]
18+
19+
1320
## [1.23.1] -- 2017-02-13
1421

1522
### Fixed
@@ -18,7 +25,6 @@ where X.Y.Z is the semver of most recent plotly.js release.
1825
- Allow `bar` and `histogram` traces to coexist on same subplot [#1365]
1926
- Fix `bar` position computations when placeholder traces are present [#1310]
2027
- Fix auto-axis-type routine for data-less `candelestick`traces [#1359]
21-
- Bower installs now fetch un-minified `dist/plotly.js` bundle [#1373]
2228

2329

2430
## [1.23.0] -- 2017-02-06

‎dist/README.md

Lines changed: 16 additions & 16 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.23.1.min.js
40+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.23.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.23.1.js
44+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.23.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`
@@ -74,8 +74,8 @@ 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.23.1.js |
78-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.23.1.min.js |
77+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.23.2.js |
78+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.23.2.min.js |
7979
| CommonJS | `require('plotly.js/lib/index-basic')` |
8080

8181
| Raw size | Minified size | Minified + gzip size |
@@ -92,8 +92,8 @@ 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.23.1.js |
96-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.23.1.min.js |
95+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.23.2.js |
96+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.23.2.min.js |
9797
| CommonJS | `require('plotly.js/lib/index-cartesian')` |
9898

9999
| Raw size | Minified size | Minified + gzip size |
@@ -110,8 +110,8 @@ 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.23.1.js |
114-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.23.1.min.js |
113+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.23.2.js |
114+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.23.2.min.js |
115115
| CommonJS | `require('plotly.js/lib/index-geo')` |
116116

117117
| Raw size | Minified size | Minified + gzip size |
@@ -128,8 +128,8 @@ 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.23.1.js |
132-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.23.1.min.js |
131+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.23.2.js |
132+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.23.2.min.js |
133133
| CommonJS | `require('plotly.js/lib/index-gl3d')` |
134134

135135
| Raw size | Minified size | Minified + gzip size |
@@ -146,8 +146,8 @@ 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.23.1.js |
150-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.23.1.min.js |
149+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.23.2.js |
150+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.23.2.min.js |
151151
| CommonJS | `require('plotly.js/lib/index-gl2d')` |
152152

153153
| Raw size | Minified size | Minified + gzip size |
@@ -164,8 +164,8 @@ 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.23.1.js |
168-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.23.1.min.js |
167+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.23.2.js |
168+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.23.2.min.js |
169169
| CommonJS | `require('plotly.js/lib/index-mapbox')` |
170170

171171
| Raw size | Minified size | Minified + gzip size |
@@ -182,8 +182,8 @@ 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.23.1.js |
186-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-finance-1.23.1.min.js |
185+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-finance-1.23.2.js |
186+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-finance-1.23.2.min.js |
187187
| CommonJS | `require('plotly.js/lib/index-finance')` |
188188

189189
| Raw size | Minified size | Minified + gzip size |

‎dist/npm-ls.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "plotly.js",
3-
"version": "1.23.1",
3+
"version": "1.23.2",
44
"dependencies": {
55
"3d-view": {
66
"version": "2.0.0",

‎dist/plotly-basic.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (basic) v1.23.1
2+
* plotly.js (basic) v1.23.2
33
* Copyright 2012-2017, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -26275,7 +26275,7 @@ exports.svgAttrs = {
2627526275
var Plotly = require('./plotly');
2627626276

2627726277
// package version injected by `npm run preprocess`
26278-
exports.version = '1.23.1';
26278+
exports.version = '1.23.2';
2627926279

2628026280
// inject promise polyfill
2628126281
require('es6-promise').polyfill();

‎dist/plotly-basic.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-cartesian.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (cartesian) v1.23.1
2+
* plotly.js (cartesian) v1.23.2
33
* Copyright 2012-2017, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -26373,7 +26373,7 @@ exports.svgAttrs = {
2637326373
var Plotly = require('./plotly');
2637426374

2637526375
// package version injected by `npm run preprocess`
26376-
exports.version = '1.23.1';
26376+
exports.version = '1.23.2';
2637726377

2637826378
// inject promise polyfill
2637926379
require('es6-promise').polyfill();

‎dist/plotly-cartesian.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-finance.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (finance) v1.23.1
2+
* plotly.js (finance) v1.23.2
33
* Copyright 2012-2017, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -26317,7 +26317,7 @@ exports.svgAttrs = {
2631726317
var Plotly = require('./plotly');
2631826318

2631926319
// package version injected by `npm run preprocess`
26320-
exports.version = '1.23.1';
26320+
exports.version = '1.23.2';
2632126321

2632226322
// inject promise polyfill
2632326323
require('es6-promise').polyfill();

‎dist/plotly-finance.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-geo-assets.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-geo.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (geo) v1.23.1
2+
* plotly.js (geo) v1.23.2
33
* Copyright 2012-2017, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -27054,7 +27054,7 @@ exports.svgAttrs = {
2705427054
var Plotly = require('./plotly');
2705527055

2705627056
// package version injected by `npm run preprocess`
27057-
exports.version = '1.23.1';
27057+
exports.version = '1.23.2';
2705827058

2705927059
// inject promise polyfill
2706027060
require('es6-promise').polyfill();

‎dist/plotly-geo.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-gl2d.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (gl2d) v1.23.1
2+
* plotly.js (gl2d) v1.23.2
33
* Copyright 2012-2017, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -50496,7 +50496,7 @@ exports.svgAttrs = {
5049650496
var Plotly = require('./plotly');
5049750497

5049850498
// package version injected by `npm run preprocess`
50499-
exports.version = '1.23.1';
50499+
exports.version = '1.23.2';
5050050500

5050150501
// inject promise polyfill
5050250502
require('es6-promise').polyfill();

‎dist/plotly-gl2d.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-gl3d.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (gl3d) v1.23.1
2+
* plotly.js (gl3d) v1.23.2
33
* Copyright 2012-2017, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -60232,7 +60232,7 @@ exports.svgAttrs = {
6023260232
var Plotly = require('./plotly');
6023360233

6023460234
// package version injected by `npm run preprocess`
60235-
exports.version = '1.23.1';
60235+
exports.version = '1.23.2';
6023660236

6023760237
// inject promise polyfill
6023860238
require('es6-promise').polyfill();

‎dist/plotly-gl3d.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-mapbox.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (mapbox) v1.23.1
2+
* plotly.js (mapbox) v1.23.2
33
* Copyright 2012-2017, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -60164,7 +60164,7 @@ exports.svgAttrs = {
6016460164
var Plotly = require('./plotly');
6016560165

6016660166
// package version injected by `npm run preprocess`
60167-
exports.version = '1.23.1';
60167+
exports.version = '1.23.2';
6016860168

6016960169
// inject promise polyfill
6017060170
require('es6-promise').polyfill();

‎dist/plotly-mapbox.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-with-meta.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js v1.23.1
2+
* plotly.js v1.23.2
33
* Copyright 2012-2017, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -105596,7 +105596,7 @@ exports.svgAttrs = {
105596105596
var Plotly = require('./plotly');
105597105597

105598105598
// package version injected by `npm run preprocess`
105599-
exports.version = '1.23.1';
105599+
exports.version = '1.23.2';
105600105600

105601105601
// inject promise polyfill
105602105602
require('es6-promise').polyfill();

‎dist/plotly.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js v1.23.1
2+
* plotly.js v1.23.2
33
* Copyright 2012-2017, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -105055,7 +105055,7 @@ exports.svgAttrs = {
105055105055
var Plotly = require('./plotly');
105056105056

105057105057
// package version injected by `npm run preprocess`
105058-
exports.version = '1.23.1';
105058+
exports.version = '1.23.2';
105059105059

105060105060
// inject promise polyfill
105061105061
require('es6-promise').polyfill();

‎dist/plotly.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "plotly.js",
3-
"version": "1.23.1",
3+
"version": "1.23.2",
44
"description": "The open source javascript graphing library that powers plotly",
55
"license": "MIT",
66
"main": "./lib/index.js",

‎src/assets/geo_assets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ var saneTopojson = require('sane-topojson');
1212

1313

1414
// package version injected by `npm run preprocess`
15-
exports.version = '1.23.1';
15+
exports.version = '1.23.2';
1616

1717
exports.topojson = saneTopojson;

‎src/core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
var Plotly = require('./plotly');
1616

1717
// package version injected by `npm run preprocess`
18-
exports.version = '1.23.1';
18+
exports.version = '1.23.2';
1919

2020
// inject promise polyfill
2121
require('es6-promise').polyfill();

‎src/plot_api/plot_api.js

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ Plotly.plot = function(gd, data, layout, config) {
337337
Registry.getComponentMethod('updatemenus', 'draw')(gd);
338338
}
339339

340-
Lib.syncOrAsync([
340+
var seq = [
341341
Plots.previousPromises,
342342
addFrames,
343343
drawFramework,
@@ -347,8 +347,11 @@ Plotly.plot = function(gd, data, layout, config) {
347347
subroutines.layoutStyles,
348348
drawAxes,
349349
drawData,
350-
finalDraw
351-
], gd);
350+
finalDraw,
351+
Plots.rehover
352+
];
353+
354+
Lib.syncOrAsync(seq, gd);
352355

353356
// even if everything we did was synchronous, return a promise
354357
// so that the caller doesn't care which route we took
@@ -1201,8 +1204,7 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
12011204

12021205
if(flags.fullReplot) {
12031206
seq.push(Plotly.plot);
1204-
}
1205-
else {
1207+
} else {
12061208
seq.push(Plots.previousPromises);
12071209

12081210
Plots.supplyDefaults(gd);
@@ -1211,6 +1213,8 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
12111213
if(flags.docolorbars) seq.push(subroutines.doColorBars);
12121214
}
12131215

1216+
seq.push(Plots.rehover);
1217+
12141218
Queue.add(gd,
12151219
restyle, [gd, specs.undoit, specs.traces],
12161220
restyle, [gd, specs.redoit, specs.traces]
@@ -1695,11 +1699,11 @@ Plotly.relayout = function relayout(gd, astr, val) {
16951699
}
16961700

16971701
var aobj = {};
1698-
if(typeof astr === 'string') aobj[astr] = val;
1699-
else if(Lib.isPlainObject(astr)) {
1702+
if(typeof astr === 'string') {
1703+
aobj[astr] = val;
1704+
} else if(Lib.isPlainObject(astr)) {
17001705
aobj = Lib.extendFlat({}, astr);
1701-
}
1702-
else {
1706+
} else {
17031707
Lib.warn('Relayout fail.', astr, val);
17041708
return Promise.reject();
17051709
}
@@ -1717,8 +1721,7 @@ Plotly.relayout = function relayout(gd, astr, val) {
17171721

17181722
if(flags.layoutReplot) {
17191723
seq.push(subroutines.layoutReplot);
1720-
}
1721-
else if(Object.keys(aobj).length) {
1724+
} else if(Object.keys(aobj).length) {
17221725
seq.push(Plots.previousPromises);
17231726
Plots.supplyDefaults(gd);
17241727

@@ -1729,6 +1732,8 @@ Plotly.relayout = function relayout(gd, astr, val) {
17291732
if(flags.docamera) seq.push(subroutines.doCamera);
17301733
}
17311734

1735+
seq.push(Plots.rehover);
1736+
17321737
Queue.add(gd,
17331738
relayout, [gd, specs.undoit],
17341739
relayout, [gd, specs.redoit]
@@ -2129,6 +2134,8 @@ Plotly.update = function update(gd, traceUpdate, layoutUpdate, traces) {
21292134
if(relayoutFlags.doCamera) seq.push(subroutines.doCamera);
21302135
}
21312136

2137+
seq.push(Plots.rehover);
2138+
21322139
Queue.add(gd,
21332140
update, [gd, restyleSpecs.undoit, relayoutSpecs.undoit, restyleSpecs.traces],
21342141
update, [gd, restyleSpecs.redoit, relayoutSpecs.redoit, restyleSpecs.traces]

0 commit comments

Comments
 (0)