X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChat.vue;h=752dadaf4d58e968efbfbcd32e9b1eb07adf9a79;hb=602d6befd30793111d3fda6e733f73e08d8b7a30;hp=2dc68428d5c04259cdf6d76c87c7643c10e30c8e;hpb=cd0d7743323309fcfd241ccba959df81a77970c7;p=vchess.git

diff --git a/client/src/components/Chat.vue b/client/src/components/Chat.vue
index 2dc68428..752dadaf 100644
--- a/client/src/components/Chat.vue
+++ b/client/src/components/Chat.vue
@@ -1,13 +1,12 @@
 <template lang="pug">
-.row
-  .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    // TODO: Chat modal sur petit écran, dans la page pour grand écran
-    .card.smallpad
-      h4 Chat
-      p(v-for="chat in chats" :class="classObject(chat)" v-html="chat.msg")
-      input#inputChat(type="text" :placeholder="st.tr['Type here']"
-        @keyup.enter="sendChat")
-      button#sendChatBtn(@click="sendChat") {{ st.tr["Send"] }}
+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")
 </template>
 
 <script>
@@ -15,7 +14,8 @@ import { store } from "@/store";
 
 export default {
   name: "my-chat",
-  props: ["players"],
+  // Prop 'pastChats' for corr games where chats are on server
+  props: ["players","pastChats"],
   data: function() {
     return {
       st: store.state,
@@ -29,14 +29,14 @@ export default {
       const data = JSON.parse(msg.data);
       if (data.code == "newchat") //only event at this level
       {
-        this.chats.push({msg:data.msg,
-          name:data.name || "@nonymous", sid:data.from});
+        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.addEventListener("message", socketMessageListener);
+      this.st.conn.addEventListener("close", socketCloseListener);
     };
     this.st.conn.onmessage = socketMessageListener;
     this.st.conn.onclose = socketCloseListener;
@@ -44,18 +44,20 @@ export default {
   methods: {
     classObject: function(chat) {
       return {
-        "my-chatmsg": chat.sid == this.st.user.sid,
+        "my-chatmsg": chat.name == this.st.user.name,
         "opp-chatmsg": this.players.some(
-          p => p.sid == chat.sid && p.sid != this.st.user.sid)
+          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.chats.push(chat);
+      const chat = {msg:chatTxt, name: this.st.user.name || "@nonymous"};
+      this.$emit("newchat-sent", chat); //useful for corr games
+      this.chats.unshift(chat);
       this.st.conn.send(JSON.stringify({
         code:"newchat", msg:chatTxt, name:chat.name}));
     },
@@ -63,7 +65,7 @@ export default {
 };
 </script>
 
-<style lang="sass">
+<style lang="sass" scoped>
 .my-chatmsg
   color: grey
 .opp-chatmsg