yetangitu/Jamstash
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes the communication between the player directive and the player service

Browse source 
- Adds a "playEnded()" function specifically for jplayer to call when the currently playing song ends. It uses $rootScope.$apply() to notify the directive that the song has changed.
- Shows the player controls' css.
- Marks the tests relating the "playing" status of the song as pending.
- Further uses the Player service in the subsonic view
This commit is contained in:
Hyzual 2014-12-20 16:39:56 +01:00
parent f6d2286456
commit 19661f463b
10 changed files with 125 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/common/main-controller.js
View file

@ -442,6 +442,7 @@
};
function loadTrackPosition() {
//TODO: HYZ: Unit test
if (utils.browserStorageCheck()) {
// Load Saved Song
var song = angular.fromJson(localStorage.getItem('CurrentSong'));
@ -450,11 +451,11 @@
// Load Saved Queue
var items = angular.fromJson(localStorage.getItem('CurrentQueue'));
if (items) {
$rootScope.queue = items;
if ($rootScope.queue.length > 0) {
notifications.updateMessage($rootScope.queue.length + ' Saved Song(s)', true);
player.queue = items;
if (player.queue.length > 0) {
notifications.updateMessage(player.queue.length + ' Saved Song(s)', true);
}
if (globals.settings.Debug) { console.log('Play Queue Loaded From localStorage: ' + $rootScope.queue.length + ' song(s)'); }
if (globals.settings.Debug) { console.log('Play Queue Loaded From localStorage: ' + player.queue.length + ' song(s)'); }
}
}
} else {
@ -474,7 +475,7 @@
//$scope.ping();
if (globals.settings.SaveTrackPosition) {
loadTrackPosition();
//FIXME: player.startSaveTrackPosition();
//FIXME: HYZ: player.startSaveTrackPosition();
}
}
/* End Startup */