Skip to content

Commit ca6a892

Browse files
committed
Merge branch 'master' into expose-purge-method
2 parents a4e590a + dd15479 commit ca6a892

File tree

28 files changed

+9662
-1736
lines changed

28 files changed

+9662
-1736
lines changed

CHANGELOG.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,27 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
99

1010
where X.Y.Z is the semver of most recent plotly.js release.
1111

12+
13+
## [1.6.2] -- 2016-03-03
14+
15+
### Fixed
16+
- SVG overflow property is now properly set for IE11 [#305, #306]
17+
- Hover labels associated with `text` arrays with falsy values are properly
18+
skipped over [#310]
19+
- Snapshot routines now strip browser-only user-select style attributes [#311]
20+
21+
22+
## [1.6.1] -- 2016-03-01
23+
24+
### Fixed
25+
- Legend scroll bars are no longer invalid SVG elements (bug introduced in 1.6.0) [#304]
26+
- Colorscale YlGnBu and YlOrRd are now properly identified [#295]
27+
28+
1229
## [1.6.0] -- 2016-02-29
1330

1431
### Added
15-
- SVG cartesian, 3D geographic maps and pie chart can now coexist on the same
32+
- SVG cartesian, 3D, geographic maps and pie charts can now coexist on the same
1633
graph [#246, #258, #289]
1734
- Legends with long item lists are now scrollable (instead of being cropped)
1835
[#243]

build/plotcss.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ var rules = {
88
"X a": "text-decoration:none;",
99
"X a:hover": "text-decoration:none;",
1010
"X .crisp": "shape-rendering:crispEdges;",
11+
"X svg": "overflow:hidden;",
1112
"X svg a": "fill:#447adb;",
1213
"X svg a:hover": "fill:#3c6dc5;",
1314
"X .main-svg": "position:absolute;top:0;left:0;pointer-events:none;",

circle.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies:
2020
test:
2121
override:
2222
- sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' mytestbed)" -- bash -c "cd /var/www/streambed/image_server/plotly.js && node test/image/compare_pixels_test.js"
23+
- sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' mytestbed)" -- bash -c "cd /var/www/streambed/image_server/plotly.js && node test/image/export_test.js"
2324
- npm run citest-jasmine
2425
- npm run test-bundle
2526
- npm run test-syntax

devtools/test_dashboard/test_gl3d.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@ plots['marker-arrays'] = require('@mocks/gl3d_marker-arrays.json');
3535
plots['scatter3d-colorscale'] = require('@mocks/gl3d_scatter3d-colorscale.json');
3636
plots['autocolorscale'] = require('@mocks/gl3d_autocolorscale.json');
3737
plots['nan-holes'] = require('@mocks/gl3d_nan-holes.json');
38+
plots['tetrahedra'] = require('@mocks/gl3d_tet.json');
3839

3940
plotButtons(plots, figDir);

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.

0 commit comments

Comments
 (0)