aboutsummaryrefslogtreecommitdiffstats
path: root/pages
diff options
context:
space:
mode:
authormrmr19932017-02-08 19:26:46 +0000
committermrmr19932017-04-16 15:24:35 +0100
commit11e4fc2e1fbb1f2c3633a7ab23dfc24eb4ca511f (patch)
tree4b4d19cf627fe8ab4c3027e9bab95e9903a48f2c /pages
parent1d9a5b4935d6cab867ab44d0d8265738c37ce988 (diff)
downloadvimium-11e4fc2e1fbb1f2c3633a7ab23dfc24eb4ca511f.tar.bz2
Revert "Use HTML5 import to load content scripts."
This reverts commit d00345f45b5b3e56970237799c69808527e91919. This is not (and will not be) supported by Firefox.
Diffstat (limited to 'pages')
-rw-r--r--pages/blank.html25
-rw-r--r--pages/completion_engines.html25
-rw-r--r--pages/content_script_loader.coffee28
-rw-r--r--pages/help_dialog.html25
-rw-r--r--pages/logging.html25
-rw-r--r--pages/options.html25
-rw-r--r--pages/vimium_resources.html24
7 files changed, 148 insertions, 29 deletions
diff --git a/pages/blank.html b/pages/blank.html
index c238282d..4f0d7bfa 100644
--- a/pages/blank.html
+++ b/pages/blank.html
@@ -1,7 +1,30 @@
<html>
<head>
<title>New Tab</title>
- <link rel="import" href="vimium_resources.html">
+ <!-- <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" />
+
</head>
<body>
</body>
diff --git a/pages/completion_engines.html b/pages/completion_engines.html
index 0c350664..338ff3eb 100644
--- a/pages/completion_engines.html
+++ b/pages/completion_engines.html
@@ -4,7 +4,30 @@
<!-- 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="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" />
+
<script src="../background_scripts/completion_engines.js"></script>
<script src="completion_engines.js"></script>
</head>
diff --git a/pages/content_script_loader.coffee b/pages/content_script_loader.coffee
new file mode 100644
index 00000000..5058bb7b
--- /dev/null
+++ b/pages/content_script_loader.coffee
@@ -0,0 +1,28 @@
+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 7bc0d86c..58cdf8c2 100644
--- a/pages/help_dialog.html
+++ b/pages/help_dialog.html
@@ -1,7 +1,30 @@
<html>
<head>
<title>Vimium Help</title>
- <link rel="import" href="vimium_resources.html">
+ <!-- <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" />
+
<script type="text/javascript" src="ui_component_server.js"></script>
<script type="text/javascript" src="help_dialog.js"></script>
</head>
diff --git a/pages/logging.html b/pages/logging.html
index bc4ffb80..dd05e819 100644
--- a/pages/logging.html
+++ b/pages/logging.html
@@ -1,7 +1,30 @@
<html>
<head>
<title>Vimium Logging</title>
- <link rel="import" href="vimium_resources.html">
+ <!-- <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" />
+
<script src="logging.js"></script>
<style type="text/css">
body {
diff --git a/pages/options.html b/pages/options.html
index 92bed6f0..b24bdec2 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -2,7 +2,30 @@
<head>
<title>Vimium Options</title>
<link rel="stylesheet" type="text/css" href="options.css">
- <link rel="import" href="vimium_resources.html">
+ <!-- <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" />
+
<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" />
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-30 23:24:34 +0000