Removes duplicate "globals" service and adds it into its own globals-service.js file.
Adds unit tests for the two functions BaseURL and BaseParams Conflicts: js/service.js
This commit is contained in:
parent
d6104aa573
commit
f57b969e55
4 changed files with 88 additions and 99 deletions
38
js/app.js
38
js/app.js
|
@ -2,44 +2,6 @@
|
|||
var JamStash = angular.module('JamStash', ['ngCookies', 'ngRoute', 'ngSanitize']);
|
||||
//var JamStash = angular.module('JamStash', ['ngCookies', 'ngRoute']);
|
||||
|
||||
JamStash.service('globals', function (utils) {
|
||||
this.settings = {
|
||||
// Subsonic
|
||||
/* Demo Server
|
||||
Username: "android-guest"),
|
||||
Password: "guest"),
|
||||
Server: "http://subsonic.org/demo"),
|
||||
*/
|
||||
Url: "http://beta.jamstash.com/#/archive/",
|
||||
Username: "",
|
||||
Password: "",
|
||||
Server: "",
|
||||
Timeout: 10000,
|
||||
Protocol: "jsonp",
|
||||
ApplicationName: "Jamstash",
|
||||
ApiVersion: "1.6.0",
|
||||
AutoPlaylists: "",
|
||||
AutoPlaylistSize: 25,
|
||||
AutoAlbumSize: 15,
|
||||
// General
|
||||
HideAZ: false,
|
||||
ScrollTitle: true,
|
||||
NotificationSong: true,
|
||||
NotificationNowPlaying: false,
|
||||
SaveTrackPosition: false,
|
||||
ForceFlash: false,
|
||||
Theme: "Default",
|
||||
DefaultLibraryLayout: "grid",
|
||||
AutoPlay: false,
|
||||
LoopQueue: false,
|
||||
Repeat: false,
|
||||
Debug: false
|
||||
};
|
||||
this.DefaultCollection = [];
|
||||
this.SavedGenres = [];
|
||||
this.BaseURL = function () { return this.settings.Server + '/rest'; };
|
||||
this.BaseParams = function () { return 'u=' + this.settings.Username + '&p=' + this.settings.Password + '&f=' + this.settings.Protocol + '&v=' + this.settings.ApiVersion + '&c=' + this.settings.ApplicationName; };
|
||||
});
|
||||
/*
|
||||
JamStash.config(function ($sceDelegateProvider) {
|
||||
$sceDelegateProvider.resourceUrlWhitelist(['/^\s*(https?|file|ms-appx):/', 'self']);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue