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

Code syntax consistency; Tooltips for asset types

Browse Source
This commit is contained in:
James Barnsley
2017-10-10 13:32:04 +13:00
parent 362e2cb17a
commit c8c3a38656
21 changed files with 64 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/App.js
View File

@ -127,7 +127,7 @@ class App extends React.Component{
if (this.props.play_state == 'playing'){
this.props.mopidyActions.pause()
this.props.uiActions.createNotification('pause', 'shortcut', 'shortcut')
}else{
} else {
this.props.mopidyActions.play()
this.props.uiActions.createNotification('play', 'shortcut', 'shortcut')
}

2
src/js/components/ArtistSentence.js
View File

@ -27,7 +27,7 @@ export default class ArtistSentence extends React.Component{
var content = <span>-</span>
} else if (!artist.uri || this.props.nolinks){
var content = <span>{ artist.name }</span>
}else{
} else {
var content = <Link className="artist" to={global.baseURL+'artist/'+artist.uri}>{ artist.name }</Link>
}
return (

2
src/js/components/ConfirmationButton.js
View File

@ -22,7 +22,7 @@ export default class ConfirmationButton extends React.Component{
if (this.state.confirming){
this.setState({ confirming: false });
this.props.onConfirm();
}else{
} else {
this.setState({ confirming: true });
}
}

2
src/js/components/Dater.js
View File

@ -100,7 +100,7 @@ export default class Dater extends React.Component{
return minutes + " minutes";
}else if (hours < 24){
return hours + " hours";
}else{
} else {
return days + " days"
}
break

6
src/js/components/ProgressSlider.js
View File

@ -21,7 +21,7 @@ class ProgressSlider extends React.Component{
var percent = (sliderX / sliderWidth ).toFixed(2);
if (this.props.connected && this.props.current_track){
var destination_time = this.props.current_track.length * percent
var destination_time = this.props.current_track.duration * percent
this.props.mopidyActions.seek(destination_time )
this.setState({ animating: false })
}
@ -30,7 +30,7 @@ class ProgressSlider extends React.Component{
render(){
var percent = 0
if (this.props.connected && this.props.current_track){
percent = this.props.time_position / this.props.current_track.length
percent = this.props.time_position / this.props.current_track.duration
percent = percent * 100;
if (percent > 100 ) percent = 100
}
@ -53,7 +53,7 @@ class ProgressSlider extends React.Component{
const mapStateToProps = (state, ownProps) => {
return {
current_track: (typeof(state.core.current_track) !== 'undefined' && typeof(state.core.tracks) !== 'undefined' && typeof(state.core.tracks[state.core.current_track.uri]) !== 'undefined' ? state.core.tracks[state.core.current_track.uri] : null),
current_track: (state.core.current_track !== undefined && state.core.tracks !== undefined && state.core.tracks[state.core.current_track.uri] !== undefined ? state.core.tracks[state.core.current_track.uri] : null),
connected: state.mopidy.connected,
time_position: state.mopidy.time_position,
play_state: state.mopidy.play_state

2
src/js/components/RelatedArtists.js
View File

@ -23,7 +23,7 @@ export default class RelatedArtists extends React.Component{
<span className="name">{ artist.name }</span>
</Link>
)
}else{
} else {
return (
<span key={artist.uri} className="artist">
<Thumbnail circle={true} size="small" images={artist.images} />

3
src/js/components/Track.js
View File

@ -208,8 +208,7 @@ export default class Track extends React.Component{
)
track_columns.push(
<span className="col duration" key="duration">
{track.duration_ms ? <Dater type="length" data={track.duration_ms} /> : null}
{track.length ? <Dater type="length" data={track.length} /> : null}
{track.duration ? <Dater type="length" data={track.duration} /> : null}
</span>
)
}

8
src/js/helpers.js
View File

@ -27,7 +27,7 @@ export let sizedImages = function(images){
sizes.medium = image.url;
}else if (image.width < 1000){
sizes.large = image.url;
}else{
} else {
sizes.huge = image.url;
}
@ -44,7 +44,7 @@ export let sizedImages = function(images){
sizes.medium = image.url;
}else if (image.width < 1000){
sizes.large = image.url;
}else{
} else {
sizes.huge = image.url;
}
@ -464,7 +464,7 @@ export let sortItems = function (array, property, reverse = false){
if (typeof(a_value[a_property_split[i]]) === 'undefined'){
a_value = false
break
}else{
} else {
a_value = a_value[a_property_split[i]]
}
}
@ -491,7 +491,7 @@ export let sortItems = function (array, property, reverse = false){
if (a_value.toLowerCase() < b_value.toLowerCase()) return -1
return 0
}else{
} else {
if (parseInt(a_value) > parseInt(b_value)) return 1
if (parseInt(a_value) < parseInt(b_value)) return -1
return 0

31
src/js/services/core/reducer.js
View File

@ -71,10 +71,17 @@ export default function reducer(core = {}, action){
var tracks = Object.assign({}, core.tracks)
if (tracks[action.key]){
var track = Object.assign({}, tracks[action.key], action.track)
}else{
} else {
var track = Object.assign({}, action.track)
}
// Standardise components
if (!track.track_number && track.track_no) track.track_number = track.track_no;
if (!track.disc_number && track.disc_no) track.disc_number = track.disc_no;
if (!track.duration && track.duration_ms) track.duration = track.duration_ms;
if (!track.duration && track.length) track.duration = track.length;
if (!track.date && track.release_date) track.date = track.release_date;
tracks[action.key] = track
return Object.assign({}, core, { tracks: tracks });
@ -129,7 +136,7 @@ export default function reducer(core = {}, action){
if (categories[action.key]){
var category = Object.assign({}, categories[action.key], action.category)
}else{
} else {
var category = Object.assign({}, action.category)
}
@ -143,7 +150,7 @@ export default function reducer(core = {}, action){
var key = 'category:'+action.categories[i].id
if (categories[key]){
var category = Object.assign({}, categories[key], action.categories[i])
}else{
} else {
var category = Object.assign({}, action.categories[i])
}
categories[key] = category
@ -180,7 +187,7 @@ export default function reducer(core = {}, action){
if (albums[action.key]){
var album = Object.assign({}, albums[action.key], action.album)
}else{
} else {
var album = Object.assign({}, action.album)
}
@ -237,7 +244,7 @@ export default function reducer(core = {}, action){
}
var artist = Object.assign({}, artists[action.key], action.artist)
}else{
} else {
var artist = Object.assign({}, action.artist)
}
@ -284,7 +291,7 @@ export default function reducer(core = {}, action){
if (users[action.key]){
var user = Object.assign({}, users[action.key], action.user)
}else{
} else {
var user = Object.assign({}, action.user)
}
@ -340,7 +347,7 @@ export default function reducer(core = {}, action){
tracks: tracks
}
)
}else{
} else {
var merged_playlist = Object.assign({}, action.playlist)
}
@ -461,7 +468,7 @@ export default function reducer(core = {}, action){
case 'LIBRARY_PLAYLISTS_LOADED':
if (core.library_playlists){
var library_playlists = [...core.library_playlists, ...action.uris]
}else{
} else {
var library_playlists = action.uris
}
@ -500,7 +507,7 @@ export default function reducer(core = {}, action){
// artists
if (core.search_results && core.search_results.artists_uris){
var artists_uris = core.search_results.artists_uris
}else{
} else {
var artists_uris = []
}
if (action.artists_uris) artists_uris = [...artists_uris, ...action.artists_uris]
@ -514,7 +521,7 @@ export default function reducer(core = {}, action){
// albums
if (core.search_results && core.search_results.albums_uris){
var albums_uris = core.search_results.albums_uris
}else{
} else {
var albums_uris = []
}
if (action.albums_uris) albums_uris = [...albums_uris, ...action.albums_uris]
@ -528,7 +535,7 @@ export default function reducer(core = {}, action){
// playlists
if (core.search_results && core.search_results.playlists_uris){
var playlists_uris = core.search_results.playlists_uris
}else{
} else {
var playlists_uris = []
}
if (action.playlists_uris) playlists_uris = [...playlists_uris, ...action.playlists_uris]
@ -542,7 +549,7 @@ export default function reducer(core = {}, action){
// tracks
if (core.search_results && core.search_results.tracks){
var tracks = core.search_results.tracks
}else{
} else {
var tracks = []
}
if (action.tracks) tracks = [...tracks, ...action.tracks]

4
src/js/services/lastfm/actions.js
View File

@ -63,7 +63,7 @@ export function getArtist(uri, artist, mbid = false){
return (dispatch, getState) => {
if (mbid){
var params = 'method=artist.getInfo&mbid='+mbid
}else{
} else {
artist = encodeURIComponent(artist );
var params = 'method=artist.getInfo&artist='+artist
}
@ -95,7 +95,7 @@ export function getAlbum(artist, album, mbid = false){
if (mbid){
var params = 'method=album.getInfo&mbid='+mbid
}else{
} else {
artist = encodeURIComponent(artist )
album = encodeURIComponent(album )
var params = 'method=album.getInfo&album='+album+'&artist='+artist

8
src/js/services/mopidy/middleware.js
View File

@ -50,7 +50,7 @@ const MopidyMiddleware = (function(){
store.dispatch(mopidyActions.getTimePosition())
// otherwise we just assume to add 1000ms every 1000ms of play time
}else{
} else {
store.dispatch(mopidyActions.setTimePosition(store.getState().mopidy.time_position + 1000 ))
}
@ -133,7 +133,7 @@ const MopidyMiddleware = (function(){
if (method in ws[model]){
var mopidyObject = ws[model][method]
var property = method;
}else{
} else {
var mopidyObject = ws[model]
var property = model;
}
@ -1178,7 +1178,7 @@ const MopidyMiddleware = (function(){
var playlist = Object.assign({}, response)
if (playlist.tracks){
playlist.tracks = [...playlist.tracks, ...tracks]
}else{
} else {
playlist.tracks = tracks
}
@ -1628,7 +1628,7 @@ const MopidyMiddleware = (function(){
if (!artist.images || artist.images.length <= 0){
if (artist.musicbrainz_id){
store.dispatch(lastfmActions.getArtist(artist.uri, false, artist.musicbrainz_id ) )
}else{
} else {
store.dispatch(lastfmActions.getArtist(artist.uri, artist.name.replace('&','and') ) )
}
}

2
src/js/services/pusher/middleware.js
View File

@ -259,7 +259,7 @@ const PusherMiddleware = (function(){
if (response.upgrade_successful){
store.dispatch(uiActions.createNotification('Upgrade complete') )
}else{
} else {
store.dispatch(uiActions.createNotification('Upgrade failed, please upgrade manually','bad') )
}

8
src/js/services/spotify/actions.js
View File

@ -703,14 +703,14 @@ export function following(uri, method = 'GET'){
case 'album':
if (method == 'GET'){
endpoint = 'me/albums/contains/?ids='+ helpers.getFromUri('albumid', uri)
}else{
} else {
endpoint = 'me/albums/?ids='+ helpers.getFromUri('albumid', uri)
}
break
case 'artist':
if (method == 'GET'){
endpoint = 'me/following/contains?type=artist&ids='+ helpers.getFromUri('artistid', uri)
}else{
} else {
endpoint = 'me/following?type=artist&ids='+ helpers.getFromUri('artistid', uri)
data = {}
}
@ -718,7 +718,7 @@ export function following(uri, method = 'GET'){
case 'user':
if (method == 'GET'){
endpoint = 'me/following/contains?type=user&ids='+ helpers.getFromUri('userid', uri)
}else{
} else {
endpoint = 'me/following?type=user&ids='+ helpers.getFromUri('userid', uri)
data = {}
}
@ -726,7 +726,7 @@ export function following(uri, method = 'GET'){
case 'playlist':
if (method == 'GET'){
endpoint = 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'/followers/contains?ids='+ getState().spotify.me.id
}else{
} else {
endpoint = 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'/followers'
}
break

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

@ -66,7 +66,7 @@ class Album extends React.Component{
case 'spotify':
if (props.album && props.album.tracks && props.album.artists_uris){
console.info('Loading album from index')
}else{
} else {
this.props.spotifyActions.getAlbum(props.params.uri );
}
break;

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

@ -60,7 +60,7 @@ class Artist extends React.Component{
case 'spotify':
if (props.artist && props.artist.albums_uris && props.artist.related_artists_uris){
console.info('Loading spotify artist from index')
}else{
} else {
this.props.spotifyActions.getArtist(props.params.uri, true);
}
break

9
src/js/views/Track.js
View File

@ -72,7 +72,7 @@ class Track extends React.Component{
case 'spotify':
if (props.track){
console.info('Loading track from index')
}else{
} else {
this.props.spotifyActions.getTrack(props.params.uri );
}
break;
@ -145,13 +145,12 @@ class Track extends React.Component{
{track.date ? <li><Dater type="date" data={track.date} /></li> : null}
{track.explicit ? <li><span className="flag dark">EXPLICIT</span></li> : null}
<li>
{track.disc_no ? <span>Disc {track.disc_no}</span> : null}
{track.disc_number ? <span>Disc {track.disc_number}</span> : null}
{track.track_no ? <span>, track {track.track_no}</span> : null}
{track.track_number ? <span>, track {track.track_number}</span> : null}
{track.disc_number && track.track_number ? <span>, </span> : null}
{track.track_number ? <span>Track {track.track_number}</span> : null}
</li>
<li>
{track.duration_ms ? <Dater type="length" data={track.duration_ms} /> : null}
{track.duration ? <Dater type="length" data={track.duration} /> : null}
{track.length ? <Dater type="length" data={track.length} /> : null}
</li>
</ul>

2
src/js/views/library/LibraryAlbums.js
View File

@ -173,7 +173,7 @@ class LibraryAlbums extends React.Component{
}
</div>
)
}else{
} else {
return (
<AlbumGrid
handleContextMenu={(e,item) => this.handleContextMenu(e,item)}

2
src/js/views/library/LibraryArtists.js
View File

@ -111,7 +111,7 @@ class LibraryArtists extends React.Component{
link_prefix={global.baseURL+"artist/"} />
</section>
)
}else{
} else {
return (
<section className="content-wrapper">
<ArtistGrid

2
src/js/views/library/LibraryPlaylists.js
View File

@ -163,7 +163,7 @@ class LibraryPlaylists extends React.Component{
link_prefix={global.baseURL+"playlist/"} />
</section>
)
}else{
} else {
return (
<section className="content-wrapper">
<PlaylistGrid

9
src/scss/components/_tooltip.scss
View File

@ -10,7 +10,7 @@
background: $overlay_dark;
display: block;
max-width: 200px;
padding: 5px;
padding: 5px 8px;
color: $white;
font-size: 11px;
line-height: 11px;
@ -18,8 +18,13 @@
left: 1px;
z-index: 97;
border-radius: 3px;
white-space: nowrap;
&::before {
&:first-letter {
text-transform: uppercase;
}
&:after {
content: '';
display: block;
width: 6px;

5
src/scss/views/_track.scss
View File

@ -12,6 +12,11 @@ main .track-view {
.details {
padding: 25px 0 30px;
.flag {
margin-left: 0;
margin-right: 0;
}
}
}