js-beautify all the controllers, services and directives (and jshint)
This commit is contained in:
Emory P
parent
95f7ef53f2
commit
bb7d018de4
23 changed files with 2533 additions and 3446 deletions
380
js/service.js
380
js/service.js
|
|
@ -1,6 +1,6 @@
|
|||
JamStash.service('model', function () {
|
||||
JamStash.service('model', function() {
|
||||
// Figure out how to move this, circular dependency with utils
|
||||
secondsToTime = function (secs) {
|
||||
secondsToTime = function(secs) {
|
||||
// secs = 4729
|
||||
var times = new Array(3600, 60, 1);
|
||||
var time = '';
|
||||
|
|
@ -12,12 +12,10 @@
|
|||
// 2: 49/1 = 49
|
||||
if (tmp < 1) {
|
||||
tmp = '00';
|
||||
}
|
||||
else if (tmp < 10) {
|
||||
} else if (tmp < 10) {
|
||||
tmp = '0' + tmp;
|
||||
}
|
||||
if (i == 0 && tmp == '00') {
|
||||
} else {
|
||||
if (i === 0 && tmp == '00') {} else {
|
||||
time += tmp;
|
||||
if (i < 2) {
|
||||
time += ':';
|
||||
|
|
@ -26,16 +24,19 @@
|
|||
secs = secs % times[i];
|
||||
}
|
||||
return time;
|
||||
}
|
||||
this.Index = function (name, artist) {
|
||||
};
|
||||
|
||||
this.Index = function(name, artist) {
|
||||
this.name = name;
|
||||
this.artist = artist;
|
||||
}
|
||||
this.Artist = function (id, name) {
|
||||
};
|
||||
|
||||
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.Album = function(id, parentid, name, artist, artistId, coverartthumb, coverartfull, date, starred, description, url, type) {
|
||||
this.id = id;
|
||||
this.parentid = parentid;
|
||||
this.name = name;
|
||||
|
|
@ -48,8 +49,9 @@
|
|||
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.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;
|
||||
|
|
@ -61,7 +63,7 @@
|
|||
this.coverartthumb = coverartthumb;
|
||||
this.coverartfull = coverartfull;
|
||||
this.duration = duration;
|
||||
this.time = duration == '' ? '00:00' : secondsToTime(duration);
|
||||
this.time = duration === '' ? '00:00' : secondsToTime(duration);
|
||||
this.rating = rating;
|
||||
this.starred = starred;
|
||||
this.suffix = suffix;
|
||||
|
|
@ -72,33 +74,50 @@
|
|||
this.playing = false;
|
||||
this.description = description;
|
||||
this.displayName = this.name + " - " + this.album + " - " + this.artist;
|
||||
}
|
||||
};
|
||||
|
||||
});
|
||||
|
||||
JamStash.service('globals', function () {
|
||||
this.SearchTypes = [
|
||||
{ id: "song", name: "Song" },
|
||||
{ id: "album", name: "Album" },
|
||||
{ id: "artist", name: "Artist" },
|
||||
];
|
||||
this.Layouts = [
|
||||
{ id: "grid", name: "Grid" },
|
||||
{ id: "list", name: "List" }
|
||||
];
|
||||
this.AlbumSorts = [
|
||||
{ id: "default", name: "Default Sort" },
|
||||
{ id: "artist", name: "Artist" },
|
||||
{ id: "album", name: "Album" },
|
||||
{ id: "track", name: "Track" },
|
||||
{ id: "createdate desc", name: "Date Added" },
|
||||
];
|
||||
JamStash.service('globals', function() {
|
||||
|
||||
this.SearchTypes = [{
|
||||
id: "song",
|
||||
name: "Song"
|
||||
}, {
|
||||
id: "album",
|
||||
name: "Album"
|
||||
}, {
|
||||
id: "artist",
|
||||
name: "Artist"
|
||||
}, ];
|
||||
|
||||
this.Layouts = [{
|
||||
id: "grid",
|
||||
name: "Grid"
|
||||
}, {
|
||||
id: "list",
|
||||
name: "List"
|
||||
}];
|
||||
|
||||
this.AlbumSorts = [{
|
||||
id: "default",
|
||||
name: "Default Sort"
|
||||
}, {
|
||||
id: "artist",
|
||||
name: "Artist"
|
||||
}, {
|
||||
id: "album",
|
||||
name: "Album"
|
||||
}, {
|
||||
id: "track",
|
||||
name: "Track"
|
||||
}, {
|
||||
id: "createdate desc",
|
||||
name: "Date Added"
|
||||
}, ];
|
||||
|
||||
this.settings = {
|
||||
// Subsonic
|
||||
/* Demo Server
|
||||
Username: "android-guest"),
|
||||
Password: "guest"),
|
||||
Server: "http://subsonic.org/demo"),
|
||||
*/
|
||||
Url: "http://Jamstash.com/beta/#/archive/",
|
||||
Username: "",
|
||||
Password: "",
|
||||
|
|
@ -127,21 +146,28 @@ JamStash.service('globals', function () {
|
|||
Repeat: false,
|
||||
Debug: false
|
||||
};
|
||||
|
||||
this.SavedCollections = [];
|
||||
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; };
|
||||
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;
|
||||
};
|
||||
});
|
||||
|
||||
// Directives
|
||||
JamStash.directive('layout', function () {
|
||||
JamStash.directive('layout', function() {
|
||||
return {
|
||||
|
||||
link: function (scope, elm, attrs) {
|
||||
link: function(scope, elm, attrs) {
|
||||
|
||||
var pageLayoutOptions = {
|
||||
name: 'pageLayout', // only for debugging
|
||||
resizeWithWindowDelay: 250, // delay calling resizeAll when window is *still* resizing
|
||||
resizeWithWindowDelay: 250, // delay calling resizeAll when window is *still* resizing
|
||||
//, resizeWithWindowMaxDelay: 2000 // force resize every XX ms while window is being resized
|
||||
//center__children: {},
|
||||
//north__paneSelector: "#container",
|
||||
|
|
@ -157,16 +183,16 @@ JamStash.directive('layout', function () {
|
|||
};
|
||||
|
||||
var layoutThreeCol = {
|
||||
east__size: .42,
|
||||
east__size: 0.42,
|
||||
east__minSize: 400,
|
||||
east__maxSize: .5, // 50% of layout width
|
||||
east__maxSize: 0.5, // 50% of layout width
|
||||
east__initClosed: false,
|
||||
east__initHidden: false,
|
||||
//center__size: 'auto',
|
||||
center__minWidth: .38,
|
||||
center__minWidth: 0.38,
|
||||
center__initClosed: false,
|
||||
center__initHidden: false,
|
||||
west__size: .2,
|
||||
west__size: 0.2,
|
||||
west__minSize: 200,
|
||||
west__initClosed: false,
|
||||
west__initHidden: false,
|
||||
|
|
@ -176,12 +202,12 @@ JamStash.directive('layout', function () {
|
|||
};
|
||||
|
||||
var layoutTwoCol = {
|
||||
center__size: .8,
|
||||
center__size: 0.8,
|
||||
center__minSize: 400,
|
||||
center__maxSize: .5, // 50% of layout width
|
||||
center__maxSize: 0.5, // 50% of layout width
|
||||
center__initClosed: false,
|
||||
center__initHidden: false,
|
||||
west__size: .2,
|
||||
west__size: 0.2,
|
||||
west__minSize: 200,
|
||||
west__initClosed: false,
|
||||
west__initHidden: false,
|
||||
|
|
@ -190,17 +216,20 @@ JamStash.directive('layout', function () {
|
|||
//applyDefaultStyles: true
|
||||
};
|
||||
|
||||
scope.$watch(attrs.state, function (state) {
|
||||
scope.$watch(attrs.state, function(state) {
|
||||
var layout;
|
||||
|
||||
if (state == 1) {
|
||||
var layout = elm.layout(pageLayoutOptions);
|
||||
layout = elm.layout(pageLayoutOptions);
|
||||
}
|
||||
|
||||
if (state == 2) {
|
||||
var layout = elm.layout(layoutTwoCol);
|
||||
layout = elm.layout(layoutTwoCol);
|
||||
//scope.layout.sizePane('east', 120);
|
||||
//scope.layout.show('west');
|
||||
//scope.layout.show('south');
|
||||
} else if (state == 3) {
|
||||
var layout = elm.layout(layoutThreeCol);
|
||||
layout = elm.layout(layoutThreeCol);
|
||||
//scope.layout.sizePane('east', 60);
|
||||
//scope.layout.hide('west');
|
||||
//scope.layout.hide('south');
|
||||
|
|
@ -210,9 +239,10 @@ JamStash.directive('layout', function () {
|
|||
}
|
||||
};
|
||||
});
|
||||
JamStash.directive('sortable', function () {
|
||||
|
||||
JamStash.directive('sortable', function() {
|
||||
return {
|
||||
link: function (scope, elm, attrs) {
|
||||
link: function(scope, elm, attrs) {
|
||||
elm.sortable({
|
||||
start: scope.dragStart,
|
||||
update: scope.dragEnd
|
||||
|
|
@ -221,69 +251,38 @@ JamStash.directive('sortable', function () {
|
|||
}
|
||||
};
|
||||
});
|
||||
JamStash.directive('split', function () {
|
||||
|
||||
JamStash.directive('split', function() {
|
||||
return {
|
||||
|
||||
link: function (scope, elm, attrs) {
|
||||
link: function(scope, elm, attrs) {
|
||||
elm.splitPane();
|
||||
/*
|
||||
//elm.first().resizable({
|
||||
$('#SubsonicAlbums > div:first').resizable({
|
||||
handles: 'e',
|
||||
minWidth: '100',
|
||||
maxWidth: '400',
|
||||
resize: function () {
|
||||
alert('foo');
|
||||
var remainingSpace = $(this).parent().width() - $(this).outerWidth();
|
||||
var divTwo = $(this).next();
|
||||
var divTwoWidth = remainingSpace - (divTwo.outerWidth() - divTwo.width());
|
||||
divTwo.css('width', divTwoWidth + 'px');
|
||||
}
|
||||
});
|
||||
*/
|
||||
/*
|
||||
scope.$watch(attrs.state, function (state) {
|
||||
if (state == 1) {
|
||||
var layout = elm.layout(pageLayoutOptions);
|
||||
}
|
||||
if (state == 2) {
|
||||
var layout = elm.layout(layoutTwoCol);
|
||||
//scope.layout.sizePane('east', 120);
|
||||
//scope.layout.show('west');
|
||||
//scope.layout.show('south');
|
||||
} else if (state == 3) {
|
||||
var layout = elm.layout(layoutThreeCol);
|
||||
//scope.layout.sizePane('east', 60);
|
||||
//scope.layout.hide('west');
|
||||
//scope.layout.hide('south');
|
||||
}
|
||||
scope.layout = layout;
|
||||
});
|
||||
*/
|
||||
}
|
||||
};
|
||||
});
|
||||
JamStash.directive('fancybox', function ($compile) {
|
||||
|
||||
JamStash.directive('fancybox', function($compile) {
|
||||
return {
|
||||
restrict: 'A',
|
||||
replace: false,
|
||||
link: function($scope, element, attrs) {
|
||||
$scope.fancyboxOpen = function() {
|
||||
var el = angular.element(element.html()),
|
||||
compiled = $compile(el);
|
||||
compiled = $compile(el);
|
||||
$.fancybox.open(el);
|
||||
compiled($scope);
|
||||
};
|
||||
$scope.fancyboxOpenUrl = function () {
|
||||
$scope.fancyboxOpenUrl = function() {
|
||||
var el = angular.element(element.html()),
|
||||
compiled = $compile(el);
|
||||
compiled = $compile(el);
|
||||
$.fancybox.open(el);
|
||||
compiled($scope);
|
||||
};
|
||||
}
|
||||
};
|
||||
});
|
||||
JamStash.directive('songpreview', function ($compile, subsonic) {
|
||||
|
||||
JamStash.directive('songpreview', function($compile, subsonic) {
|
||||
return {
|
||||
restrict: 'E',
|
||||
templateUrl: 'js/partials/songs.html',
|
||||
|
|
@ -292,8 +291,8 @@ JamStash.directive('songpreview', function ($compile, subsonic) {
|
|||
scope: {
|
||||
song: '@'
|
||||
},
|
||||
link: function (scope, element, attrs) {
|
||||
subsonic.getSongTemplate(function (data) {
|
||||
link: function(scope, element, attrs) {
|
||||
subsonic.getSongTemplate(function(data) {
|
||||
scope.song = data;
|
||||
//var el = angular.element(element.html()),
|
||||
//var el = element.html(),
|
||||
|
|
@ -302,23 +301,25 @@ JamStash.directive('songpreview', function ($compile, subsonic) {
|
|||
//compiled($scope);
|
||||
});
|
||||
}
|
||||
}
|
||||
})
|
||||
JamStash.directive('stopEvent', function () {
|
||||
};
|
||||
});
|
||||
|
||||
JamStash.directive('stopEvent', function() {
|
||||
return {
|
||||
restrict: 'A',
|
||||
link: function (scope, element, attr) {
|
||||
element.bind(attr.stopEvent, function (e) {
|
||||
link: function(scope, element, attr) {
|
||||
element.bind(attr.stopEvent, function(e) {
|
||||
e.stopPropagation();
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
JamStash.directive('ngEnter', function () {
|
||||
return function (scope, element, attrs) {
|
||||
element.bind("keydown keypress", function (event) {
|
||||
|
||||
JamStash.directive('ngEnter', function() {
|
||||
return function(scope, element, attrs) {
|
||||
element.bind("keydown keypress", function(event) {
|
||||
if (event.which === 13) {
|
||||
scope.$apply(function () {
|
||||
scope.$apply(function() {
|
||||
scope.$eval(attrs.ngEnter);
|
||||
});
|
||||
|
||||
|
|
@ -327,23 +328,28 @@ JamStash.directive('ngEnter', function () {
|
|||
});
|
||||
};
|
||||
});
|
||||
JamStash.directive('ngDownload', function ($compile) {
|
||||
|
||||
JamStash.directive('ngDownload', function($compile) {
|
||||
return {
|
||||
restrict: 'E',
|
||||
scope: { data: '=' },
|
||||
link: function (scope, elm, attrs) {
|
||||
scope: {
|
||||
data: '='
|
||||
},
|
||||
link: function(scope, elm, attrs) {
|
||||
function getUrl() {
|
||||
return URL.createObjectURL(new Blob([JSON.stringify(scope.data)], { type: "application/json" }));
|
||||
return URL.createObjectURL(new Blob([JSON.stringify(scope.data)], {
|
||||
type: "application/json"
|
||||
}));
|
||||
}
|
||||
|
||||
elm.append($compile(
|
||||
'<a class="button" download="backup.json"' +
|
||||
'href="' + getUrl() + '">' +
|
||||
'Download' +
|
||||
'</a>'
|
||||
'<a class="button" download="backup.json"' +
|
||||
'href="' + getUrl() + '">' +
|
||||
'Download' +
|
||||
'</a>'
|
||||
)(scope));
|
||||
|
||||
scope.$watch(scope.data, function () {
|
||||
scope.$watch(scope.data, function() {
|
||||
elm.children()[0].href = getUrl();
|
||||
});
|
||||
}
|
||||
|
|
@ -351,105 +357,110 @@ JamStash.directive('ngDownload', function ($compile) {
|
|||
});
|
||||
|
||||
/* Factory */
|
||||
JamStash.factory('json', function ($http) { // Deferred loading
|
||||
JamStash.factory('json', function($http) { // Deferred loading
|
||||
return {
|
||||
getCollections: function (callback) {
|
||||
getCollections: function(callback) {
|
||||
$http.get('js/json_collections.js').success(callback);
|
||||
},
|
||||
getChangeLog: function (callback) {
|
||||
getChangeLog: function(callback) {
|
||||
$http.get('js/json_changelog.js').success(callback);
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
JamStash.factory('template', function ($http, $compile, $http, $templateCache) { // Deferred loading
|
||||
|
||||
JamStash.factory('template', function($compile, $http, $templateCache) { // Deferred loading
|
||||
return {
|
||||
getCollections: function (callback) {
|
||||
$http.get('js/json_collections.js', { cache: $templateCache }).success(callback);
|
||||
getCollections: function(callback) {
|
||||
$http.get('js/json_collections.js', {
|
||||
cache: $templateCache
|
||||
}).success(callback);
|
||||
},
|
||||
getChangeLog: function (callback) {
|
||||
$http.get('js/json_changelog.js', { cache: $templateCache }).success(callback);
|
||||
getChangeLog: function(callback) {
|
||||
$http.get('js/json_changelog.js', {
|
||||
cache: $templateCache
|
||||
}).success(callback);
|
||||
},
|
||||
getSongs: function (callback) {
|
||||
getSongs: function(callback) {
|
||||
templateUrl = 'js/partials/songs.html';
|
||||
$http.get(templateUrl, { cache: $templateCache }).success(callback);
|
||||
$http.get(templateUrl, {
|
||||
cache: $templateCache
|
||||
}).success(callback);
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
JamStash.factory('subsonic', function ($http, globals, utils) {
|
||||
|
||||
JamStash.factory('subsonic', function($http, globals, utils) {
|
||||
return {
|
||||
getSongTemplate: function (callback) {
|
||||
getSongTemplate: function(callback) {
|
||||
var id = '16608';
|
||||
var url = globals.BaseURL() + '/getMusicDirectory.view?' + globals.BaseParams() + '&id=' + id;
|
||||
/*
|
||||
$.ajax({
|
||||
url: url,
|
||||
method: 'GET',
|
||||
dataType: globals.settings.Protocol,
|
||||
timeout: globals.settings.Timeout,
|
||||
success: function (data) {
|
||||
|
||||
|
||||
$http.get(url).success(function(data) {
|
||||
var items = [];
|
||||
var song = [];
|
||||
if (typeof data["subsonic-response"].directory.child != 'undefined') {
|
||||
if (data["subsonic-response"].directory.child.length > 0) {
|
||||
items = data["subsonic-response"].directory.child;
|
||||
} else {
|
||||
items[0] = data["subsonic-response"].directory.child;
|
||||
}
|
||||
angular.forEach(items, function(item, key) {
|
||||
if (!item.isDir) {
|
||||
song.push(utils.mapSong(item));
|
||||
}
|
||||
});
|
||||
callback(song);
|
||||
}
|
||||
});
|
||||
*/
|
||||
$http.get(url).success(function (data) {
|
||||
var items = [];
|
||||
var song = [];
|
||||
if (typeof data["subsonic-response"].directory.child != 'undefined') {
|
||||
if (data["subsonic-response"].directory.child.length > 0) {
|
||||
items = data["subsonic-response"].directory.child;
|
||||
} else {
|
||||
items[0] = data["subsonic-response"].directory.child;
|
||||
}
|
||||
angular.forEach(items, function (item, key) {
|
||||
if (!item.isDir) {
|
||||
song.push(utils.mapSong(item));
|
||||
}
|
||||
});
|
||||
callback(song);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
/* Filters */
|
||||
JamStash.filter('capitalize', function () {
|
||||
return function (input, scope) {
|
||||
JamStash.filter('capitalize', function() {
|
||||
return function(input, scope) {
|
||||
return input.substring(0, 1).toUpperCase() + input.substring(1);
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
JamStash.service('notifications', function ($rootScope, globals) {
|
||||
JamStash.service('notifications', function($rootScope, globals) {
|
||||
var msgIndex = 1;
|
||||
this.updateMessage = function (msg, autohide) {
|
||||
if (msg != '') {
|
||||
this.updateMessage = function(msg, autohide) {
|
||||
if (msg !== '') {
|
||||
var id = msgIndex;
|
||||
$('#messages').append('<span id=\"msg_' + id + '\" class="message">' + msg + '</span>');
|
||||
$('#messages').fadeIn();
|
||||
$("#messages").scrollTo('100%');
|
||||
var el = '#msg_' + id;
|
||||
if (autohide) {
|
||||
setTimeout(function () {
|
||||
$(el).fadeOut(function () { $(this).remove(); });
|
||||
setTimeout(function() {
|
||||
$(el).fadeOut(function() {
|
||||
$(this).remove();
|
||||
});
|
||||
}, globals.settings.NotificationTimeout);
|
||||
}
|
||||
$(el).click(function () {
|
||||
$(el).fadeOut(function () { $(this).remove(); });
|
||||
$(el).click(function() {
|
||||
$(el).fadeOut(function() {
|
||||
$(this).remove();
|
||||
});
|
||||
return false;
|
||||
});
|
||||
msgIndex++;
|
||||
}
|
||||
}
|
||||
this.requestPermissionIfRequired = function () {
|
||||
};
|
||||
|
||||
this.requestPermissionIfRequired = function() {
|
||||
if (!this.hasNotificationPermission() && (window.webkitNotifications)) {
|
||||
window.webkitNotifications.requestPermission();
|
||||
}
|
||||
}
|
||||
this.hasNotificationPermission = function () {
|
||||
return !!(window.webkitNotifications) && (window.webkitNotifications.checkPermission() == 0);
|
||||
}
|
||||
var notifications = new Array();
|
||||
this.showNotification = function (pic, title, text, type, bind) {
|
||||
};
|
||||
|
||||
this.hasNotificationPermission = function() {
|
||||
return !!(window.webkitNotifications) && (window.webkitNotifications.checkPermission() === 0);
|
||||
};
|
||||
|
||||
var notifications = [];
|
||||
this.showNotification = function(pic, title, text, type, bind) {
|
||||
if (this.hasNotificationPermission()) {
|
||||
//closeAllNotifications()
|
||||
var popup;
|
||||
|
|
@ -458,25 +469,26 @@ JamStash.service('notifications', function ($rootScope, globals) {
|
|||
} else if (type == 'html') {
|
||||
popup = window.webkitNotifications.createHTMLNotification(text);
|
||||
}
|
||||
if (bind = '#NextTrack') {
|
||||
popup.addEventListener('click', function (bind) {
|
||||
if (bind == '#NextTrack') {
|
||||
popup.addEventListener('click', function(bind) {
|
||||
//$(bind).click();
|
||||
$rootScope.nextTrack();
|
||||
this.cancel();
|
||||
})
|
||||
});
|
||||
}
|
||||
notifications.push(popup);
|
||||
setTimeout(function (notWin) {
|
||||
setTimeout(function(notWin) {
|
||||
notWin.cancel();
|
||||
}, globals.settings.NotificationTimeout, popup);
|
||||
popup.show();
|
||||
} else {
|
||||
console.log("showNotification: No Permission");
|
||||
}
|
||||
}
|
||||
this.closeAllNotifications = function () {
|
||||
for (notification in notifications) {
|
||||
};
|
||||
|
||||
this.closeAllNotifications = function() {
|
||||
for (var notification in notifications) {
|
||||
notifications[notification].cancel();
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue