Merge pull request #71 from jaedb/develop

Buildout 2.6.0
jaedb · Mar 7, 2016 · 5ea7ab4 · 5ea7ab4
2 parents daee193 + 0b3fe63
commit 5ea7ab4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/mopidy_spotmop/__init__.py b/mopidy_spotmop/__init__.py
@@ -11,7 +11,7 @@
 from services.auth import auth
 from mopidy import config, ext
 
-__version__ = '2.5.19'
+__version__ = '2.6.0'
 __ext_name__ = 'spotmop'
 __verbosemode__ = False
 

diff --git a/mopidy_spotmop/static/app/search/template.html b/mopidy_spotmop/static/app/search/template.html
@@ -92,12 +92,7 @@ <h1 class="mobile-hide">Search results</h1>
 			</div>
 
 			<div ng-if="type == 'track'">
-				<div class="search-items tracklist"  ng-controller="TracklistController">
-					<track ng-repeat="track in tracklist.tracks"></track>	
-				</div>
-				<div ng-hide="tracklist.tracks.length || loading" class="no-items">
-					No items
-				</div>	
+                <tracklist ng-if="tracklist.tracks" tracks="tracklist.tracks" type="track" class="tracklist search-results"></tracklist>
 			</div>
 
 			<div ng-if="type == 'all'">

diff --git a/src/app/search/template.html b/src/app/search/template.html
@@ -92,12 +92,7 @@ <h1 class="mobile-hide">Search results</h1>
 			</div>
 
 			<div ng-if="type == 'track'">
-				<div class="search-items tracklist"  ng-controller="TracklistController">
-					<track ng-repeat="track in tracklist.tracks"></track>	
-				</div>
-				<div ng-hide="tracklist.tracks.length || loading" class="no-items">
-					No items
-				</div>	
+                <tracklist ng-if="tracklist.tracks" tracks="tracklist.tracks" type="track" class="tracklist search-results"></tracklist>
 			</div>
 
 			<div ng-if="type == 'all'">