diff --git a/index.php b/index.php
index 146fa4b6..0c2aedb7 100755
--- a/index.php
+++ b/index.php
@@ -9,12 +9,6 @@
-
@@ -59,7 +53,7 @@
-
+
Chat
@@ -96,19 +90,23 @@
-
- -
+
diff --git a/server/server.js b/server/server.js
index 47dfcea9..8bfd05e6 100755
--- a/server/server.js
+++ b/server/server.js
@@ -37,7 +37,8 @@ io.on('connection', function(socket){
var in_list = false;
socket.on('chat', function (data) {
- io.sockets.emit('chat,'+coll, guid + " said: " + data);
+ if(data != "" && data !== undefined && data !== null && data.length < 151)
+ io.sockets.emit('chat,'+coll, guid + " said: " + data);
});
socket.on('frontpage_lists', function()
diff --git a/static/css/style.css b/static/css/style.css
index 3c5d2173..0f47d8d0 100755
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -192,6 +192,16 @@ hide mdi-action-visibility mdi-action-visibility-off
/*------------------- Channel page ---------------------------------------------------------------------------- */
+#chat {
+ height: 81%;
+ overflow-y: scroll;
+ text-align:left;
+}
+
+#chat-log {
+ padding: 0px 0px 0px 11px !important;
+}
+
#player_overlay{
background-color:black;
position: absolute;
diff --git a/static/js/youtube.js b/static/js/youtube.js
index df55a2d3..549a610f 100755
--- a/static/js/youtube.js
+++ b/static/js/youtube.js
@@ -32,7 +32,7 @@ socket.on(chan.toLowerCase()+",np", function(obj)
$("#player_overlay").height($("#player").height());
if(!window.mobilecheck())
$("#player_overlay").toggleClass("hide");
- importOldList(chan.toLowerCase());
+ importOldList(chan.toLowerCasettings-barse());
}
else{
console.log("gotten new song");
@@ -71,11 +71,6 @@ socket.on(chan.toLowerCase()+",viewers", function(view)
getTitle(song_title, viewers);
});
-socket.on("chat,"+chan.toLowerCase(), function(data)
-{
- console.log(data);
-});
-
$(document).ready(function()
{
@@ -84,6 +79,13 @@ $(document).ready(function()
edge: 'right', // Choose the horizontal origin
closeOnClick: false // Closes side-nav on clicks, useful for Angular/Meteor
});
+
+ $("#chat-btn").sideNav({
+ menuWidth: 272, // Default is 240
+ edge: 'left', // Choose the horizontal origin
+ closeOnClick: true // Closes side-nav on clicks, useful for Angular/Meteor
+ });
+
$('#settings-close').sideNav('hide');
if(!window.mobilecheck() && !msieversion())
@@ -251,11 +253,6 @@ function notifyUser(id, title) {
}
}
-function chat(data)
-{
- socket.emit("chat", data);
- return;
-}
function getRandomInt(min, max) {
return Math.floor(Math.random() * (max - min)) + min;