From de2616493ea549c6eaa435b409f74438d8692f93 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Wed, 30 Mar 2016 06:40:20 +0100
Subject: Minor refactor of link-hints exit sequence.

The exit sequence is clearer like this.
---
 content_scripts/link_hints.coffee | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee
index 526e3917..374a6784 100644
--- a/content_scripts/link_hints.coffee
+++ b/content_scripts/link_hints.coffee
@@ -56,7 +56,7 @@ HintCoordinator =
     chrome.runtime.sendMessage extend request, {handler: "linkHintsMessage", messageType, frameId}
 
   prepareToActivateMode: (mode, onExit) ->
-    @onExit = [(isSuccess) -> onExit() if isSuccess]
+    @onExit = [onExit]
     @sendMessage "prepareToActivateMode", modeIndex: availableModes.indexOf mode
 
   getHintDescriptors: ->
@@ -86,10 +86,11 @@ HintCoordinator =
 LinkHints =
   activateMode: (count = 1, mode = OPEN_IN_CURRENT_TAB) ->
     if 0 < count or mode is OPEN_WITH_QUEUE
-      HintCoordinator.prepareToActivateMode mode, ->
-        # Wait for the next tick to allow the previous mode to exit.  It might yet generate a click event,
-        # which would cause our new mode to exit immediately.
-        Utils.nextTick -> LinkHints.activateMode count-1, mode
+      HintCoordinator.prepareToActivateMode mode, (isSuccess) ->
+        if isSuccess
+          # Wait for the next tick to allow the previous mode to exit.  It might yet generate a click event,
+          # which would cause our new mode to exit immediately.
+          Utils.nextTick -> LinkHints.activateMode count-1, mode
 
   activateModeToOpenInNewTab: (count) -> @activateMode count, OPEN_IN_NEW_BG_TAB
   activateModeToOpenInNewForegroundTab: (count) -> @activateMode count, OPEN_IN_NEW_FG_TAB
-- 
cgit v1.2.3