Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bd960c9

Browse files
etpinardetpinard
committed
Merge branch 'master' into gl-hover
2 parents 2849724 + 5d35fd6 commit bd960c9

File tree

128 files changed

+92564
-89161
lines changed

Some content is hidden

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

128 files changed

+92564
-89161
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

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
3232
**Prerequisites**:
3333

3434
- git
35-
- [node.js](https://nodejs.org/en/). We recommend using node.js 4.2.1 (LTS).
35+
- [node.js](https://nodejs.org/en/). We recommend using node.js 4.2.x (LTS).
3636
Upgrading and managing node versions can be easily done using
3737
[`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
3838

‎README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Read the [Getting started page](https://plot.ly/javascript/getting-started/) for
5151

5252
## Modules
5353

54-
If you would like to reduce the bundle size of plotly.js, you can create a *custom* bundle by using `plotly.js/lib/core`, and loading only the trace types that you need (e.g. `pie` or `choropleth`). The recommended way to do this is by creating a *bundling file*:
54+
If you would like to reduce the bundle size of plotly.js, you can create a *custom* bundle by using `plotly.js/lib/core`, and loading only the trace types that you need (e.g. `pie` or `choropleth`). The recommended way to do this is by creating a *bundling file*:
5555

5656
```javascript
5757
// in custom-plotly.js
@@ -63,7 +63,7 @@ plotlyCore.register([
6363
require('plotly.js/lib/choropleth')
6464
]);
6565

66-
module.exports = customPlotly;
66+
module.exports = plotlyCore;
6767
```
6868

6969
Then elsewhere in your code:
@@ -119,7 +119,7 @@ plotly.js is maintained under the [Semantic Versioning guidelines](http://semver
119119

120120
See the [Releases section](https://github.com/plotly/plotly.js/releases) of our GitHub project for changelogs for each release version of plotly.js.
121121

122-
## Clients for R, Python, and MATLAB
122+
## Clients for R, Python, Node, and MATLAB
123123

124124
Open-source clients to the plotly.js APIs are available at these links:
125125

@@ -128,7 +128,8 @@ Open-source clients to the plotly.js APIs are available at these links:
128128
|**R / RStudio**| [ropensci/plotly](https://github.com/ropensci/plotly) | [plot.ly/r/getting-started](https://plot.ly/r/getting-started) |
129129
|**Python / Pandas / IPython notebook**| [plotly/plotly.py](https://github.com/plotly/plotly.py) | [plot.ly/python/getting-started](https://plot.ly/python/getting-started) |
130130
|**MATLAB**| [plotly/matlab-api](https://github.com/plotly/matlab-api) | [plot.ly/matlab/getting-started](https://plot.ly/matlab/getting-started) |
131-
|**node.js**| [plotly/plotly-nodejs](https://github.com/plotly/plotly-nodejs) | [plot.ly/nodejs/getting-started](https://plot.ly/nodejs/getting-started) |
131+
|**node.js / Tonicdev / Jupyter notebook**| [plotly/plotly-notebook-js](https://github.com/plotly/plotly-notebook-js) | |
132+
|**node.js cloud client**| [plotly/plotly-nodejs](https://github.com/plotly/plotly-nodejs) | [plot.ly/nodejs/getting-started](https://plot.ly/nodejs/getting-started) |
132133
|**Julia**| [plotly/Plotly.jl](https://github.com/plotly/Plotly.jl) | [plot.ly/julia/getting-started](https://plot.ly/julia/getting-started) |
133134

134135
plotly.js charts can also be created and saved online for free at [plot.ly/plot](https://plot.ly/plot).

‎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.

0 commit comments

Comments
 (0)