Skip to content

Commit cb2729e

Browse files
committed
Squashed commit of the following:
commit ec8c3d7 Author: Dmitry <[email protected]> Date: Mon Jan 22 16:32:49 2018 -0500 Adjust timeouts commit 109ffe5 Author: Dmitry <[email protected]> Date: Mon Jan 22 16:04:42 2018 -0500 Make test run more securely commit c7c0a4a Author: Dmitry <[email protected]> Date: Mon Jan 22 15:16:33 2018 -0500 Split gl_plot_interact by two commit e43507e Author: Dmitry <[email protected]> Date: Mon Jan 22 15:03:15 2018 -0500 Increase timeout commit 9251311 Author: Dmitry <[email protected]> Date: Mon Jan 22 14:36:31 2018 -0500 Loosen test precision commit 22112f9 Author: Dmitry <[email protected]> Date: Mon Jan 22 12:53:26 2018 -0500 Unsingle test commit 39be256 Author: Dmitry <[email protected]> Date: Mon Jan 22 12:51:57 2018 -0500 Avoid randomity in test commit 8692ec9 Author: Dmitry <[email protected]> Date: Mon Jan 22 12:28:31 2018 -0500 Reduce timeout interval commit 348d4d0 Author: Dmitry <[email protected]> Date: Mon Jan 22 12:27:14 2018 -0500 Add big points selection test commit 1f6e68b Merge: 022e7e1 c28f498 Author: Dmitry <[email protected]> Date: Mon Jan 22 11:44:06 2018 -0500 Merge branch 'master' into reglscatter-fix Conflicts: package.json commit 022e7e1 Author: Dmitry <[email protected]> Date: Mon Jan 22 11:43:28 2018 -0500 Bump deps commit 373c5b3 Author: Dmitry <[email protected]> Date: Fri Jan 19 12:11:10 2018 -0500 Bump regl-scatter2d
1 parent 5ae70af commit cb2729e

File tree

5 files changed

+602
-519
lines changed

5 files changed

+602
-519
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@
9898
"polybooljs": "^1.2.0",
9999
"regl": "^1.3.1",
100100
"regl-error2d": "^2.0.3",
101-
"regl-line2d": "^2.1.0",
102-
"regl-scatter2d": "^2.1.10",
101+
"regl-line2d": "^2.1.2",
102+
"regl-scatter2d": "^2.1.11",
103103
"right-now": "^1.0.0",
104104
"robust-orientation": "^1.1.3",
105105
"sane-topojson": "^2.0.0",

src/components/dragelement/unhover.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ unhover.wrapped = function(gd, evt, subplot) {
2323
gd = getGraphDiv(gd);
2424

2525
// Important, clear any queued hovers
26-
throttle.clear(gd._fullLayout._uid + hoverConstants.HOVERID);
26+
if(gd._fullLayout) {
27+
throttle.clear(gd._fullLayout._uid + hoverConstants.HOVERID);
28+
}
2729

2830
unhover.raw(gd, evt, subplot);
2931
};

test/jasmine/assets/read_pixel.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
'use strict';
22

3-
module.exports = function(canvas, x, y) {
3+
module.exports = function(canvas, x, y, w, h) {
44
if(!canvas) return null;
55

6+
if(!w) w = 1;
7+
if(!h) h = 1;
8+
69
var gl = canvas.getContext('webgl');
710

8-
var pixels = new Uint8Array(4);
11+
var pixels = new Uint8Array(4 * w * h);
912

10-
gl.readPixels(x, y, 1, 1, gl.RGBA, gl.UNSIGNED_BYTE, pixels);
13+
gl.readPixels(x, y, w, h, gl.RGBA, gl.UNSIGNED_BYTE, pixels);
1114

1215
return pixels;
1316
};

0 commit comments

Comments
 (0)