Removing calls to document.write to load a script (#148)

Instead of generating script tags for plugins client-side, it is now done server side, because calls to document.write to load a script can be blocked on Chrome in some cases, as documented in the following document: https://developers.google.com/web/updates/2016/08/removing-document-write
attester · Oct 24, 2016 · 034fc35 · 034fc35
1 parent 0129c8c
commit 034fc35
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 29 deletions.
diff --git a/lib/test-server/client/plugins.js b/lib/test-server/client/plugins.js
diff --git a/lib/test-server/client/slave.html b/lib/test-server/client/slave.html
@@ -23,7 +23,7 @@
 	<script src="json3/json3.min.js"></script>
 	<script src="js-polyfills/typedarray.js"></script>
 	<script src="/socket.io/socket.io.js"></script>
-	<script src="plugins.js"></script>
+	<% _(query.plugin || []).castArray().forEach(function (plugin) {%><script src="<%= encodeURI(plugin) %>"></script><%}); %>
 	<script src="slave-client.js"></script>
 	<script src="stacktrace.js"></script>
 </body>

diff --git a/lib/test-server/test-server.js b/lib/test-server/test-server.js
@@ -225,6 +225,11 @@ var TestServer = function (config, logger) {
         page: "/status.html",
         path: path.join(__dirname, "client", "status.html")
     }));
+    app.use('/__attester__', template.bind({
+        data: this,
+        page: "/slave.html",
+        path: path.join(__dirname, "client", "slave.html")
+    }));
     app.use('/__attester__', serveStatic(__dirname + '/client'));
     app.use('/__attester__/json3', serveStatic(path.dirname(require.resolve("json3/lib/json3.js"))));
     app.use('/__attester__/js-polyfills', serveStatic(path.dirname(require.resolve("js-polyfills"))));

diff --git a/lib/test-type/test-content.json b/lib/test-type/test-content.json
@@ -1,6 +1,7 @@
 {
 	"head-start": [
 		"<title><%= data.name %></title>",
+		"<% _(query.plugin || []).castArray().forEach(function (plugin) { %><script type=\"text/javascript\" src=\"<%= encodeURI(plugin) %>\"></script><% }); %>",
 		"<% _.forEach(data.config.extraScripts.before, function (script) { %><script type=\"text/javascript\" data-extrascript=\"before\" src=\"<%= script %>\"></script><% }); %>"
 	],
 	"head-end": [

diff --git a/lib/test-type/testPage.html b/lib/test-type/testPage.html
@@ -5,7 +5,6 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width">
     <script type="text/javascript" src="/__attester__/iframe.js"></script>
-    <script type="text/javascript" src="/__attester__/plugins.js"></script>
     <%= head %>
 </head>
 <body>