Quellcode durchsuchen

made some changes to chat

Akira Laine vor 9 Jahren
Ursprung
Commit
9b8d4c2a3a
3 geänderte Dateien mit 28 neuen und 8 gelöschten Zeilen
  1. 2 2
      app/client/app.css
  2. 15 5
      app/client/client.js
  3. 11 1
      app/client/templates/room.html

+ 2 - 2
app/client/app.css

@@ -1268,12 +1268,13 @@ nav form input[type="image"]{
     margin-top: 30px;
 }
 #chat-ul, #global-chat-ul {
-    overflow-y: hidden;
     margin: 0;
     padding: 0 15px 0 15px;
     padding-bottom: 20px;
     word-break: normal;
     word-wrap: break-word;
+    height: 82%;
+    overflow-y: scroll;
 }
 .chat-message:nth-child(even) {
    color: white;
@@ -1318,7 +1319,6 @@ nav form input[type="image"]{
 }
 #chat, #global-chat {
     height:100%;
-    overflow: auto;
 }
 .navbar-default .navbar-nav .open .dropdown-menu>li>a,.navbar-default .navbar-nav .open .dropdown-menu {
     background-color: transparent;

+ 15 - 5
app/client/client.js

@@ -1006,27 +1006,34 @@ Template.room.events({
     },
     "click #chat-tab": function(e) {
         Meteor.setTimeout(function() {
-            var elem = document.getElementById('chat');
-            elem.scrollTop = elem.scrollHeight;
+            $("#chat-ul").scrollTop(100000);
         }, 1);
     },
-    "click #global-tab": function(e) {
+    "click #global-chat-tab": function(e) {
         Meteor.setTimeout(function() {
-            var elem = document.getElementById('global-chat');
-            elem.scrollTop = elem1.scrollHeight;
+            $("#global-chat-ul").scrollTop(100000);
         }, 1);
     },
     "click #submit": function() {
         sendMessage();
+        Meteor.setTimeout(function(){
+            $("#chat-ul").scrollTop(100000);
+        }, 1000)
     },
     "click #global-submit": function() {
         sendMessageGlobal();
+        Meteor.setTimeout(function(){
+            $("#global-chat-ul").scrollTop(100000);
+        }, 1000)
     },
     "keyup #chat-input": function(e) {
         if (e.type === "keyup" && e.which === 13) {
             e.preventDefault();
             if (!$('#chat-input').data('dropdownshown')) {
                 sendMessage();
+                Meteor.setTimeout(function(){
+                    $("#chat-ul").scrollTop(100000);
+                }, 1000)
             }
         }
     },
@@ -1035,6 +1042,9 @@ Template.room.events({
             e.preventDefault();
             if (!$('#global-chat-input').data('dropdownshown')) {
                 sendMessageGlobal();
+                Meteor.setTimeout(function(){
+                    $("#global-chat-ul").scrollTop(100000);
+                }, 1000)
             }
         }
     },

+ 11 - 1
app/client/templates/room.html

@@ -119,7 +119,17 @@
                             <ul id="chat-ul">
                                 {{#each chat}}
                                     {{#emojione}}
-                                        <li class="chat-message"><small class="rank-{{this.rawrank}}">{{this.rank}}</small> <a style="text-decoration: none" href="/u/{{this.username}}" target="_blank"><b class="bold">{{this.username}}</b></a> <span title="{{time}}" style="float: right;">{{rtime time}}</span> <br/>{{this.message}}</li>
+                                        <li class="chat-message"><small class="rank-{{this.rawrank}}">{{this.rank}}</small> <a style="text-decoration: none" href="/u/{{this.username}}" target="_blank"><b class="bold">{{this.username}}</b></a> <span title="{{time}}" style="float: right;">{{rtime time}}</span> <br/>
+                                        {{#if this.isMentioned}}
+                                            {{#if this.curUserMention}}
+                                                <span style="background-color: lightblue">{{this.message}}</span>
+                                            {{else}}
+                                                {{this.message}}
+                                            {{/if}}
+                                        {{else}}
+                                            {{this.message}}
+                                        {{/if}}
+                                        </li>
                                     {{/emojione}}
                                     <hr>
                                 {{/each}}