Skip to content

Commit fc93674

Browse files
etpinardetpinard
committed
Merge branch 'master' into try-madge
2 parents dc91e8d + e63bab4 commit fc93674

File tree

111 files changed

+43357
-35701
lines changed

Some content is hidden

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

111 files changed

+43357
-35701
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
node_modules
2+
*.sublime*
23

34
build/*
45

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,18 @@ 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.16.3] -- 2016-08-23
14+
15+
### Fixed
16+
- Fix SVG exports for graphs with layout images [#846]
17+
- Properly handles duplicate categories in non-default `categoryorder` [#863]
18+
- Fix range selector position logic for overlaying axes [#873]
19+
- Autorange is now properly computed for heatmapgl and contourgl traces [#855,
20+
#874]
21+
- Trace toggling via legend preserves axis ranges in gl2d plots [#855, #874]
22+
- Bump `mapbox-gl` dependency to 0.22.0 [#867]
23+
24+
1325
## [1.16.2] -- 2016-08-09
1426

1527
### Fixed

‎devtools/test_dashboard/server.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function createMocksList(files) {
8484
return acc;
8585
}, []);
8686

87-
var filename = file.name.split('/').pop();
87+
var filename = file.name.split(path.sep).pop();
8888

8989
return {
9090
name: filename.slice(0, -5),

‎dist/README.md‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ The main plotly.js bundle includes all the official (non-beta) trace modules.
3636

3737
It be can imported as minified javascript
3838
- using dist file `dist/plotly.min.js`
39-
- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.min.js OR https://cdn.plot.ly/plotly-plotly-1.16.2.min.js
39+
- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.min.js OR https://cdn.plot.ly/plotly-plotly-1.16.3.min.js
4040

4141
or as raw javascript:
4242
- using dist file `dist/plotly.js`
43-
- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.js OR https://cdn.plot.ly/plotly-plotly-1.16.2.js
43+
- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.js OR https://cdn.plot.ly/plotly-plotly-1.16.3.js
4444
- using CommonJS with `require('plotly.js')`
4545

4646
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`
@@ -49,7 +49,7 @@ The main plotly.js bundle weights in at:
4949

5050
| plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
5151
|-----------|---------------|----------------------|---------------------|
52-
| 3.8 MB | 1.6 MB | 488.9 kB | 3.9 MB |
52+
| 3.8 MB | 1.7 MB | 502.9 kB | 3.9 MB |
5353

5454
## Partial bundles
5555

@@ -72,13 +72,13 @@ The `basic` partial bundle contains the `scatter`, `bar` and `pie` trace modules
7272
| dist bundle (minified) | `dist/plotly-basic.min.js` |
7373
| CDN URL (latest) | https://cdn.plot.ly/plotly-basic-latest.js |
7474
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-basic-latest.min.js |
75-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.16.2.js |
76-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.16.2.min.js |
75+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.16.3.js |
76+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.16.3.min.js |
7777
| CommonJS | `require('plotly.js/lib/index-basic')` |
7878

7979
| Raw size | Minified size | Minified + gzip size |
8080
|------|-----------------|------------------------|
81-
| 1.4 MB | 549 kB | 180.6 kB |
81+
| 1.4 MB | 549.2 kB | 180.6 kB |
8282

8383
### plotly.js cartesian
8484

@@ -90,13 +90,13 @@ The `cartesian` partial bundle contains the `scatter`, `bar`, `box`, `heatmap`,
9090
| dist bundle (minified) | `dist/plotly-cartesian.min.js` |
9191
| CDN URL (latest) | https://cdn.plot.ly/plotly-cartesian-latest.js |
9292
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-cartesian-latest.min.js |
93-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.16.2.js |
94-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.16.2.min.js |
93+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.16.3.js |
94+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.16.3.min.js |
9595
| CommonJS | `require('plotly.js/lib/index-cartesian')` |
9696

9797
| Raw size | Minified size | Minified + gzip size |
9898
|------|-----------------|------------------------|
99-
| 1.6 MB | 618.2 kB | 201.3 kB |
99+
| 1.6 MB | 618.4 kB | 201.3 kB |
100100

101101
### plotly.js geo
102102

@@ -108,13 +108,13 @@ The `geo` partial bundle contains the `scatter`, `scattergeo` and `choropleth` t
108108
| dist bundle (minified) | `dist/plotly-geo.min.js` |
109109
| CDN URL (latest) | https://cdn.plot.ly/plotly-geo-latest.js |
110110
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-geo-latest.min.js |
111-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.16.2.js |
112-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.16.2.min.js |
111+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.16.3.js |
112+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.16.3.min.js |
113113
| CommonJS | `require('plotly.js/lib/index-geo')` |
114114

115115
| Raw size | Minified size | Minified + gzip size |
116116
|------|-----------------|------------------------|
117-
| 1.5 MB | 578.6 kB | 191.5 kB |
117+
| 1.5 MB | 578.7 kB | 191.5 kB |
118118

119119
### plotly.js gl3d
120120

@@ -126,13 +126,13 @@ The `gl3d` partial bundle contains the `scatter`, `scatter3d`, `surface` and `me
126126
| dist bundle (minified) | `dist/plotly-gl3d.min.js` |
127127
| CDN URL (latest) | https://cdn.plot.ly/plotly-gl3d-latest.js |
128128
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-gl3d-latest.min.js |
129-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.16.2.js |
130-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.16.2.min.js |
129+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.16.3.js |
130+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.16.3.min.js |
131131
| CommonJS | `require('plotly.js/lib/index-gl3d')` |
132132

133133
| Raw size | Minified size | Minified + gzip size |
134134
|------|-----------------|------------------------|
135-
| 2.3 MB | 985.1 kB | 310.6 kB |
135+
| 2.3 MB | 985.2 kB | 310.7 kB |
136136

137137
### plotly.js gl2d
138138

@@ -144,13 +144,13 @@ The `gl2d` partial bundle contains the `scatter`, `scattergl`, `heatmapgl` and `
144144
| dist bundle (minified) | `dist/plotly-gl2d.min.js` |
145145
| CDN URL (latest) | https://cdn.plot.ly/plotly-gl2d-latest.js |
146146
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-gl2d-latest.min.js |
147-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.16.2.js |
148-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.16.2.min.js |
147+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.16.3.js |
148+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.16.3.min.js |
149149
| CommonJS | `require('plotly.js/lib/index-gl2d')` |
150150

151151
| Raw size | Minified size | Minified + gzip size |
152152
|------|-----------------|------------------------|
153-
| 2 MB | 854.8 kB | 271 kB |
153+
| 2 MB | 855.5 kB | 271.2 kB |
154154

155155
### plotly.js mapbox
156156

@@ -162,13 +162,13 @@ The `mapbox` partial bundle contains the `scatter` and `scattermapbox` trace mod
162162
| dist bundle (minified) | `dist/plotly-mapbox.min.js` |
163163
| CDN URL (latest) | https://cdn.plot.ly/plotly-mapbox-latest.js |
164164
| CDN URL (latest minified) | https://cdn.plot.ly/plotly-mapbox-latest.min.js |
165-
| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.16.2.js |
166-
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.16.2.min.js |
165+
| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.16.3.js |
166+
| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.16.3.min.js |
167167
| CommonJS | `require('plotly.js/lib/index-mapbox')` |
168168

169169
| Raw size | Minified size | Minified + gzip size |
170170
|------|-----------------|------------------------|
171-
| 2.3 MB | 957.9 kB | 285.1 kB |
171+
| 2.4 MB | 1017.5 kB | 298.9 kB |
172172

173173
----------------
174174

‎dist/extras/request_animation_frame.js‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/**
2+
* Copyright 2012-2016, Plotly, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* LICENSE file in the root directory of this source tree.
7+
*/
8+
9+
// This code adapted from:
10+
//
11+
// http://paulirish.com/2011/requestanimationframe-for-smart-animating/
12+
// http://my.opera.com/emoller/blog/2011/12/20/requestanimationframe-for-smart-er-animating
13+
14+
// requestAnimationFrame polyfill by Erik Möller. fixes from Paul Irish and Tino Zijdel
15+
16+
// MIT license
17+
18+
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) {
34+
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+
}

‎dist/plotly-basic.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (basic) v1.16.2
2+
* plotly.js (basic) v1.16.3
33
* Copyright 2012-2016, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -17490,6 +17490,7 @@ function imageDefaults(imageIn, imageOut, fullLayout) {
1749017490
var d3 = require('d3');
1749117491
var Drawing = require('../drawing');
1749217492
var Axes = require('../../plots/cartesian/axes');
17493+
var xmlnsNamespaces = require('../../constants/xmlns_namespaces');
1749317494

1749417495
module.exports = function draw(gd) {
1749517496

@@ -17531,9 +17532,10 @@ module.exports = function draw(gd) {
1753117532

1753217533
// Images must be converted to dataURL's for exporting.
1753317534
function setImage(d) {
17534-
1753517535
var thisImage = d3.select(this);
1753617536

17537+
thisImage.attr('xmlns', xmlnsNamespaces.svg);
17538+
1753717539
var imagePromise = new Promise(function(resolve) {
1753817540

1753917541
var img = new Image();
@@ -17571,7 +17573,6 @@ module.exports = function draw(gd) {
1757117573
}
1757217574

1757317575
function applyAttributes(d) {
17574-
1757517576
var thisImage = d3.select(this);
1757617577

1757717578
// Axes if specified
@@ -17619,7 +17620,9 @@ module.exports = function draw(gd) {
1761917620
yId = yref ? yref._id : '',
1762017621
clipAxes = xId + yId;
1762117622

17622-
thisImage.call(Drawing.setClipUrl, 'clip' + fullLayout._uid + clipAxes);
17623+
if(clipAxes) {
17624+
thisImage.call(Drawing.setClipUrl, 'clip' + fullLayout._uid + clipAxes);
17625+
}
1762317626
}
1762417627

1762517628

@@ -17649,7 +17652,7 @@ module.exports = function draw(gd) {
1764917652
imagesAbove.each(applyAttributes);
1765017653
};
1765117654

17652-
},{"../../plots/cartesian/axes":116,"../drawing":41,"d3":9}],53:[function(require,module,exports){
17655+
},{"../../constants/xmlns_namespaces":88,"../../plots/cartesian/axes":116,"../drawing":41,"d3":9}],53:[function(require,module,exports){
1765317656
/**
1765417657
* Copyright 2012-2016, Plotly, Inc.
1765517658
* All rights reserved.
@@ -20248,7 +20251,8 @@ function getPosDflt(containerOut, layout, counterAxes) {
2024820251

2024920252
var posY = 0;
2025020253
for(var i = 0; i < anchoredList.length; i++) {
20251-
posY = Math.max(layout[anchoredList[i]].domain[1], posY);
20254+
var domain = layout[anchoredList[i]].domain;
20255+
if(domain) posY = Math.max(domain[1], posY);
2025220256
}
2025320257

2025420258
return [containerOut.domain[0], posY + constants.yPad];
@@ -23233,7 +23237,7 @@ exports.svgAttrs = {
2323323237
var Plotly = require('./plotly');
2323423238

2323523239
// package version injected by `npm run preprocess`
23236-
exports.version = '1.16.2';
23240+
exports.version = '1.16.3';
2323723241

2323823242
// plot api
2323923243
exports.plot = Plotly.plot;
@@ -36122,7 +36126,7 @@ function flattenUniqueSort(axisLetter, sortFunction, data) {
3612236126
insertionIndex = bisector(categoryArray, category);
3612336127

3612436128
// skip loop on already encountered values
36125-
if(insertionIndex < categoryArray.length - 1 && categoryArray[insertionIndex] === category) continue;
36129+
if(insertionIndex < categoryArray.length && categoryArray[insertionIndex] === category) continue;
3612636130

3612736131
// insert value
3612836132
categoryArray.splice(insertionIndex, 0, category);

‎dist/plotly-basic.min.js‎

Lines changed: 7 additions & 7 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: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* plotly.js (cartesian) v1.16.2
2+
* plotly.js (cartesian) v1.16.3
33
* Copyright 2012-2016, Plotly, Inc.
44
* All rights reserved.
55
* Licensed under the MIT license
@@ -17574,6 +17574,7 @@ function imageDefaults(imageIn, imageOut, fullLayout) {
1757417574
var d3 = require('d3');
1757517575
var Drawing = require('../drawing');
1757617576
var Axes = require('../../plots/cartesian/axes');
17577+
var xmlnsNamespaces = require('../../constants/xmlns_namespaces');
1757717578

1757817579
module.exports = function draw(gd) {
1757917580

@@ -17615,9 +17616,10 @@ module.exports = function draw(gd) {
1761517616

1761617617
// Images must be converted to dataURL's for exporting.
1761717618
function setImage(d) {
17618-
1761917619
var thisImage = d3.select(this);
1762017620

17621+
thisImage.attr('xmlns', xmlnsNamespaces.svg);
17622+
1762117623
var imagePromise = new Promise(function(resolve) {
1762217624

1762317625
var img = new Image();
@@ -17655,7 +17657,6 @@ module.exports = function draw(gd) {
1765517657
}
1765617658

1765717659
function applyAttributes(d) {
17658-
1765917660
var thisImage = d3.select(this);
1766017661

1766117662
// Axes if specified
@@ -17703,7 +17704,9 @@ module.exports = function draw(gd) {
1770317704
yId = yref ? yref._id : '',
1770417705
clipAxes = xId + yId;
1770517706

17706-
thisImage.call(Drawing.setClipUrl, 'clip' + fullLayout._uid + clipAxes);
17707+
if(clipAxes) {
17708+
thisImage.call(Drawing.setClipUrl, 'clip' + fullLayout._uid + clipAxes);
17709+
}
1770717710
}
1770817711

1770917712

@@ -17733,7 +17736,7 @@ module.exports = function draw(gd) {
1773317736
imagesAbove.each(applyAttributes);
1773417737
};
1773517738

17736-
},{"../../plots/cartesian/axes":124,"../drawing":48,"d3":16}],60:[function(require,module,exports){
17739+
},{"../../constants/xmlns_namespaces":95,"../../plots/cartesian/axes":124,"../drawing":48,"d3":16}],60:[function(require,module,exports){
1773717740
/**
1773817741
* Copyright 2012-2016, Plotly, Inc.
1773917742
* All rights reserved.
@@ -20332,7 +20335,8 @@ function getPosDflt(containerOut, layout, counterAxes) {
2033220335

2033320336
var posY = 0;
2033420337
for(var i = 0; i < anchoredList.length; i++) {
20335-
posY = Math.max(layout[anchoredList[i]].domain[1], posY);
20338+
var domain = layout[anchoredList[i]].domain;
20339+
if(domain) posY = Math.max(domain[1], posY);
2033620340
}
2033720341

2033820342
return [containerOut.domain[0], posY + constants.yPad];
@@ -23317,7 +23321,7 @@ exports.svgAttrs = {
2331723321
var Plotly = require('./plotly');
2331823322

2331923323
// package version injected by `npm run preprocess`
23320-
exports.version = '1.16.2';
23324+
exports.version = '1.16.3';
2332123325

2332223326
// plot api
2332323327
exports.plot = Plotly.plot;
@@ -36230,7 +36234,7 @@ function flattenUniqueSort(axisLetter, sortFunction, data) {
3623036234
insertionIndex = bisector(categoryArray, category);
3623136235

3623236236
// skip loop on already encountered values
36233-
if(insertionIndex < categoryArray.length - 1 && categoryArray[insertionIndex] === category) continue;
36237+
if(insertionIndex < categoryArray.length && categoryArray[insertionIndex] === category) continue;
3623436238

3623536239
// insert value
3623636240
categoryArray.splice(insertionIndex, 0, category);
@@ -44918,6 +44922,7 @@ module.exports = function calc(gd, trace) {
4491844922
ya = Axes.getFromId(gd, trace.yaxis || 'y'),
4491944923
isContour = Plots.traceIs(trace, 'contour'),
4492044924
isHist = Plots.traceIs(trace, 'histogram'),
44925+
isGL2D = Plots.traceIs(trace, 'gl2d'),
4492144926
zsmooth = isContour ? 'best' : trace.zsmooth,
4492244927
x,
4492344928
x0,
@@ -45001,8 +45006,11 @@ module.exports = function calc(gd, trace) {
4500145006
yIn = trace.ytype === 'scaled' ? '' : trace.y,
4500245007
yArray = makeBoundArray(trace, yIn, y0, dy, z.length, ya);
4500345008

45004-
Axes.expand(xa, xArray);
45005-
Axes.expand(ya, yArray);
45009+
// handled in gl2d convert step
45010+
if(!isGL2D) {
45011+
Axes.expand(xa, xArray);
45012+
Axes.expand(ya, yArray);
45013+
}
4500645014

4500745015
var cd0 = {x: xArray, y: yArray, z: z};
4500845016

‎dist/plotly-cartesian.min.js‎

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

0 commit comments

Comments
 (0)