Merge pull request #1133 from chme/web_next

[web] Fix switching to Spotify search with empty query

web-src/package.json

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

web-src/src/components/TabsSearch.vue

@@ -34,39 +34,34 @@ export default {
   computed: {
     spotify_enabled () {
       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: {
     search_library: function () {
-      if (!this.query) {
-        return
-      }
-
       this.$router.push({
         path: '/search/library',
-        query: {
-          type: 'track,artist,album,playlist,audiobook,podcast',
-          query: this.query,
-          limit: 3,
-          offset: 0
-        }
+        query: this.route_query
       })
     },
 
     search_spotify: function () {
-      if (!this.query) {
-        return
-      }
-
       this.$router.push({
         path: '/search/spotify',
-        query: {
-          type: 'track,artist,album,playlist,audiobook,podcast',
-          query: this.query,
-          limit: 3,
-          offset: 0
-        }
+        query: this.route_query
       })
     }
   }