mirror of
https://github.com/bra1n/townsquare.git
synced 2025-04-04 22:24:36 +00:00
Merge branch 'develop'
This commit is contained in:
commit
5a8c9985c5
1 changed files with 5 additions and 6 deletions
|
@ -5,7 +5,6 @@
|
||||||
<span class="nominator" :style="nominatorStyle"></span>
|
<span class="nominator" :style="nominatorStyle"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="overlay">
|
<div class="overlay">
|
||||||
<audio src="../assets/sounds/countdown.mp3" preload="auto"></audio>
|
|
||||||
<em class="blue">{{ nominator.name }}</em> nominated
|
<em class="blue">{{ nominator.name }}</em> nominated
|
||||||
<em>{{ nominee.name }}</em
|
<em>{{ nominee.name }}</em
|
||||||
>!
|
>!
|
||||||
|
@ -105,11 +104,6 @@
|
||||||
<span>2</span>
|
<span>2</span>
|
||||||
<span>1</span>
|
<span>1</span>
|
||||||
<span>GO</span>
|
<span>GO</span>
|
||||||
<audio
|
|
||||||
:autoplay="!grimoire.isMuted"
|
|
||||||
src="../assets/sounds/countdown.mp3"
|
|
||||||
:muted="grimoire.isMuted"
|
|
||||||
></audio>
|
|
||||||
</div>
|
</div>
|
||||||
</transition>
|
</transition>
|
||||||
</div>
|
</div>
|
||||||
|
@ -117,6 +111,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { mapGetters, mapState } from "vuex";
|
import { mapGetters, mapState } from "vuex";
|
||||||
|
import bongs from "../assets/sounds/countdown.mp3";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
computed: {
|
computed: {
|
||||||
|
@ -194,6 +189,10 @@ export default {
|
||||||
countdown() {
|
countdown() {
|
||||||
this.$store.commit("session/lockVote", 0);
|
this.$store.commit("session/lockVote", 0);
|
||||||
this.$store.commit("session/setVoteInProgress", true);
|
this.$store.commit("session/setVoteInProgress", true);
|
||||||
|
if (!this.grimoire.isMuted) {
|
||||||
|
var sound = new Audio(bongs);
|
||||||
|
sound.play();
|
||||||
|
}
|
||||||
this.voteTimer = setInterval(() => {
|
this.voteTimer = setInterval(() => {
|
||||||
this.start();
|
this.start();
|
||||||
}, 4000);
|
}, 4000);
|
||||||
|
|
Loading…
Add table
Reference in a new issue