diff options
| author | Stephen Blott | 2017-04-18 05:47:15 +0100 |
|---|---|---|
| committer | GitHub | 2017-04-18 05:47:15 +0100 |
| commit | 8058a54fd5a6a2f0e1a62a3a66f837a07045396e (patch) | |
| tree | a7e0949cd41b8fa8d03fa27140f8b815ec1d64c4 /pages | |
| parent | 84723d7561d0cc12f54a6d388dcd505ddd6105ac (diff) | |
| parent | b0fc681480da40ec0bdb43773275ef7181c78cf1 (diff) | |
| download | vimium-8058a54fd5a6a2f0e1a62a3a66f837a07045396e.tar.bz2 | |
Merge pull request #2476 from mrmr1993/firefox
Improve firefox support
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/blank.html | 22 | ||||
| -rw-r--r-- | pages/completion_engines.html | 22 | ||||
| -rw-r--r-- | pages/help_dialog.html | 22 | ||||
| -rw-r--r-- | pages/hud.coffee | 5 | ||||
| -rw-r--r-- | pages/logging.html | 22 | ||||
| -rw-r--r-- | pages/options.html | 22 | ||||
| -rw-r--r-- | pages/vimium_resources.html | 24 |
7 files changed, 109 insertions, 30 deletions
diff --git a/pages/blank.html b/pages/blank.html index c238282d..8f10c7f6 100644 --- a/pages/blank.html +++ b/pages/blank.html @@ -1,7 +1,27 @@ <html> <head> <title>New Tab</title> - <link rel="import" href="vimium_resources.html"> + <script src="../lib/utils.js"></script> + <script src="../lib/keyboard_utils.js"></script> + <script src="../lib/dom_utils.js"></script> + <script src="../lib/rect.js"></script> + <script src="../lib/handler_stack.js"></script> + <script src="../lib/settings.js"></script> + <script src="../lib/find_mode_history.js"></script> + <script src="../content_scripts/mode.js"></script> + <script src="../content_scripts/ui_component.js"></script> + <script src="../content_scripts/link_hints.js"></script> + <script src="../content_scripts/vomnibar.js"></script> + <script src="../content_scripts/scroller.js"></script> + <script src="../content_scripts/marks.js"></script> + <script src="../content_scripts/mode_insert.js"></script> + <script src="../content_scripts/mode_find.js"></script> + <script src="../content_scripts/mode_key_handler.js"></script> + <script src="../content_scripts/mode_visual.js"></script> + <script src="../content_scripts/hud.js"></script> + <script src="../content_scripts/vimium_frontend.js"></script> + <link rel="stylesheet" type="text/css" href="../content_scripts/vimium.css" /> + </head> <body> </body> diff --git a/pages/completion_engines.html b/pages/completion_engines.html index 0c350664..0c86edf7 100644 --- a/pages/completion_engines.html +++ b/pages/completion_engines.html @@ -4,7 +4,27 @@ <!-- We re-use some styling from the options page, so that the look and feel here is similar --> <link rel="stylesheet" type="text/css" href="options.css"> <link rel="stylesheet" type="text/css" href="completion_engines.css"> - <link rel="import" href="vimium_resources.html"> + <script src="../lib/utils.js"></script> + <script src="../lib/keyboard_utils.js"></script> + <script src="../lib/dom_utils.js"></script> + <script src="../lib/rect.js"></script> + <script src="../lib/handler_stack.js"></script> + <script src="../lib/settings.js"></script> + <script src="../lib/find_mode_history.js"></script> + <script src="../content_scripts/mode.js"></script> + <script src="../content_scripts/ui_component.js"></script> + <script src="../content_scripts/link_hints.js"></script> + <script src="../content_scripts/vomnibar.js"></script> + <script src="../content_scripts/scroller.js"></script> + <script src="../content_scripts/marks.js"></script> + <script src="../content_scripts/mode_insert.js"></script> + <script src="../content_scripts/mode_find.js"></script> + <script src="../content_scripts/mode_key_handler.js"></script> + <script src="../content_scripts/mode_visual.js"></script> + <script src="../content_scripts/hud.js"></script> + <script src="../content_scripts/vimium_frontend.js"></script> + <link rel="stylesheet" type="text/css" href="../content_scripts/vimium.css" /> + <script src="../background_scripts/completion_engines.js"></script> <script src="completion_engines.js"></script> </head> diff --git a/pages/help_dialog.html b/pages/help_dialog.html index 7bc0d86c..b2d14dab 100644 --- a/pages/help_dialog.html +++ b/pages/help_dialog.html @@ -1,7 +1,27 @@ <html> <head> <title>Vimium Help</title> - <link rel="import" href="vimium_resources.html"> + <script src="../lib/utils.js"></script> + <script src="../lib/keyboard_utils.js"></script> + <script src="../lib/dom_utils.js"></script> + <script src="../lib/rect.js"></script> + <script src="../lib/handler_stack.js"></script> + <script src="../lib/settings.js"></script> + <script src="../lib/find_mode_history.js"></script> + <script src="../content_scripts/mode.js"></script> + <script src="../content_scripts/ui_component.js"></script> + <script src="../content_scripts/link_hints.js"></script> + <script src="../content_scripts/vomnibar.js"></script> + <script src="../content_scripts/scroller.js"></script> + <script src="../content_scripts/marks.js"></script> + <script src="../content_scripts/mode_insert.js"></script> + <script src="../content_scripts/mode_find.js"></script> + <script src="../content_scripts/mode_key_handler.js"></script> + <script src="../content_scripts/mode_visual.js"></script> + <script src="../content_scripts/hud.js"></script> + <script src="../content_scripts/vimium_frontend.js"></script> + <link rel="stylesheet" type="text/css" href="../content_scripts/vimium.css" /> + <script type="text/javascript" src="ui_component_server.js"></script> <script type="text/javascript" src="help_dialog.js"></script> </head> diff --git a/pages/hud.coffee b/pages/hud.coffee index 36e4cbd2..af528203 100644 --- a/pages/hud.coffee +++ b/pages/hud.coffee @@ -58,7 +58,10 @@ handlers = hud.innerText = "/\u200A" # \u200A is a "hair space", to leave enough space before the caret/first char. inputElement = document.createElement "span" - inputElement.contentEditable = "plaintext-only" + try # NOTE(mrmr1993): Chrome supports non-standard "plaintext-only", which is what we *really* want. + inputElement.contentEditable = "plaintext-only" + catch # Fallback to standard-compliant version. + inputElement.contentEditable = "true" inputElement.id = "hud-find-input" hud.appendChild inputElement diff --git a/pages/logging.html b/pages/logging.html index bc4ffb80..6eff58c4 100644 --- a/pages/logging.html +++ b/pages/logging.html @@ -1,7 +1,27 @@ <html> <head> <title>Vimium Logging</title> - <link rel="import" href="vimium_resources.html"> + <script src="../lib/utils.js"></script> + <script src="../lib/keyboard_utils.js"></script> + <script src="../lib/dom_utils.js"></script> + <script src="../lib/rect.js"></script> + <script src="../lib/handler_stack.js"></script> + <script src="../lib/settings.js"></script> + <script src="../lib/find_mode_history.js"></script> + <script src="../content_scripts/mode.js"></script> + <script src="../content_scripts/ui_component.js"></script> + <script src="../content_scripts/link_hints.js"></script> + <script src="../content_scripts/vomnibar.js"></script> + <script src="../content_scripts/scroller.js"></script> + <script src="../content_scripts/marks.js"></script> + <script src="../content_scripts/mode_insert.js"></script> + <script src="../content_scripts/mode_find.js"></script> + <script src="../content_scripts/mode_key_handler.js"></script> + <script src="../content_scripts/mode_visual.js"></script> + <script src="../content_scripts/hud.js"></script> + <script src="../content_scripts/vimium_frontend.js"></script> + <link rel="stylesheet" type="text/css" href="../content_scripts/vimium.css" /> + <script src="logging.js"></script> <style type="text/css"> body { diff --git a/pages/options.html b/pages/options.html index 92bed6f0..34ff70f9 100644 --- a/pages/options.html +++ b/pages/options.html @@ -2,7 +2,27 @@ <head> <title>Vimium Options</title> <link rel="stylesheet" type="text/css" href="options.css"> - <link rel="import" href="vimium_resources.html"> + <script src="../lib/utils.js"></script> + <script src="../lib/keyboard_utils.js"></script> + <script src="../lib/dom_utils.js"></script> + <script src="../lib/rect.js"></script> + <script src="../lib/handler_stack.js"></script> + <script src="../lib/settings.js"></script> + <script src="../lib/find_mode_history.js"></script> + <script src="../content_scripts/mode.js"></script> + <script src="../content_scripts/ui_component.js"></script> + <script src="../content_scripts/link_hints.js"></script> + <script src="../content_scripts/vomnibar.js"></script> + <script src="../content_scripts/scroller.js"></script> + <script src="../content_scripts/marks.js"></script> + <script src="../content_scripts/mode_insert.js"></script> + <script src="../content_scripts/mode_find.js"></script> + <script src="../content_scripts/mode_key_handler.js"></script> + <script src="../content_scripts/mode_visual.js"></script> + <script src="../content_scripts/hud.js"></script> + <script src="../content_scripts/vimium_frontend.js"></script> + <link rel="stylesheet" type="text/css" href="../content_scripts/vimium.css" /> + <script type="text/javascript" src="options.js"></script> </head> diff --git a/pages/vimium_resources.html b/pages/vimium_resources.html deleted file mode 100644 index 2fad22a2..00000000 --- a/pages/vimium_resources.html +++ /dev/null @@ -1,24 +0,0 @@ -<!-- All content scripts (and CSS) listed in the manifest must be listed here too. - These load Vimium on Vimium's internal pages (such as the options page). --> - -<script src="/lib/utils.js"></script> -<script src="/lib/keyboard_utils.js"></script> -<script src="/lib/dom_utils.js"></script> -<script src="/lib/rect.js"></script> -<script src="/lib/handler_stack.js"></script> -<script src="/lib/settings.js"></script> -<script src="/lib/find_mode_history.js"></script> -<script src="/content_scripts/mode.js"></script> -<script src="/content_scripts/ui_component.js"></script> -<script src="/content_scripts/link_hints.js"></script> -<script src="/content_scripts/vomnibar.js"></script> -<script src="/content_scripts/scroller.js"></script> -<script src="/content_scripts/marks.js"></script> -<script src="/content_scripts/mode_insert.js"></script> -<script src="/content_scripts/mode_find.js"></script> -<script src="/content_scripts/mode_key_handler.js"></script> -<script src="/content_scripts/mode_visual.js"></script> -<script src="/content_scripts/hud.js"></script> -<script src="/content_scripts/vimium_frontend.js"></script> - -<link rel="stylesheet" type="text/css" href="/content_scripts/vimium.css" /> |