Merge branch 'master' into wip/typescript

stanford-oval · Jun 9, 2021 · 9f71ffe · 9f71ffe
2 parents 7cf0d46 + 4ca7cf9
commit 9f71ffe
Show file tree

Hide file tree

Showing 10 changed files with 136 additions and 80 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,8 +43,6 @@
     "webrtcvad": "^1.0.1"
   },
   "devDependencies": {
-    "@types/gm": "^1.18.9",
-    "@types/node": "^14.17.2",
     "@types/body-parser": "^1.19.0",
     "@types/connect-flash": "0.0.36",
     "@types/cookie-parser": "^1.4.2",
@@ -54,22 +52,24 @@
     "@types/express-session": "^1.17.3",
     "@types/express-ws": "^3.0.0",
     "@types/gettext-parser": "^4.0.0",
+    "@types/gm": "^1.18.9",
     "@types/morgan": "^1.9.2",
+    "@types/node": "^14.17.3",
     "@types/passport": "^1.0.6",
     "@types/passport-http-bearer": "^1.0.36",
     "@types/passport-local": "^1.0.33",
     "@types/passport-strategy": "^0.2.35",
     "@types/q": "^1.5.4",
     "@types/serve-static": "^1.13.9",
-    "@typescript-eslint/eslint-plugin": "^4.26.0",
-    "@typescript-eslint/parser": "^4.26.0",
+    "@typescript-eslint/eslint-plugin": "^4.26.1",
+    "@typescript-eslint/parser": "^4.26.1",
     "coveralls": "^3.1.0",
     "eslint": "^7.28.0",
     "form-data": "^4.0.0",
     "nodemon": "^2.0.7",
     "nyc": "^15.1.0",
     "parse5": "^6.0.1",
-    "selenium-webdriver": "^4.0.0-beta.3",
+    "selenium-webdriver": "^4.0.0-beta.4",
     "source-map-support": "^0.5.19",
     "tough-cookie": "^4.0.0",
     "ts-node": "^10.0.0",

diff --git a/public/javascripts/conversation.js b/public/javascripts/conversation.js
@@ -28,6 +28,7 @@ $(() => {
             manageSpinner('remove');
             manageLostConnectionMsg('add');
             manageLostConnectionMsg('show');
+            scrollChat();
             return;
         }
 
@@ -133,6 +134,7 @@ $(() => {
         addVoteButtons();
         manageLostConnectionMsg('add');
         manageSpinner('remove');
+        scrollChat();
         return msg;
     }
 
@@ -245,7 +247,7 @@ $(() => {
 
     function buttonMessage(title, json) {
         var holder = $('<div>').addClass('col-xs-12 col-sm-6');
-        var btn = $('<a>').addClass('message message-button btn btn-default')
+        var btn = $('<a>').addClass('message message-button new-msg-button btn btn-default')
             .attr('href', '#').text(title);
         btn.click((event) => {
             handleParsedCommand(json, title);
@@ -263,7 +265,7 @@ $(() => {
             url = '/me' + url;*/
 
         var holder = $('<div>').addClass('col-xs-12 col-sm-6');
-        var btn = $('<a>').addClass('message message-button btn btn-default')
+        var btn = $('<a>').addClass('message message-button new-msg-button btn btn-default')
             .attr('href', url).attr("target", "_blank").attr("rel", "noopener").text(title);
         holder.append(btn);
         getGrid().append(holder);
@@ -272,7 +274,7 @@ $(() => {
 
     function yesnoMessage() {
         var holder = $('<div>').addClass('col-xs-6 col-sm-4 col-md-3');
-        var btn = $('<a>').addClass('message message-yesno btn btn-default')
+        var btn = $('<a>').addClass('message message-yesno new-msg-button btn btn-default')
             .attr('href', '#').text("Yes");
         btn.click((event) => {
             handleSpecial('yes', "Yes");
@@ -281,7 +283,7 @@ $(() => {
         holder.append(btn);
         getGrid().append(holder);
         holder = $('<div>').addClass('col-xs-6 col-sm-4 col-md-3');
-        btn = $('<a>').addClass('message message-yesno btn btn-default')
+        btn = $('<a>').addClass('message message-yesno new-msg-button btn btn-default')
             .attr('href', '#').text("No");
         btn.click(function(event) {
             handleSpecial('no', "No");
@@ -414,6 +416,7 @@ $(() => {
 
         manageLostConnectionMsg('add');
         manageSpinner('show');
+        scrollChat();
     }
 
     $('#input-form').submit((event) => {