5d385149f3
- Added a new SelectedSongs service. Its purpose is to store an array of selected songs and all behaviour associated with it : adding songs to it, removing them, toggling a song, etc. It also changes each song's selected property. - Removed selectAll, selectNone, playAll, playFrom, addSongsToQueue and selectSong from main-controller.js. Those are now defined either in queue.js, subsonic.js or archive.js, depending on where they are used. I know it does add some duplication between archive.js and subsonic.js, but this will be addressed in a later commit (maybe by creating a shared service). - Refactored subsonic-service.js' addToPlaylist() and split it between subsonic-service.js and subsonic.js (like all the other playlist-related functions). - Moved subsonic-service.js' songsRemoveSelected() to subsonic.js since it only removes songs from the scope. - Removed $rootScope and utils (unused dependencies) from subsonic-service.js
72 lines
2.1 KiB
JavaScript
72 lines
2.1 KiB
JavaScript
/**
|
|
* jamstash.queue.controller Module
|
|
*
|
|
* Manages the playing queue. Gives access to the player service's queue-related functions,
|
|
* like adding, removing and shuffling the queue.
|
|
*/
|
|
angular.module('jamstash.queue.controller', ['jamstash.player.service', 'jamstash.settings.service', 'jamstash.selectedsongs'])
|
|
|
|
.controller('QueueController', ['$scope', 'globals', 'player', 'SelectedSongs',
|
|
function ($scope, globals, player, SelectedSongs) {
|
|
'use strict';
|
|
$scope.settings = globals.settings;
|
|
$scope.player = player;
|
|
|
|
$scope.playSong = function (song) {
|
|
player.play(song);
|
|
};
|
|
|
|
$scope.emptyQueue = function () {
|
|
player.emptyQueue();
|
|
//TODO: Hyz: Shouldn't it be in a directive ?
|
|
$.fancybox.close();
|
|
};
|
|
|
|
$scope.shuffleQueue = function () {
|
|
player.shuffleQueue();
|
|
//TODO: Hyz: Shouldn't it be in a directive ?
|
|
$('#SideBar').stop().scrollTo('.header', 400);
|
|
};
|
|
|
|
$scope.addSongToQueue = function (song) {
|
|
player.addSong(song);
|
|
};
|
|
|
|
$scope.removeSongFromQueue = function (song) {
|
|
player.removeSong(song);
|
|
};
|
|
|
|
$scope.removeSelectedSongsFromQueue = function () {
|
|
player.removeSongs(SelectedSongs.get());
|
|
};
|
|
|
|
$scope.isPlayingSong = function (song) {
|
|
return angular.equals(song, player.getPlayingSong());
|
|
};
|
|
|
|
$scope.$watch(function () {
|
|
return player.getPlayingSong();
|
|
}, function (newSong) {
|
|
if(newSong !== undefined) {
|
|
//TODO: Hyz: Shouldn't it be in a directive ?
|
|
$('#SideBar').stop().scrollTo('.song.id' + newSong.id, 400);
|
|
}
|
|
});
|
|
|
|
/**
|
|
* Change the queue's order through jQuery UI's sortable
|
|
*/
|
|
$scope.dragStart = function (e, ui) {
|
|
ui.item.data('start', ui.item.index());
|
|
};
|
|
|
|
$scope.dragEnd = function (e, ui) {
|
|
var start = ui.item.data('start'),
|
|
end = ui.item.index();
|
|
player.queue.splice(end, 0, player.queue.splice(start, 1)[0]);
|
|
};
|
|
|
|
$scope.toggleSelection = function (song) {
|
|
SelectedSongs.toggle(song);
|
|
};
|
|
}]);
|