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

Standardizing bracket syntax

Browse Source
This commit is contained in:
James Barnsley
2017-10-10 13:05:28 +13:00
parent 0ca37b0f62
commit 2ffa337ffa
116 changed files with 7451 additions and 3246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,8 +10,8 @@ var helpers = require('../../helpers')
* @param getState obj
* @param endpoint params = the url params to send
**/
const sendRequest = ( dispatch, getState, params ) => {
return new Promise( (resolve, reject) => {
const sendRequest = (dispatch, getState, params ) => {
return new Promise((resolve, reject) => {
var loader_key = helpers.generateGuid()
dispatch(uiActions.startLoading(loader_key, 'lastfm_'+params))
@ -23,7 +23,7 @@ const sendRequest = ( dispatch, getState, params ) => {
url: '//ws.audioscrobbler.com/2.0/?format=json&api_key=4320a3ef51c9b3d69de552ac083c55e3&'+params
}
$.ajax(config).then(
$.ajax(config).then(
response => {
dispatch(uiActions.stopLoading(loader_key))
resolve(response)
@ -59,18 +59,18 @@ export function connect(){
}
}
export function getArtist( uri, artist, mbid = false ){
export function getArtist(uri, artist, mbid = false){
return (dispatch, getState) => {
if( mbid ){
if (mbid){
var params = 'method=artist.getInfo&mbid='+mbid
}else{
artist = encodeURIComponent( artist );
artist = encodeURIComponent(artist );
var params = 'method=artist.getInfo&artist='+artist
}
sendRequest(dispatch, getState, params)
.then(
response => {
if( response.artist ){
if (response.artist){
dispatch({
type: 'ARTIST_LOADED',
key: uri,
@ -88,22 +88,22 @@ export function getArtist( uri, artist, mbid = false ){
}
}
export function getAlbum( artist, album, mbid = false ){
export function getAlbum(artist, album, mbid = false){
return (dispatch, getState) => {
dispatch({ type: 'LASTFM_ALBUM_LOADED', data: false });
if( mbid ){
if (mbid){
var params = 'method=album.getInfo&mbid='+mbid
}else{
artist = encodeURIComponent( artist )
album = encodeURIComponent( album )
artist = encodeURIComponent(artist )
album = encodeURIComponent(album )
var params = 'method=album.getInfo&album='+album+'&artist='+artist
}
sendRequest(dispatch, getState, params)
.then(
response => {
if( response.album ){
if (response.album){
dispatch({
type: 'LASTFM_ALBUM_LOADED',
data: response.album
@ -114,16 +114,16 @@ export function getAlbum( artist, album, mbid = false ){
}
}
export function getTrack( artist, track ){
export function getTrack(artist, track){
return (dispatch, getState) => {
dispatch({ type: 'LASTFM_TRACK_LOADED', data: false });
artist = encodeURIComponent( artist );
artist = encodeURIComponent(artist );
sendRequest(dispatch, getState, 'method=track.getInfo&track='+track+'&artist='+artist)
.then(
response => {
if( response.track ){
if (response.track){
dispatch({
type: 'LASTFM_TRACK_LOADED',
data: response.track

2
src/js/services/lastfm/reducer.js
View File

@ -1,6 +1,6 @@
export default function reducer(lastfm = {}, action){
switch (action.type) {
switch (action.type){
case 'LASTFM_CONNECT':
case 'LASTFM_CONNECTING':