PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-22 04:58:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Repeat playlists

Browse source
This commit is contained in:
Josef Citrine 2016-05-16 21:43:55 +01:00
parent 2d1e7448f1
commit 9f01a0cbc5
4 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/templates/directives/player.html
View file

@ -12,7 +12,7 @@
</a>
</li>
<li ng-class="{disabled: !player.canGoNext}"><a pfm-eat-click ng-click="playNext()" class="next" href="#"><i class="icon-fast-forward"></i></a></li>
<li><a ng-class="{active: player.repeatOnce}" pfm-eat-click ng-click="toggleRepeat()" class="repeat" href="#"><i class="icon-repeat"></i></a></li>
<li><a ng-class="{active: player.repeatState != 0}" pfm-eat-click ng-click="toggleRepeat()" class="repeat" href="#"><i class="icon-repeat"></i><span>{{ repeatText }}</span></a></li>
<li class="volume">
<a pfm-eat-click ng-click="" class="volume" href="#">
<i class="icon-volume-up"></i>

6
resources/assets/scripts/app/directives/player.coffee
View file

@ -30,6 +30,7 @@ module.exports = angular.module('ponyfm').directive 'pfmPlayer', () ->
($scope, player, auth) ->
$scope.player = player
$scope.auth = auth.data
$scope.repeatText = ''
$scope.playPause = () ->
$scope.player.playPause()
@ -42,6 +43,11 @@ module.exports = angular.module('ponyfm').directive 'pfmPlayer', () ->
$scope.toggleRepeat = () ->
$scope.player.toggleRepeat()
if $scope.player.repeatState == 2
$scope.repeatText = '1'
else
$scope.repeatText = ''
$scope.seek = (e) ->
$transport = $ '.transport'
percent = ((e.pageX - $transport.offset().left) / $transport.width())

27
resources/assets/scripts/app/services/player.coffee
View file

@ -44,7 +44,10 @@ module.exports = angular.module('ponyfm').factory('player', [
track.progress = (self.currentSound.position / (track.duration * 1000)) * 100
onfinish: () -> $rootScope.safeApply ->
if self.repeatOnce
if self.repeatState == 2
# Track repeat
# Playlist repeat is handled
# in self.playNext()
self.currentSound.play()
else
track.isPlaying = false
@ -82,7 +85,7 @@ module.exports = angular.module('ponyfm').factory('player', [
readyDef: readyDef.promise()
canGoPrev: false
canGoNext: false
repeatOnce: false
repeatState: 0
playPause: () ->
return if !self.ready
@ -94,16 +97,19 @@ module.exports = angular.module('ponyfm').factory('player', [
self.currentSound.pause()
playNext: () ->
return if !self.canGoNext
return if !self.canGoNext && self.repeatState != 1
self.currentSound.stop() if self.currentSound != null
self.playlistIndex++
if self.playlistIndex >= self.playlist.length
self.playlist.length = 0
self.currentTrack = null
self.currentSong = null
self.isPlaying = false
return
if self.repeatState != 1
self.playlist.length = 0
self.currentTrack = null
self.currentSong = null
self.isPlaying = false
return
else
self.playlistIndex = 0
play self.playlist[self.playlistIndex]
updateCanGo()
@ -125,7 +131,10 @@ module.exports = angular.module('ponyfm').factory('player', [
updateCanGo()
toggleRepeat: () ->
self.repeatOnce = !self.repeatOnce
if self.repeatState >= 2
self.repeatState = 0
else
self.repeatState++
seek: (progress) ->
return if !self.currentSound

4
resources/assets/styles/components/player.less vendored
View file

@ -167,9 +167,9 @@ body.is-logged {
}
}
> a.active {
> a.repeat.active {
text-decoration: none;
background: darken(#eee, 10%);
background: darken(#eee, 5%);
color: #000;
}