Merge branch 'master' into develop

VERSION.md

@@ -1 +1 @@
-3.32.5
+3.33.0

mopidy_iris/__init__.py

@@ -12,7 +12,7 @@ from handlers import WebsocketHandler, HttpHandler
 from core import IrisCore
 
 logger = logging.getLogger(__name__)
-__version__ = '3.32.5'
+__version__ = '3.33.0'
 
 ##
 # Core extension class

mopidy_iris/static/index.html

@@ -98,8 +98,8 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-	var build = "1550721289";
-	var version = "3.32.5";
+	var build = "1550726971";
+	var version = "3.33.0";
 
 	// Construct the script tag
     var js = document.createElement("script");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mopidy-iris",
-  "version": "3.32.5",
+  "version": "3.33.0",
   "description": "Mopidy HTTP interface",
   "repository": "https://github.com/jaedb/iris",
   "author": "James Barnsley <james@barnsley.nz>",

src/js/components/NiceNumber.js

@@ -16,9 +16,9 @@ export default class NiceNumber extends React.Component{
 			formatted = Math.round( formatted * 10 ) / 10;
 			formatted = formatted+'m';
 
-		// > 100 thousand
-		} else if (formatted > 100000){
-			formatted = formatted / 100000;
+		// > 1 thousand
+		} else if (formatted > 1000){
+			formatted = formatted / 1000;
 			formatted = Math.round( formatted * 10 ) / 10;
 			formatted = formatted+'k';
 
@@ -30,10 +30,6 @@ export default class NiceNumber extends React.Component{
 	}
 
 	render(){
-		if (!this.props.value){
-			return null;
-		} else {
-			return <span className="counter">{this.format()}</span>;
-		}
+		return <span className="counter">{this.format()}</span>;
 	}
 }

src/js/views/Artist.js

@@ -296,9 +296,9 @@ class Artist extends React.Component{
 
 				<div className="col col--w40 tiles artist-stats">
 					{thumbnails}
-					{artist.followers ? <div className="tile"><span className="content"><Icon type="fontawesome" name="users" /><NiceNumber value={artist.followers} /> followers</span></div> : null}
+					{artist.followers ? <div className="tile"><span className="content"><Icon type="fontawesome" name="users" />{artist.followers.toLocaleString()} followers</span></div> : null}
 					{artist.popularity ? <div className="tile"><span className="content"><Icon type="fontawesome" name="fire" />{artist.popularity }% popularity</span></div> : null}
-					{artist.listeners ? <div className="tile"><span className="content"><Icon type="fontawesome" name="headphones" /><NiceNumber value={artist.listeners} /> listeners</span></div> : null }
+					{artist.listeners ? <div className="tile"><span className="content"><Icon type="fontawesome" name="headphones" />{ artist.listeners.toLocaleString() } listeners</span></div> : null }
 				</div>
 
 				<div className="col col--w60 biography">