[FIX] Prevent playlist with no name

* Init UpNext with first player playlist * if we remove the current track form upnext trigger next
poupotte · Mar 30, 2016 · 2c25aaf · 2c25aaf
1 parent a1e6dd4
commit 2c25aaf
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 14 deletions.
diff --git a/app/application.js b/app/application.js
@@ -24,13 +24,7 @@ let Application = Mn.Application.extend({
         // All track initialization
         let allTracks = new Tracks([], { type: 'all' });
 
-        allTracks.fetch({
-            success: () => { // For now initialize upNext with all track
-                this.allTracks.get('tracks').each(track => {
-                    this.upNext.get('tracks').add(track);
-                });
-            }
-        });
+        allTracks.fetch();
         this.allTracks = new Playlist({
             title: "All Songs",
             tracks: allTracks

diff --git a/app/styles/header.styl b/app/styles/header.styl
@@ -15,6 +15,9 @@ div[role='contentinfo']
             color: $text-dark
             display: inline-block
 
+            span
+                padding: 0 8px
+
         span[contenteditable='true']:hover
             background-color: $background-dark
 

diff --git a/app/views/header.js b/app/views/header.js
@@ -14,7 +14,7 @@ const Header = Mn.ItemView.extend({
         'click #reset-upnext': 'resetUpNext',
         'click #delete-playlist': 'deletePlaylist',
         'keypress @ui.title': 'keypressPlaylistTitle',
-        'focusout @ui.title' : 'savePlaylistTitle'
+        'blur @ui.title' : 'savePlaylistTitle'
     },
 
     modelEvents: {
@@ -31,16 +31,19 @@ const Header = Mn.ItemView.extend({
 
     keypressPlaylistTitle(e) {
         if (e.key == 'Enter') {
-            this.savePlaylistTitle();
             this.ui.title.blur();
             return false;
         }
     },
 
     savePlaylistTitle(e) {
-        let currentPlaylist = this.model.get('currentPlaylist');
-        currentPlaylist.set('title', this.ui.title.html());
-        currentPlaylist.save();
+        if (this.ui.title.html() == '') {
+            setTimeout(() => { this.ui.title.focus() }, 0);
+        } else {
+            let currentPlaylist = this.model.get('currentPlaylist');
+            currentPlaylist.set('title', this.ui.title.html());
+            currentPlaylist.save();
+        }
     },
 
     serializeData() {

diff --git a/app/views/player.js b/app/views/player.js
@@ -35,6 +35,7 @@ const Player = Mn.LayoutView.extend({
 
     initialize() {
         this.listenTo(application.channel,'reset:UpNext', this.render);
+        this.listenTo(application.channel, 'player:next', this.next)
         this.listenTo(application.appState, 'change:currentTrack',
             function(appState, currentTrack) {
                 if (currentTrack) {
@@ -80,7 +81,7 @@ const Player = Mn.LayoutView.extend({
     onRender() {
         let audio = this.ui.player.get(0);
         audio.ontimeupdate = this.onTimeUpdate;
-        audio.onended = this.next;
+        audio.onended = () => { this.next() };
         audio.onvolumechange = this.onVolumeChange;
         audio.volume = application.appState.get('currentVolume');
     },
@@ -156,6 +157,9 @@ const Player = Mn.LayoutView.extend({
                 this.replayCurrent();
             }
             application.appState.set('currentTrack', upNext.at(0));
+        } else {
+            application.appState.set('currentTrack', undefined);
+            this.render();
         }
     },
 

diff --git a/app/views/popupPlaylists.js b/app/views/popupPlaylists.js
@@ -73,7 +73,7 @@ const PopupPlaylists = Mn.CompositeView.extend({
         if(e.keyCode == 13) {
             let newPlaylist = new Playlist({ title: title });
             newPlaylist.addTrack(this.model);
-            application.allPlaylists.create(newPlaylist);
+            application.allPlaylists.add(newPlaylist);
             this.ui.playlistText.val('');
         }
     },

diff --git a/app/views/track.js b/app/views/track.js
@@ -51,6 +51,13 @@ const TrackView = Mn.LayoutView.extend({
     },
 
     play(e) {
+        // Add current playlist to upNext if no track in UpNext
+        let tracks = application.appState.get('currentPlaylist').get('tracks');
+        if (application.upNext.get('tracks').length == 0) {
+            tracks.each(track => {
+                application.upNext.get('tracks').add(track);
+            });
+        }
         application.appState.set('currentTrack', this.model);
     },
 
@@ -86,6 +93,9 @@ const TrackView = Mn.LayoutView.extend({
 
     deleteFromUpNext(e) {
         e.stopPropagation();
+        if (this.model == application.appState.get('currentTrack')) {
+            application.channel.trigger('player:next');
+        }
         application.upNext.removeTrack(this.model);
     },