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

Rename the previously changed subsonic controller, service and related tests.

Browse source 
In order to better follow the google naming convention.

See https://docs.google.com/document/d/1XXMvReO8-Awi1EZXAXS4PzDzdNvV6pGcuaF4Q9821Es/pub
This commit is contained in:
Hyzual 2014-10-29 00:13:23 +01:00
parent f57b969e55
commit a2747a633d
7 changed files with 67 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.html
View file

@ -32,6 +32,8 @@
<script src="bower_components/jplayer/jquery.jplayer/jquery.jplayer.js" type="text/javascript"></script>
<script src="bower_components/notify.js/notify.js" type="text/javascript"></script>
<script src="js/app.js" type="text/javascript"></script>
<script src="js/services/globals-service.js" type="text/javascript"></script>
<script src="js/services/model-service.js" type="text/javascript"></script>
<script src="js/service.js" type="text/javascript"></script>
<script src="js/utils.js" type="text/javascript"></script>
<script src="js/controllers/main.js" type="text/javascript"></script>

7
js/controllers/subsonicCtrl.js → js/controllers/subsonic-controller.js
View file

@ -1,6 +1,9 @@
JamStash.controller('SubsonicCtrl',
'use strict';
var Jamstash = angular.module('JamStash');
Jamstash.controller('SubsonicCtrl',
function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, $http, utils, globals, model, map, subsonic, notifications) {
'use strict';
$scope.settings = globals.settings;
$scope.itemType = 'ss';

79
js/service.js
View file

@ -1,81 +1,4 @@
JamStash.service('model', function () {
// Figure out how to move this, circular dependency with utils
secondsToTime = function (secs) {
// secs = 4729
var times = new Array(3600, 60, 1);
var time = '';
var tmp;
for (var i = 0; i < times.length; i++) {
tmp = Math.floor(secs / times[i]);
// 0: 4729/3600 = 1
// 1: 1129/60 = 18
// 2: 49/1 = 49
if (tmp < 1) {
tmp = '00';
}
else if (tmp < 10) {
tmp = '0' + tmp;
}
if (i === 0 && tmp == '00') {
} else {
time += tmp;
if (i < 2) {
time += ':';
}
}
secs = secs % times[i];
}
return time;
};
this.Index = function (name, artist) {
this.name = name;
this.artist = artist;
};
this.Artist = function (id, name) {
this.id = id;
this.name = name;
};
this.Album = function (id, parentid, name, artist, artistId, coverartthumb, coverartfull, date, starred, description, url, type) {
this.id = id;
this.parentid = parentid;
this.name = name;
this.artist = artist;
this.artistId = artistId;
this.coverartthumb = coverartthumb;
this.coverartfull = coverartfull;
this.date = date;
this.starred = starred;
this.description = description;
this.url = url;
this.type = type;
};
this.Song = function (id, parentid, track, name, artist, artistId, album, albumId, coverartthumb, coverartfull, duration, rating, starred, suffix, specs, url, position, description) {
this.id = id;
this.parentid = parentid;
this.track = track;
this.name = name;
this.artist = artist;
this.artistId = artistId;
this.album = album;
this.albumId = albumId;
this.coverartthumb = coverartthumb;
this.coverartfull = coverartfull;
this.duration = duration;
this.time = duration === '' ? '00:00' : secondsToTime(duration);
this.rating = rating;
this.starred = starred;
this.suffix = suffix;
this.specs = specs;
this.url = url;
this.position = position;
this.selected = false;
this.playing = false;
this.description = description;
this.displayName = this.name + " - " + this.album + " - " + this.artist;
};
});
JamStash.service('notifications', function ($rootScope, globals) {
JamStash.service('notifications', function ($rootScope, globals) {
var msgIndex = 1;
this.updateMessage = function (msg, autohide) {
if (msg != '') {

52
js/services/model-service.js Normal file
View file

@ -0,0 +1,52 @@
'use strict';
var jamstash = angular.module('JamStash');
jamstash.service('model', function (utils) {
this.Index = function (name, artist) {
this.name = name;
this.artist = artist;
};
this.Artist = function (id, name) {
this.id = id;
this.name = name;
};
this.Album = function (id, parentid, name, artist, artistId, coverartthumb, coverartfull, date, starred, description, url, type) {
this.id = id;
this.parentid = parentid;
this.name = name;
this.artist = artist;
this.artistId = artistId;
this.coverartthumb = coverartthumb;
this.coverartfull = coverartfull;
this.date = date;
this.starred = starred;
this.description = description;
this.url = url;
this.type = type;
};
this.Song = function (id, parentid, track, name, artist, artistId, album, albumId, coverartthumb, coverartfull, duration, rating, starred, suffix, specs, url, position, description) {
this.id = id;
this.parentid = parentid;
this.track = track;
this.name = name;
this.artist = artist;
this.artistId = artistId;
this.album = album;
this.albumId = albumId;
this.coverartthumb = coverartthumb;
this.coverartfull = coverartfull;
this.duration = duration;
this.time = duration === '' ? '00:00' : utils.secondsToTime(duration);
this.rating = rating;
this.starred = starred;
this.suffix = suffix;
this.specs = specs;
this.url = url;
this.position = position;
this.selected = false;
this.playing = false;
this.description = description;
this.displayName = this.name + " - " + this.album + " - " + this.artist;
};
});

0
js/services/subsonicService.js → js/services/subsonic-service.js
View file

0
test/controllers/subsonicCtrl_test.js → test/controllers/subsonic-controller_test.js
View file

8
test/services/subsonicService_test.js → test/services/subsonic-service.js
View file

@ -1,9 +1,15 @@
describe("subsonicService", function() {
'use strict';
/*
var Subsonic;
beforeEach(module('JamStash'));
beforeEach(inject(function (subsonic) {
Subsonic = subsonic;
}));
it("should exist", inject(function(subsonic) {
expect(subsonic).toBeDefined();
}));
*/
});