From d1920e99082adceb1bd1c0b48588b12ddbcaa2f2 Mon Sep 17 00:00:00 2001 From: Matthew McNamara Date: Wed, 18 Feb 2015 18:42:02 +0000 Subject: [PATCH] Bye bye viewsetup.js! :wave: --- lib/bundle_views/index.js | 32 ++++++++++---------------- test/setup/test-bundle/view/index.html | 4 +--- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/lib/bundle_views/index.js b/lib/bundle_views/index.js index 5ff8a17fe..4992c6c14 100644 --- 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 = ''; - $('body').append(scriptNode); + + var scripts = '' + + '' + + ''; + + 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 index eb8e17f6f..1148cb1c4 100644 --- a/test/setup/test-bundle/view/index.html +++ b/test/setup/test-bundle/view/index.html @@ -6,9 +6,7 @@