Merge branch 'master' into gl-hover

Author: etpinard

.eslintrc

@@ -35,6 +35,8 @@
     "no-unused-vars": [2],
     "no-use-before-define": [2, "nofunc"],
     "no-loop-func": [2],
-    "no-console": [0]
+    "no-console": [0],
+    "no-unexpected-multiline": [2],
+    "no-unused-labels": [2]
   },
 }

CHANGELOG.md

@@ -9,6 +9,12 @@ 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.5.2] -- 2016-02-10
+
+### Fixed
+- Fix geo trace visibility toggling (bug introduced in 1.5.1) [#245]
+
+
 ## [1.5.1] -- 2016-02-01
 
 ### Fixed
@@ -18,7 +24,7 @@ where X.Y.Z is the semver of most recent plotly.js release.
 - Soon to be deprecated `SVGElement.offsetParent` calls are removed [#222]
 - Geo zoom in button is now correctly titled `Zoom in` [#219]
 - All attribute description are correctly stripped from the dist files (bug
-  introduce in 1.5.0) [#223]
+  introduced in 1.5.0) [#223]
 - Insecure dev dependencies `ecstatic` and `uglify-js` are bumped [#225]
 - Outdated karma-browserify dev dependency is bumped [#229]
 

CONTRIBUTING.md

@@ -32,7 +32,7 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
 **Prerequisites**:
 
 - git
-- [node.js](https://nodejs.org/en/). We recommend using node.js 4.2.1 (LTS).
+- [node.js](https://nodejs.org/en/). We recommend using node.js 4.2.x (LTS).
   Upgrading and managing node versions can be easily done using
   [`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
 

README.md

@@ -51,7 +51,7 @@ Read the [Getting started page](https://plot.ly/javascript/getting-started/) for
 
 ## Modules
 
-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*: 
+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*:
 
 ```javascript
 // in custom-plotly.js
@@ -63,7 +63,7 @@ plotlyCore.register([
     require('plotly.js/lib/choropleth')
 ]);
 
-module.exports = customPlotly;
+module.exports = plotlyCore;
 ```
 
 Then elsewhere in your code:
@@ -119,7 +119,7 @@ plotly.js is maintained under the [Semantic Versioning guidelines](http://semver
 
 See the [Releases section](https://github.com/plotly/plotly.js/releases) of our GitHub project for changelogs for each release version of plotly.js.
 
-## Clients for R, Python, and MATLAB
+## Clients for R, Python, Node, and MATLAB
 
 Open-source clients to the plotly.js APIs are available at these links:
 
@@ -128,7 +128,8 @@ Open-source clients to the plotly.js APIs are available at these links:
 |**R / RStudio**| [ropensci/plotly](https://github.com/ropensci/plotly) | [plot.ly/r/getting-started](https://plot.ly/r/getting-started) |
 |**Python / Pandas / IPython notebook**| [plotly/plotly.py](https://github.com/plotly/plotly.py) | [plot.ly/python/getting-started](https://plot.ly/python/getting-started) |
 |**MATLAB**| [plotly/matlab-api](https://github.com/plotly/matlab-api) | [plot.ly/matlab/getting-started](https://plot.ly/matlab/getting-started) |
-|**node.js**| [plotly/plotly-nodejs](https://github.com/plotly/plotly-nodejs) | [plot.ly/nodejs/getting-started](https://plot.ly/nodejs/getting-started) |
+|**node.js / Tonicdev / Jupyter notebook**| [plotly/plotly-notebook-js](https://github.com/plotly/plotly-notebook-js) | |
+|**node.js cloud client**| [plotly/plotly-nodejs](https://github.com/plotly/plotly-nodejs) | [plot.ly/nodejs/getting-started](https://plot.ly/nodejs/getting-started) |
 |**Julia**| [plotly/Plotly.jl](https://github.com/plotly/Plotly.jl) | [plot.ly/julia/getting-started](https://plot.ly/julia/getting-started) |
 
 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

@@ -1,5 +1,7 @@
 /* global Plotly:false Tabs:false */
 
+var Lib = require('@src/lib');
+
 var plotlist = document.getElementById('plot-list');
 var anchor = document.getElementById('embedded-graph');
 var image = document.getElementById('embedded-image');
@@ -40,9 +42,10 @@ function plotButtons(plots, figDir) {
             anchor.appendChild(gd);
 
             var plot = plots[plotname];
-            Plotly.plot(gd, plot.data, plot.layout);
-
+            var data = Lib.extendDeep([], plot.data);
+            var layout = Lib.extendDeep({}, plot.layout);
 
+            Plotly.plot(gd, data, layout);
         });
     });
 

devtools/test_dashboard/index.html

@@ -21,6 +21,8 @@
 
     <!-- helper functions to manipulate the graph div -->
     <script>
+    var d3 = Plotly.d3;
+
     var Tabs = {
         getGraph: function() {
             return document.getElementById('embedded-graph').children[0];
@@ -34,10 +36,15 @@
             anchor.appendChild(graphDiv);
 
             return graphDiv;
+        },
+        plotMock: function(mockName) {
+            var mockURL = '../../test/image/mocks/' + mockName + '.json';
+
+            d3.json(mockURL, function(err, fig) {
+                Plotly.plot(Tabs.fresh(), fig.data, fig.layout);
+            });
         }
     };
-
-    var d3 = Plotly.d3;
     </script>
 
 </body>