diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/app.js b/app.js
index 712dbaa..1627dd3 100755
--- a/app.js
+++ b/app.js
@@ -7,8 +7,6 @@ var debug = false; // todo move this to configfile
var handle = {}
handle["/"] = requestHandlers.sendInterface;
handle["/interface"] = requestHandlers.sendInterface;
-// handle["/sprite/emoji.css"] = requestHandlers.sendEmojiCss;
-// handle["/sprite/emoji.png"] = requestHandlers.sendEmojiPng;
handle["/js/jquery-1.12.1.min"] = requestHandlers.sendJquery;
handle["/js/jquery-ui.js"] = requestHandlers.sendJqueryUI;
handle["/css/bootstrap.min.css"] = requestHandlers.sendBootstrap;
diff --git a/board.html b/board.html
old mode 100644
new mode 100755
diff --git a/clear.html b/clear.html
old mode 100644
new mode 100755
index 6e59cd1..fcdff87
--- a/clear.html
+++ b/clear.html
@@ -3,7 +3,6 @@
Clear Board
-
diff --git a/demo.html b/demo.html
old mode 100644
new mode 100755
diff --git a/requestHandlers.js b/requestHandlers.js
index 39c9c09..f2b8000 100755
--- a/requestHandlers.js
+++ b/requestHandlers.js
@@ -12,20 +12,6 @@ function sendInterface(response) {
response.end(html);
}
-// function sendEmojiCss(response) {
-// console.log("Request handler 'Emojicss' was called.");
-// response.writeHead(200, {"Content-Type": "text/css"});
-// var html = fs.readFileSync(__dirname + "/served/emoji.css")
-// response.end(html);
-// }
-//
-// function sendEmojiPng(response) {
-// console.log("Request handler 'Emojipng' was called.");
-// response.writeHead(200, {"Content-Type": "image/png"});
-// var html = fs.readFileSync(__dirname + "/served/emoji.png")
-// response.end(html);
-// }
-
function sendBootstrap(response) {
console.log("Request handler 'css' was called.");
response.writeHead(200, {"Content-Type": "text/css"});
diff --git a/route.js b/route.js
old mode 100644
new mode 100755
diff --git a/served/bootstrap.min.css b/served/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/served/jquery-1.12.1.min.js b/served/jquery-1.12.1.min.js
old mode 100644
new mode 100755
diff --git a/served/jquery-ui.js b/served/jquery-ui.js
old mode 100644
new mode 100755
diff --git a/server.js b/server.js
index 9794804..3d8fa63 100755
--- a/server.js
+++ b/server.js
@@ -7,7 +7,6 @@ low = require('lowdb'),
storage = require('lowdb/file-async'),
db = low('db.json', { storage });
-// var convert = require('emojize').emojize;
var config = low('config.json', { storage });
var socketServer;
var port = config('mainConfig').chain().find({ param: 'port' }).value()['value'];
@@ -115,7 +114,7 @@ function initSocketIO(httpServer,debug)
var colors = db('messages').chain().takeRight(number).map('color').value();
for(var i = 0; i < messages.length; i++){
- socket.emit('newMessage',times[i],numbers[i],/*convert(*/messages[i]/*)*/,colors[i]);
+ socket.emit('newMessage',times[i],numbers[i],messages[i],colors[i]);
}
});
@@ -132,7 +131,7 @@ function initSocketIO(httpServer,debug)
var messageRecieved = escapeHtml(message);
db('messages').push({ numberString: numberStringRecieved,number: numberRecieved, time: timeRecieved, message: messageRecieved,color: color });
//add a new message to the board directly
- socketServer.emit('newMessage', timeRecieved, numberRecieved, /*convert(*/messageRecieved/*)*/,color);
+ socketServer.emit('newMessage', timeRecieved, numberRecieved, messageRecieved,color);
numberStringRecieved = null;
numberRecieved = null;
timeRecieved = null;
@@ -187,7 +186,7 @@ function serialListener(debug)
var messageRecieved = escapeHtml(ucs2Parse(data));
db('messages').push({ numberString: numberStringRecieved,number: numberRecieved, time: timeRecieved, message: messageRecieved,color: color });
//add a new message to the board directly
- socketServer.emit('newMessage', timeRecieved, numberRecieved, /*convert(*/messageRecieved/*)*/,color);
+ socketServer.emit('newMessage', timeRecieved, numberRecieved, messageRecieved,color);
numberStringRecieved = null;
numberRecieved = null;
timeRecieved = null;