secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
James Barnsley
2018-04-14 13:48:22 +12:00
parent 27699bc48e c614482723
commit 68c89d0070
10 changed files with 73 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.md
View File

@ -1 +1 @@
3.16.2
3.16.3

2
mopidy_iris/__init__.py
View File

@ -13,7 +13,7 @@ from core import IrisCore
from raven import Client
logger = logging.getLogger(__name__)
__version__ = '3.16.2'
__version__ = '3.16.3'
##
# Core extension class

49
mopidy_iris/static/app.js
View File

@ -16665,8 +16665,8 @@ var LazyLoadListener = function (_React$Component) {
value: function render() {
return _react2.default.createElement(
'div',
{ className: "lazy-loader body-loader" + (this.state.loading ? ' loading' : '') },
this.state.loading ? _react2.default.createElement('div', { className: 'loader' }) : null
{ className: "lazy-loader body-loader" + (this.state.loading || this.props.forceLoader ? ' loading' : '') },
this.state.loading || this.props.forceLoader ? _react2.default.createElement('div', { className: 'loader' }) : null
);
}
}]);
@ -64500,6 +64500,12 @@ var Album = function (_React$Component) {
}
}
if (tracks.length <= 0 && helpers.isLoading(this.props.load_queue, ['spotify_albums/' + helpers.getFromUri('albumid', this.props.params.uri)])) {
var is_loading_tracks = true;
} else {
var is_loading_tracks = false;
}
return _react2.default.createElement(
'div',
{ className: 'view album-view content-wrapper' },
@ -64573,7 +64579,7 @@ var Album = function (_React$Component) {
'section',
{ className: 'list-wrapper' },
_react2.default.createElement(_TrackList2.default, { className: 'album-track-list', tracks: tracks, uri: this.props.params.uri }),
_react2.default.createElement(_LazyLoadListener2.default, { loading: this.props.album.tracks_more, loadMore: function loadMore() {
_react2.default.createElement(_LazyLoadListener2.default, { loading: this.props.album.tracks_more, forceLoader: is_loading_tracks, loadMore: function loadMore() {
return _this2.loadMore();
} })
)
@ -64970,16 +64976,6 @@ var Artist = function (_React$Component) {
default:
var tracks = [];
if (this.props.artist.tracks_uris && this.props.tracks) {
for (var i = 0; i < this.props.artist.tracks_uris.length; i++) {
var uri = this.props.artist.tracks_uris[i];
if (this.props.tracks.hasOwnProperty(uri)) {
tracks.push(this.props.tracks[uri]);
}
}
}
var sort_options = [{
value: 'name',
label: 'Name'
@ -64991,6 +64987,22 @@ var Artist = function (_React$Component) {
label: 'Tracks'
}];
var tracks = [];
if (this.props.artist.tracks_uris && this.props.tracks) {
for (var i = 0; i < this.props.artist.tracks_uris.length; i++) {
var uri = this.props.artist.tracks_uris[i];
if (this.props.tracks.hasOwnProperty(uri)) {
tracks.push(this.props.tracks[uri]);
}
}
}
if (tracks.length <= 0 && helpers.isLoading(this.props.load_queue, ['spotify_artists/' + helpers.getFromUri('artistid', this.props.params.uri) + '/top-tracks'])) {
var is_loading_tracks = true;
} else {
var is_loading_tracks = false;
}
return _react2.default.createElement(
'div',
{ className: 'body overview' },
@ -65005,7 +65017,8 @@ var Artist = function (_React$Component) {
_react2.default.createElement(
'div',
{ className: 'list-wrapper' },
_react2.default.createElement(_TrackList2.default, { className: 'artist-track-list', uri: this.props.params.uri, tracks: tracks })
_react2.default.createElement(_TrackList2.default, { className: 'artist-track-list', uri: this.props.params.uri, tracks: tracks }),
_react2.default.createElement(_LazyLoadListener2.default, { forceLoader: is_loading_tracks })
)
),
_react2.default.createElement('div', { className: 'col w5' }),
@ -65506,6 +65519,12 @@ var Playlist = function (_React$Component) {
}
}
if (tracks.length <= 0 && helpers.isLoading(this.props.load_queue, ['spotify_users/' + user_id + '/playlists/' + playlist_id, 'spotify_users/' + user_id + '/playlists/' + playlist_id + '/tracks'])) {
var is_loading_tracks = true;
} else {
var is_loading_tracks = false;
}
return _react2.default.createElement(
'div',
{ className: 'view playlist-view content-wrapper' },
@ -65576,7 +65595,7 @@ var Playlist = function (_React$Component) {
}, reorderTracks: function reorderTracks(indexes, index) {
return _this3.reorderTracks(indexes, index);
} }),
_react2.default.createElement(_LazyLoadListener2.default, { loading: this.props.playlist.tracks_more, loadMore: function loadMore() {
_react2.default.createElement(_LazyLoadListener2.default, { loading: this.props.playlist.tracks_more, forceLoader: is_loading_tracks, loadMore: function loadMore() {
return _this3.loadMore();
} })
)

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

4
mopidy_iris/static/index.html
View File

@ -73,8 +73,8 @@
// Release details
// These are automatically injected to built HTML
var build = "1523522517";
var version = "3.16.2";
var build = "1523668283";
var version = "3.16.3";
// Construct the script tag
var js = document.createElement("script");

2
package.json
View File

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

4
src/js/components/LazyLoadListener.js
View File

@ -33,8 +33,8 @@ export default class LazyLoadListener extends React.Component{
render(){
return (
<div className={"lazy-loader body-loader"+(this.state.loading ? ' loading' : '')}>
{this.state.loading ? <div className="loader"></div> : null}
<div className={"lazy-loader body-loader"+(this.state.loading || this.props.forceLoader ? ' loading' : '')}>
{this.state.loading || this.props.forceLoader ? <div className="loader"></div> : null}
</div>
)
}

8
src/js/views/Album.js
View File

@ -137,6 +137,12 @@ class Album extends React.Component{
}
}
if (tracks.length <= 0 && helpers.isLoading(this.props.load_queue,['spotify_albums/'+helpers.getFromUri('albumid',this.props.params.uri)])){
var is_loading_tracks = true;
} else {
var is_loading_tracks = false;
}
return (
<div className="view album-view content-wrapper">
<div className="thumbnail-wrapper">
@ -165,7 +171,7 @@ class Album extends React.Component{
<section className="list-wrapper">
<TrackList className="album-track-list" tracks={tracks} uri={this.props.params.uri} />
<LazyLoadListener loading={this.props.album.tracks_more} loadMore={ () => this.loadMore() }/>
<LazyLoadListener loading={this.props.album.tracks_more} forceLoader={is_loading_tracks} loadMore={() => this.loadMore()}/>
</section>
</div>

27
src/js/views/Artist.js
View File

@ -174,16 +174,6 @@ class Artist extends React.Component{
default:
var tracks = [];
if (this.props.artist.tracks_uris && this.props.tracks){
for (var i = 0; i < this.props.artist.tracks_uris.length; i++){
var uri = this.props.artist.tracks_uris[i]
if (this.props.tracks.hasOwnProperty(uri)){
tracks.push(this.props.tracks[uri])
}
}
}
var sort_options = [
{
value: 'name',
@ -199,12 +189,29 @@ class Artist extends React.Component{
}
];
var tracks = [];
if (this.props.artist.tracks_uris && this.props.tracks){
for (var i = 0; i < this.props.artist.tracks_uris.length; i++){
var uri = this.props.artist.tracks_uris[i]
if (this.props.tracks.hasOwnProperty(uri)){
tracks.push(this.props.tracks[uri])
}
}
}
if (tracks.length <= 0 && helpers.isLoading(this.props.load_queue,['spotify_artists/'+helpers.getFromUri('artistid',this.props.params.uri)+'/top-tracks'])){
var is_loading_tracks = true;
} else {
var is_loading_tracks = false;
}
return (
<div className="body overview">
<div className={"top-tracks col w"+(related_artists.length > 0 ? "70" : "100")}>
<h4>Top tracks</h4>
<div className="list-wrapper">
<TrackList className="artist-track-list" uri={this.props.params.uri} tracks={tracks} />
<LazyLoadListener forceLoader={is_loading_tracks} />
</div>
</div>

8
src/js/views/Playlist.js
View File

@ -190,6 +190,12 @@ class Playlist extends React.Component{
}
}
if (tracks.length <= 0 && helpers.isLoading(this.props.load_queue,['spotify_users/'+user_id+'/playlists/'+playlist_id, 'spotify_users/'+user_id+'/playlists/'+playlist_id+'/tracks'])){
var is_loading_tracks = true;
} else {
var is_loading_tracks = false;
}
return (
<div className="view playlist-view content-wrapper">
<div className="thumbnail-wrapper">
@ -216,7 +222,7 @@ class Playlist extends React.Component{
<section className="list-wrapper">
<TrackList uri={this.props.params.uri} className="playlist-track-list" context={context} tracks={tracks} removeTracks={ tracks_indexes => this.removeTracks(tracks_indexes) } reorderTracks={ (indexes, index) => this.reorderTracks(indexes, index) } />
<LazyLoadListener loading={this.props.playlist.tracks_more} loadMore={ () => this.loadMore() }/>
<LazyLoadListener loading={this.props.playlist.tracks_more} forceLoader={is_loading_tracks} loadMore={() => this.loadMore()}/>
</section>
</div>
)