Merge branch 'develop'

IRIS_VERSION

@@ -1 +1 @@
-3.53.0
+3.53.1

mopidy_iris/__init__.py

@@ -3,7 +3,7 @@
 
 from mopidy import config, ext
 
-__version__ = "3.53.0"
+__version__ = "3.53.1"
 
 logger = logging.getLogger(__name__)
 

mopidy_iris/static/index.html

@@ -106,8 +106,8 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-	var build = "1603873501";
-	var version = "3.53.0";
+	var build = "1604338606";
+	var version = "3.53.1";
 
 	// Construct the script tag
 	var js = document.createElement("script");

mopidy_iris/static/manifest.json

@@ -1,5 +1,5 @@
 {
-  "manifest_version": "3.53.0",
+  "manifest_version": "3.53.1",
   "short_name": "Iris",
   "name": "Iris",
   "icons": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mopidy-iris",
-  "version": "3.53.0",
+  "version": "3.53.1",
   "description": "Mopidy HTTP interface",
   "repository": "https://github.com/jaedb/iris",
   "author": "James Barnsley <[email protected]>",

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Mopidy-Iris
-version = 3.53.0
+version = 3.53.1
 url = https://github.com/jaedb/iris
 author = James Barnsley
 author_email = [email protected]

src/js/components/GridItem.js

@@ -55,17 +55,21 @@ class GridItem extends React.Component {
 
   renderSecondary = ({
     uri,
-    tracks_total = 0,
-    tracks,
+    tracks_total,
+    tracks = [],
     followers,
     albums_uris,
     artists,
   }) => {
+    let trackCount = 0;
+    if (tracks) trackCount = tracks.length;
+    if (tracks_total) trackCount = tracks_total;
+
     switch (uriType(uri)) {
       case 'playlist':
         return (
           <span className="grid__item__secondary__content">
-            <I18n path="specs.tracks" count={tracks.length || tracks_total} />
+            <I18n path="specs.tracks" count={trackCount} />
           </span>
         );
 

src/js/components/Services.js

@@ -299,31 +299,37 @@ class Services extends React.Component {
       }
     } = this.props;
 
-    const spotify_icon = (
+    const spotify_icon = spotifyUser ? (
       <Thumbnail
         className="menu-item__thumbnail"
         circle
         size="small"
-        images={spotifyUser ? spotifyUser.images : null}
+        images={spotifyUser.images}
       />
+    ) : (
+      <Thumbnail className="menu-item__thumbnail" circle size="small" />
     );
 
-    const lastfm_icon = (
+    const lastfm_icon = lastfmUser ? (
       <Thumbnail
         className="menu-item__thumbnail"
         circle
         size="small"
-        images={lastfmUser ? lastfmUser.images : null}
+        images={lastfmUser.images}
       />
+    ) : (
+      <Icon type="fontawesome" name="lastfm" className="menu-item__icon" />
     );
 
-    const genius_icon = (
+    const genius_icon = geniusUser ? (
       <Thumbnail
         className="menu-item__thumbnail"
         circle
         size="small"
-        images={geniusUser ? geniusUser.images : null}
+        images={geniusUser.images}
       />
+    ) : (
+      <Icon name="genius" type="svg" className="menu-item__icon" />
     );
 
     return (

src/js/locale/en.yaml

@@ -77,27 +77,27 @@ fields:
     followers: Followers
     popularity: Popularity
 time:
-  seconds: 
+  seconds:
     short: secs
     singular: second
     plural: seconds
-  minutes: 
+  minutes:
     short: mins
     singular: minute
     plural: minutes
-  hours: 
+  hours:
     short: hrs
     singular: hour
     plural: hours
-  days: 
+  days:
     short: days
     singular: day
     plural: days
-  weeks: 
+  weeks:
     short: wks
     singular: week
     plural: weeks
-  years: 
+  years:
     short: yrs
     singular: year
     plural: years

src/js/views/Playlist.js

@@ -9,7 +9,6 @@ import Thumbnail from '../components/Thumbnail';
 import PinButton from '../components/Fields/PinButton';
 import { nice_number } from '../components/NiceNumber';
 import { Dater, dater } from '../components/Dater';
-import LazyLoadListener from '../components/LazyLoadListener';
 import FollowButton from '../components/Fields/FollowButton';
 import Loader from '../components/Loader';
 import ContextMenuTrigger from '../components/ContextMenuTrigger';
@@ -22,12 +21,12 @@ import * as spotifyActions from '../services/spotify/actions';
 import {
   uriSource,
   getFromUri,
-  isLoading,
   sourceIcon,
   decodeMopidyUri,
 } from '../util/helpers';
 import { i18n, I18n } from '../locale';
 import { makeItemSelector, makeLoadingSelector } from '../util/selectors';
+import { sortItems } from '../util/arrays';
 
 class Playlist extends React.Component {
   constructor(props) {

src/js/views/Settings.js

@@ -247,7 +247,7 @@ class Settings extends React.Component {
             <I18n path="settings.interface.title" />
             <a name="interface" />
           </h4>
-          
+
           <div className="field dropdown">
             <div className="name"><I18n path="settings.interface.language.label" /></div>
             <div className="input">