From ec6cd1bb08b409b29321b8d4538aec1adc90c6de Mon Sep 17 00:00:00 2001
From: An Phan <an@construct.sg>
Date: Fri, 1 Apr 2016 15:10:02 +0800
Subject: [PATCH] Properly activate a playlist after creation

---
 .../js/components/main-wrapper/sidebar/playlist-item.vue | 1 +
 .../js/components/main-wrapper/sidebar/playlists.vue     | 9 ++++++++-
 resources/assets/js/components/shared/add-to-menu.vue    | 6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/components/main-wrapper/sidebar/playlist-item.vue b/resources/assets/js/components/main-wrapper/sidebar/playlist-item.vue
index 40897596..276af095 100644
--- a/resources/assets/js/components/main-wrapper/sidebar/playlist-item.vue
+++ b/resources/assets/js/components/main-wrapper/sidebar/playlist-item.vue
@@ -155,6 +155,7 @@
                 if (view === 'favorites') {
                     this.active = this.isFavorites;
                 } else if (view === 'playlist') {
+                    console.log(playlist.id, this.playlist.id);
                     this.active = this.playlist === playlist;
                 } else {
                     this.active = false;
diff --git a/resources/assets/js/components/main-wrapper/sidebar/playlists.vue b/resources/assets/js/components/main-wrapper/sidebar/playlists.vue
index f45b4fa3..cc6b1f70 100644
--- a/resources/assets/js/components/main-wrapper/sidebar/playlists.vue
+++ b/resources/assets/js/components/main-wrapper/sidebar/playlists.vue
@@ -29,6 +29,8 @@
 </template>
 
 <script>
+    import { last } from 'lodash';
+
     import playlistStore from '../../../stores/playlist';
     import favoriteStore from '../../../stores/favorite';
 
@@ -55,7 +57,12 @@
             store() {
                 this.creating = false;
 
-                playlistStore.store(this.newName, [], () => this.newName = '');
+                playlistStore.store(this.newName, [], () => {
+                    this.newName = '';
+                    this.$nextTick(() => {
+                        this.$root.loadPlaylist(last(this.playlistState.playlists));
+                    });
+                });
             },
         },
     };
diff --git a/resources/assets/js/components/shared/add-to-menu.vue b/resources/assets/js/components/shared/add-to-menu.vue
index e55e6c85..145baf2f 100644
--- a/resources/assets/js/components/shared/add-to-menu.vue
+++ b/resources/assets/js/components/shared/add-to-menu.vue
@@ -69,8 +69,10 @@
                 playlistStore.store(this.newPlaylistName, this.songs, () => {
                     this.newPlaylistName = '';
 
-                    // Activate the new playlist right away
-                    this.$root.loadPlaylist(last(this.playlistState.playlists));
+                    this.$nextTick(() => {
+                        // Activate the new playlist right away
+                        this.$root.loadPlaylist(last(this.playlistState.playlists));
+                    });
                 });
 
                 this.close();