From 39160cd75b75432cab8ebd904b90a78f5a9945e0 Mon Sep 17 00:00:00 2001
From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Wed, 14 Aug 2019 20:06:38 +0200
Subject: [PATCH] fix search

---
 music_assistant.code-workspace                   |  7 +++++++
 music_assistant/web/components/headermenu.vue.js |  5 +----
 music_assistant/web/pages/search.vue.js          | 12 +++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 music_assistant.code-workspace

diff --git a/music_assistant.code-workspace b/music_assistant.code-workspace
new file mode 100644
index 00000000..362d7c25
--- /dev/null
+++ b/music_assistant.code-workspace
@@ -0,0 +1,7 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	]
+}
\ No newline at end of file
diff --git a/music_assistant/web/components/headermenu.vue.js b/music_assistant/web/components/headermenu.vue.js
index b65a5ce9..dff05921 100755
--- a/music_assistant/web/components/headermenu.vue.js
+++ b/music_assistant/web/components/headermenu.vue.js
@@ -28,9 +28,6 @@ Vue.component("headermenu", {
                       {{ $globals.windowtitle }}
                   </v-card-title>
             <v-spacer></v-spacer>
-            <v-btn icon v-on:click="$globals.showsearchbox = true">
-                <v-icon>search</v-icon>
-              </v-btn>
         </v-layout>
     </v-toolbar>
     <v-toolbar flat fixed dense dark scroll-off-screen color="transparent" v-if="!$globals.windowtitle" > 
@@ -43,7 +40,7 @@ Vue.component("headermenu", {
             </v-btn>
             <v-spacer></v-spacer>
             <v-spacer></v-spacer>
-            <v-btn icon v-on:click="$globals.showsearchbox = true">
+            <v-btn icon v-on:click="$router.push({path: '/search'})">
                 <v-icon>search</v-icon>
               </v-btn>
         </v-layout>
diff --git a/music_assistant/web/pages/search.vue.js b/music_assistant/web/pages/search.vue.js
index b1a8be29..996c01ef 100755
--- a/music_assistant/web/pages/search.vue.js
+++ b/music_assistant/web/pages/search.vue.js
@@ -6,8 +6,8 @@ var Search = Vue.component('Search', {
         solo
         clearable
         :label="$t('type_to_search')"
-        prepend-inner-icon="search"
-        v-model="searchQuery">
+        append-icon="search"
+        v-model="searchQuery" v-on:keyup.enter="Search" @click:append="Search" style="margin-left:30px; margin-right:30px; margin-top:10px">
       </v-text-field>
 
       <v-tabs
@@ -90,7 +90,7 @@ var Search = Vue.component('Search', {
         </v-tabs>
 
       </section>`,
-  props: ['searchQuery'],
+  props: [],
   data() {
     return {
       selected: [2],
@@ -99,16 +99,14 @@ var Search = Vue.component('Search', {
       tracks: [],
       playlists: [],
       timeout: null,
+      active: 0,
+      searchQuery: ""
     }
   },
   created() {
     this.$globals.windowtitle = this.$t('search');
-    this.Search();
   },
   watch: {
-    searchQuery () {
-      this.Search();
-    }
   },
   methods: {
     toggle (index) {
-- 
2.34.1