Merge remote-tracking branch 'plotly/master' into parcoords-squashed-2

Author: monfera

CHANGELOG.md

@@ -10,6 +10,23 @@ 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.23.2] -- 2017-02-15
+
+### Changed
+- Bower installs now fetch un-minified `dist/plotly.js` bundle [#1373]
+- Add package to packagist repository [#1375]
+
+
+## [1.23.1] -- 2017-02-13
+
+### Fixed
+- Fix `relayout` for `scene.camera` values [#1364]
+- Fix scaling on axis corner drag interactions for `bar` traces [#1370]
+- Allow `bar` and `histogram` traces to coexist on same subplot [#1365]
+- Fix `bar` position computations when placeholder traces are present [#1310]
+- Fix auto-axis-type routine for data-less `candelestick`traces [#1359]
+
+
 ## [1.23.0] -- 2017-02-06
 
 ### Added

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "plotly.js",
   "description": "The open source javascript graphing library that powers plotly",
-  "main": "./dist/plotly.min.js",
+  "main": "./dist/plotly.js",
   "authors": [
     "Plotly, Inc."
   ],

composer.json

@@ -0,0 +1,20 @@
+{
+  "name": "plotly/plotly.js",
+  "description": "The open source javascript graphing library that powers plotly",
+  "keywords": [
+      "graphing",
+      "plotting",
+      "data",
+      "visualization",
+      "plotly"
+  ],
+  "minimum-stability": "stable",
+  "homepage": "https://plot.ly/javascript/",
+  "license": "MIT",
+  "authors": [
+      {
+          "name": "Plotly, Inc.",
+          "email": "[email protected]"
+      }
+  ]
+}

dist/README.md

@@ -37,11 +37,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-latest.min.js OR https://cdn.plot.ly/plotly-1.23.0.min.js
+- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.23.2.min.js
 
 or as raw javascript:
 - using dist file `dist/plotly.js`
-- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.23.0.js
+- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.23.2.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`
@@ -50,7 +50,7 @@ The main plotly.js bundle weights in at:
 
 | plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
 |-----------|---------------|----------------------|---------------------|
-| 4.5 MB | 1.8 MB | 560.4 kB | 4.7 MB |
+| 4.5 MB | 1.8 MB | 560.5 kB | 4.7 MB |
 
 ## Partial bundles
 
@@ -74,13 +74,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.23.0.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.23.0.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-basic-1.23.2.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-basic-1.23.2.min.js |
 | CommonJS | `require('plotly.js/lib/index-basic')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 1.6 MB | 626.3 kB | 203.4 kB |
+| 1.6 MB | 626.7 kB | 203.5 kB |
 
 ### plotly.js cartesian
 
@@ -92,13 +92,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.23.0.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.23.0.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-cartesian-1.23.2.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-cartesian-1.23.2.min.js |
 | CommonJS | `require('plotly.js/lib/index-cartesian')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 1.8 MB | 700.4 kB | 225.8 kB |
+| 1.8 MB | 700.8 kB | 225.9 kB |
 
 ### plotly.js geo
 
@@ -110,13 +110,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.23.0.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.23.0.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-geo-1.23.2.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-geo-1.23.2.min.js |
 | CommonJS | `require('plotly.js/lib/index-geo')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 1.7 MB | 650.5 kB | 212.4 kB |
+| 1.7 MB | 650.9 kB | 212.5 kB |
 
 ### plotly.js gl3d
 
@@ -128,13 +128,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.23.0.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.23.0.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl3d-1.23.2.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl3d-1.23.2.min.js |
 | CommonJS | `require('plotly.js/lib/index-gl3d')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 2.5 MB | 1 MB | 333.5 kB |
+| 2.5 MB | 1 MB | 333.6 kB |
 
 ### plotly.js gl2d
 
@@ -146,13 +146,13 @@ The `gl2d` partial bundle contains the `scatter`, `scattergl`, `pointcloud`, `he
 | 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.23.0.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.23.0.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-gl2d-1.23.2.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-gl2d-1.23.2.min.js |
 | CommonJS | `require('plotly.js/lib/index-gl2d')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 2.3 MB | 948.9 kB | 297.1 kB |
+| 2.3 MB | 949.2 kB | 297.2 kB |
 
 ### plotly.js mapbox
 
@@ -164,13 +164,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.23.0.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.23.0.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-mapbox-1.23.2.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-mapbox-1.23.2.min.js |
 | CommonJS | `require('plotly.js/lib/index-mapbox')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 2.7 MB | 1 MB | 316.4 kB |
+| 2.7 MB | 1 MB | 316.5 kB |
 
 ### plotly.js finance
 
@@ -182,13 +182,13 @@ The `finance` partial bundle contains the `scatter`, `bar`, `histogram`, `pie`,
 | dist bundle (minified) | `dist/plotly-finance.min.js` |
 | CDN URL (latest) | https://cdn.plot.ly/plotly-finance-latest.js |
 | CDN URL (latest minified) | https://cdn.plot.ly/plotly-finance-latest.min.js |
-| CDN URL (tagged) | https://cdn.plot.ly/plotly-finance-1.23.0.js |
-| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-finance-1.23.0.min.js |
+| CDN URL (tagged) | https://cdn.plot.ly/plotly-finance-1.23.2.js |
+| CDN URL (tagged minified) | https://cdn.plot.ly/plotly-finance-1.23.2.min.js |
 | CommonJS | `require('plotly.js/lib/index-finance')` |
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 1.7 MB | 653.2 kB | 211 kB |
+| 1.7 MB | 653.6 kB | 211.1 kB |
 
 ----------------
 

dist/npm-ls.json

@@ -1,6 +1,6 @@
 {
   "name": "plotly.js",
-  "version": "1.23.0",
+  "version": "1.23.2",
   "dependencies": {
     "3d-view": {
       "version": "2.0.0",
@@ -1418,7 +1418,7 @@
             },
             "through2": {
               "version": "0.6.5",
-              "from": "through2@^0.6.3",
+              "from": "through2@>=0.6.3 <0.7.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"
             }
           }

dist/plotly-basic.js

@@ -1,5 +1,5 @@
 /**
-* plotly.js (basic) v1.23.0
+* plotly.js (basic) v1.23.2
 * Copyright 2012-2017, Plotly, Inc.
 * All rights reserved.
 * Licensed under the MIT license
@@ -20233,20 +20233,23 @@ function handleCamera3d(gd, ev) {
     var button = ev.currentTarget,
         attr = button.getAttribute('data-attr'),
         fullLayout = gd._fullLayout,
-        sceneIds = Plots.getSubplotIds(fullLayout, 'gl3d');
+        sceneIds = Plots.getSubplotIds(fullLayout, 'gl3d'),
+        aobj = {};
 
     for(var i = 0; i < sceneIds.length; i++) {
         var sceneId = sceneIds[i],
-            fullSceneLayout = fullLayout[sceneId],
-            scene = fullSceneLayout._scene;
+            key = sceneId + '.camera',
+            scene = fullLayout[sceneId]._scene;
 
-        if(attr === 'resetDefault') scene.setCameraToDefault();
+        if(attr === 'resetDefault') {
+            aobj[key] = null;
+        }
         else if(attr === 'resetLastSave') {
-            // This handler looks in the un-updated fullLayout.scene.camera object to reset the camera
-            // to the last saved position.
-            scene.setCamera(fullSceneLayout.camera);
+            aobj[key] = Lib.extendDeep({}, scene.cameraInitial);
         }
     }
+
+    Plotly.relayout(gd, aobj);
 }
 
 modeBarButtons.hoverClosest3d = {
@@ -26272,7 +26275,7 @@ exports.svgAttrs = {
 var Plotly = require('./plotly');
 
 // package version injected by `npm run preprocess`
-exports.version = '1.23.0';
+exports.version = '1.23.2';
 
 // inject promise polyfill
 require('es6-promise').polyfill();
@@ -32436,6 +32439,7 @@ Plotly.relayout = function relayout(gd, astr, val) {
         if(flags.dolayoutstyle) seq.push(subroutines.layoutStyles);
         if(flags.doticks) seq.push(subroutines.doTicksRelayout);
         if(flags.domodebar) seq.push(subroutines.doModeBar);
+        if(flags.docamera) seq.push(subroutines.doCamera);
     }
 
     Queue.add(gd,
@@ -32483,6 +32487,7 @@ function _relayout(gd, aobj) {
         doplot: false,
         docalc: false,
         domodebar: false,
+        docamera: false,
         layoutReplot: false
     };
 
@@ -32679,7 +32684,10 @@ function _relayout(gd, aobj) {
             var pp1 = String(p.parts[1] || '');
             // check whether we can short-circuit a full redraw
             // 3d or geo at this point just needs to redraw.
-            if(p.parts[0].indexOf('scene') === 0) flags.doplot = true;
+            if(p.parts[0].indexOf('scene') === 0) {
+                if(p.parts[1] === 'camera') flags.docamera = true;
+                else flags.doplot = true;
+            }
             else if(p.parts[0].indexOf('geo') === 0) flags.doplot = true;
             else if(p.parts[0].indexOf('ternary') === 0) flags.doplot = true;
             else if(ai === 'paper_bgcolor') flags.doplot = true;
@@ -32831,6 +32839,7 @@ Plotly.update = function update(gd, traceUpdate, layoutUpdate, traces) {
         if(relayoutFlags.dolayoutstyle) seq.push(subroutines.layoutStyles);
         if(relayoutFlags.doticks) seq.push(subroutines.doTicksRelayout);
         if(relayoutFlags.domodebar) seq.push(subroutines.doModeBar);
+        if(relayoutFlags.doCamera) seq.push(subroutines.doCamera);
     }
 
     Queue.add(gd,
@@ -34501,6 +34510,18 @@ exports.doModeBar = function(gd) {
     return Plots.previousPromises(gd);
 };
 
+exports.doCamera = function(gd) {
+    var fullLayout = gd._fullLayout,
+        sceneIds = Plots.getSubplotIds(fullLayout, 'gl3d');
+
+    for(var i = 0; i < sceneIds.length; i++) {
+        var sceneLayout = fullLayout[sceneIds[i]],
+            scene = sceneLayout._scene;
+
+        scene.setCamera(sceneLayout.camera);
+    }
+};
+
 },{"../components/color":24,"../components/drawing":47,"../components/modebar":70,"../components/titles":98,"../lib":118,"../plotly":142,"../plots/plots":171,"../registry":178}],140:[function(require,module,exports){
 /**
 * Copyright 2012-2017, Plotly, Inc.
@@ -37782,10 +37803,13 @@ function getBoxPosLetter(trace) {
 }
 
 function isBoxWithoutPositionCoords(trace, axLetter) {
-    var posLetter = getBoxPosLetter(trace);
+    var posLetter = getBoxPosLetter(trace),
+        isBox = Registry.traceIs(trace, 'box'),
+        isCandlestick = Registry.traceIs(trace._fullInput || {}, 'candlestick');
 
     return (
-        Registry.traceIs(trace, 'box') &&
+        isBox &&
+        !isCandlestick &&
         axLetter === posLetter &&
         trace[posLetter] === undefined &&
         trace[posLetter + '0'] === undefined
@@ -38752,7 +38776,7 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
                 // This is specifically directed at scatter traces, applying an inverse
                 // scale to individual points to counteract the scale of the trace
                 // as a whole:
-                .selectAll('.points').selectAll('.point')
+                .select('.scatterlayer').selectAll('.points').selectAll('.point')
                     .call(Drawing.setPointGroupScale, 1 / xScaleFactor, 1 / yScaleFactor);
         }
     }
@@ -48350,8 +48374,9 @@ module.exports = function plot(gd, plotinfo, cdbar) {
 
     var bartraces = plotinfo.plot.select('.barlayer')
         .selectAll('g.trace.bars')
-            .data(cdbar)
-      .enter().append('g')
+        .data(cdbar);
+
+    bartraces.enter().append('g')
         .attr('class', 'trace bars');
 
     bartraces.append('g')
@@ -48871,7 +48896,8 @@ module.exports = function setPositions(gd, plotinfo) {
             fullTrace.visible === true &&
             Registry.traceIs(fullTrace, 'bar') &&
             fullTrace.xaxis === xa._id &&
-            fullTrace.yaxis === ya._id
+            fullTrace.yaxis === ya._id &&
+            !calcTraces[i][0].placeholder
         ) {
             if(fullTrace.orientation === 'h') {
                 calcTracesHorizontal.push(calcTraces[i]);