Merge pull request #876 from plotly/mergeback-1.16.3

Merge 1.16.3 book-keeping into master
plotly · Aug 23, 2016 · 5b92305 · 5b92305
2 parents c627f0e + d4a373e
commit 5b92305
Show file tree

Hide file tree

Showing 21 changed files with 37,241 additions and 34,342 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,18 @@ 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.16.3] -- 2016-08-23
+
+### Fixed
+- Fix SVG exports for graphs with layout images [#846]
+- Properly handles duplicate categories in non-default `categoryorder` [#863]
+- Fix range selector position logic for overlaying axes [#873]
+- Autorange is now properly computed for heatmapgl and contourgl traces [#855,
+  #874]
+- Trace toggling via legend preserves axis ranges in gl2d plots [#855, #874]
+- Bump `mapbox-gl` dependency to 0.22.0 [#867]
+
+
 ## [1.16.2] -- 2016-08-09
 
 ### Fixed

diff --git a/dist/README.md b/dist/README.md
@@ -36,11 +36,11 @@ The main plotly.js bundle includes all the official (non-beta) trace modules.
 
 It be can imported as minified javascript
 - using dist file `dist/plotly.min.js`
-- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.min.js OR https://cdn.plot.ly/plotly-plotly-1.16.2.min.js
+- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.min.js OR https://cdn.plot.ly/plotly-plotly-1.16.3.min.js
 
 or as raw javascript:
 - using dist file `dist/plotly.js`
-- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.js OR https://cdn.plot.ly/plotly-plotly-1.16.2.js
+- using CDN URL https://cdn.plot.ly/plotly-plotly-latest.js OR https://cdn.plot.ly/plotly-plotly-1.16.3.js
 - using CommonJS with `require('plotly.js')`
 
 If you would like to have access to the attribute meta information (including attribute descriptions as on the [schema reference page](https://plot.ly/javascript/reference/)), use dist file `dist/plotly-with-meta.js`
@@ -49,7 +49,7 @@ The main plotly.js bundle weights in at:
 
 | plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
 |-----------|---------------|----------------------|---------------------|
-| 3.8 MB | 1.6 MB | 488.9 kB | 3.9 MB |
+| 3.8 MB | 1.7 MB | 502.9 kB | 3.9 MB |
 
 ## Partial bundles
 
@@ -72,13 +72,13 @@ The `basic` partial bundle contains the `scatter`, `bar` and `pie` trace modules
 | dist bundle (minified) | `dist/plotly-basic.min.js` |
 | CDN URL (latest) | https://cdn.plot.ly/plotly-basic-latest.js |
 | CDN URL (latest minified) | https://cdn.plot.ly/plotly-basic-latest.min.js |
-| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.16.2.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.16.2.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.16.3.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.16.3.min.js |
 | CommonJS | `require('plotly.js/lib/index-basic')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 1.4 MB | 549 kB | 180.6 kB |
+| 1.4 MB | 549.2 kB | 180.6 kB |
 
 ### plotly.js cartesian
 
@@ -90,13 +90,13 @@ The `cartesian` partial bundle contains the `scatter`, `bar`, `box`, `heatmap`,
 | dist bundle (minified) | `dist/plotly-cartesian.min.js` |
 | CDN URL (latest) | https://cdn.plot.ly/plotly-cartesian-latest.js |
 | CDN URL (latest minified) | https://cdn.plot.ly/plotly-cartesian-latest.min.js |
-| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.16.2.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.16.2.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.16.3.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.16.3.min.js |
 | CommonJS | `require('plotly.js/lib/index-cartesian')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 1.6 MB | 618.2 kB | 201.3 kB |
+| 1.6 MB | 618.4 kB | 201.3 kB |
 
 ### plotly.js geo
 
@@ -108,13 +108,13 @@ The `geo` partial bundle contains the `scatter`, `scattergeo` and `choropleth` t
 | dist bundle (minified) | `dist/plotly-geo.min.js` |
 | CDN URL (latest) | https://cdn.plot.ly/plotly-geo-latest.js |
 | CDN URL (latest minified) | https://cdn.plot.ly/plotly-geo-latest.min.js |
-| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.16.2.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.16.2.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.16.3.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.16.3.min.js |
 | CommonJS | `require('plotly.js/lib/index-geo')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 1.5 MB | 578.6 kB | 191.5 kB |
+| 1.5 MB | 578.7 kB | 191.5 kB |
 
 ### plotly.js gl3d
 
@@ -126,13 +126,13 @@ The `gl3d` partial bundle contains the `scatter`, `scatter3d`, `surface` and `me
 | dist bundle (minified) | `dist/plotly-gl3d.min.js` |
 | CDN URL (latest) | https://cdn.plot.ly/plotly-gl3d-latest.js |
 | CDN URL (latest minified) | https://cdn.plot.ly/plotly-gl3d-latest.min.js |
-| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.16.2.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.16.2.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.16.3.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.16.3.min.js |
 | CommonJS | `require('plotly.js/lib/index-gl3d')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 2.3 MB | 985.1 kB | 310.6 kB |
+| 2.3 MB | 985.2 kB | 310.7 kB |
 
 ### plotly.js gl2d
 
@@ -144,13 +144,13 @@ The `gl2d` partial bundle contains the `scatter`, `scattergl`, `heatmapgl` and `
 | dist bundle (minified) | `dist/plotly-gl2d.min.js` |
 | CDN URL (latest) | https://cdn.plot.ly/plotly-gl2d-latest.js |
 | CDN URL (latest minified) | https://cdn.plot.ly/plotly-gl2d-latest.min.js |
-| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.16.2.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.16.2.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.16.3.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.16.3.min.js |
 | CommonJS | `require('plotly.js/lib/index-gl2d')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 2 MB | 854.8 kB | 271 kB |
+| 2 MB | 855.5 kB | 271.2 kB |
 
 ### plotly.js mapbox
 
@@ -162,13 +162,13 @@ The `mapbox` partial bundle contains the `scatter` and `scattermapbox` trace mod
 | dist bundle (minified) | `dist/plotly-mapbox.min.js` |
 | CDN URL (latest) | https://cdn.plot.ly/plotly-mapbox-latest.js |
 | CDN URL (latest minified) | https://cdn.plot.ly/plotly-mapbox-latest.min.js |
-| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.16.2.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.16.2.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.16.3.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.16.3.min.js |
 | CommonJS | `require('plotly.js/lib/index-mapbox')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 2.3 MB | 957.9 kB | 285.1 kB |
+| 2.4 MB | 1017.5 kB | 298.9 kB |
 
 ----------------
 

diff --git a/dist/plotly-basic.js b/dist/plotly-basic.js
@@ -1,5 +1,5 @@
 /**
-* plotly.js (basic) v1.16.2
+* plotly.js (basic) v1.16.3
 * Copyright 2012-2016, Plotly, Inc.
 * All rights reserved.
 * Licensed under the MIT license
@@ -17490,6 +17490,7 @@ function imageDefaults(imageIn, imageOut, fullLayout) {
 var d3 = require('d3');
 var Drawing = require('../drawing');
 var Axes = require('../../plots/cartesian/axes');
+var xmlnsNamespaces = require('../../constants/xmlns_namespaces');
 
 module.exports = function draw(gd) {
 
@@ -17531,9 +17532,10 @@ module.exports = function draw(gd) {
 
     // Images must be converted to dataURL's for exporting.
     function setImage(d) {
-
         var thisImage = d3.select(this);
 
+        thisImage.attr('xmlns', xmlnsNamespaces.svg);
+
         var imagePromise = new Promise(function(resolve) {
 
             var img = new Image();
@@ -17571,7 +17573,6 @@ module.exports = function draw(gd) {
     }
 
     function applyAttributes(d) {
-
         var thisImage = d3.select(this);
 
         // Axes if specified
@@ -17619,7 +17620,9 @@ module.exports = function draw(gd) {
             yId = yref ? yref._id : '',
             clipAxes = xId + yId;
 
-        thisImage.call(Drawing.setClipUrl, 'clip' + fullLayout._uid + clipAxes);
+        if(clipAxes) {
+            thisImage.call(Drawing.setClipUrl, 'clip' + fullLayout._uid + clipAxes);
+        }
     }
 
 
@@ -17649,7 +17652,7 @@ module.exports = function draw(gd) {
     imagesAbove.each(applyAttributes);
 };
 
-},{"../../plots/cartesian/axes":116,"../drawing":41,"d3":9}],53:[function(require,module,exports){
+},{"../../constants/xmlns_namespaces":88,"../../plots/cartesian/axes":116,"../drawing":41,"d3":9}],53:[function(require,module,exports){
 /**
 * Copyright 2012-2016, Plotly, Inc.
 * All rights reserved.
@@ -20248,7 +20251,8 @@ function getPosDflt(containerOut, layout, counterAxes) {
 
     var posY = 0;
     for(var i = 0; i < anchoredList.length; i++) {
-        posY = Math.max(layout[anchoredList[i]].domain[1], posY);
+        var domain = layout[anchoredList[i]].domain;
+        if(domain) posY = Math.max(domain[1], posY);
     }
 
     return [containerOut.domain[0], posY + constants.yPad];
@@ -23233,7 +23237,7 @@ exports.svgAttrs = {
 var Plotly = require('./plotly');
 
 // package version injected by `npm run preprocess`
-exports.version = '1.16.2';
+exports.version = '1.16.3';
 
 // plot api
 exports.plot = Plotly.plot;
@@ -36122,7 +36126,7 @@ function flattenUniqueSort(axisLetter, sortFunction, data) {
             insertionIndex = bisector(categoryArray, category);
 
             // skip loop on already encountered values
-            if(insertionIndex < categoryArray.length - 1 && categoryArray[insertionIndex] === category) continue;
+            if(insertionIndex < categoryArray.length && categoryArray[insertionIndex] === category) continue;
 
             // insert value
             categoryArray.splice(insertionIndex, 0, category);

diff --git a/dist/plotly-basic.min.js b/dist/plotly-basic.min.js
diff --git a/dist/plotly-cartesian.js b/dist/plotly-cartesian.js
@@ -1,5 +1,5 @@
 /**
-* plotly.js (cartesian) v1.16.2
+* plotly.js (cartesian) v1.16.3
 * Copyright 2012-2016, Plotly, Inc.
 * All rights reserved.
 * Licensed under the MIT license
@@ -17574,6 +17574,7 @@ function imageDefaults(imageIn, imageOut, fullLayout) {
 var d3 = require('d3');
 var Drawing = require('../drawing');
 var Axes = require('../../plots/cartesian/axes');
+var xmlnsNamespaces = require('../../constants/xmlns_namespaces');
 
 module.exports = function draw(gd) {
 
@@ -17615,9 +17616,10 @@ module.exports = function draw(gd) {
 
     // Images must be converted to dataURL's for exporting.
     function setImage(d) {
-
         var thisImage = d3.select(this);
 
+        thisImage.attr('xmlns', xmlnsNamespaces.svg);
+
         var imagePromise = new Promise(function(resolve) {
 
             var img = new Image();
@@ -17655,7 +17657,6 @@ module.exports = function draw(gd) {
     }
 
     function applyAttributes(d) {
-
         var thisImage = d3.select(this);
 
         // Axes if specified
@@ -17703,7 +17704,9 @@ module.exports = function draw(gd) {
             yId = yref ? yref._id : '',
             clipAxes = xId + yId;
 
-        thisImage.call(Drawing.setClipUrl, 'clip' + fullLayout._uid + clipAxes);
+        if(clipAxes) {
+            thisImage.call(Drawing.setClipUrl, 'clip' + fullLayout._uid + clipAxes);
+        }
     }
 
 
@@ -17733,7 +17736,7 @@ module.exports = function draw(gd) {
     imagesAbove.each(applyAttributes);
 };
 
-},{"../../plots/cartesian/axes":124,"../drawing":48,"d3":16}],60:[function(require,module,exports){
+},{"../../constants/xmlns_namespaces":95,"../../plots/cartesian/axes":124,"../drawing":48,"d3":16}],60:[function(require,module,exports){
 /**
 * Copyright 2012-2016, Plotly, Inc.
 * All rights reserved.
@@ -20332,7 +20335,8 @@ function getPosDflt(containerOut, layout, counterAxes) {
 
     var posY = 0;
     for(var i = 0; i < anchoredList.length; i++) {
-        posY = Math.max(layout[anchoredList[i]].domain[1], posY);
+        var domain = layout[anchoredList[i]].domain;
+        if(domain) posY = Math.max(domain[1], posY);
     }
 
     return [containerOut.domain[0], posY + constants.yPad];
@@ -23317,7 +23321,7 @@ exports.svgAttrs = {
 var Plotly = require('./plotly');
 
 // package version injected by `npm run preprocess`
-exports.version = '1.16.2';
+exports.version = '1.16.3';
 
 // plot api
 exports.plot = Plotly.plot;
@@ -36230,7 +36234,7 @@ function flattenUniqueSort(axisLetter, sortFunction, data) {
             insertionIndex = bisector(categoryArray, category);
 
             // skip loop on already encountered values
-            if(insertionIndex < categoryArray.length - 1 && categoryArray[insertionIndex] === category) continue;
+            if(insertionIndex < categoryArray.length && categoryArray[insertionIndex] === category) continue;
 
             // insert value
             categoryArray.splice(insertionIndex, 0, category);
@@ -44918,6 +44922,7 @@ module.exports = function calc(gd, trace) {
         ya = Axes.getFromId(gd, trace.yaxis || 'y'),
         isContour = Plots.traceIs(trace, 'contour'),
         isHist = Plots.traceIs(trace, 'histogram'),
+        isGL2D = Plots.traceIs(trace, 'gl2d'),
         zsmooth = isContour ? 'best' : trace.zsmooth,
         x,
         x0,
@@ -45001,8 +45006,11 @@ module.exports = function calc(gd, trace) {
         yIn = trace.ytype === 'scaled' ? '' : trace.y,
         yArray = makeBoundArray(trace, yIn, y0, dy, z.length, ya);
 
-    Axes.expand(xa, xArray);
-    Axes.expand(ya, yArray);
+    // handled in gl2d convert step
+    if(!isGL2D) {
+        Axes.expand(xa, xArray);
+        Axes.expand(ya, yArray);
+    }
 
     var cd0 = {x: xArray, y: yArray, z: z};
 

diff --git a/dist/plotly-cartesian.min.js b/dist/plotly-cartesian.min.js
diff --git a/dist/plotly-geo-assets.js b/dist/plotly-geo-assets.js