diff --git a/mopidy_iris/__init__.py b/mopidy_iris/__init__.py index a38de2a9..82c62560 100755 --- a/mopidy_iris/__init__.py +++ b/mopidy_iris/__init__.py @@ -12,7 +12,7 @@ from handlers import WebsocketHandler, HttpHandler from core import IrisCore logger = logging.getLogger(__name__) -__version__ = '3.0.3' +__version__ = '3.0.4' ## # Core extension class diff --git a/src/js/views/Settings.js b/src/js/views/Settings.js index 0232e1f6..d2ed2441 100755 --- a/src/js/views/Settings.js +++ b/src/js/views/Settings.js @@ -47,16 +47,6 @@ class Settings extends React.Component{ changed = true } - if (newProps.mopidy.host != this.state.mopidy_host && this.state.input_in_focus != 'mopidy_host'){ - state.mopidy_host = newProps.mopidy.host - changed = true - } - - if (newProps.mopidy.port != this.state.mopidy_port && this.state.input_in_focus != 'mopidy_port'){ - state.mopidy_port = newProps.mopidy.port - changed = true - } - if (newProps.pusher.username != this.state.pusher_username && this.state.input_in_focus != 'pusher_username'){ state.pusher_username = newProps.pusher.username changed = true diff --git a/src/js/views/library/LibraryPlaylists.js b/src/js/views/library/LibraryPlaylists.js index daf8d13c..4c9503c9 100755 --- a/src/js/views/library/LibraryPlaylists.js +++ b/src/js/views/library/LibraryPlaylists.js @@ -58,8 +58,28 @@ class LibraryPlaylists extends React.Component{ var playlists = [] for (var i = 0; i < this.props.library_playlists.length; i++){ var uri = this.props.library_playlists[i] + var owner_id = helpers.getFromUri('playlistowner',uri) + if (this.props.playlists.hasOwnProperty(uri)){ - playlists.push(this.props.playlists[uri]) + + switch (this.props.filter){ + + case 'only_mine': + if (this.props.me_id && owner_id == this.props.me_id){ + playlists.push(this.props.playlists[uri]) + } + break + + case 'only_others': + if (!this.props.me_id || owner_id != this.props.me_id){ + playlists.push(this.props.playlists[uri]) + } + break + + default: + playlists.push(this.props.playlists[uri]) + break + } } } @@ -113,6 +133,21 @@ class LibraryPlaylists extends React.Component{ render(){ + var filter_options = [ + { + value: 'all', + label: 'All' + }, + { + value: 'only_mine', + label: 'Owned by me' + }, + { + value: 'only_others', + label: 'I\'m following' + } + ] + var view_options = [ { value: 'thumbnails', @@ -149,6 +184,7 @@ class LibraryPlaylists extends React.Component{ var options = ( + {this.props.uiActions.set({ library_playlists_filter: val}); this.props.uiActions.hideContextMenu() }} /> {this.setSort(val); this.props.uiActions.hideContextMenu() }} /> {this.props.uiActions.set({ library_playlists_view: val}); this.props.uiActions.hideContextMenu() }} />