okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/ciderapp/Cider

Browse source
This commit is contained in:
vapormusic 2021-12-25 09:12:48 +07:00
commit 62858b5fe4
3 changed files with 93 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/renderer/index.js
View file

@ -343,9 +343,15 @@ const app = new Vue({
// load last played track
try {
<<<<<<< HEAD
let lastItem = window.localStorage.getItem("currentTrack")
let time = window.localStorage.getItem("currentTime")
let queue = window.localStorage.getItem("currentQueue")
=======
lastItem = window.localStorage.getItem("currentTrack")
time = window.localStorage.getItem("currentTime")
queue = window.localStorage.getItem("currentQueue")
>>>>>>> 7322c71... save last played track, time and queue
if (lastItem != null) {
lastItem = JSON.parse(lastItem)
var kind = lastItem.attributes.playParams.kind;
@ -365,9 +371,15 @@ const app = new Vue({
let ids = queue.map ( e => (e.playParams ? e.playParams.id : (e.attributes.playParams ? e.attributes.playParams.id : '') ))
if (ids.length > 0) {
for (id of ids){
<<<<<<< HEAD
try{
app.mk.playLater({songs: [id] })
} catch (err){}
=======
try{
app.mk.playLater({songs: [id] })
} catch (err){}
>>>>>>> 7322c71... save last played track, time and queue
}
}
}
@ -375,7 +387,11 @@ const app = new Vue({
})
<<<<<<< HEAD
})},1500)
=======
})},1000)
>>>>>>> 7322c71... save last played track, time and queue
}