Skip to content

Fixing issue #5350 by moving the 'false' check #6727

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 7 commits into from
Sep 22, 2023
Merged

Fixing issue #5350 by moving the 'false' check #6727

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26eb06b
Fixing issue #5350 by moving the 'false' check to affect only the sin…
andrej-vasilj Sep 15, 2023
cf2ef69
Modified 1 legend unit test
andrej-vasilj Sep 15, 2023
6477e1a
removing trailing spaces
andrej-vasilj Sep 15, 2023
07f2b70
small tweak to always call handler
andrej-vasilj Sep 19, 2023
0757d3d
dblclick default handler only when single click and dbl click are not…
andrej-vasilj Sep 21, 2023
c25bc9b
added draftlog file
andrej-vasilj Sep 22, 2023
6b72540
Added unit test for bug fix
andrej-vasilj Sep 22, 2023
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
6 changes: 3 additions & 3 deletions src/components/legend/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,10 @@ function clickOrDoubleClick(gd, legend, legendItem, numClicks, evt) {
evtData.label = legendItem.datum()[0].label;
}

var clickVal = Events.triggerHandler(gd, 'plotly_legendclick', evtData);
if(clickVal === false) return;

if(numClicks === 1) {
var clickVal = Events.triggerHandler(gd, 'plotly_legendclick', evtData);
if(clickVal === false) return;

legend._clickTimeout = setTimeout(function() {
if(!gd._fullLayout) return;
handleClick(legendItem, gd, numClicks);
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/legend_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2720,7 +2720,7 @@ describe('legend with custom doubleClickDelay', function() {
.then(_assert('[long] after click + (t/2) delay', 1, 0))
.then(delay(tLong + 10))
.then(click(0)).then(delay(DBLCLICKDELAY + 1)).then(click(0))
.then(_assert('[long] after click + (DBLCLICKDELAY+1) delay + click', 2, 1))
.then(_assert('[long] after click + (DBLCLICKDELAY+1) delay + click', 1, 1))
.then(delay(tLong + 10))
.then(click(0)).then(delay(1.1 * tLong)).then(click(0))
.then(_assert('[long] after click + (1.1*t) delay + click', 2, 0))
Expand Down