8000 Merge branch 'master' into dropdown-filter · peak-dev/plotly.js@0a3ebd9 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0a3ebd9

Browse files
committed
Merge branch 'master' into dropdown-filter
2 parents fee87db + c71973b commit 0a3ebd9

37 files changed

+91684
-88999
lines changed

.eslintrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
"no-unused-vars": [2],
3636
"no-use-before-define": [2, "nofunc"],
3737
"no-loop-func": [2],
38-
"no-console": [0]
38+
"no-console": [0],
39+
"no-unexpected-multiline": [2],
40+
"no-unused-labels": [2]
3941
},
4042
}

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ 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+
## [1.5.2] -- 2016-02-10
13+
14+
### Fixed
15+
- Fix geo trace visibility toggling (bug introduced in 1.5.1) [#245]
16+
17+
1218
## [1.5.1] -- 2016-02-01
1319

1420
### Fixed
@@ -18,7 +24,7 @@ where X.Y.Z is the semver of most recent plotly.js release.
1824
- Soon to be deprecated `SVGElement.offsetParent` calls are removed [#222]
1925
- Geo zoom in button is now correctly titled `Zoom in` [#219]
2026
- All attribute description are correctly stripped from the dist files (bug
21-
introduce in 1.5.0) [#223]
27+
introduced in 1.5.0) [#223]
2228
- Insecure dev dependencies `ecstatic` and `uglify-js` are bumped [#225]
2329
- Outdated karma-browserify dev dependency is bumped [#229]
2430

devtools/test_dashboard/buttons.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* global Plotly:false Tabs:false */
22

3+
var Lib = require('@src/lib');
4+
35
var plotlist = document.getElementById('plot-list');
46
var anchor = document.getElementById('embedded-graph');
57
var image = document.getElementById('embedded-image');
@@ -40,9 +42,10 @@ function plotButtons(plots, figDir) {
4042
anchor.appendChild(gd);
4143

4244
var plot = plots[plotname];
43-
Plotly.plot(gd, plot.data, plot.layout);
44-
45+
var data = Lib.extendDeep([], plot.data);
46+
var layout = Lib.extendDeep({}, plot.layout);
4547

48+
Plotly.plot(gd, data, layout);
4649
});
4750
});
4851

devtools/test_dashboard/index.html

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
<!-- helper functions to manipulate the graph div -->
2323
<script>
24+
var d3 = Plotly.d3;
25+
2426
var Tabs = {
2527
getGraph: function() {
2628
return document.getElementById('embedded-graph').children[0];
@@ -34,10 +36,15 @@
3436
anchor.appendChild(graphDiv);
3537

3638
return graphDiv;
39+
},
40+
plotMock: function(mockName) {
41+
var mockURL = '../../test/image/mocks/' + mockName + '.json';
42+
43+
d3.json(mockURL, function(err, fig) {
44+
Plotly.plot(Tabs.fresh(), fig.data, fig.layout);
45+
});
3746
}
3847
};
39-
40-
var d3 = Plotly.d3;
4148
</script>
4249

4350
</body>

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-with-meta.js

Lines changed: 45134 additions & 44311 deletions
Large diffs are not rendered by default.

dist/plotly.js

Lines changed: 45134 additions & 44311 deletions
Large diffs are not rendered by default.

dist/plotly.min.js

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "plotly.js",
3-
"version": "1.5.1",
3+
"version": "1.5.2",
44
"description": "The open source javascript graphing library that powers plotly",
55
"license": "MIT",
66
"main": "./lib/index.js",
@@ -82,9 +82,9 @@
8282
"browserify": "^13.0.0",
8383
"browserify-transform-tools": "^1.5.1",
8484
"ecstatic": "^1.4.0",
85-
"eslint": "^1.10.3",
85+
"eslint": "^2.1.0",
8686
"falafel": "^1.2.0",
87-
"glob": "^6.0.4",
87+
"glob": "^7.0.0",
8888
"jasmine-core": "^2.3.4",
8989
"karma": "^0.13.15",
9090
"karma-browserify": "^5.0.1",

src/.eslintrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
"env": {
44
"browser": true
55
},
6+
"globals": {
7+
"Promise": true,
8+
"Uint8Array": true
9+
},
610
"rules": {
711
"strict": [2, "global"]
812
}

0 commit comments

Comments
 (0)
0