Skip to content

Branch for 1.31.2 #2111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Oct 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.


## [1.31.2] -- 2017-10-23

### Fixed
- Fix multiple `table` restyle bugs [#2107]
- Fix selection work when `visible: false` choropleth traces are present [#2099, #2109]
- Fix (another) contour generation bug [#2091]


## [1.31.1] -- 2017-10-16

### Fixed
Expand Down
36 changes: 18 additions & 18 deletions dist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ The main plotly.js bundle includes all the official (non-beta) trace modules.

It be can imported as minified javascript
- using dist file `dist/plotly.min.js`
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.31.1.min.js
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.31.2.min.js

or as raw javascript:
- using dist file `dist/plotly.js`
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.31.1.js
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.31.2.js
- using CommonJS with `require('plotly.js')`

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

| plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
|-----------|---------------|----------------------|---------------------|
| 5.6 MB | 2.2 MB | 684.4 kB | 5.8 MB |
| 5.6 MB | 2.2 MB | 684.5 kB | 5.8 MB |

## Partial bundles

Expand All @@ -74,13 +74,13 @@ The `basic` partial bundle contains the `scatter`, `bar` and `pie` trace modules
| dist bundle (minified) | `dist/plotly-basic.min.js` |
| CDN URL (latest) | https://cdn.plot.ly/plotly-basic-latest.js |
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-basic-latest.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.31.1.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.31.1.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.31.2.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.31.2.min.js |
| CommonJS | `require('plotly.js/lib/index-basic')` |

| Raw size | Minified size | Minified + gzip size |
|------|-----------------|------------------------|
| 1.9 MB | 686.3 kB | 223.1 kB |
| 1.9 MB | 686.2 kB | 223.1 kB |

### plotly.js cartesian

Expand All @@ -92,8 +92,8 @@ The `cartesian` partial bundle contains the `scatter`, `bar`, `box`, `heatmap`,
| dist bundle (minified) | `dist/plotly-cartesian.min.js` |
| CDN URL (latest) | https://cdn.plot.ly/plotly-cartesian-latest.js |
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-cartesian-latest.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.31.1.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.31.1.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.31.2.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.31.2.min.js |
| CommonJS | `require('plotly.js/lib/index-cartesian')` |

| Raw size | Minified size | Minified + gzip size |
Expand All @@ -110,8 +110,8 @@ The `geo` partial bundle contains the `scatter`, `scattergeo` and `choropleth` t
| dist bundle (minified) | `dist/plotly-geo.min.js` |
| CDN URL (latest) | https://cdn.plot.ly/plotly-geo-latest.js |
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-geo-latest.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.31.1.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.31.1.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.31.2.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.31.2.min.js |
| CommonJS | `require('plotly.js/lib/index-geo')` |

| Raw size | Minified size | Minified + gzip size |
Expand All @@ -128,8 +128,8 @@ The `gl3d` partial bundle contains the `scatter`, `scatter3d`, `surface` and `me
| dist bundle (minified) | `dist/plotly-gl3d.min.js` |
| CDN URL (latest) | https://cdn.plot.ly/plotly-gl3d-latest.js |
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-gl3d-latest.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.31.1.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.31.1.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.31.2.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.31.2.min.js |
| CommonJS | `require('plotly.js/lib/index-gl3d')` |

| Raw size | Minified size | Minified + gzip size |
Expand All @@ -146,8 +146,8 @@ The `gl2d` partial bundle contains the `scatter`, `scattergl`, `pointcloud`, `he
| dist bundle (minified) | `dist/plotly-gl2d.min.js` |
| CDN URL (latest) | https://cdn.plot.ly/plotly-gl2d-latest.js |
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-gl2d-latest.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.31.1.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.31.1.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.31.2.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.31.2.min.js |
| CommonJS | `require('plotly.js/lib/index-gl2d')` |

| Raw size | Minified size | Minified + gzip size |
Expand All @@ -164,8 +164,8 @@ The `mapbox` partial bundle contains the `scatter` and `scattermapbox` trace mod
| dist bundle (minified) | `dist/plotly-mapbox.min.js` |
| CDN URL (latest) | https://cdn.plot.ly/plotly-mapbox-latest.js |
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-mapbox-latest.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.31.1.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.31.1.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.31.2.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.31.2.min.js |
| CommonJS | `require('plotly.js/lib/index-mapbox')` |

| Raw size | Minified size | Minified + gzip size |
Expand All @@ -182,8 +182,8 @@ The `finance` partial bundle contains the `scatter`, `bar`, `histogram`, `pie`,
| dist bundle (minified) | `dist/plotly-finance.min.js` |
| CDN URL (latest) | https://cdn.plot.ly/plotly-finance-latest.js |
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-finance-latest.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-finance-1.31.1.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-finance-1.31.1.min.js |
| CDN URL (tagged) | https://cdn.plot.ly/plotly-finance-1.31.2.js |
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-finance-1.31.2.min.js |
| CommonJS | `require('plotly.js/lib/index-finance')` |

| Raw size | Minified size | Minified + gzip size |
Expand Down
2 changes: 1 addition & 1 deletion dist/npm-ls.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "plotly.js",
"version": "1.31.1",
"version": "1.31.2",
"dependencies": {
"3d-view": {
"version": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion dist/plot-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -21758,7 +21758,7 @@
"arrayOk": true,
"dflt": null,
"role": "style",
"description": "The width of cells.",
"description": "The width of columns expressed as a ratio. Columns fill the available width in proportion of their specified column widths.",
"editType": "calc"
},
"columnorder": {
Expand Down
11 changes: 4 additions & 7 deletions dist/plotly-basic.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* plotly.js (basic) v1.31.1
* plotly.js (basic) v1.31.2
* Copyright 2012-2017, Plotly, Inc.
* All rights reserved.
* Licensed under the MIT license
Expand Down Expand Up @@ -29568,7 +29568,7 @@ exports.svgAttrs = {
var Plotly = require('./plotly');

// package version injected by `npm run preprocess`
exports.version = '1.31.1';
exports.version = '1.31.2';

// inject promise polyfill
require('es6-promise').polyfill();
Expand Down Expand Up @@ -46595,7 +46595,7 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
for(i = 0; i < gd.calcdata.length; i++) {
cd = gd.calcdata[i];
trace = cd[0].trace;
if(!trace._module || !trace._module.selectPoints) continue;
if(trace.visible !== true || !trace._module || !trace._module.selectPoints) continue;

if(dragOptions.subplot) {
if(
Expand Down Expand Up @@ -54927,12 +54927,9 @@ var DESELECTDIM = require('../../constants/interactions').DESELECTDIM;
module.exports = function selectPoints(searchInfo, polygon) {
var cd = searchInfo.cd;
var selection = [];
var trace = cd[0].trace;
var node3 = cd[0].node3;
var i;

if(trace.visible !== true) return [];

if(polygon === false) {
// clear selection
for(i = 0; i < cd.length; i++) {
Expand Down Expand Up @@ -59450,7 +59447,7 @@ module.exports = function selectPoints(searchInfo, polygon) {

// TODO: include lines? that would require per-segment line properties
var hasOnlyLines = (!subtypes.hasMarkers(trace) && !subtypes.hasText(trace));
if(trace.visible !== true || hasOnlyLines) return [];
if(hasOnlyLines) return [];

var opacity = Array.isArray(marker.opacity) ? 1 : marker.opacity;

Expand Down
12 changes: 6 additions & 6 deletions dist/plotly-basic.min.js

Large diffs are not rendered by default.

72 changes: 34 additions & 38 deletions dist/plotly-cartesian.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* plotly.js (cartesian) v1.31.1
* plotly.js (cartesian) v1.31.2
* Copyright 2012-2017, Plotly, Inc.
* All rights reserved.
* Licensed under the MIT license
Expand Down Expand Up @@ -29666,7 +29666,7 @@ exports.svgAttrs = {
var Plotly = require('./plotly');

// package version injected by `npm run preprocess`
exports.version = '1.31.1';
exports.version = '1.31.2';

// inject promise polyfill
require('es6-promise').polyfill();
Expand Down Expand Up @@ -46693,7 +46693,7 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
for(i = 0; i < gd.calcdata.length; i++) {
cd = gd.calcdata[i];
trace = cd[0].trace;
if(!trace._module || !trace._module.selectPoints) continue;
if(trace.visible !== true || !trace._module || !trace._module.selectPoints) continue;

if(dragOptions.subplot) {
if(
Expand Down Expand Up @@ -56185,12 +56185,9 @@ var DESELECTDIM = require('../../constants/interactions').DESELECTDIM;
module.exports = function selectPoints(searchInfo, polygon) {
var cd = searchInfo.cd;
var selection = [];
var trace = cd[0].trace;
var node3 = cd[0].node3;
var i;

if(trace.visible !== true) return [];

if(polygon === false) {
// clear selection
for(i = 0; i < cd.length; i++) {
Expand Down Expand Up @@ -58598,18 +58595,13 @@ function makePath(pi, loc, edgeflag, xtol, ytol) {
if(cnt === 10000) {
Lib.log('Infinite loop in contour?');
}
var closedpath = equalPts(pts[0], pts[pts.length - 1], xtol, ytol),
totaldist = 0,
distThresholdFactor = 0.2 * pi.smoothing,
alldists = [],
cropstart = 0,
distgroup,
cnt2,
cnt3,
newpt,
ptcnt,
ptavg,
thisdist;
var closedpath = equalPts(pts[0], pts[pts.length - 1], xtol, ytol);
var totaldist = 0;
var distThresholdFactor = 0.2 * pi.smoothing;
var alldists = [];
var cropstart = 0;
var distgroup, cnt2, cnt3, newpt, ptcnt, ptavg, thisdist,
i, j, edgepathi, edgepathj;

/*
* Check for points that are too close together (<1/5 the average dist
Expand Down Expand Up @@ -58694,41 +58686,45 @@ function makePath(pi, loc, edgeflag, xtol, ytol) {

// edge path - does it start where an existing edge path ends, or vice versa?
var merged = false;
pi.edgepaths.forEach(function(edgepath, edgei) {
if(!merged && equalPts(edgepath[0], pts[pts.length - 1], xtol, ytol)) {
for(i = 0; i < pi.edgepaths.length; i++) {
edgepathi = pi.edgepaths[i];
if(!merged && equalPts(edgepathi[0], pts[pts.length - 1], xtol, ytol)) {
pts.pop();
merged = true;

// now does it ALSO meet the end of another (or the same) path?
var doublemerged = false;
pi.edgepaths.forEach(function(edgepath2, edgei2) {
if(!doublemerged && equalPts(
edgepath2[edgepath2.length - 1], pts[0], xtol, ytol)) {
for(j = 0; j < pi.edgepaths.length; j++) {
edgepathj = pi.edgepaths[j];
if(equalPts(edgepathj[edgepathj.length - 1], pts[0], xtol, ytol)) {
doublemerged = true;
pts.splice(0, 1);
pi.edgepaths.splice(edgei, 1);
if(edgei2 === edgei) {
pts.shift();
pi.edgepaths.splice(i, 1);
if(j === i) {
// the path is now closed
pi.paths.push(pts.concat(edgepath2));
pi.paths.push(pts.concat(edgepathj));
}
else {
pi.edgepaths[edgei2] =
pi.edgepaths[edgei2].concat(pts, edgepath2);
if(j > i) j--;
pi.edgepaths[j] = edgepathj.concat(pts, edgepathi);
}
break;
}
});
}
if(!doublemerged) {
pi.edgepaths[edgei] = pts.concat(edgepath);
pi.edgepaths[i] = pts.concat(edgepathi);
}
}
});
pi.edgepaths.forEach(function(edgepath, edgei) {
if(!merged && equalPts(edgepath[edgepath.length - 1], pts[0], xtol, ytol)) {
pts.splice(0, 1);
pi.edgepaths[edgei] = edgepath.concat(pts);
}
for(i = 0; i < pi.edgepaths.length; i++) {
if(merged) break;
edgepathi = pi.edgepaths[i];
if(equalPts(edgepathi[edgepathi.length - 1], pts[0], xtol, ytol)) {
pts.shift();
pi.edgepaths[i] = edgepathi.concat(pts);
merged = true;
}
});
}

if(!merged) pi.edgepaths.push(pts);
}
Expand Down Expand Up @@ -66554,7 +66550,7 @@ module.exports = function selectPoints(searchInfo, polygon) {

// TODO: include lines? that would require per-segment line properties
var hasOnlyLines = (!subtypes.hasMarkers(trace) && !subtypes.hasText(trace));
if(trace.visible !== true || hasOnlyLines) return [];
if(hasOnlyLines) return [];

var opacity = Array.isArray(marker.opacity) ? 1 : marker.opacity;

Expand Down
14 changes: 7 additions & 7 deletions dist/plotly-cartesian.min.js

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions dist/plotly-finance.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* plotly.js (finance) v1.31.1
* plotly.js (finance) v1.31.2
* Copyright 2012-2017, Plotly, Inc.
* All rights reserved.
* Licensed under the MIT license
Expand Down Expand Up @@ -29610,7 +29610,7 @@ exports.svgAttrs = {
var Plotly = require('./plotly');

// package version injected by `npm run preprocess`
exports.version = '1.31.1';
exports.version = '1.31.2';

// inject promise polyfill
require('es6-promise').polyfill();
Expand Down Expand Up @@ -46637,7 +46637,7 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
for(i = 0; i < gd.calcdata.length; i++) {
cd = gd.calcdata[i];
trace = cd[0].trace;
if(!trace._module || !trace._module.selectPoints) continue;
if(trace.visible !== true || !trace._module || !trace._module.selectPoints) continue;

if(dragOptions.subplot) {
if(
Expand Down Expand Up @@ -54969,12 +54969,9 @@ var DESELECTDIM = require('../../constants/interactions').DESELECTDIM;
module.exports = function selectPoints(searchInfo, polygon) {
var cd = searchInfo.cd;
var selection = [];
var trace = cd[0].trace;
var node3 = cd[0].node3;
var i;

if(trace.visible !== true) return [];

if(polygon === false) {
// clear selection
for(i = 0; i < cd.length; i++) {
Expand Down Expand Up @@ -62399,7 +62396,7 @@ module.exports = function selectPoints(searchInfo, polygon) {

// TODO: include lines? that would require per-segment line properties
var hasOnlyLines = (!subtypes.hasMarkers(trace) && !subtypes.hasText(trace));
if(trace.visible !== true || hasOnlyLines) return [];
if(hasOnlyLines) return [];

var opacity = Array.isArray(marker.opacity) ? 1 : marker.opacity;

Expand Down
14 changes: 7 additions & 7 deletions dist/plotly-finance.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/plotly-geo-assets.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading