X-Git-Url: https://git.auder.net/pieces/Checkered/cq.svg?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChat.vue;h=c5fde454c1036e2836b80281ab82402815c82831;hb=9ddaf8da8743c50b9019888a82d84392913c60c9;hp=752dadaf4d58e968efbfbcd32e9b1eb07adf9a79;hpb=602d6befd30793111d3fda6e733f73e08d8b7a30;p=vchess.git

diff --git a/client/src/components/Chat.vue b/client/src/components/Chat.vue
index 752dadaf..c5fde454 100644
--- a/client/src/components/Chat.vue
+++ b/client/src/components/Chat.vue
@@ -2,7 +2,7 @@
 div
   input#inputChat(type="text" :placeholder="st.tr['Type here']"
     @keyup.enter="sendChat")
-  button#sendChatBtn(@click="sendChat") {{ st.tr["Send"] }}
+  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)"
@@ -11,41 +11,27 @@ div
 
 <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","newChat"],
   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);
-    };
-    this.st.conn.onmessage = socketMessageListener;
-    this.st.conn.onclose = socketCloseListener;
+  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.some(
+        "opp-chatmsg": !!this.players && this.players.some(
           p => p.name == chat.name && p.name != this.st.user.name)
       };
     },
@@ -56,10 +42,8 @@ export default {
         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
+      this.$emit("mychat", chat);
       this.chats.unshift(chat);
-      this.st.conn.send(JSON.stringify({
-        code:"newchat", msg:chatTxt, name:chat.name}));
     },
   },
 };