Skip to content

Commit

Permalink
Disable content-script loader (temporary).
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@smblott-github
smblott-github committed Sep 27, 2016
1 parent 6a14a48 commit 8601edd
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 6 deletions.
24 changes: 23 additions & 1 deletion pages/blank.html
View file
@@ -1,7 +1,29 @@
<html>
<head>
<title>New Tab</title>
<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>

</head>
<body>
</body>
Expand Down
25 changes: 23 additions & 2 deletions pages/completion_engines.html
View file
Expand Up @@ -4,8 +4,29 @@
<!-- 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>
<script type="text/javascript" src="../lib/settings.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 src="../background_scripts/completion_engines.js"></script>
<script src="completion_engines.js"></script>
</head>
Expand Down
24 changes: 23 additions & 1 deletion pages/help_dialog.html
View file
@@ -1,7 +1,29 @@
<html>
<head>
<title>Vimium Help</title>
<script type="text/javascript" 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="ui_component_server.js"></script>
<script type="text/javascript" src="help_dialog.js"></script>
<link rel="stylesheet" type="text/css" href="../content_scripts/vimium.css" />
Expand Down
24 changes: 23 additions & 1 deletion pages/logging.html
View file
@@ -1,7 +1,29 @@
<html>
<head>
<title>Vimium Logging</title>
<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 src="logging.js"></script>
<style type="text/css">
body {
Expand Down
24 changes: 23 additions & 1 deletion pages/options.html
View file
Expand Up @@ -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>

Expand Down

0 comments on commit 8601edd

Please sign in to comment.