Bye bye viewsetup.js! 👋

nodecg · Feb 18, 2015 · d1920e9 · d1920e9
1 parent fedb4e1
commit d1920e9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/lib/bundle_views/index.js b/lib/bundle_views/index.js
@@ -7,6 +7,7 @@ var filteredConfig = configHelper.getFilteredConfig();
 var cheerio = require('cheerio');
 var fs = require('fs');
 var path = require('path');
+var util = require('util');
 var log = require('../logger')('nodecg/lib/bundle_views');
 var Bundles = require('../bundles');
 
@@ -16,24 +17,6 @@ log.trace('Adding Express routes');
 
 app.set('views', path.resolve(__dirname, '../..'));
 
-app.get('/viewsetup.js', function(req, res) {
-    var bundleName = req.query.bundle || '';
-
-    // Don't send the script if the query string is missing
-    if (bundleName === '') {
-        res.send(404);
-        return;
-    }
-
-    var bundle = Bundles.find(bundleName);
-    res.type('.js');
-    res.render('lib/client_includes/viewsetup.js.ejs', {
-        bundleName: bundle.name,
-        ncgConfig: JSON.stringify(filteredConfig),
-        bundleConfig: JSON.stringify(bundle.config)
-    });
-});
-
 app.get('/view/:bundleName*', function(req, res, next) {
     var bundleName = req.params.bundleName;
 
@@ -71,8 +54,17 @@ app.get('/view/:bundleName*', function(req, res, next) {
     if (resName.endsWith('.html')) {
         var file = fs.readFileSync(fileLocation);
         var $ = cheerio.load(file);
-        var scriptNode = '<script src="/viewsetup.js?bundle='+ bundle.name +'"></script>';
-        $('body').append(scriptNode);
+
+        var scripts = '<script src="/socket.io/socket.io.js"></script>' +
+            '<script src="/nodecg-api.js"></script>' +
+            '<script>var socket = io("//%s:%s/");' +
+            'window.nodecg = new NodeCG("%s", %s, %s, socket);</script>';
+
+        scripts = util.format(scripts, filteredConfig.host, filteredConfig.port,
+            bundle.name, JSON.stringify(filteredConfig), JSON.stringify(bundle.config));
+
+        var currentHead = $('head').html();
+        $('head').html(scripts + currentHead);
 
         res.send($.html());
     } else {

diff --git a/test/setup/test-bundle/view/index.html b/test/setup/test-bundle/view/index.html
@@ -6,9 +6,7 @@
 </head>
 <body>
     <script>
-        document.addEventListener("ncgReady", function() {
-            window.viewApi = nodecg;
-        })
+        window.viewApi = nodecg;
     </script>
 </body>
 </html>