Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump line2d #2556

Merged
merged 7 commits into from
Apr 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 59 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions src/traces/scattergl/convert.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/traces/scattergl/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/traces/scatterpolargl/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file modified test/image/baselines/gl2d_line_dash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.