diff --git a/package-lock.json b/package-lock.json index 9c0c407a671..98883ad63ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2183,6 +2183,14 @@ } } }, + "d": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", + "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", + "requires": { + "es5-ext": "0.10.42" + } + }, "d3": { "version": "3.5.17", "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz", @@ -2907,11 +2915,51 @@ "is-symbol": "1.0.1" } }, + "es5-ext": { + "version": "0.10.42", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz", + "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==", + "requires": { + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" + } + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.42", + "es6-symbol": "3.1.1" + } + }, "es6-promise": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=" }, + "es6-symbol": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", + "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.42" + } + }, + "es6-weak-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", + "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.42", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" + } + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -8177,6 +8225,11 @@ "dev": true, "optional": true }, + "next-tick": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" + }, "nextafter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/nextafter/-/nextafter-1.0.0.tgz", @@ -10002,21 +10055,22 @@ } }, "regl-line2d": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-2.1.5.tgz", - "integrity": "sha512-4KgIu1FW+2VoGOKmE7rT5ANyxfWLNm0KiGoiPvF6Fho5XUZyT+rafaU8hfzIGHFfk8PlxbTjl8oQkeuUYbpA6g==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-3.0.1.tgz", + "integrity": "sha512-6hhuHQBMhWFde28/jKDTCSkc0ZdTpsJpKflGCFmUpBHo2DAOYQkNfC1ARe+eOO70FqoahkdIrB9OJKB8J8Nupg==", "requires": { "array-bounds": "1.0.1", "array-normalize": "1.1.3", "bubleify": "1.1.0", "color-normalize": "1.0.3", "earcut": "2.1.3", + "es6-weak-map": "2.0.2", "flatten-vertex-data": "1.0.0", "glslify": "6.1.1", "object-assign": "4.1.1", + "parse-rect": "1.2.0", "pick-by-alias": "1.2.0", - "to-float32": "1.0.0", - "update-diff": "1.1.0" + "to-float32": "1.0.0" } }, "regl-scatter2d": { diff --git a/package.json b/package.json index 6c79f20635e..8afa622f458 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "polybooljs": "^1.2.0", "regl": "^1.3.1", "regl-error2d": "^2.0.3", - "regl-line2d": "^2.1.5", + "regl-line2d": "^3.0.1", "regl-scatter2d": "^3.0.0", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", diff --git a/src/traces/scattergl/convert.js b/src/traces/scattergl/convert.js index e1c405b938a..dac9fb5b750 100644 --- a/src/traces/scattergl/convert.js +++ b/src/traces/scattergl/convert.js @@ -27,13 +27,13 @@ function convertStyle(gd, trace) { var i; var opts = { - marker: null, - line: null, - fill: null, - errorX: null, - errorY: null, - selected: null, - unselected: null + marker: undefined, + line: undefined, + fill: undefined, + errorX: undefined, + errorY: undefined, + selected: undefined, + unselected: undefined }; if(trace.visible !== true) return opts; diff --git a/src/traces/scattergl/index.js b/src/traces/scattergl/index.js index 0ff5fe9c942..ddebaf3df3b 100644 --- a/src/traces/scattergl/index.js +++ b/src/traces/scattergl/index.js @@ -121,7 +121,7 @@ function calc(gd, trace) { scene.count++; // stash scene ref - stash.scene = scene; + stash._scene = scene; stash.index = scene.count - 1; stash.x = x; stash.y = y; @@ -326,7 +326,7 @@ function plot(gd, subplot, cdata) { if(!cdata.length) return; var fullLayout = gd._fullLayout; - var scene = cdata[0][0].t.scene; + var scene = cdata[0][0].t._scene; var dragmode = fullLayout.dragmode; // we may have more subplots than initialized data due to Axes.getSubplots method @@ -760,7 +760,7 @@ function selectPoints(searchInfo, polygon) { var stash = cd[0].t; var x = stash.x; var y = stash.y; - var scene = stash.scene; + var scene = stash._scene; if(!scene) return selection; @@ -816,7 +816,7 @@ function selectPoints(searchInfo, polygon) { function style(gd, cd) { if(cd) { var stash = cd[0].t; - var scene = stash.scene; + var scene = stash._scene; scene.clear(); scene.draw(); } diff --git a/src/traces/scatterpolargl/index.js b/src/traces/scatterpolargl/index.js index 34871fb5eb7..b5aa5c17e5f 100644 --- a/src/traces/scatterpolargl/index.js +++ b/src/traces/scatterpolargl/index.js @@ -131,7 +131,7 @@ function plot(container, subplot, cdata) { scene.count = cdata.length; // stash scene ref - stash.scene = scene; + stash._scene = scene; stash.index = traceIndex; stash.x = x; stash.y = y; diff --git a/test/image/baselines/gl2d_line_dash.png b/test/image/baselines/gl2d_line_dash.png index 91d2c7d7051..e4a2a59af79 100644 Binary files a/test/image/baselines/gl2d_line_dash.png and b/test/image/baselines/gl2d_line_dash.png differ