From 92f1ff737b0b6b0bceaba9b51c11be9a13f7ecdb Mon Sep 17 00:00:00 2001 From: Darren Date: Sun, 27 Oct 2013 10:23:17 +0000 Subject: [PATCH] Moving index.html out of the assets folder - the page is not an asset of itself --- client/build.js | 2 +- server/httphandler.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/build.js b/client/build.js index f80d0a4..1e759fa 100644 --- a/client/build.js +++ b/client/build.js @@ -210,7 +210,7 @@ fs.readdir(__dirname + '/src/translations', function (err, translation_files) { var index_src = fs.readFileSync(__dirname + '/src/index.html.tmpl', FILE_ENCODING) .replace(new RegExp('<%base_path%>', 'g'), config.get().http_base_path || '/kiwi'); -fs.writeFile(__dirname + '/assets/index.html', index_src, { encoding: FILE_ENCODING }, function (err) { +fs.writeFile(__dirname + '/index.html', index_src, { encoding: FILE_ENCODING }, function (err) { if (!err) { console.log('Built index.html'); } else { diff --git a/server/httphandler.js b/server/httphandler.js index 68c4fbc..7073133 100644 --- a/server/httphandler.js +++ b/server/httphandler.js @@ -57,7 +57,7 @@ HttpHandler.prototype.serve = function (request, response) { // Any requests for /client to load the index file if (request.url.match(new RegExp('^' + base_path_regex + '([/$]|$)', 'i'))) { - request.url = '/assets/index.html'; + request.url = '/index.html'; } // If the 'magic' translation is requested, figure out the best language to use from -- 2.25.1