diff options
| author | Stephen Blott | 2016-10-01 13:32:28 +0100 |
|---|---|---|
| committer | GitHub | 2016-10-01 13:32:28 +0100 |
| commit | d439a13afd1569548e62def33278f31b258984db (patch) | |
| tree | 6a7df895aa18a807d5492c08847ebb923e46f136 /pages/options.html | |
| parent | 469e085c3645a26f460c793082fd3c8beb24ef16 (diff) | |
| parent | d27a4bd53b8bd2939a9d5c5ecd8b251c2645c1ed (diff) | |
| download | vimium-d439a13afd1569548e62def33278f31b258984db.tar.bz2 | |
Merge pull request #2285 from smblott-github/content-loader-via-import
Use HTML5 import to load content scripts.
Diffstat (limited to 'pages/options.html')
| -rw-r--r-- | pages/options.html | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/pages/options.html b/pages/options.html index b24bdec2..92bed6f0 100644 --- a/pages/options.html +++ b/pages/options.html @@ -2,30 +2,7 @@ <head> <title>Vimium Options</title> <link rel="stylesheet" type="text/css" href="options.css"> - <!-- <script src="content_script_loader.js"></script> --> - <!-- NOTE(smblott) Temporarily, do not use the content-script loader (2016-09-27). It appears no longer - to be loading scripts synchronously, and so all dependent pages fail. --> - <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" /> - + <link rel="import" href="vimium_resources.html"> <script type="text/javascript" src="options.js"></script> </head> |