aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2016-04-19 09:26:50 +0100
committerStephen Blott2016-04-21 06:41:57 +0100
commit810dafcb7c4d76bf0bebfab12bbb869e0e19bd3a (patch)
treec3374c49e0a9e65425eb1334461f53ca1edb4bff
parentff2bb00565eb1111a5b2d5ced5f6405591ae7bc6 (diff)
downloadvimium-810dafcb7c4d76bf0bebfab12bbb869e0e19bd3a.tar.bz2
Help dialog; remove ability to blur the dialog.
Previously, you could blur the help dialog on the options page (to read and type command names). With the reinstated help-dialog styling (whereby the help-dialog iframe extends across the entire window), this doesn't make sense. So it's removed.
-rw-r--r--content_scripts/ui_component.coffee2
-rw-r--r--content_scripts/vimium_frontend.coffee4
-rw-r--r--pages/options.coffee2
3 files changed, 3 insertions, 5 deletions
diff --git a/content_scripts/ui_component.coffee b/content_scripts/ui_component.coffee
index 7422aada..59e4fe41 100644
--- a/content_scripts/ui_component.coffee
+++ b/content_scripts/ui_component.coffee
@@ -56,7 +56,7 @@ class UIComponent
false # We will not be calling sendResponse.
# If this frame receives the focus, then hide the UI component.
window.addEventListener "focus", (event) =>
- if event.target == window and @options?.focus and not @options?.allowBlur
+ if event.target == window and @options?.focus
@hide false
true # Continue propagating the event.
# Set the iframe's port, thereby rendering the UI component ready.
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index a80093f9..68cd402d 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -630,10 +630,8 @@ window.HelpDialog ?=
if @isShowing()
@helpUI.hide()
else
- # On the options page, we allow the help dialog to blur, elsewhere we do not. This allows users to view
- # the help dialog while typing in the key-mappings input.
@helpUI.activate extend request,
- name: "activate", focus: true, allowBlur: window.isVimiumOptionsPage ? false
+ name: "activate", focus: true
initializePreDomReady()
DomUtils.documentReady initializeOnDomReady
diff --git a/pages/options.coffee b/pages/options.coffee
index 883405e6..ff6ad15a 100644
--- a/pages/options.coffee
+++ b/pages/options.coffee
@@ -324,4 +324,4 @@ document.addEventListener "DOMContentLoaded", ->
# Exported for tests.
root = exports ? window
-extend root, {Options, isVimiumOptionsPage: true}
+extend root, {Options}