Merge pull request #1133 from chme/web_next

[web] Fix switching to Spotify search with empty query
This commit is contained in:
Christian Meffert 2020-11-22 11:19:10 +01:00 committed by GitHub
commit 17e7df84fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 25 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{ {
"name": "forked-daapd-web", "name": "forked-daapd-web",
"version": "0.8.2", "version": "0.8.3",
"private": true, "private": true,
"description": "forked-daapd web interface", "description": "forked-daapd web interface",
"author": "chme <christian.meffert@googlemail.com>", "author": "chme <christian.meffert@googlemail.com>",

View File

@ -34,39 +34,34 @@ export default {
computed: { computed: {
spotify_enabled () { spotify_enabled () {
return this.$store.state.spotify.webapi_token_valid return this.$store.state.spotify.webapi_token_valid
},
route_query: function () {
if (!this.query) {
return null
}
return {
type: 'track,artist,album,playlist,audiobook,podcast',
query: this.query,
limit: 3,
offset: 0
}
} }
}, },
methods: { methods: {
search_library: function () { search_library: function () {
if (!this.query) {
return
}
this.$router.push({ this.$router.push({
path: '/search/library', path: '/search/library',
query: { query: this.route_query
type: 'track,artist,album,playlist,audiobook,podcast',
query: this.query,
limit: 3,
offset: 0
}
}) })
}, },
search_spotify: function () { search_spotify: function () {
if (!this.query) {
return
}
this.$router.push({ this.$router.push({
path: '/search/spotify', path: '/search/spotify',
query: { query: this.route_query
type: 'track,artist,album,playlist,audiobook,podcast',
query: this.query,
limit: 3,
offset: 0
}
}) })
} }
} }