X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChat.vue;h=273cf7a7e1969f444d7976bf9ec9497fa21b6e4f;hb=5fbc0680d484bf6b8f4ea183f26bbe22797f92a3;hp=d8513b31126958be50bdbb6587bc333453b16a12;hpb=bfe9a1357f43c2a2cc271e0f244f4785363d7961;p=vchess.git

diff --git a/client/src/components/Chat.vue b/client/src/components/Chat.vue
index d8513b31..273cf7a7 100644
--- a/client/src/components/Chat.vue
+++ b/client/src/components/Chat.vue
@@ -1,71 +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"],
+  props: ["players", "pastChats"],
   data: function() {
     return {
       st: store.state,
-      chats: [], //chat messages after human game
-    };
-  },
-  created: function() {
-    const curMsgListener = this.st.conn.onmessage; //from Game or Hall
-    const socketMessageListener = msg => {
-      curMsgListener(msg);
-      const data = JSON.parse(msg.data);
-      if (data.code == "newchat") //only event at this level
-      {
-        this.chats.unshift({msg:data.msg, name:data.name || "@nonymous"});
-        this.$emit("newchat-received"); //data not required here
-      }
-    };
-    const socketCloseListener = () => {
-      store.socketCloseListener(); //reinitialize connexion (in store.js)
-      this.st.conn.addEventListener('message', socketMessageListener);
-      this.st.conn.addEventListener('close', socketCloseListener);
+      chats: [] //chat messages after human game
     };
-    this.st.conn.onmessage = socketMessageListener;
-    this.st.conn.onclose = socketCloseListener;
   },
   methods: {
     classObject: function(chat) {
       return {
-        "my-chatmsg": chat.name == this.st.user.name,
-        "opp-chatmsg": 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;
+      const chatTxt = chatInput.value.trim();
+      chatInput.focus(); //required on smartphones
+      if (chatTxt == "") return; //nothing to send
       chatInput.value = "";
-      const chat = {msg:chatTxt, name: this.st.user.name || "@nonymous"};
-      this.$emit("newchat-sent", chat); //useful for corr games
+      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);
-      this.st.conn.send(JSON.stringify({
-        code:"newchat", msg:chatTxt, name:chat.name}));
     },
-  },
+    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>