X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChat.vue;h=bce0ba0df5b52491ee7972cc323c3c2a94dc2330;hb=c64b61f254fb6e606ab6be6440b6dbec1bb2ad05;hp=7eeba5ac77b6ea22e29bc58d5d1e1df0a50634d8;hpb=ac8f441c6441d827b43aabeb812cb4c79e9ee96b;p=vchess.git

diff --git a/client/src/components/Chat.vue b/client/src/components/Chat.vue
index 7eeba5ac..bce0ba0d 100644
--- a/client/src/components/Chat.vue
+++ b/client/src/components/Chat.vue
@@ -1,58 +1,93 @@
 <template lang="pug">
 div
-  input#inputChat(type="text" :placeholder="st.tr['Type here']"
-    @keyup.enter="sendChat")
-  button#sendChatBtn(@click="sendChat") {{ st.tr["Send"] }}
-  p(v-for="chat in chats" :class="classObject(chat)"
-    v-html="chat.name + ': ' + chat.msg")
-  p(v-for="chat in pastChats" :class="classObject(chat)"
-    v-html="chat.name + ': ' + chat.msg")
+  button(@click="clearHistory()")
+    | {{ st.tr["Clear history"] }}
+  input#inputChat(
+    type="text"
+    :placeholder="st.tr['Chat here']"
+    @keyup.enter="sendChat()"
+  )
+  button(@click="sendChat()") {{ st.tr["Send"] }}
+  p(v-for="chat in chats.concat(pastChats)")
+    span.name {{ chat.name || "@nonymous" }} :&nbsp;
+    span(
+      :class="classObject(chat)"
+      v-html="chat.msg"
+    )
 </template>
 
 <script>
 import { store } from "@/store";
-
 export default {
   name: "my-chat",
   // Prop 'pastChats' for corr games where chats are on server
-  props: ["players","pastChats","newChat"],
+  props: ["players", "pastChats"],
   data: function() {
     return {
       st: store.state,
-      chats: [], //chat messages after human game
+      chats: [] //chat messages after human game
     };
   },
-  watch: {
-    newChat: function(chat) {
-      if (chat.msg != "")
-        this.chats.unshift({msg:chat.msg, name:chat.name || "@nonymous"});
-    },
-  },
   methods: {
     classObject: function(chat) {
       return {
-        "my-chatmsg": chat.name == this.st.user.name,
-        "opp-chatmsg": !!this.players && this.players.some(
-          p => p.name == chat.name && p.name != this.st.user.name)
+        "my-chatmsg": (
+          !!chat.name && chat.name == this.st.user.name ||
+          !!chat.sid && chat.sid == this.st.user.sid
+        ),
+        "opp-chatmsg":
+          !!this.players &&
+          this.players.some(
+            p => {
+              return (
+                (
+                  !!p.name &&
+                  p.name == chat.name &&
+                  p.name != this.st.user.name
+                )
+                ||
+                (
+                  !!p.sid &&
+                  p.sid == chat.sid &&
+                  p.sid != this.st.user.sid
+                )
+              );
+            }
+          )
       };
     },
     sendChat: function() {
       let chatInput = document.getElementById("inputChat");
       const chatTxt = chatInput.value.trim();
-      if (chatTxt == "")
-        return; //nothing to send
+      chatInput.focus(); //required on smartphones
+      if (chatTxt == "") return; //nothing to send
       chatInput.value = "";
-      const chat = {msg:chatTxt, name: this.st.user.name || "@nonymous"};
+      const chat = {
+        msg: chatTxt,
+        name: this.st.user.name,
+        // SID is required only for anonymous users (in live games)
+        sid: this.st.user.id == 0 ? this.st.user.sid : null
+      };
       this.$emit("mychat", chat);
       this.chats.unshift(chat);
     },
-  },
+    newChat: function(chat) {
+      if (chat.msg != "") this.chats.unshift(chat);
+    },
+    clearHistory: function() {
+      this.chats = [];
+      this.$emit("chatcleared");
+    }
+  }
 };
 </script>
 
 <style lang="sass" scoped>
+.name
+  color: #839192
+
 .my-chatmsg
-  color: grey
+  color: #6c3483
 .opp-chatmsg
-  color: black
+  color: #1f618d
 </style>