From d00345f45b5b3e56970237799c69808527e91919 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 1 Oct 2016 12:05:29 +0100
Subject: Use HTML5 import to load content scripts.

This is one approach to fixing #2277 properly.  (Currently there's a
temporary fix in place.)

This uses HTML5 imports in place of the content-script loader.

This is better than the current "fix" because content scripts are only
listed in one place two places (as opposed to six).

It's worse than the previous content-script loader, though, in that
content scripts must be listed in two places, instead of one.

Fixes #2277.
---
 pages/options.html | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'pages/options.html')
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>
 
-- 
cgit v1.2.3

