Region flags in game/wrist feeds

html/src/app.js

@@ -765,7 +765,7 @@ speechSynthesis.getVoices();
     });
 
     Vue.component('location', {
-        template: '<span @click="showWorldDialog" :class="{ \'x-link\': link && this.location !== \'private\' && this.location !== \'offline\'}">{{ text }}<slot></slot></span>',
+        template: '<span @click="showWorldDialog" :class="{ \'x-link\': link && this.location !== \'private\' && this.location !== \'offline\'}">{{ text }}<slot></slot><span class="famfamfam-flags" :class="region" style="display:inline-block;margin-left:5px"></span></span>',
         props: {
             location: String,
             hint: {
@@ -779,7 +779,8 @@ speechSynthesis.getVoices();
         },
         data() {
             return {
-                text: this.location
+                text: this.location,
+                region: this.region
             };
         },
         methods: {
@@ -816,6 +817,16 @@ speechSynthesis.getVoices();
                         this.text = ref.name;
                     }
                 }
+                this.region = '';
+                if ((this.location !== '') && (!L.isOffline) && (!L.isPrivate)) {
+                    if (L.region === 'eu') {
+                        this.region = 'europeanunion';
+                    } else if (L.region === 'jp') {
+                        this.region = 'jp';
+                    } else {
+                        this.region = 'us';
+                    }
+                }
             },
             showWorldDialog() {
                 if (this.link) {

html/src/index.pug

@@ -472,9 +472,9 @@ html
                     el-table-column(label="Message" prop="message")
                         template(v-once #default="scope")
                             span(v-if="scope.row.message" v-text="scope.row.message")
-                            span(v-else-if='scope.row.details.inviteMessage' v-text="scope.row.details.inviteMessage")
+                            span(v-else-if='scope.row.details && scope.row.details.inviteMessage' v-text="scope.row.details.inviteMessage")
-                            span(v-else-if='scope.row.details.requestMessage' v-text="scope.row.details.requestMessage")
+                            span(v-else-if='scope.row.details && scope.row.details.requestMessage' v-text="scope.row.details.requestMessage")
-                            span(v-else-if='scope.row.details.responseMessage' v-text="scope.row.details.responseMessage")
+                            span(v-else-if='scope.row.details && scope.row.details.responseMessage' v-text="scope.row.details.responseMessage")
                     el-table-column(label="Action" width="80" align="right")
                         template(v-once #default="scope")
                             template(v-if="scope.row.senderUserId !== API.currentUser.id")
@@ -1104,10 +1104,6 @@ html
                             div(v-if="userDialog.ref.location" style="display:flex;flex-direction:column;margin-bottom:10px;padding-bottom:10px;border-bottom:1px solid #eee")
                                 div(style="flex:none")
                                     location(:location="userDialog.ref.location")
-                                        template(v-if="userDialog.ref.location && userDialog.ref.location !== 'private' && userDialog.ref.location !== 'offline'")
-                                            span.famfamfam-flags(v-if="userDialog.$location.region === 'eu'" class="europeanunion" style="display:inline-block;margin-left:5px")
-                                            span.famfamfam-flags(v-else-if="userDialog.$location.region === 'jp'" class="jp" style="display:inline-block;margin-left:5px")
-                                            span.famfamfam-flags(v-else class="us" style="display:inline-block;margin-left:5px")
                                     template(v-if="userDialog.ref.location && userDialog.ref.location !== 'private' && userDialog.ref.location !== 'offline'")
                                         launch(:location="userDialog.ref.location" style="margin-left:5px")
                                         invite-yourself(:location="userDialog.ref.location" style="margin-left:5px")

html/src/vr.js

@@ -452,7 +452,7 @@ speechSynthesis.getVoices();
     };
 
     Vue.component('location', {
-        template: '<span>{{ text }}<slot></slot></span>',
+        template: '<span>{{ text }}<slot></slot><span class="famfamfam-flags" :class="region" style="display:inline-block;margin-left:5px"></span></span>',
         props: {
             location: String,
             hint: {
@@ -462,7 +462,8 @@ speechSynthesis.getVoices();
         },
         data() {
             return {
-                text: this.location
+                text: this.location,
+                region: this.region
             };
         },
         methods: {
@@ -499,6 +500,16 @@ speechSynthesis.getVoices();
                         this.text = ref.name;
                     }
                 }
+                this.region = '';
+                if ((this.location !== '') && (!L.isOffline) && (!L.isPrivate)) {
+                    if (L.region === 'eu') {
+                        this.region = 'europeanunion';
+                    } else if (L.region === 'jp') {
+                        this.region = 'jp';
+                    } else {
+                        this.region = 'us';
+                    }
+                }
             }
         },
         watch: {

html/src/vr.scss

@@ -12,6 +12,7 @@
 @import "~animate.css/animate.min.css";
 @import "~noty/lib/noty.css";
 @import "~element-ui/lib/theme-chalk/index.css";
+@import "~famfamfam-flags/dist/sprite/famfamfam-flags.min.css";
 
 /*
     마지노선인듯