Serving new client code

diff --git a/server/http-handler.js b/server/http-handler.js
index 83d7d352e63e3e0f4818b3c691d467946f449397..950f1e55e7059427dbb1d7f8fe9362d222fc0ad6 100755 (executable)
--- a/server/http-handler.js
+++ b/server/http-handler.js
@@ -13,11 +13,20 @@ module.exports.HttpHandler = HttpHandler;
 
 
 HttpHandler.prototype.serve = function (request, response) {
+    // The incoming requests root directory (ie. /kiwiclient/)
+    // TODO: check the config for this setting
+    var root_path = '/client',
+        root_path_regex = root_path.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+
+    // Any asset request to head into the asset dir
+    request.url = request.url.replace(root_path + '/assets/', '/assets/');
+
     // Any requests for /client to load the index file
-    if (request.url.match(/^\/client/)) {
+    if (request.url.match(new RegExp('^' + root_path_regex, 'i'))) {
         request.url = '/';
     }
 
+
     this.file_server.serve(request, response, function (err) {
         if (err) {
             response.writeHead(err.status, err.headers);