Merge conflict; Removing loader

This commit is contained in:
James Barnsley
2018-04-10 20:16:00 +12:00
4 changed files with 11 additions and 2 deletions

View File

@ -53,10 +53,12 @@ const PusherMiddleware = (function(){
// Broadcast of an error
if (message.error !== undefined){
store.dispatch(coreActions.handleException(
'Pusher: '+message.error.message,
message
));
} else {
switch (message.method){
@ -90,6 +92,9 @@ const PusherMiddleware = (function(){
case 'radio_stopped':
store.dispatch(pusherActions.radioStopped());
break;
case 'restart':
window.location.reload(true);
break;
}
}
}