Merge branch 'master' into label_automargin

Author: nicolaskruchten

.circleci/config.yml

@@ -3,25 +3,25 @@ version: 2.0
 # Inspired by:
 # https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
 # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
+#
+# For list of official CircleCI node.js images, go to:
+# https://hub.docker.com/r/circleci/node/tags/
 
 jobs:
   build:
     docker:
-      - image: circleci/node:6.10.3
+      - image: circleci/node:8.9.4
     working_directory: ~/plotly.js
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
-            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package.json" }}
+            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
+            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
       - run:
           name: Install dependencies
           command: |
             npm install
-            npm dedupe
-            npm prune
-            npm install
       - run:
           name: List dependency versions
           command: |
@@ -47,7 +47,7 @@ jobs:
   test-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:6.10.3-browsers
+      - image: circleci/node:8.9.4-browsers
     working_directory: ~/plotly.js
     steps:
       - checkout
@@ -58,9 +58,26 @@ jobs:
           command: |
             sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
       - run:
-          name: Run jasmine tests
+          name: Run jasmine tests (batch 1)
           command: ./.circleci/test.sh jasmine
 
+  test-jasmine2:
+    docker:
+      # need '-browsers' version to test in real (xvfb-wrapped) browsers
+      - image: circleci/node:8.9.4-browsers
+    working_directory: ~/plotly.js
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/plotly.js
+      - run:
+          name: Set timezone to Alaska time (arbitrary timezone to test date logic)
+          command: |
+            sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
+      - run:
+          name: Run jasmine tests (batch 2)
+          command: ./.circleci/test.sh jasmine2
+
   test-image:
     docker:
       - image: plotly/testbed:latest
@@ -82,7 +99,7 @@ jobs:
 
   test-syntax:
     docker:
-      - image: circleci/node:6.10.3
+      - image: circleci/node:8.9.4
     working_directory: ~/plotly.js
     steps:
       - checkout
@@ -100,6 +117,9 @@ workflows:
       - test-jasmine:
           requires:
             - build
+      - test-jasmine2:
+          requires:
+            - build
       - test-image:
           requires:
             - build

.circleci/test.sh

@@ -5,12 +5,37 @@ set +e
 set +o pipefail
 
 EXIT_STATE=0
+MAX_AUTO_RETRY=5
+
+# inspired by https://unix.stackexchange.com/a/82602
+retry () {
+    local n=0
+
+    until [ $n -ge $MAX_AUTO_RETRY ]; do
+        "$@" && break
+        n=$[$n+1]
+        echo ''
+        echo run $n of $MAX_AUTO_RETRY failed, trying again ...
+        echo ''
+        sleep 15
+    done
+
+    if [ $n -eq $MAX_AUTO_RETRY ]; then
+        EXIT_STATE=1
+    fi
+}
 
 case $1 in
 
     jasmine)
-        npm run test-jasmine    || EXIT_STATE=$?
-        npm run test-bundle     || EXIT_STATE=$?
+        npm run test-jasmine -- --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
+    jasmine2)
+        npm run test-jasmine -- --tags=gl --skip-tags=noCI,flaky || EXIT_STATE=$?
+        retry npm run test-jasmine -- --tags=flaky --skip-tags=noCI
+        npm run test-bundle || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
@@ -22,8 +47,8 @@ case $1 in
         ;;
 
     syntax)
-        npm run lint            || EXIT_STATE=$?
-        npm run test-syntax     || EXIT_STATE=$?
+        npm run lint        || EXIT_STATE=$?
+        npm run test-syntax || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 

.eslintrc

@@ -23,7 +23,8 @@
     "no-trailing-spaces": [2],
     "no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 0}],
     "eol-last": [2],
-    "indent": [2, 4, {"SwitchCase": 1}],
+    "indent": [0],
+    "indent-legacy": [2, 4, {"SwitchCase": 1}],
     "max-len": [0, 80],
     "brace-style": [0, "stroustrup", {"allowSingleLine": true}],
     "curly": [2, "multi-line"],
@@ -46,7 +47,7 @@
     "space-before-blocks": [2],
     "spaced-comment": [2, "always"],
     "no-tabs": [2],
-    "no-multi-spaces": [2],
+    "no-multi-spaces": [2, {"ignoreEOLComments": true}],
     "no-whitespace-before-property": [2],
     "no-unexpected-multiline": [2],
     "no-floating-decimal": [2],
@@ -65,6 +66,7 @@
     "no-use-before-define": [2, "nofunc"],
     "no-loop-func": [2],
     "no-console": [0],
-    "no-unused-labels": [2]
+    "no-unused-labels": [2],
+    "no-useless-escape": [0]
   }
 }

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,8 @@ Developers are strongly encouraged to first make a PR to their own plotly.js for
 Before opening a pull request, developer should: 
 
 - `git rebase` their local branch off the latest `master`,
-- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on verion bumps),
+- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps),
+- make sure to commit changes to the `package-lock.json` file (if any),
 - write an overview of what the PR attempts to do,
 - select the _Allow edits from maintainers_ option (see this [article](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) for more details).
 

CHANGELOG.md

@@ -10,6 +10,39 @@ 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.34.0] -- 2018-02-12
+
+### Added
+- Add `Plotly.react`, a new do-it-all API method that creates and update graphs
+  using the same API signature [#2341]
+- Add constraint-type contours to `contour` traces [#2270]
+- Add `notched` and `notchwidth` attributes to `box` traces [#2305]
+- Add localization machinery to auto-formatted date axis ticks [#2261]
+- Add support for `text` in `mesh3d` traces [#2327]
+- Add support for scalar `text` in `surface` traces [#2327]
+- Make mode bar for graphs with multiple subplot types more usable [#2339]
+- Add `npm@5` package-lock file [#2323]
+
+### Changed
+- All of gl-vis dependencies now use `gl-shader@4.2.1` [#2293, #2306]
+- All our dependencies and source now use `glslify@6.1.0` [#2326]
+
+### Fixed
+- Prevent page scroll on mobile device on `gl2d` and `gl3d` subplots [#2296]
+- Fix multi-marker `scattergl` selection errors (bug introduced in `1.33.0`) [#2295]
+- Fix `Plotly.addTraces` in `scattergl` selection call backs (bug introduced in `1.33.0`) [#2298]
+- Fix trace `opacity` restyle for `scattergl` traces (bug introduced in `1.33.0`) [#2299]
+- Fix `scattergl` handling of `selectedpoints` across multiple traces [#2311]
+- Fix `scattergl` horizontal and vertical line rendering [#2340]
+- Fix restyle for scalar `hoverinfo` for `scatter3d`, `surface` and `mesh3d` traces [#2327]
+- Fix `table` when content-less cells and headers are supplied [#2314]
+- Fix `Plotly.animate` for attribute nested in `dimensions` containers [#2324]
+- Fix `hoverformat` on `visible: false` cartesian axes (bug introduced in `1.33.0`) [#2329]
+- Fix handling of double negative translate transform values [#2339]
+- Fix compare `hovermode` fallback for non-cartesian subplot types [#2339]
+- Fix animation error messages when overriding and ignoring frames updates [#2313]
+
+
 ## [1.33.1] -- 2018-01-24
 
 ### Fixed

CONTRIBUTING.md

@@ -24,19 +24,24 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
 | `type: community` | issue left open for community input and pull requests |
 | `type: duplicate` | *self-explanatory* |
 | `type: wontfix` | *self-explanatory* |
-| `status: discussion needed` | Issue or PR that required discussion among maintaners before moving forward |
-| `status: in progress` | PRs that required some intial feedback but not ready to merge |
+| `status: discussion needed` | Issue or PR that required discussion among maintainers before moving forward |
+| `status: in progress` | PRs that required some initial feedback but not ready to merge |
 | `status: reviewable` | PRs that are completed from the author's perspective |
 | `status: on hold` | PRs that are put on hold |
 
 ## Development
 
-#### Perequisites
+#### Prerequisites
 
 - git
-- [node.js](https://nodejs.org/en/). We recommend using node.js v6.x or v4.x (both LTS).
-  Upgrading and managing node versions can be easily done using
-  [`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
+- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
+  versions starting from v4 should work.  Upgrading and managing node versions
+  can be easily done using [`nvm`](https://github.com/creationix/nvm) or its
+  Windows alternatives.
+- [`npm`](https://www.npmjs.com/) v5.x and up (which ships by default with
+  node.js v8.x) to ensure that the
+  [`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
+  used and updated correctly.
 
 #### Step 1: Clone the plotly.js repo and install its dependencies
 

devtools/test_dashboard/devtools.js

@@ -202,7 +202,7 @@ function searchMocks(e) {
 
     results.forEach(function(r) {
         var result = document.createElement('span');
-        result.className = 'search-result';
+        result.className = getResultClass(r.name);
         result.innerText = r.name;
 
         result.addEventListener('click', function() {
@@ -212,6 +212,10 @@ function searchMocks(e) {
             // Clear plots and plot selected.
             Tabs.purge();
             Tabs.plotMock(mockName);
+
+            mocksList.querySelectorAll('span').forEach(function(el) {
+                el.className = getResultClass(el.innerText);
+            });
         });
 
         mocksList.appendChild(result);
@@ -222,8 +226,16 @@ function searchMocks(e) {
     });
 }
 
+function getNameFromHash() {
+    return window.location.hash.replace(/^#/, '');
+}
+
+function getResultClass(name) {
+    return 'search-result' + (getNameFromHash() === name ? ' search-result__selected' : '');
+}
+
 function plotFromHash() {
-    var initialMock = window.location.hash.replace(/^#/, '');
+    var initialMock = getNameFromHash();
 
     if(initialMock.length > 0) {
         Tabs.plotMock(initialMock);

devtools/test_dashboard/style.css

@@ -56,6 +56,9 @@ header span{
   color: #fff;
   background-color: #4983EC;
 }
+.search-result__selected{
+  background-color: #DDDDEE;
+}
 #plots{
   overflow: scroll;
 }