From 8601edd71e74ba522e32658309cb2e7acca8aeeb Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 27 Sep 2016 06:45:19 +0100
Subject: Disable content-script loader (temporary).

Scripts loaded via the content-script loader previously were loaded
synchronously.  In recent versions of Chrome, they now seem to be loaded
asynchrnously, which causes errors.

This is a temporary commit to keep master healthy until I (or somebody)
figures out properly what is going on.

It is expected to be reverted in due course.
---
 pages/options.html | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'pages/options.html')
diff --git a/pages/options.html b/pages/options.html
index 17fe64bd..04d7fe27 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -2,7 +2,29 @@
   <head>
     <title>Vimium Options</title>
     <link rel="stylesheet" type="text/css" href="options.css">
-    <script src="content_script_loader.js"></script>
+    <!-- <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>
+
     <script type="text/javascript" src="options.js"></script>
   </head>
 
-- 
cgit v1.2.3

