Skip to content

Fix to enable switching modes using plotly react method on scattergl traces #3132

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Oct 24, 2018
Merged

Fix to enable switching modes using plotly react method on scattergl traces #3132

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fce8aad
check destroy functions before execution
archmoj Oct 21, 2018
709294c
fix for issue 2999
archmoj Oct 21, 2018
dd51b95
updated condistions
archmoj Oct 21, 2018
55ede35
modified if statements
archmoj Oct 23, 2018
1c8702a
improved test to be integer
archmoj Oct 24, 2018
81e2dce
add test for non-integer gd width/height
etpinard Oct 24, 2018
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
26 changes: 20 additions & 6 deletions src/traces/scattergl/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,27 @@ function sceneUpdate(gd, subplot) {

// remove scene resources
scene.destroy = function destroy() {
if(scene.fill2d) scene.fill2d.destroy();
if(scene.scatter2d) scene.scatter2d.destroy();
if(scene.error2d) scene.error2d.destroy();
if(scene.line2d) scene.line2d.destroy();
if(scene.select2d) scene.select2d.destroy();
if((scene.fill2d) &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non-blocking comment: We (me and @alexcjohnson ) would usually write these lines as

if(scene.fill2d && scene.fill2d.destroy) {
    scene.fill2d.destroy();
}

(scene.fill2d.destroy)) {
scene.fill2d.destroy();}
if((scene.scatter2d) &&
(scene.scatter2d.destroy)) {
scene.scatter2d.destroy();}
if((scene.error2d) &&
(scene.error2d.destroy)) {
scene.error2d.destroy();}
if((scene.line2d) &&
(scene.line2d.destroy)) {
scene.line2d.destroy();}
if((scene.select2d) &&
(scene.select2d.destroy)) {
scene.select2d.destroy();}
if(scene.glText) {
scene.glText.forEach(function(text) { text.destroy(); });
scene.glText.forEach(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and this thing as

scene.glText.forEach(function(text) {
    if(text.destroy) text.destroy();
});

function(text) {
if(text.destroy) text.destroy();
}
);
}

scene.lineOptions = null;
Expand Down