Merge branch 'master' into transform-plugins

- https://github.com/plotly/plotly.js/pull/491/files#diff-ad4f76ccd6044ed16514297078e13b84R455
  for more detail on the conflict

Author: etpinard

.eslintignore

@@ -4,4 +4,3 @@ build
 
 test/jasmine/assets/jquery-1.8.3.min.js
 src/plots/polar/micropolar.js
-src/plots/geo/projections.js

.eslintrc

@@ -1,7 +1,7 @@
 {
   "root": true,
   "extends": [
-    "eslint:recommended",
+    "eslint:recommended"
   ],
   "env": {
     "commonjs": true
@@ -16,7 +16,7 @@
     "brace-style": [0, "stroustrup", {"allowSingleLine": true}],
     "curly": [0, "multi"],
     "camelcase": [0, {"properties": "never"}],
-    "comma-spacing": [0, {"before": false, "after": true}],
+    "comma-spacing": [2, {"before": false, "after": true}],
     "comma-style": [2, "last"],
     "semi": [2],
     "semi-spacing": [2, {"before": false, "after": true}],
@@ -36,9 +36,9 @@
     "no-whitespace-before-property": [2],
     "no-unexpected-multiline": [2],
     "no-floating-decimal": [2],
-    "space-infix-ops": [0, {"int32Hint": false}],
+    "space-infix-ops": [2, {"int32Hint": true}],
     "quotes": [2, "single"],
-    "dot-notation": [2, {"allowKeywords": false}],
+    "dot-notation": [2],
     "operator-linebreak": [2, "after"],
     "eqeqeq": [2],
     "new-cap": [0],
@@ -50,5 +50,5 @@
     "no-loop-func": [2],
     "no-console": [0],
     "no-unused-labels": [2]
-  },
+  }
 }

CHANGELOG.md

@@ -10,6 +10,155 @@ 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
+- Attribute `line.color` in `scatter3d` traces now support color scales [#617]
+- Annotations tail positions can now be set in data coordinates via the new
+  `axref` and `ayref` attributes [#610]
+- Attribute `hoveron` is added for `scatter` and `scatterternary` traces which
+  adds the option to show hover labels about fill regions (instead of simply of
+  about data points) [#673]
+- Layout shapes can now be moved and resized (except for 'path' shapes) in
+  editable contexts [#660]
+
+### Changed
+- Numerous additions and changes where made to the mapbox layout layers
+  attributes (introduced in 1.13.0). Namely, `circle` and `symbol` layer type
+  where added. Note that some style attributes have been renamed to match the
+  mapbox-gl API more closely. [#681]
+
+### Fixed
+- Off-screen heatmap traces are properly deleted (bug introduced in 1.5.1)
+  [#655]
+- Hover labels for multi-heatmap subplot is functional again (bug introduced in
+  1.4.0) [#655]
+- Heatmap x/y brick generation is now functional for 0 and 1 item columns [#651]
+- Multiple layout images can now shared the same image source [#672]
+- Updating legend border and bgcolor attribute now works via `Plotly.relayout`
+  [#652]
+- Dragmode 'select' and 'lasso' no longer throw exception when selecting
+  `legendonly` traces [#644]
+- Ternary plots now respect the `staticPlot` config option [#645]
+- Descriptions for axes `nticks` and contour traces `ncountours`now properly
+  describe their behavior [#662]
+
+
+## [1.13.0] -- 2016-06-13
+
+### Added
+- Beta version of the `scattermapbox` trace type - which allows users to create
+  `mapbox-gl` maps using the plotly.js API. Note that `scattermapbox` is only
+  available through custom bundling in this release [#626]
+- Configurable log levels. All plotly.js logging is now turned off by default.
+  Use `Plotly.setPlotConfig({ logging: /* 1 or 2 */ })` to (1) display warnings
+  only or (2) all logs [#590]
+- Thorough `mesh3d` attribute descriptions [#593]
+
+### Changed
+- Generalize hover picking routine (to make more easily re-usable for other plot
+  types) [#575, #631]
+
+### Fixed
+- Fix `Plotly.toImage` and `Plotly.downloadImage` bug specific to Chrome 51 on
+  OSX [#604]
+- Fix `Plotly.downloadImage` for `svg` types [#604]
+- Fix `scattergl` opacity and connectgaps for `'lines'` mode [#589]
+- Make legend scroll bar keep its position after redraws [#584]
+- Properly handle axis-reference shapes on overlaid axes [#612]
+- Fix `Plotly.relayout` calls for `layout.images` in `{ astr: val }` notation
+  [#624]
+- Bring back correct default value for `lightposition` in surface traces (bug
+  introduced in 1.12.0) [#571]
+- Fix typos in contours descriptions in contour traces [#583]
+- Fix typos in `axis.ticktext` description [#607]
+- Fix ambiguities in histogram `nbin` descriptions [#623]
+
+
+## [1.12.0] -- 2016-05-26
+
+### Added
+- Light positions, face normal epsilon and vertex normal epsilon are now
+  configurable in `mesh3d` traces [#556]
+- Light position is now configurable in `surface` traces [#556]
+- `surface` and `mesh3d` lighting attributes are now accompanied with
+  comprehensive descriptions. [#556]
+
+### Changed
+- Plot modules are now allowed to have their own `toSVG` method for
+  subplot-specific to-svg logic [#554]
+
+### Fixed
+- gl2d plots are now functional in `core-js` environments (e.g. in babel es6
+  presets) [#569]
+- gl2d replot calls from a blank plot are now functional [#570]
+- SVG graph config argument `scrollZoom` is now again functional (bug introduced
+  in v1.10.0) [#564]
+- `layout.separators` is now honored in pie text labels [#547]
+- Heatmap `zsmooth` value `'fast'` is now functional for arbitrary layout widths
+  [#548]
+- Range sliders now respond to all axis range relayout calls [#568]
+
+
+## [1.11.0] -- 2016-05-17
+
+### Added
+- Add top-level methods `Plotly.toImage` to convert a plotly graph to an image
+  data URL (svg, png, jpg, and webp are supported) and `Plotly.downloadImage` to
+  download a plotly graph as an image [#446]
+- Add the ability to add arbitrary images loaded from a url to a plot's layout
+  [#525]
+- Add the option of making legend span horizontally [#535]
+- Add `connectgaps` attribute to `scattergl` traces [#449]
+- Add new 'relative' bar mode which stacks on top of one another with negative
+  values below the axis, positive values above [#517]
+- Add support for the 'winkel tripel' projection in geo subplots [#492]
+- Event `plotly_relayout` is now emitted on gl2d subplot drag/pan/zoom
+  interactions [#466]
+- Add support for fill coloring in `contourgl` traces [#522, #543]
+
+### Changed
+- Cartesian on-hover routine is now uses a 50ms interval between search calls
+  instead of 100ms for smoother displaying hover labels [#514]
+- [Internal change] fullLayout `_has` fields are replaced by a `_has` method
+  which checks if a particular plot type is present on a graph [#491]
+
+### Fixed
+- Bar widths of traces with null coordinates are now correctly computed [#542]
+- Error bar spans on bar traces with null coordinates are now correctly computed
+  [#542]
+- All promises spawn in `Plotly.plot` are now guaranteed to be resolved before
+  the final resolve [#521]
+- Restyling `scatterternary` data attributes is now working [#540]
+- Error bar of 0 length in log axes are not included in hover labels (instead of
+  showing `NaN`s) [#533]
+
+
+## [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

CONTRIBUTING.md

@@ -47,6 +47,7 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
 | `type: feature` | planned feature additions |
 | `type: performance` | performance related tasks |
 | `type: maintenace` | source code cleanup resulting in no enhancement for users |
+| `type: documentation` | API doc or attribute description improvements |
 | `type: community` | issue left open for community input and pull requests |
 | `type: duplicate` | *self-explanatory* |
 | `type: wontfix` | *self-explanatory* |
@@ -72,7 +73,18 @@ cd plotly.js
 npm install
 ```
 
-#### Step 2: Start the test dashboard
+#### Step 2: Setup Mapbox access token
+
+As of `v1.13.0`, plotly.js includes a [`mapbox-gl`](https://github.com/mapbox/mapbox-gl-js) integration. Creating `mapbox-gl` graphs requires an
+[`accessToken`](https://www.mapbox.com/help/define-access-token/). To make sure
+that the plotly.js test suites and devtools work properly, locate your Mapbox access
+token and run:
+
+```bash
+export MAPBOX_ACCESS_TOKEN="<your access token>" && npm run pretest
+```
+
+#### Step 3: Start the test dashboard
 
 ```
 npm start
@@ -84,7 +96,7 @@ This command bundles up the source files with source maps using
 dev plotly.js bundle update every time a source file is saved) and opens up a
 tab in your browser.
 
-#### Step 3: Open up the console and start developing
+#### Step 4: Open up the console and start developing
 
 A typical workflow is to make some modifications to the source, update the
 test dashboard, inspect and debug the changes, then repeat. The test dashboard

README.md

@@ -1,10 +1,7 @@
 <a href="https://plot.ly/javascript/"><img src="http://images.plot.ly/logo/plotlyjs-logo@2x.png" 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
@@ -25,6 +22,11 @@ chart types, including 3D charts, statistical graphs, and SVG maps.
 
 ## Quick start options
 
+**It is important to note that logging is turned off by default in v1.13.0 onwards.**
+To turn logging on for development, you will want to run
+`Plotly.setPlotConfig({ logging: 2 })` before any plotting.
+See [this file](https://github.com/plotly/plotly.js/blob/master/src/lib/loggers.js) for more details.
+
 #### Download the latest release
 [Latest Release on Github](https://github.com/plotly/plotly.js/releases/)
 
@@ -51,6 +53,9 @@ and use the plotly.js `dist` file(s) or require plotly.js using CommonJS as `var
 
 <!-- OR use a specific plotly.js release (e.g. version 1.5.0) -->
 <script type="text/javascript" src="https://cdn.plot.ly/plotly-1.5.0.min.js"></script>
+
+<!-- OR an un-minified version is also available -->
+<script type="text/javascript" src="https://cdn.plot.ly/plotly-latest.js"></script>
 ```
 
 and use the `Plotly` object in the window scope.

circle.yml

@@ -15,12 +15,14 @@ dependencies:
     - docker pull plotly/testbed:latest
   post:
     - npm run cibuild
+    - npm run pretest
     - docker run -d --name mytestbed -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/testbed:latest
+    - sudo ./tasks/run_in_testbed.sh mytestbed "cp -f test/image/index.html ../server_app/index.html"
     - wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping
 test:
   override:
-    - sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' mytestbed)" -- bash -c "cd /var/www/streambed/image_server/plotly.js && node test/image/compare_pixels_test.js"
-    - sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' mytestbed)" -- bash -c "cd /var/www/streambed/image_server/plotly.js && node test/image/export_test.js"
+    - sudo ./tasks/run_in_testbed.sh mytestbed "export CIRCLECI=1 && node test/image/compare_pixels_test.js"
+    - sudo ./tasks/run_in_testbed.sh mytestbed "node test/image/export_test.js"
     - npm run citest-jasmine
     - npm run test-bundle
     - npm run test-syntax

devtools/image_viewer/index.html

@@ -3,8 +3,9 @@
 </head>
 <body>
     <div id="plot-list" style="overflow:auto; height:100px;"></div>
+    <div id="plot-toggles"></div>
     <div id="plot-images"></div>
-    <div id="plot-mock"></div>
+    <pre id="plot-mock"></pre>
 
     <script type="text/javascript" src="../../build/image_viewer-bundle.js"></script>
 </body>

devtools/image_viewer/viewer.js

@@ -4,8 +4,22 @@ var path = require('path');
 var d3 = require('d3');
 
 var $plotlist = document.getElementById('plot-list'),
+    $toggles = document.getElementById('plot-toggles'),
     $images = document.getElementById('plot-images'),
-    $mock = document.getElementById('plot-mock');
+    $mock = document.getElementById('plot-mock'),
+    $toggleBaseline = document.createElement('button'),
+    $toggleTest = document.createElement('button'),
+    $toggleDiff = document.createElement('button'),
+    $imgBaseline = document.createElement('img'),
+    $imgTest = document.createElement('img'),
+    $imgDiff = document.createElement('img');
+
+$toggles.style.display = 'none';
+$images.style.display = 'none';
+
+setupToggle($toggleBaseline, $imgBaseline, 'Baseline');
+setupToggle($toggleTest, $imgTest, 'Test');
+setupToggle($toggleDiff, $imgDiff, 'Diff');
 
 var pathToRoot = path.join(__dirname, '../../'),
     pathToImageTest = path.join(pathToRoot, 'test/image'),
@@ -33,37 +47,58 @@ imageNames.forEach(function(imageName) {
 function createButton(imageName) {
     var button = document.createElement('button');
     button.style.cssFloat = 'left';
-    button.style.width = '100px';
     button.style.height = '40px';
     button.innerHTML = imageName;
+    button.style.padding = '0.5em';
+    button.style.border = '0';
+    button.style.margin = '1px';
+    button.style.cursor = 'pointer';
 
     button.addEventListener('click', function() {
-        var imgBaseline = createImg(dirBaseline, imageName),
-            imgTest = createImg(dirTest, imageName),
-            imgDiff = createImg(dirDiff, 'diff-' + imageName);
-
         d3.json(dirMocks + imageName + '.json', function(err, mock) {
-            $images.innerHTML = '';
-            $images.appendChild(imgBaseline);
-            $images.appendChild(imgTest);
-            $images.appendChild(imgDiff);
+            $toggles.style.display = 'block';
 
-            $mock.innerHTML = '';
-            $mock.appendChild(createJSONview(mock));
+            $images.style.display = 'block';
+            $imgBaseline.src = dirBaseline + imageName + '.png';
+            $imgTest.src = dirTest + imageName + '.png';
+            $imgDiff.src = dirDiff + 'diff-' + imageName + '.png';
+
+            $mock.innerHTML = JSON.stringify(mock, null, 2);
         });
     });
 
     return button;
 }
 
-function createImg(dir, name) {
-    var img = new Image();
-    img.src = dir + name + '.png';
-    return img;
+function setupToggle(toggle, img, title) {
+    img.title = title;
+    toggle.innerHTML = title;
+    toggle.style.padding = '0.5em';
+    toggle.style.border = '0';
+    toggle.style.margin = '1px';
+    toggle.style.cursor = 'pointer';
+
+    checkToggle(toggle, img);
+
+    toggle.addEventListener('click', function() {
+        if(toggle.value === 'checked') uncheckToggle(toggle, img);
+        else checkToggle(toggle, img);
+    });
+
+    $toggles.appendChild(toggle);
+    $images.appendChild(img);
+}
+
+function checkToggle(toggle, img) {
+    toggle.value = 'checked';
+    toggle.style.color = '#4c4c4c';
+    toggle.style.backgroundColor = '#f2f1f0';
+    img.style.display = 'inline';
 }
 
-function createJSONview(mock) {
-    var jsonView = document.createElement('pre');
-    jsonView.innerHTML = JSON.stringify(mock, null, 2);
-    return jsonView;
+function uncheckToggle(toggle, img) {
+    toggle.value = 'unchecked';
+    toggle.style.color = '#f2f1f0';
+    toggle.style.backgroundColor = '#4c4c4c';
+    img.style.display = 'none';
 }