diff --git a/resources/assets/js/components/AudioManager.vue b/resources/assets/js/components/AudioManager.vue index 61e23eb16..46f4871b3 100644 --- a/resources/assets/js/components/AudioManager.vue +++ b/resources/assets/js/components/AudioManager.vue @@ -30,7 +30,6 @@ export default { audioTimer: null, audioId: 0, audioSrc: null, - callback: null, } }, mounted() { @@ -44,9 +43,7 @@ export default { }, watch: { audioPlay(play) { - if (typeof this.callback === "function") { - this.callback(play) - } + this.updateState(); // this.audioTimer && clearTimeout(this.audioTimer); if (!play) { @@ -57,6 +54,9 @@ export default { } }, 3000) } + }, + audioSrc() { + this.updateState(); } }, methods: { @@ -75,8 +75,7 @@ export default { } return } - const {id, src, callback} = msg - this.callback = callback || null; + const {id, src} = msg if (src === this.audioSrc) { if (ended) { audio.play() @@ -94,6 +93,10 @@ export default { } }, + updateState() { + this.$store.state.audioPlaying = this.audioPlay && this.audioSrc ? this.audioSrc : null; + }, + overAudio() { this.audioPlay = false; }, diff --git a/resources/assets/js/pages/manage/components/DialogView.vue b/resources/assets/js/pages/manage/components/DialogView.vue index 0a3aec8e8..79f089f99 100644 --- a/resources/assets/js/pages/manage/components/DialogView.vue +++ b/resources/assets/js/pages/manage/components/DialogView.vue @@ -33,7 +33,7 @@