PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2025-02-16 18:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

#4: Fixed an error in the cache polling callback.

Browse source
This commit is contained in:
Peter Deltchev 2015-11-09 22:29:02 -08:00
parent c28c887e29
commit 2d93ed0ef4
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Commands/UploadTrackCommand.php
View file

@ -136,6 +136,7 @@ class UploadTrackCommand extends CommandBase
$trackFile = new TrackFile();
$trackFile->is_master = $name === 'FLAC' ? true : false;
$trackFile->format = $name;
if (in_array($name, Track::$CacheableFormats) && $trackFile->is_master == false) {
$trackFile->is_cacheable = true;
} else {

6
resources/assets/scripts/app/controllers/album.coffee
View file

@ -49,7 +49,11 @@ angular.module('ponyfm').controller "album", [
if $scope.albumUrl == 'error'
$scope.isInProgress = false
else if $scope.albumUrl == 'pending'
$timeout $scope.getCachedAlbum(id, format), 5000
# $timeout takes a callback function
# https://stackoverflow.com/a/23391203/3225811
$timeout(
$scope.getCachedAlbum(id, format)
, 5000)
else
$scope.isInProgress = false
$window.open $scope.albumUrl

6
resources/assets/scripts/app/controllers/playlist.coffee
View file

@ -43,7 +43,11 @@ angular.module('ponyfm').controller 'playlist', [
if $scope.playlistUrl == 'error'
$scope.isInProgress = false
else if $scope.playlistUrl == 'pending'
$timeout $scope.getCachedPlaylist(id, format), 5000
# $timeout takes a callback function
# https://stackoverflow.com/a/23391203/3225811
$timeout(
() ->$scope.getCachedPlaylist(id, format)
, 5000)
else
$scope.isInProgress = false
$window.open $scope.playlistUrl

8
resources/assets/scripts/app/controllers/track.coffee
View file

@ -81,8 +81,12 @@ angular.module('ponyfm').controller "track", [
if $scope.trackUrl == 'error'
$scope.isInProgress = false
else if $scope.trackUrl == 'pending'
$timeout $scope.getCachedTrack(id, format), 5000
# $timeout takes a callback function
# https://stackoverflow.com/a/23391203/3225811
$timeout(
()-> $scope.getCachedTrack(id, format)
, 5000)
else
$scope.isInProgress = false
$window.location = $scope.trackUrl#, '_blank'
$window.location = $scope.trackUrl
]