Merge branch 'merge-animate-api-take-3' into animate-api-take-3

Author: rreusser

CHANGELOG.md

@@ -10,6 +10,20 @@ 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.14.1] -- 2016-06-28
+
+### Fixed
+- Fix colorscale restyle calls on heatmap traces (bug introduced in 1.14.0)
+  [#694]
+- Hover after zoom / pan is now functional again in ternary plots (bug
+  introduced in 1.14.0) [#688]
+- Fix mapbox layer relayout starting from invisible layer [#693]
+- Hover labels when `hoveron: 'fills'` are now constrained to the viewports
+  [#688]
+- Fix `surface` countours description [#696]
+- Fix `mapbox.layers.line` description [#690]
+
+
 ## [1.14.0] -- 2016-06-22
 
 ### Added

README.md

@@ -1,10 +1,7 @@
 <a href="https://plot.ly/javascript/"><img src="http://images.plot.ly/logo/[email protected]" height="70"></a>
 
 [![npm version](https://badge.fury.io/js/plotly.js.svg)](https://badge.fury.io/js/plotly.js)
-
 [![circle ci](https://circleci.com/gh/plotly/plotly.js.png?&style=shield&circle-token=1f42a03b242bd969756fc3e53ede204af9b507c0)](https://circleci.com/gh/plotly/plotly.js)
-[![Dependency Status](https://david-dm.org/plotly/plotly.js.svg?style=flat-square)](https://david-dm.org/plotly/plotly.js)
-[![devDependency Status](https://david-dm.org/plotly/plotly.js/dev-status.svg?style=flat-square)](https://david-dm.org/plotly/plotly.js#info=devDependencies)
 
 Built on top of [d3.js](http://d3js.org/) and [stack.gl](http://stack.gl/),
 plotly.js is a high-level, declarative charting library. plotly.js ships with 20

dist/plotly-geo-assets.js

@@ -1,5 +1,5 @@
 /**
-* plotly.js v1.14.0
+* plotly.js v1.14.1
 * Copyright 2012-2016, Plotly, Inc.
 * All rights reserved.
 * Licensed under the MIT license
@@ -60704,7 +60704,7 @@ exports.svgAttrs = {
 var Plotly = require('./plotly');
 
 // package version injected by `npm run preprocess`
-exports.version = '1.14.0';
+exports.version = '1.14.1';
 
 // plot api
 exports.plot = Plotly.plot;
@@ -83808,9 +83808,9 @@ proto.initInteractions = function() {
         Plotly.relayout(gd, attrs);
     }
 
-    dragElement.init(dragOptions);
-
     // finally, set up hover and click
+    // these event handlers must already be set before dragElement.init
+    // so it can stash them and override them.
     dragger.onmousemove = function(evt) {
         fx.hover(gd, evt, _this.id);
         gd._fullLayout._lasthover = dragger;
@@ -83826,6 +83826,8 @@ proto.initInteractions = function() {
     dragger.onclick = function(evt) {
         fx.click(gd, evt);
     };
+
+    dragElement.init(dragOptions);
 };
 
 function removeZoombox(gd) {
@@ -89255,15 +89257,15 @@ function plotOne(gd, plotinfo, cd) {
 
     image3.enter().append('svg:image').attr({
         xmlns: xmlnsNamespaces.svg,
-        'xlink:href': canvas.toDataURL('image/png'),
         preserveAspectRatio: 'none'
     });
 
     image3.attr({
         height: imageHeight,
         width: imageWidth,
         x: left,
-        y: top
+        y: top,
+        'xlink:href': canvas.toDataURL('image/png')
     });
 
     image3.exit().remove();
@@ -93250,6 +93252,11 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
         }
 
         if(inside) {
+            // constrain ymin/max to the visible plot, so the label goes
+            // at the middle of the piece you can see
+            ymin = Math.max(ymin, 0);
+            ymax = Math.min(ymax, ya._length);
+
             // find the overall left-most and right-most points of the
             // polygon(s) we're inside at their combined vertical midpoint.
             // This is where we will draw the hover label.
@@ -93271,6 +93278,10 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
                 }
             }
 
+            // constrain xmin/max to the visible plot now too
+            xmin = Math.max(xmin, 0);
+            xmax = Math.min(xmax, xa._length);
+
             // get only fill or line color for the hover color
             var color = Color.defaultLine;
             if(Color.opacity(trace.fillcolor)) color = trace.fillcolor;
@@ -96665,12 +96676,29 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
     var scatterPointData = scatterHover(pointData, xval, yval, hovermode);
     if(!scatterPointData || scatterPointData[0].index === false) return;
 
-    // if hovering on a fill, we don't show any point data so the label is
-    // unchanged from what scatter gives us.
-    if(scatterPointData[0].index === undefined) return scatterPointData;
+    var newPointData = scatterPointData[0];
 
-    var newPointData = scatterPointData[0],
-        cdi = newPointData.cd[newPointData.index];
+    // if hovering on a fill, we don't show any point data so the label is
+    // unchanged from what scatter gives us - except that it needs to
+    // be constrained to the trianglular plot area, not just the rectangular
+    // area defined by the synthetic x and y axes
+    // TODO: in some cases the vertical middle of the shape is not within
+    // the triangular viewport at all, so the label can become disconnected
+    // from the shape entirely. But calculating what portion of the shape
+    // is actually visible, as constrained by the diagonal axis lines, is not
+    // so easy and anyway we lost the information we would have needed to do
+    // this inside scatterHover.
+    if(newPointData.index === undefined) {
+        var yFracUp = 1 - (newPointData.y0 / pointData.ya._length),
+            xLen = pointData.xa._length,
+            xMin = xLen * yFracUp / 2,
+            xMax = xLen - xMin;
+        newPointData.x0 = Math.max(Math.min(newPointData.x0, xMax), xMin);
+        newPointData.x1 = Math.max(Math.min(newPointData.x1, xMax), xMin);
+        return scatterPointData;
+    }
+
+    var cdi = newPointData.cd[newPointData.index];
 
     newPointData.a = cdi.a;
     newPointData.b = cdi.b;
@@ -96867,7 +96895,7 @@ function makeContourProjAttr(axLetter) {
         dflt: false,
         description: [
             'Determines whether or not these contour lines are projected',
-            'on the', axLetter, 'axis walls.',
+            'on the', axLetter, 'plane.',
             'If `highlight` is set to *true* (the default), the projected',
             'lines are shown on hover.',
             'If `show` is set to *true*, the projected lines are shown',

dist/plotly-with-meta.js

@@ -1,5 +1,5 @@
 /**
-* plotly.js v1.14.0
+* plotly.js v1.14.1
 * Copyright 2012-2016, Plotly, Inc.
 * All rights reserved.
 * Licensed under the MIT license
@@ -60280,7 +60280,7 @@ exports.svgAttrs = {
 var Plotly = require('./plotly');
 
 // package version injected by `npm run preprocess`
-exports.version = '1.14.0';
+exports.version = '1.14.1';
 
 // plot api
 exports.plot = Plotly.plot;
@@ -82930,9 +82930,9 @@ proto.initInteractions = function() {
         Plotly.relayout(gd, attrs);
     }
 
-    dragElement.init(dragOptions);
-
     // finally, set up hover and click
+    // these event handlers must already be set before dragElement.init
+    // so it can stash them and override them.
     dragger.onmousemove = function(evt) {
         fx.hover(gd, evt, _this.id);
         gd._fullLayout._lasthover = dragger;
@@ -82948,6 +82948,8 @@ proto.initInteractions = function() {
     dragger.onclick = function(evt) {
         fx.click(gd, evt);
     };
+
+    dragElement.init(dragOptions);
 };
 
 function removeZoombox(gd) {
@@ -88192,15 +88194,15 @@ function plotOne(gd, plotinfo, cd) {
 
     image3.enter().append('svg:image').attr({
         xmlns: xmlnsNamespaces.svg,
-        'xlink:href': canvas.toDataURL('image/png'),
         preserveAspectRatio: 'none'
     });
 
     image3.attr({
         height: imageHeight,
         width: imageWidth,
         x: left,
-        y: top
+        y: top,
+        'xlink:href': canvas.toDataURL('image/png')
     });
 
     image3.exit().remove();
@@ -91888,6 +91890,11 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
         }
 
         if(inside) {
+            // constrain ymin/max to the visible plot, so the label goes
+            // at the middle of the piece you can see
+            ymin = Math.max(ymin, 0);
+            ymax = Math.min(ymax, ya._length);
+
             // find the overall left-most and right-most points of the
             // polygon(s) we're inside at their combined vertical midpoint.
             // This is where we will draw the hover label.
@@ -91909,6 +91916,10 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
                 }
             }
 
+            // constrain xmin/max to the visible plot now too
+            xmin = Math.max(xmin, 0);
+            xmax = Math.min(xmax, xa._length);
+
             // get only fill or line color for the hover color
             var color = Color.defaultLine;
             if(Color.opacity(trace.fillcolor)) color = trace.fillcolor;
@@ -95193,12 +95204,29 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
     var scatterPointData = scatterHover(pointData, xval, yval, hovermode);
     if(!scatterPointData || scatterPointData[0].index === false) return;
 
-    // if hovering on a fill, we don't show any point data so the label is
-    // unchanged from what scatter gives us.
-    if(scatterPointData[0].index === undefined) return scatterPointData;
+    var newPointData = scatterPointData[0];
 
-    var newPointData = scatterPointData[0],
-        cdi = newPointData.cd[newPointData.index];
+    // if hovering on a fill, we don't show any point data so the label is
+    // unchanged from what scatter gives us - except that it needs to
+    // be constrained to the trianglular plot area, not just the rectangular
+    // area defined by the synthetic x and y axes
+    // TODO: in some cases the vertical middle of the shape is not within
+    // the triangular viewport at all, so the label can become disconnected
+    // from the shape entirely. But calculating what portion of the shape
+    // is actually visible, as constrained by the diagonal axis lines, is not
+    // so easy and anyway we lost the information we would have needed to do
+    // this inside scatterHover.
+    if(newPointData.index === undefined) {
+        var yFracUp = 1 - (newPointData.y0 / pointData.ya._length),
+            xLen = pointData.xa._length,
+            xMin = xLen * yFracUp / 2,
+            xMax = xLen - xMin;
+        newPointData.x0 = Math.max(Math.min(newPointData.x0, xMax), xMin);
+        newPointData.x1 = Math.max(Math.min(newPointData.x1, xMax), xMin);
+        return scatterPointData;
+    }
+
+    var cdi = newPointData.cd[newPointData.index];
 
     newPointData.a = cdi.a;
     newPointData.b = cdi.b;

dist/plotly.js

@@ -1,6 +1,6 @@
 {
   "name": "plotly.js",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "description": "The open source javascript graphing library that powers plotly",
   "license": "MIT",
   "main": "./lib/index.js",
@@ -90,13 +90,13 @@
     "browserify": "^13.0.0",
     "browserify-transform-tools": "^1.5.1",
     "ecstatic": "^1.4.0",
-    "eslint": "^2.8.0",
+    "eslint": "^3.0.0",
     "falafel": "^1.2.0",
     "fs-extra": "^0.30.0",
     "fuse.js": "^2.2.0",
     "glob": "^7.0.0",
     "jasmine-core": "^2.4.1",
-    "karma": "^0.13.15",
+    "karma": "^1.1.0",
     "karma-browserify": "^5.0.1",
     "karma-chrome-launcher": "^1.0.1",
     "karma-coverage": "^1.0.0",

dist/plotly.min.js

@@ -12,6 +12,6 @@ var saneTopojson = require('sane-topojson');
 
 
 // package version injected by `npm run preprocess`
-exports.version = '1.14.0';
+exports.version = '1.14.1';
 
 exports.topojson = saneTopojson;

package.json

@@ -15,7 +15,7 @@
 var Plotly = require('./plotly');
 
 // package version injected by `npm run preprocess`
-exports.version = '1.14.0';
+exports.version = '1.14.1';
 
 // plot api
 exports.plot = Plotly.plot;

src/assets/geo_assets.js

@@ -27,12 +27,21 @@ function MapboxLayer(mapbox, index) {
     this.source = null;
     this.layerType = null;
     this.below = null;
+
+    // is layer currently visible
+    this.visible = false;
 }
 
 var proto = MapboxLayer.prototype;
 
 proto.update = function update(opts) {
-    if(this.needsNewSource(opts)) {
+    if(!this.visible) {
+
+        // IMPORTANT: must create source before layer to not cause errors
+        this.updateSource(opts);
+        this.updateLayer(opts);
+    }
+    else if(this.needsNewSource(opts)) {
 
         // IMPORTANT: must delete layer before source to not cause errors
         this.updateLayer(opts);
@@ -43,6 +52,8 @@ proto.update = function update(opts) {
     }
 
     this.updateStyle(opts);
+
+    this.visible = isVisible(opts);
 };
 
 proto.needsNewSource = function(opts) {
@@ -209,10 +220,7 @@ function convertSourceOpts(opts) {
 module.exports = function createMapboxLayer(mapbox, index, opts) {
     var mapboxLayer = new MapboxLayer(mapbox, index);
 
-    // IMPORTANT: must create source before layer to not cause errors
-    mapboxLayer.updateSource(opts);
-    mapboxLayer.updateLayer(opts);
-    mapboxLayer.updateStyle(opts);
+    mapboxLayer.update(opts);
 
     return mapboxLayer;
 };

src/core.js

@@ -191,7 +191,7 @@ module.exports = {
                 dflt: 2,
                 role: 'style',
                 description: [
-                    'Sets the line radius.',
+                    'Sets the line width.',
                     'Has an effect only when `type` is set to *line*.'
                 ].join(' ')
             }

src/plots/mapbox/layers.js

@@ -659,9 +659,9 @@ proto.initInteractions = function() {
         Plotly.relayout(gd, attrs);
     }
 
-    dragElement.init(dragOptions);
-
     // finally, set up hover and click
+    // these event handlers must already be set before dragElement.init
+    // so it can stash them and override them.
     dragger.onmousemove = function(evt) {
         fx.hover(gd, evt, _this.id);
         gd._fullLayout._lasthover = dragger;
@@ -677,6 +677,8 @@ proto.initInteractions = function() {
     dragger.onclick = function(evt) {
         fx.click(gd, evt);
     };
+
+    dragElement.init(dragOptions);
 };
 
 function removeZoombox(gd) {