summaryrefslogtreecommitdiff
path: root/src/web/app/common/views/components/othello.room.vue
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-08 18:30:28 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-08 18:30:28 +0900
commit6d5b486833f068a95dceaa25adf1b7a0bd3fb7bb (patch)
treebaf970cb0b4ba59b8f3dc2e4e4548cc434a5b567 /src/web/app/common/views/components/othello.room.vue
parentv4016 (diff)
downloadmisskey-6d5b486833f068a95dceaa25adf1b7a0bd3fb7bb.tar.gz
misskey-6d5b486833f068a95dceaa25adf1b7a0bd3fb7bb.tar.bz2
misskey-6d5b486833f068a95dceaa25adf1b7a0bd3fb7bb.zip
Fix bug
Diffstat (limited to 'src/web/app/common/views/components/othello.room.vue')
-rw-r--r--src/web/app/common/views/components/othello.room.vue12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/web/app/common/views/components/othello.room.vue b/src/web/app/common/views/components/othello.room.vue
index b41d97ec61..445a0b45d6 100644
--- a/src/web/app/common/views/components/othello.room.vue
+++ b/src/web/app/common/views/components/othello.room.vue
@@ -21,6 +21,13 @@
<mk-switch v-model="game.settings.is_llotheo" @change="onIsLlotheoChange" text="石の少ない方が勝ち(ロセオ)"/>
</div>
+ <p class="status">
+ <template v-if="isAccepted && isOpAccepted">ゲームは数秒後に開始されます<mk-ellipsis/></template>
+ <template v-if="isAccepted && !isOpAccepted">相手の準備が完了するのを待っています<mk-ellipsis/></template>
+ <template v-if="!isAccepted && isOpAccepted">あなたの準備が完了するのを待っています</template>
+ <template v-if="!isAccepted && !isOpAccepted">準備中<mk-ellipsis/></template>
+ </p>
+
<div class="actions">
<el-button @click="exit">キャンセル</el-button>
<el-button type="primary" @click="accept" v-if="!isAccepted">準備完了</el-button>
@@ -50,6 +57,11 @@ export default Vue.extend({
if (this.game.user1_id == (this as any).os.i.id && this.game.user1_accepted) return true;
if (this.game.user2_id == (this as any).os.i.id && this.game.user2_accepted) return true;
return false;
+ },
+ isOpAccepted(): boolean {
+ if (this.game.user1_id != (this as any).os.i.id && this.game.user1_accepted) return true;
+ if (this.game.user2_id != (this as any).os.i.id && this.game.user2_accepted) return true;
+ return false;
}
},