Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e60123f

Browse filesBrowse files
committed
Merge remote-tracking branch 'origin/master' into font-shadow-striding-capitalize
- Resolved sonflicts in test/image/baselines/trace_metatext.png
2 parents 9416441 + cfccbcc commit e60123f
Copy full SHA for e60123f

File tree

86 files changed

+111
-94
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

86 files changed

+111
-94
lines changed

‎draftlogs/6996_fix.md

Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions

‎draftlogs/6997_fix.md

Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions

‎draftlogs/6998_fix.md

Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions

‎src/components/legend/draw.js

Copy file name to clipboardExpand all lines: src/components/legend/draw.js
+11-6Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -423,18 +423,23 @@ function drawOne(gd, opts) {
423423
dragElement.init({
424424
element: legend.node(),
425425
gd: gd,
426-
prepFn: function() {
426+
prepFn: function(e) {
427+
if(e.target === scrollBar.node()) {
428+
return;
429+
}
427430
var transform = Drawing.getTranslate(legend);
428431
x0 = transform.x;
429432
y0 = transform.y;
430433
},
431434
moveFn: function(dx, dy) {
432-
var newX = x0 + dx;
433-
var newY = y0 + dy;
435+
if(x0 !== undefined && y0 !== undefined) {
436+
var newX = x0 + dx;
437+
var newY = y0 + dy;
434438

435-
Drawing.setTranslate(legend, newX, newY);
436-
xf = dragElement.align(newX, legendObj._width, gs.l, gs.l + gs.w, legendObj.xanchor);
437-
yf = dragElement.align(newY + legendObj._height, -legendObj._height, gs.t + gs.h, gs.t, legendObj.yanchor);
439+
Drawing.setTranslate(legend, newX, newY);
440+
xf = dragElement.align(newX, legendObj._width, gs.l, gs.l + gs.w, legendObj.xanchor);
441+
yf = dragElement.align(newY + legendObj._height, -legendObj._height, gs.t + gs.h, gs.t, legendObj.yanchor);
442+
}
438443
},
439444
doneFn: function() {
440445
if(xf !== undefined && yf !== undefined) {

‎src/lib/dom.js

Copy file name to clipboardExpand all lines: src/lib/dom.js
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ function getElementAndAncestors(element) {
134134
while(isTransformableElement(element)) {
135135
allElements.push(element);
136136
element = element.parentNode;
137+
if(typeof ShadowRoot === 'function' && element instanceof ShadowRoot) {
138+
element = element.host;
139+
}
137140
}
138141
return allElements;
139142
}

‎stackgl_modules/index.js

Copy file name to clipboardExpand all lines: stackgl_modules/index.js
+17-17Lines changed: 17 additions & 17 deletions
Large diffs are not rendered by default.

‎stackgl_modules/package-lock.json

Copy file name to clipboardExpand all lines: stackgl_modules/package-lock.json
+63-62Lines changed: 63 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎stackgl_modules/package.json

Copy file name to clipboardExpand all lines: stackgl_modules/package.json
+9-8Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,22 @@
1313
"box-intersect": "plotly/box-intersect#v1.1.0",
1414
"convex-hull": "^1.0.3",
1515
"delaunay-triangulate": "^1.1.6",
16-
"gl-axes3d": "^1.7.0",
17-
"gl-cone3d": "^1.6.0",
18-
"gl-error3d": "^1.0.16",
16+
"gl-axes3d": "^1.7.1",
17+
"gl-cone3d": "^1.6.1",
18+
"gl-error3d": "^1.0.17",
1919
"gl-heatmap2d": "^1.1.1",
20-
"gl-line3d": "1.2.1",
21-
"gl-mesh3d": "^2.3.1",
20+
"gl-line3d": "^1.2.2",
21+
"gl-mesh3d": "^2.3.2",
2222
"gl-plot2d": "^1.5.0",
2323
"gl-plot3d": "^2.4.7",
2424
"gl-pointcloud2d": "^1.0.3",
25-
"gl-scatter3d": "^1.4.0",
25+
"gl-scatter3d": "^1.4.1",
2626
"gl-select-box": "^1.0.4",
2727
"gl-shader": "4.3.1",
2828
"gl-spikes2d": "^1.0.2",
29-
"gl-streamtube3d": "^1.4.1",
30-
"gl-surface3d": "^1.6.0",
29+
"gl-spikes3d": "^1.0.11",
30+
"gl-streamtube3d": "^1.4.2",
31+
"gl-surface3d": "^1.6.1",
3132
"glslify": "^7.1.1",
3233
"incremental-convex-hull": "plotly/incremental-convex-hull#v1.1.0",
3334
"is-mobile": "^4.0.0",
-27 Bytes

‎test/image/baselines/gl3d_bunny.png

Copy file name to clipboard
8 Bytes
10 Bytes
-21 Bytes
27 Bytes
-7 Bytes
0 Bytes
19 Bytes
8 Bytes
-3 Bytes
-53 Bytes
-162 Bytes
-150 Bytes
-1 Bytes
-5 Bytes
-1 Bytes
8 Bytes

‎test/image/baselines/gl3d_ribbons.png

Copy file name to clipboard
14 Bytes
-27 Bytes

‎test/image/baselines/gl3d_snowden.png

Copy file name to clipboard
1 Byte
8 Bytes
-1 Bytes
-1 Bytes
-64 Bytes
-11 Bytes
1 Byte
16 Bytes
808 Bytes
-14 Bytes
50 Bytes

‎test/image/baselines/plot_types.png

Copy file name to clipboard
-2 Bytes
2 Bytes

‎test/image/compare_pixels_test.js

Copy file name to clipboardExpand all lines: test/image/compare_pixels_test.js
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ for(var i = 0; i < allMockList.length; i++) {
178178
'gl3d_opacity-scaling-spikes',
179179
'gl3d_cone-wind',
180180
'gl3d_isosurface_math',
181-
'gl3d_scatter3d-blank-text'
181+
'gl3d_scatter3d-blank-text',
182+
'gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges'
182183
].indexOf(mockName) !== -1) threshold = 0.7;
183184
}
184185

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.