Merge branch 'master' into has-plot-type

Author: etpinard

CHANGELOG.md

@@ -10,6 +10,34 @@ 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.10.2] -- 2016-05-05
+
+### Fixed
+- Subplot and range slider clip paths are now functional in AngularJS [#509]
+- `relayout` call involving axis `categoryorder` and `categoryarray` are now
+  working [#510]
+- Annotation drag interactions in `editable: true` mode are now functional (bug
+  introduced in 1.10.0)[#505]
+- Improved attribute description for shape `xref` and `yref` [#506]
+
+
+## [1.10.1] -- 2016-05-02
+
+### Fixed
+- Resizing a graph (e.g. via `Plotly.relayout` or Plotly.Plots.resize)
+  properly updates the plot area clip paths (bug introduced in 1.10.0) [#490]
+- `Plotly.Snapshot.toSVG` is now functional again in IE11 and old version of
+  Chrome and FF (bug introduced in 1.10.0) [#489]
+- Hover labels of superimposed traces when 'hovermode' is set to 'closest' are
+  properly displayed (bug introduced in 1.10.0) [#495]
+- Surface contour highlights are toggleable [#459]
+- Surface contour highlights style attributes are lower cased [#459]
+- Zoom overlay are drawn over shapes [#448]
+- Legend are draggable in `editable: true` contexts (bug introduced in 1.6.0)
+  [#487]
+- Legend scroll box are drawn outside the legend [#478]
+
+
 ## [1.10.0] -- 2016-04-12
 
 ### Added

README.md

@@ -28,12 +28,14 @@ chart types, including 3D charts, statistical graphs, and SVG maps.
 #### Download the latest release
 [Latest Release on Github](https://github.com/plotly/plotly.js/releases/)
 
+and use the plotly.js `dist` file(s). More info [here](https://github.com/plotly/plotly.js/blob/master/dist/README.md).
+
 #### Clone the repo
 ```bash
 git clone https://github.com/plotly/plotly.js.git
 ```
 
-and use the plotly.js `dist` file(s). More info [here](https://github.com/plotly/plotly.js/blob/master/dist/README.md).
+and use the plotly.js `dist` file(s).
 
 #### Install with `npm`
 ```bash
@@ -53,7 +55,7 @@ and use the plotly.js `dist` file(s) or require plotly.js using CommonJS as `var
 
 and use the `Plotly` object in the window scope.
 
-Read the [Getting started page](https://plot.ly/javascript/getting-started/) for more examples.
+##### Read the [Getting started page](https://plot.ly/javascript/getting-started/) for more examples.
 
 ## Modules
 
@@ -82,7 +84,7 @@ To learn more about the plotly.js module architecture, refer to our [modularizin
 
 #### Non-ascii characters
 
-Important: the plotly.js code base contains some non-ascii characters. Therefore, please make sure to set the `chartset` attribute to `"utf-8"` in the script tag that imports your plotly.js bundle. For example:
+Important: the plotly.js code base contains some non-ascii characters. Therefore, please make sure to set the `charset` attribute to `"utf-8"` in the script tag that imports your plotly.js bundle. For example:
 
 ```html
 <script type="text/javascript" src="my-plotly-bundle.js" charset="utf-8"></script>

devtools/test_dashboard/devtools.js

@@ -11,6 +11,13 @@ var d3 = window.d3 = Plotly.d3;
 // Our gracious testing object
 var Tabs = {
 
+    // Set plot config options
+    setPlotConfig: function() {
+
+        // use local topojson files
+        Plotly.setPlotConfig({ topojsonURL: '../../dist/topojson/' });
+    },
+
     // Return the specified plot container (or default one)
     getGraph: function(id) {
         id = id || 'graph';
@@ -24,7 +31,7 @@ var Tabs = {
         var graphDiv = Tabs.getGraph(id);
 
         if(graphDiv) {
-            graphDiv.remove();
+            graphDiv.parentNode.removeChild(graphDiv);
         }
 
         graphDiv = document.createElement('div');
@@ -110,6 +117,7 @@ var Tabs = {
         var interval = setInterval(function() {
             if(window.Plotly) {
                 clearInterval(interval);
+                Tabs.setPlotConfig();
                 Tabs.onReload();
             }
         }, 100);
@@ -125,6 +133,8 @@ setInterval(function() {
     window.fullData = window.gd._fullData;
 }, 1000);
 
+// Set plot config on first load
+Tabs.setPlotConfig();
 
 // Mocks search and plotting
 var f = new Fuse(mocks, {

devtools/test_dashboard/index.html

@@ -2,6 +2,7 @@
 <html>
 <head>
   <title>Plotly.js Devtools</title>
+  <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans:600,400,300,200|Droid+Sans|PT+Sans+Narrow|Gravitas+One|Droid+Sans+Mono|Droid+Serif|Raleway|Old+Standard+TT"/>
   <link rel="stylesheet" type="text/css" href="./style.css">
 </head>
 <body>
@@ -18,8 +19,8 @@
   </div>
   <div id="snapshot"></div>
 
+  <script type="text/javascript" src="../../dist/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
   <script id="source" type="text/javascript" src="../../build/plotly.js"></script>
   <script type="text/javascript" src="../../build/test_dashboard-bundle.js"></script>
 </body>
 </html>
-