diff options
| author | Stephen Blott | 2016-09-27 06:45:19 +0100 |
|---|---|---|
| committer | Stephen Blott | 2016-09-27 06:45:19 +0100 |
| commit | 8601edd71e74ba522e32658309cb2e7acca8aeeb (patch) | |
| tree | af3f6fac8d3aaababfd6028deeddbd3a11834b8f | |
| parent | 6a14a480809e78c33034eac94b223b54dd35925a (diff) | |
| download | vimium-8601edd71e74ba522e32658309cb2e7acca8aeeb.tar.bz2 | |
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.
| -rw-r--r-- | pages/blank.html | 24 | ||||
| -rw-r--r-- | pages/completion_engines.html | 25 | ||||
| -rw-r--r-- | pages/help_dialog.html | 24 | ||||
| -rw-r--r-- | pages/logging.html | 24 | ||||
| -rw-r--r-- | pages/options.html | 24 |
5 files changed, 115 insertions, 6 deletions
diff --git a/pages/blank.html b/pages/blank.html index 496c1868..97aaef81 100644 --- a/pages/blank.html +++ b/pages/blank.html @@ -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> diff --git a/pages/completion_engines.html b/pages/completion_engines.html index 69158c78..c2c4f3c7 100644 --- a/pages/completion_engines.html +++ b/pages/completion_engines.html @@ -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> diff --git a/pages/help_dialog.html b/pages/help_dialog.html index 8ac000fb..71869933 100644 --- a/pages/help_dialog.html +++ b/pages/help_dialog.html @@ -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" /> diff --git a/pages/logging.html b/pages/logging.html index 78095e4b..b2ed3c58 100644 --- a/pages/logging.html +++ b/pages/logging.html @@ -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 { 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> |