From 7eebae2b9f068dfaefd08c2b468bb0f7abb9df9e Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Fri, 2 Sep 2016 00:34:40 -0400
Subject: [PATCH] Fixed comments

---
 hourglass/client/main/main.css |  2 +-
 hourglass/client/main/main.js  | 13 ++++++-------
 hourglass/server/main.js       |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css
index 83e3e94..39a48a9 100644
--- a/hourglass/client/main/main.css
+++ b/hourglass/client/main/main.css
@@ -802,7 +802,7 @@ input, textarea {
 #comment {
 	width: 105%;
 	position: relative;
-	overflow-y: scroll;
+	overflow-y: auto;
 }
 
 .commentBox {
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 2568879..ca6bf3f 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -676,6 +676,7 @@ Template.main.events({
         var input = document.getElementById('workComment');
         comment = input.value;
         input.value = "";
+        Session.set("commentRestrict",null);
         if (comment !== "") {
             document.getElementById('workComment').value = "";
             Meteor.call('addComment', [comment, workId], function(err,result) {
@@ -702,18 +703,16 @@ Template.main.events({
         sendData("deleteWork");
         closeDivFade(document.getElementsByClassName("overlay")[0]);
     },
-    'keydown #workComment' (event) { // Restrict length on comment.
-        var chars = event.target.value.length;
+    'keyup #workComment' (event) { // Restrict length on comment.
+        var chars = 200-event.target.value.length;
         document.getElementById("commentRestrict").style.color = "#7E7E7E";
-        if(chars === 0) { // Don't display if nothing in comment.
+        if(chars === 200) { // Don't display if nothing in comment.
             Session.set("commentRestrict","");
             return;
-        }
-        if(chars === 200) {
+        } else if(chars === 0) {
             document.getElementById("commentRestrict").style.color = "#FF1A1A"; // Make text red if 0 characters left.
-
         }
-        Session.set("commentRestrict", "Characters left: " + (200-chars).toString());
+        Session.set("commentRestrict", "Characters left: " + chars.toString());
         
     }, 
     'click #markDone' () { // Click done button.
diff --git a/hourglass/server/main.js b/hourglass/server/main.js
index 1e101eb..c984fd5 100644
--- a/hourglass/server/main.js
+++ b/hourglass/server/main.js
@@ -392,7 +392,7 @@ Meteor.methods({
         var foundsubs = currentclass.subscribers;
         if (typeof comment === "string" && comment.length <= 200 &&
             _.contains(foundsubs, Meteor.userId()) &&
-            _.contains(currentclass.banned, Meteor.userId())) {
+            !_.contains(currentclass.banned, Meteor.userId())) {
             var commentInfo = {
                 "comment": input[0],
                 "user": user,