From 5b92573a2856e2592ab1bc6629f957deeecce488 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Sat, 28 Apr 2018 16:10:09 +1200
Subject: [PATCH] Reinstating added_by search origins

---
 src/js/components/Track.js           | 6 +++++-
 src/js/services/mopidy/middleware.js | 1 +
 src/js/views/Search.js               | 4 ++--
 src/scss/components/_lists.scss      | 3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/js/components/Track.js b/src/js/components/Track.js
index 1c2cd06f..a5ff9d10 100755
--- a/src/js/components/Track.js
+++ b/src/js/components/Track.js
@@ -228,6 +228,10 @@ export default class Track extends React.Component{
 						var link = <URILink type="browse" uri={track.added_from.replace("iris:browse:","")}>browse</URILink>
 						break;
 
+					case "search":
+						var link = <URILink type="search" uri={track.added_from.replace("iris:","")}>search</URILink>
+						break;
+
 					default:
 						var link = <URILink type={type} uri={track.added_from}>{type}</URILink>;
 				}
@@ -238,7 +242,7 @@ export default class Track extends React.Component{
 				var added = <span className="by">{track.added_by}</span>
 
 			} else {
-				var added = <span className="placeholder">-</span>
+				var added = <span className="empty">-</span>
 			}
 
 			track_columns.push(
diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index 83aec6e7..b3e5bf91 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -93,6 +93,7 @@ const MopidyMiddleware = (function(){
                 break;
 
             case 'event:trackPlaybackEnded':
+                // This doesn't fire when it's the last track in the queue... bug in Mopidy?
                 store.dispatch(mopidyActions.clearCurrentTrack());
                 store.dispatch(mopidyActions.getTimePosition());
                 break;
diff --git a/src/js/views/Search.js b/src/js/views/Search.js
index d7236200..df9d57cc 100755
--- a/src/js/views/Search.js
+++ b/src/js/views/Search.js
@@ -218,7 +218,7 @@ class Search extends React.Component{
 							Tracks
 						</h4>
 						<section className="list-wrapper">
-							<TrackList tracks={tracks} uri={this.props.params.query} show_source_icon />
+							<TrackList tracks={tracks} uri={'iris:'+this.props.params.query} show_source_icon />
 							<LazyLoadListener enabled={this.props['tracks_more'] && spotify_search_enabled} loadMore={ () => this.loadMore('tracks') }/>
 						</section>
 					</div>
@@ -285,7 +285,7 @@ class Search extends React.Component{
 				if (tracks.length > 0){
 					var tracks_section = (
 						<section className="list-wrapper">
-							<TrackList tracks={tracks} uri={this.props.params.query} show_source_icon />
+							<TrackList tracks={tracks} uri={'iris:'+this.props.params.query} show_source_icon />
 							<LazyLoadListener loading={this.props['tracks_more'] && spotify_search_enabled} loadMore={ () => this.loadMore('tracks') }/>
 						</section>
 					)
diff --git a/src/scss/components/_lists.scss b/src/scss/components/_lists.scss
index 4d327967..d8031620 100755
--- a/src/scss/components/_lists.scss
+++ b/src/scss/components/_lists.scss
@@ -353,7 +353,8 @@
 					float: none !important;
 					padding-left: 0.25em;
 
-					.by {
+					.by,
+					.empty {
 						display: none;
 					}