From 93a07e4c4ccc64b5939adbf71a12bfad403845ad Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Mon, 17 Apr 2017 17:36:04 +0100
Subject: Remove content_script_loader and all references to it

---
 pages/blank.html                   |  3 ---
 pages/completion_engines.html      |  3 ---
 pages/content_script_loader.coffee | 28 ----------------------------
 pages/help_dialog.html             |  3 ---
 pages/logging.html                 |  3 ---
 pages/options.html                 |  3 ---
 6 files changed, 43 deletions(-)
 delete mode 100644 pages/content_script_loader.coffee
diff --git a/pages/blank.html b/pages/blank.html
index 4f0d7bfa..8f10c7f6 100644
--- a/pages/blank.html
+++ b/pages/blank.html
@@ -1,9 +1,6 @@
 <html>
   <head>
     <title>New Tab</title>
-    <!-- <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>
diff --git a/pages/completion_engines.html b/pages/completion_engines.html
index 338ff3eb..0c86edf7 100644
--- a/pages/completion_engines.html
+++ b/pages/completion_engines.html
@@ -4,9 +4,6 @@
     <!-- 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">
-    <!-- <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>
diff --git a/pages/content_script_loader.coffee b/pages/content_script_loader.coffee
deleted file mode 100644
index 5058bb7b..00000000
--- a/pages/content_script_loader.coffee
+++ /dev/null
@@ -1,28 +0,0 @@
-injectContentScripts = ->
-  manifest = chrome.runtime.getManifest()
-  content_scripts = manifest.content_scripts
-
-  insertLocation = document.head.firstChild
-
-  for scriptInfo in content_scripts
-    continue if scriptInfo.matches.indexOf("<all_urls>") == -1
-
-    if scriptInfo.js
-      for script in scriptInfo.js
-        scriptElement = document.createElement "script"
-        scriptElement.type = "text/javascript"
-        scriptElement.async = false # Don't load out of order!
-        scriptElement.src = chrome.runtime.getURL script
-
-        insertLocation.parentElement.insertBefore scriptElement, insertLocation
-
-    if scriptInfo.css
-      for style in scriptInfo.css
-        styleElement = document.createElement "link"
-        styleElement.rel = "stylesheet"
-        styleElement.type = "text/css"
-        styleElement.href = chrome.runtime.getURL style
-
-        insertLocation.parentElement.insertBefore styleElement, insertLocation
-
-injectContentScripts()
diff --git a/pages/help_dialog.html b/pages/help_dialog.html
index 58cdf8c2..b2d14dab 100644
--- a/pages/help_dialog.html
+++ b/pages/help_dialog.html
@@ -1,9 +1,6 @@
 <html>
   <head>
     <title>Vimium Help</title>
-    <!-- <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>
diff --git a/pages/logging.html b/pages/logging.html
index dd05e819..6eff58c4 100644
--- a/pages/logging.html
+++ b/pages/logging.html
@@ -1,9 +1,6 @@
 <html>
   <head>
     <title>Vimium Logging</title>
-    <!-- <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>
diff --git a/pages/options.html b/pages/options.html
index b24bdec2..34ff70f9 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -2,9 +2,6 @@
   <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>
-- 
cgit v1.2.3

