[FIX] Add track to playlist (rdubigny#16)

poupotte · Apr 13, 2016 · 3741dd1 · 3741dd1
1 parent 81b20f5
commit 3741dd1
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 11 deletions.
diff --git a/app/styles/playlists.styl b/app/styles/playlists.styl
@@ -71,6 +71,7 @@ div[role='toolbar']
             overflow: hidden
             text-overflow: "…"
             white-space: nowrap
+
             a
                 width: 100%
                 height: 100%

diff --git a/app/styles/popup-menu.styl b/app/styles/popup-menu.styl
@@ -29,7 +29,7 @@
                 color: $text-dark
                 align-items: center
 
-                a
+                p
                     width: 100%
                     height: 100%
                     text-decoration: none

diff --git a/app/views/playlist.js b/app/views/playlist.js
@@ -4,10 +4,12 @@ import application from '../application';
 
 const PlaylistView = Mn.ItemView.extend({
 
-    template: require('./templates/playlist'),
-
     tagName: 'li',
 
+    initialize(options) {
+        this.template = options.template;
+    },
+
     className() {
         let currentPlaylist = application.appState.get('currentPlaylist');
         let selected = currentPlaylist == this.model ? 'selected' : ''

diff --git a/app/views/playlists.js b/app/views/playlists.js
@@ -12,6 +12,10 @@ const Playlists = Mn.CompositeView.extend({
 
     childView: PlaylistView,
 
+    childViewOptions: {
+        template: require('./templates/playlist')
+    },
+
     modelEvents: {
         "change:currentPlaylist": "render"
     },

diff --git a/app/views/popupPlaylists.js b/app/views/popupPlaylists.js
@@ -12,14 +12,18 @@ const PopupPlaylists = Mn.CompositeView.extend({
 
     childView: PlaylistView,
 
+    childViewOptions: {
+        template: require('./templates/popupPlaylist')
+    },
+
     ui: {
         addPlaylist: '#add-playlist',
         playlistText: '#playlist-text',
         playlistPopup: '#playlist-popup-menu'
     },
 
     events: {
-        'click li': 'addToPlaylist',
+        'click li p': 'addToPlaylist',
         'click @ui.addPlaylist': 'showInput',
         'keyup @ui.playlistText': 'keyupPlaylistText',
     },
@@ -69,6 +73,11 @@ const PopupPlaylists = Mn.CompositeView.extend({
             newPlaylist.addTrack(this.model);
             application.allPlaylists.add(newPlaylist);
             this.ui.playlistText.val('');
+            let notification = {
+                status: 'ok',
+                message: 'Added to ' + newPlaylist.get('title')
+            }
+            application.channel.request('notification', notification);
         }
     },
 

diff --git a/app/views/templates/content.jst b/app/views/templates/content.jst
@@ -1,2 +1,2 @@
 <div role="complementary"></div>
-<div id="tracks"></div>
+<div id="tracks"></div>
diff --git a/app/views/templates/notification.jst b/app/views/templates/notification.jst
@@ -9,4 +9,4 @@
     </svg>
     <% } %>
     <p><%= message %></p>
-</div>
+</div>
diff --git a/app/views/templates/player.jst b/app/views/templates/player.jst
@@ -62,4 +62,4 @@
             </svg>
         </button>
     </div>
-</div>
+</div>
diff --git a/app/views/templates/playlist.jst b/app/views/templates/playlist.jst
@@ -1 +1 @@
-<a href="#playlists/<%= _id %>/tracks"><%= title %>
+<a href="#playlists/<%= _id %>/tracks"><%= title %></a>
diff --git a/app/views/templates/playlists.jst b/app/views/templates/playlists.jst
@@ -13,4 +13,4 @@
         <input id="playlist-text" type="text" placeholder="Add Playlist"/>
         <h4><%= t('add playlist') %></h4>
     </div>
-</div>
+</div>
diff --git a/app/views/templates/popupPlaylist.jst b/app/views/templates/popupPlaylist.jst
@@ -0,0 +1 @@
+<p data-id="<%= _id %>"><%= title %></p>
diff --git a/app/views/templates/popupPlaylists.jst b/app/views/templates/popupPlaylists.jst
@@ -6,4 +6,4 @@
         <p>Add to New Playlist</p>
     </div>
 
-</div>
+</div>
diff --git a/app/views/templates/tracks.jst b/app/views/templates/tracks.jst
@@ -5,4 +5,4 @@
 	<div class="album-column-cell" role="gridcell">ALBUM</div>
 	<div class="length-column-cell" role="gridcell">LENGTH</div>
 </div>
-<ul id="track-list"></ul>
+<ul id="track-list"></ul>