Merge pull request #64 from jaedb/develop

Hotfix
jaedb · Feb 22, 2016 · bc4e0cc · bc4e0cc
2 parents 6d0b1c7 + 716fc70
commit bc4e0cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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') ){

diff --git 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;