Merge remote-tracking branch 'upstream/master'

Author: mikolalysenko

.eslintrc

@@ -8,7 +8,7 @@
   },
   "rules": {
     "no-trailing-spaces": [2],
-    "no-multiple-empty-lines": [2, {"max": 3, "maxEOF": 1}],
+    "no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 1}],
     "linebreak-style": [2, "unix"],
     "indent": [2, 4, {"SwitchCase": 1}],
     "max-len": [0, 80],
@@ -19,10 +19,18 @@
     "comma-style": [2, "last"],
     "semi": [2],
     "semi-spacing": [2, {"before": false, "after": true}],
-    "key-spacing": [0, {"beforeColon": false, "afterColon": true}],
+    "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
+    "keyword-spacing": [2, {"overrides": {
+      "if": {"after": false},
+      "for": {"after": false},
+      "while": {"after": false},
+      "switch": {"after": false},
+      "catch": {"after": false}
+    }}],
     "no-spaced-func": [2],
     "space-in-parens": [2, "never"],
     "space-before-function-paren": [2, "never"],
+    "space-before-blocks": [2],
     "no-multi-spaces": [2],
     "space-infix-ops": [0, {"int32Hint": false}],
     "quotes": [2, "single"],

CHANGELOG.md

@@ -9,6 +9,64 @@ 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.6.2] -- 2016-03-03
+
+### Fixed
+- SVG overflow property is now properly set for IE11 [#305, #306]
+- Hover labels associated with `text` arrays with falsy values are properly
+  skipped over [#310]
+- Snapshot routines now strip browser-only user-select style attributes [#311]
+
+
+## [1.6.1] -- 2016-03-01
+
+### Fixed
+- Legend scroll bars are no longer invalid SVG elements (bug introduced in 1.6.0) [#304]
+- Colorscale YlGnBu and YlOrRd are now properly identified [#295]
+
+
+## [1.6.0] -- 2016-02-29
+
+### Added
+- SVG cartesian, 3D, geographic maps and pie charts can now coexist on the same
+  graph [#246, #258, #289]
+- Legends with long item lists are now scrollable (instead of being cropped)
+  [#243]
+- Event `plotly_deselect` is now emitted after double-clicking in `select` and
+  `lasso` drag modes.
+- Event `plotly_doubleclick` is now emitted after double-clicking on SVG cartesian
+  graphs in `zoom` and `pan` drag modes.
+- Layout attributes `dragmode` and `hovermode` can now be set individually in
+  each scene [#258]
+- `Plotly.Plots.resize` now returns a promise. [#253, #262]
+
+### Fixed
+
+- `Plotly.deleteTraces` now properly deletes the last trace of a cartesian
+  subplot [#289]
+- `Plotly.deleteTraces` now works on heatmap, contour, pie, surface, mesh3d and
+  geo trace types [#289]
+- `Plotly.deleteTraces` now properly delete color bars associated with deleted
+  traces
+- Clearing cartesian axes via `relayout` no longer results in an uncaught error
+  [#289]
+- Events `plotly_hover`, `plotly_unhover` and `plotly_click` are properly
+  emitted on 3D graphs [#240]
+- Null and undefined categories are properly skipped over [#286]
+- Hover labels on 3D graphs are now properly hidden when `hovermode` is set to
+  false [#258]
+- Multi-scene 3D graphs now set their camera position via their own scene
+  attributes [#258]
+- Toggling `hovermode` on 3D graphs no longer resets the scene domain [#258]
+- Resetting the camera position on scenes where the `camera` attribute was
+  supplied no longer results in an uncaught error [#258]
+- Axis attributes `hoverformat`, `tickprefix`, `ticksuffix` are honored even
+  when `showticklabels` is set to false [#267]
+- Config option `doubleClick` set to `'reset'` now properly handles auto-ranged
+  axes [#285]
+
+
 ## [1.5.2] -- 2016-02-10
 
 ### Fixed

build/plotcss.js

@@ -8,6 +8,7 @@ var rules = {
     "X a": "text-decoration:none;",
     "X a:hover": "text-decoration:none;",
     "X .crisp": "shape-rendering:crispEdges;",
+    "X svg": "overflow:hidden;",
     "X svg a": "fill:#447adb;",
     "X svg a:hover": "fill:#3c6dc5;",
     "X .main-svg": "position:absolute;top:0;left:0;pointer-events:none;",

circle.yml

@@ -20,6 +20,7 @@ dependencies:
 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"
     - npm run citest-jasmine
     - npm run test-bundle
     - npm run test-syntax

devtools/test_dashboard/buttons.js

@@ -65,12 +65,12 @@ function plotButtons(plots, figDir) {
         /*
          * Grab the currently loaded plot and make an image - replacing the plot.
          */
-        if (!gd) return;
+        if(!gd) return;
 
         var layout = gd.layout;
         var data = gd.data;
 
-        if (!layout || !data) return;
+        if(!layout || !data) return;
 
         Plotly.Plots.getSubplotIds(gd._fullLayout, 'gl3d').forEach(function(key) {
             var scene = gd._fullLayout[key]._scene;