Bunch of stuff, mostly moving player to it's own file and adding a progress bar
This commit is contained in:
parent
fd1d0e7f55
commit
558b498ded
6 changed files with 239 additions and 169 deletions
|
@ -96,7 +96,6 @@ function QueueListCtrl($scope, $rootScope, pageSwitcher, feedItems, feeds, downl
|
|||
$scope.queue = queueList.getQueueList();
|
||||
|
||||
$scope.$on('queueListRefresh', function(event) {
|
||||
console.log('rebuilding');
|
||||
$rootScope.$apply(queueList.rebuildList());
|
||||
});
|
||||
|
||||
|
@ -161,7 +160,7 @@ function TopBarCtrl($scope, player, pageSwitcher)
|
|||
};
|
||||
|
||||
$scope.$on('playItem', function(event, feedItem) {
|
||||
player.play(feedItem, $scope);
|
||||
player.play(feedItem);
|
||||
});
|
||||
|
||||
$scope.currentInfo = function() {
|
||||
|
@ -188,7 +187,21 @@ function TopBarCtrl($scope, player, pageSwitcher)
|
|||
return !!pageSwitcher.backPage;
|
||||
};
|
||||
|
||||
$scope.jumpAudio = function(distance) {
|
||||
var lastForwardJump = 0,
|
||||
forwardJumpCount = 1;
|
||||
|
||||
$scope.jumpAudioForward = function() {
|
||||
var distance = 5;
|
||||
if (lastForwardJump > new Date().getTime() - 2000) {
|
||||
distance = forwardJumpCount * distance;
|
||||
forwardJumpCount++;
|
||||
} else {
|
||||
forwardJumpCount = 0;
|
||||
}
|
||||
|
||||
player.jumpAudio(distance);
|
||||
};
|
||||
$scope.jumpAudioBack = function(distance) {
|
||||
player.jumpAudio(distance);
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue