merge upstream

www/css/cytube.css

@@ -420,8 +420,6 @@ label[for="emotealphabox"]{
     background-color: rgba(129, 20, 21, 0.1);
 }
 
-
-
 .server-msg-reconnect {
     border: 1px solid #009900;
     line-height: 2;

www/js/ui.js

@@ -582,8 +582,6 @@ $("#mediaurl").keyup(function(ev) {
                         }
                     })
                     .appendTo($("#addfromurl-title")).show("blind");//append and show
-
-
             }
         } else {
             $("#addfromurl-title").hide("blind");
@@ -1001,7 +999,6 @@ EMOTELISTMODAL.find(".emotelist-alphabetical").change(function () {
 });
 EMOTELISTMODAL.find(".emotelist-alphabetical").prop("checked", USEROPTS.emotelist_sort);
 
-
 $("#fullscreenbtn").click(function () {
     var elem = document.querySelector("#videowrap .embed-responsive");
     // this shit is why frontend web development sucks

www/js/util.js

@@ -1623,10 +1623,6 @@ function formatChatMessage(data, last) {
             addClassToNameAndTimestamp: data.msgclass
         };
     }
-    //break if toke command [DEPRICATED] No longer in use as chozobot is no longer used
-    /*if(data.msg.charAt() === '!'){
-	return;
-    }*/
     // Phase 1: Determine whether to show the username or not
     var skip = data.username === last.name;
     if(data.meta.addClass === "server-whisper")
@@ -1661,7 +1657,6 @@ function formatChatMessage(data, last) {
     if(!data.meta.addClass === "shout"){
         assignColors(data.username);
     }
-    console.log(data.meta.addClass);
     if (data.meta.superadminflair) {
 	
         $("<strong/>").addClass("username").attr('onclick',"chatpaste('" + data.username + "')").text(data.username + 
@@ -1693,7 +1688,6 @@ function formatChatMessage(data, last) {
     if (data.meta.addClass && data.meta.addClassToNameAndTimestamp) {
         name.addClass(data.meta.addClass);
     }
-    
 
     // Add the message itself
     var message = $("<span/>").appendTo(div);