mikeguru
diff --git a/‎src/components/legend/draw.js
Copy file name to clipboardExpand all lines: src/components/legend/draw.js
+5-5Lines changed: 5 additions & 5 deletions b/‎src/components/legend/draw.js
Copy file name to clipboardExpand all lines: src/components/legend/draw.js
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎test/jasmine/tests/legend_test.js
Copy file name to clipboardExpand all lines: test/jasmine/tests/legend_test.js
+7-5Lines changed: 7 additions & 5 deletions b/‎test/jasmine/tests/legend_test.js
Copy file name to clipboardExpand all lines: test/jasmine/tests/legend_test.js
+7-5Lines changed: 7 additions & 5 deletions
@@ -375,20 +375,20 @@ function clickOrDoubleClick(gd, legend, legendItem, numClicks, evt) {
         evtData.group = trace._group;
     }
 
-    var returnVal;
+    var clickVal = Events.triggerHandler(gd, 'plotly_legendclick', evtData);
+    if(clickVal === false) return;
 
     if(numClicks === 1) {
         legend._clickTimeout = setTimeout(function() {
-            returnVal = Events.triggerHandler(gd, 'plotly_legendclick', evtData);
-            if(returnVal !== false) handleClick(legendItem, gd, numClicks);
+            handleClick(legendItem, gd, numClicks);
         }, DBLCLICKDELAY);
     }
     else if(numClicks === 2) {
         if(legend._clickTimeout) clearTimeout(legend._clickTimeout);
         gd._legendMouseDownTime = 0;
 
-        returnVal = Events.triggerHandler(gd, 'plotly_legenddoubleclick', evtData);
-        if(returnVal !== false) handleClick(legendItem, gd, numClicks);
+        var dblClickVal = Events.triggerHandler(gd, 'plotly_legenddoubleclick', evtData);
+        if(dblClickVal !== false) handleClick(legendItem, gd, numClicks);
     }
 }
 
 
@@ -1340,17 +1340,19 @@ describe('legend interaction', function() {
                         reject('did not trigger ' + evtName);
                     }, 2 * DBLCLICKDELAY);
 
-                    gd.on(evtName, function(d) {
-                        hasBeenCalled = true;
-                        _assert(d, exp);
-                    });
-                    gd.on('plotly_restyle', function() {
+                    function done() {
                         if(hasBeenCalled) {
                             clearTimeout(to);
                             resolve();
                         }
+                    }
+
+                    gd.once(evtName, function(d) {
+                        hasBeenCalled = true;
+                        _assert(d, exp);
                     });
 
+                    gd.once('plotly_restyle', done);
                     click(clickArg[0], clickArg[1])();
                 });
             }
Original file line number	Diff line number	Diff line change
`@@ -375,20 +375,20 @@ function clickOrDoubleClick(gd, legend, legendItem, numClicks, evt) {`
`375`	`375`	`evtData.group = trace._group;`
`376`	`376`	`}`
`377`	`377`
`378`		`- var returnVal;`
	`378`	`+ var clickVal = Events.triggerHandler(gd, 'plotly_legendclick', evtData);`
	`379`	`+ if(clickVal === false) return;`
`379`	`380`
`380`	`381`	`if(numClicks === 1) {`
`381`	`382`	`legend._clickTimeout = setTimeout(function() {`
`382`		`- returnVal = Events.triggerHandler(gd, 'plotly_legendclick', evtData);`
`383`		`- if(returnVal !== false) handleClick(legendItem, gd, numClicks);`
	`383`	`+ handleClick(legendItem, gd, numClicks);`
`384`	`384`	`}, DBLCLICKDELAY);`
`385`	`385`	`}`
`386`	`386`	`else if(numClicks === 2) {`
`387`	`387`	`if(legend._clickTimeout) clearTimeout(legend._clickTimeout);`
`388`	`388`	`gd._legendMouseDownTime = 0;`
`389`	`389`
`390`		`- returnVal = Events.triggerHandler(gd, 'plotly_legenddoubleclick', evtData);`
`391`		`- if(returnVal !== false) handleClick(legendItem, gd, numClicks);`
	`390`	`+ var dblClickVal = Events.triggerHandler(gd, 'plotly_legenddoubleclick', evtData);`
	`391`	`+ if(dblClickVal !== false) handleClick(legendItem, gd, numClicks);`
`392`	`392`	`}`
`393`	`393`	`}`
`394`	`394`