X-Git-Url: https://git.auder.net/doc/index.css?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChat.vue;h=f1e1fad251a25307745933432b462efa2d26b8d1;hb=e891730f77312340d68bb7ef72a4207541fa3914;hp=8f1646f456aca6e9b9cd1892051d20ea054395de;hpb=3837d4f7885a3c3cdb468da2f3fa3fa1e5a1415a;p=vchess.git

diff --git a/client/src/components/Chat.vue b/client/src/components/Chat.vue
index 8f1646f4..f1e1fad2 100644
--- a/client/src/components/Chat.vue
+++ b/client/src/components/Chat.vue
@@ -1,72 +1,67 @@
 <template lang="pug">
-.card
-  input#inputChat(type="text" :placeholder="st.tr['Type here']"
-    @keyup.enter="sendChat")
-  button#sendChatBtn(@click="sendChat") {{ st.tr["Send"] }}
-  p(v-for="chat in pastChats" :class="classObject(chat)" v-html="chat.name + ': ' + chat.msg")
-  p(v-for="chat in chats" :class="classObject(chat)" v-html="chat.name + ': ' + chat.msg")
+div
+  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 }} :&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", "newChat"],
   data: function() {
     return {
       st: store.state,
-      chats: [], //chat messages after human game
+      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", sid:data.from});
-      }
-    };
-    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.sid == this.st.user.sid,
-        "opp-chatmsg": this.players.some(
-          p => p.sid == chat.sid && p.sid != this.st.user.sid)
+        "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
+          )
       };
     },
     sendChat: function() {
       let chatInput = document.getElementById("inputChat");
-      const chatTxt = chatInput.value;
+      const chatTxt = chatInput.value.trim();
+      if (chatTxt == "") return; //nothing to send
       chatInput.value = "";
-      const chat = {msg:chatTxt, name: this.st.user.name || "@nonymous",
-        sid:this.st.user.sid};
-      this.$emit("newchat", chat); //useful for corr games
+      const chat = { msg: chatTxt, name: this.st.user.name || "@nonymous" };
+      this.$emit("mychat", chat);
       this.chats.unshift(chat);
-      this.st.conn.send(JSON.stringify({
-        code:"newchat", msg:chatTxt, name:chat.name}));
-    },
-  },
+    }
+  }
 };
 </script>
 
 <style lang="sass" scoped>
+.name
+  color: #abb2b9
+
 .my-chatmsg
-  color: grey
+  color: #7d3c98
 .opp-chatmsg
-  color: black
-#chat
-  max-width: 100%
+  color: #2471a3
 </style>