From d65d33ce7f25c7a71bbb2dc15b161e081014ae42 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Wed, 3 Feb 2016 14:10:52 +0000
Subject: Move frameId check from toggleHelpDialog to its message listener

---
 content_scripts/vimium_frontend.coffee | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index b28a1a20..67742963 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -137,7 +137,7 @@ initializePreDomReady = ->
 
   requestHandlers =
     showHUDforDuration: handleShowHUDforDuration
-    toggleHelpDialog: (request) -> toggleHelpDialog(request.dialogHtml, request.frameId)
+    toggleHelpDialog: (request) -> if frameId == request.frameId then toggleHelpDialog request.dialogHtml
     focusFrame: (request) -> if (frameId == request.frameId) then focusThisFrame request
     refreshCompletionKeys: refreshCompletionKeys
     getScrollPosition: -> scrollX: window.scrollX, scrollY: window.scrollY
@@ -832,8 +832,7 @@ window.HelpDialog =
     addOrRemove = if visible then "add" else "remove"
     HelpDialog.dialogElement.classList[addOrRemove] "showAdvanced"
 
-toggleHelpDialog = (html, fid) ->
-  return unless fid == frameId
+toggleHelpDialog = (html) ->
   if HelpDialog.showing
     HelpDialog.hide()
   else
-- 
cgit v1.2.3