From 1096e94914c432be7723ed085fa535512b0d91b9 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Fri, 19 Feb 2016 15:34:36 +1300 Subject: [PATCH 1/2] Canvas bg in artist page --- src/assets/css/core.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/assets/css/core.css b/src/assets/css/core.css index a00507a..7cc18ea 100644 --- a/src/assets/css/core.css +++ b/src/assets/css/core.css @@ -1408,6 +1408,10 @@ body.dragging .tracklist .track.selected { opacity: 0; } +.artist-intro .image-container canvas { + background-color: #444444; +} + .artist-page .title-panel { position: absolute; bottom: 0; From 716fc705e862a538e78e37889335bd3148e8d348 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Fri, 19 Feb 2016 05:53:23 +0000 Subject: [PATCH 2/2] Fixing deselect issue --- src/app/common/tracklist/controller.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/common/tracklist/controller.js b/src/app/common/tracklist/controller.js index 466dcf6..8082956 100644 --- a/src/app/common/tracklist/controller.js +++ b/src/app/common/tracklist/controller.js @@ -235,10 +235,10 @@ angular.module('spotmop.common.tracklist', [ }); - // collapse menus and deselect tracks when we click outside of a tracklist + // collapse menus and deselect tracks when we click outside of a tracklist and not on a contextmenu $(document).on('mouseup', 'body', function( event ){ - if( $(event.target).closest('.tracklist').length <= 0 ){ - + if( $(event.target).closest('.tracklist').length <= 0 && $(event.target).closest('contextmenu').length <= 0 ){ + // if we've just dropped some tracks somewhere, don't unselect them // NOTE: this doesn't apply when dragging in the queue, as changing the queue completely refreshes it and flushes all selected states if( !$('body').hasClass('dragging') ){