Merge remote-tracking branch 'origin/master'

Rello · Aug 6, 2019 · f40cda1 · f40cda1
2 parents 362c168 + a1c1159
commit f40cda1
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/js/app.js b/js/app.js
@@ -612,18 +612,16 @@ OCA.Audioplayer.UI = {
     },
 
     trackClickHandler: function (callback) {
-        var albumWrapper = $('.albumwrapper');
+        var albumWrapper = document.getElementById('individual-playlist');
         var getcoverUrl = OC.generateUrl('apps/audioplayer/getcover/');
         var category = OCA.Audioplayer.UI.PlaylistContainer.data('playlist').split('-');
 
         var canPlayMimeType = OCA.Audioplayer.Core.canPlayMimeType;
-        var playlist = albumWrapper.find('li');
+        var playlist = albumWrapper.getElementsByTagName('li');
 
-        playlist.each(function (index, elm) {
-            var element = $(elm);
-
-            if (!(category[0] === 'Playlist' && category[1].toString()[0] !== 'X' && category[1] !== '')) {
-                element.draggable({
+        if (!(category[0] === 'Playlist' && category[1].toString()[0] !== 'X' && category[1] !== '')) {
+            for (var track of playlist) {
+                $(track).draggable({
                     appendTo: 'body',
                     helper: OCA.Audioplayer.Playlists.dragElement,
                     cursor: 'move',
@@ -633,10 +631,9 @@ OCA.Audioplayer.UI = {
                     }
                 });
             }
-
-            element.on('click', function() {
-                OCA.Audioplayer.UI.onTitleClick(getcoverUrl, canPlayMimeType, playlist, element);
-            });
+        }
+        albumWrapper.addEventListener('click', function(event) {
+            OCA.Audioplayer.UI.onTitleClick(getcoverUrl, canPlayMimeType, playlist, event.target);
         });
         // the callback is used for the the init function to get feedback when all title rows are ready
         if (typeof callback === 'function') {
@@ -645,7 +642,7 @@ OCA.Audioplayer.UI = {
     },
 
     onTitleClick: function (coverUrl, canPlayMimeType, playlist, element) {
-        var activeLi = element.closest('li');
+        var activeLi = $(element).closest('li');
         // if enabled, play sonos and skip the rest of the processing
         if ($('#audioplayer_sonos').val() === 'checked') {
             var liIndex = element.parents('li').index();
@@ -667,7 +664,7 @@ OCA.Audioplayer.UI = {
             // the visible playlist has to be copied to the player queue
             // this disconnects the free navigation in AP while continuing to play a playlist
             if (OCA.Audioplayer.UI.PlaylistContainer.data('playlist') !== OCA.Audioplayer.UI.ActivePlaylist.data('playlist')) {
-                var ClonePlaylist = playlist.clone();
+                var ClonePlaylist = $(playlist).clone();
                 OCA.Audioplayer.UI.ActivePlaylist.html('');
                 OCA.Audioplayer.UI.ActivePlaylist.append(ClonePlaylist);
                 OCA.Audioplayer.UI.ActivePlaylist.find('span').remove();