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

Adds back support of oga and m4a

Browse source 
- Fixes the various remaining calls to $rootScope.queue. They now use the player service.
- main-controller.js watches the player's queue and shows the queue on change (if the global setting is true)
- Fixes the animation of the scrubber width. It is now done in the player directive.
This commit is contained in:
Hyzual 2015-01-11 20:17:13 +01:00
parent 95c791fa40
commit 09fb66f2fe
6 changed files with 97 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

41
app/common/main-controller_test.js
View file

@ -1,18 +1,25 @@
describe("Main controller", function() {
'use strict';
var scope, $rootScope, utils, globals, notifications, player, locker;
var scope, mockGlobals, player, utils;
beforeEach(function() {
module('JamStash');
mockGlobals = {
settings: {
ShowQueue: false,
Debug: true
}
};
inject(function ($controller, _$rootScope_, _$document_, _$window_, _$location_, _$cookieStore_, _utils_, _globals_, _model_, _notifications_, _player_, _locker_) {
$rootScope = _$rootScope_;
module('JamStash', function($provide) {
$provide.value('globals', mockGlobals);
});
inject(function ($controller, $rootScope, _$document_, _$window_, _$location_, _$cookieStore_, _utils_, globals, _model_, _notifications_, _player_, _locker_, _Page_) {
scope = $rootScope.$new();
utils = _utils_;
globals = _globals_;
notifications = _notifications_;
player = _player_;
locker = _locker_;
utils = _utils_;
spyOn(utils, "switchTheme");
$controller('AppController', {
$scope: scope,
@ -24,11 +31,13 @@ describe("Main controller", function() {
utils: utils,
globals: globals,
model: _model_,
notifications: notifications,
notifications: _notifications_,
player: player,
locker: locker
locker: _locker_,
Page: _Page_
});
});
player.queue = [];
});
xdescribe("updateFavorite -", function() {
@ -57,4 +66,16 @@ describe("Main controller", function() {
xdescribe("toggleSetting -", function() {
});
it("given that the global setting 'ShowQueue' is true, when the playing queue's length changes and is not empty, it shows the queue", function() {
mockGlobals.settings.ShowQueue = true;
player.queue = [{
id: 684
}];
spyOn(scope, "showQueue");
scope.$apply();
expect(scope.showQueue).toHaveBeenCalled();
});
});