AnthonyDuan/taiko-web
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Show Lyrics option to settings

Browse Source
This commit is contained in:
LoveEevee
2020-03-31 16:44:54 +03:00
parent 51bd6cec63
commit de284d204d
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/js/loadsong.js
View File

@@ -137,11 +137,11 @@ class LoadSong{
reader.readAsText(songObj.chart)
}
}
if(songObj.lyricsFile){
if(songObj.lyricsFile && settings.getItem("showLyrics")){
var reader = new FileReader()
this.addPromise(pageEvents.load(reader).then(event => {
songObj.lyricsData = event.target.result
}), songObj.lyricsFile.webkitRelativePath)
}, () => Promise.resolve()), songObj.lyricsFile.webkitRelativePath)
reader.readAsText(songObj.lyricsFile)
}
}else{
@@ -149,7 +149,7 @@ class LoadSong{
this.addPromise(loader.ajax(url).then(data => {
this.songData = data.replace(/\0/g, "").split("\n")
}), url)
if(song.lyrics && !songObj.lyricsData){
if(song.lyrics && !songObj.lyricsData && !this.multiplayer && (!this.touchEnabled || this.autoPlayEnabled) && settings.getItem("showLyrics")){
var url = this.getSongDir(song) + "main.vtt"
this.addPromise(loader.ajax(url).then(data => {
songObj.lyricsData = data