milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

beginning remote subtitle downloading

Browse source
This commit is contained in:
Luke Pulverenti 2014-05-06 22:28:19 -04:00
parent c1acc0d03a
commit 3b5259ce8e
12 changed files with 225 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

23
dashboard-ui/scripts/indexpage.js
View file

@ -8,24 +8,6 @@
var options = {
SortBy: "SortName",
Fields: "PrimaryImageAspectRatio"
};
ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
$('.myLibrary', page).html(LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: 'backdrop',
showTitle: true,
centerText: true
})).createPosterItemMenus();
});
options = {
SortBy: "DatePlayed",
SortOrder: "Descending",
MediaTypes: "Video",
@ -50,7 +32,8 @@
preferBackdrop: true,
shape: 'backdrop',
overlayText: true,
showTitle: true
showTitle: true,
showParentTitle: true
})).createPosterItemMenus();
@ -60,7 +43,7 @@
SortBy: "DateCreated",
SortOrder: "Descending",
Limit: screenWidth >= 1920 ? 10 : (screenWidth >= 1440 ? 8 : (screenWidth >= 800 ? 8 : 8)),
Limit: screenWidth >= 1920 ? 20 : (screenWidth >= 1440 ? 16 : (screenWidth >= 800 ? 12 : 8)),
Recursive: true,
Fields: "PrimaryImageAspectRatio",
Filters: "IsUnplayed,IsNotFolder",

27
dashboard-ui/scripts/librarybrowser.js
View file

@ -356,6 +356,33 @@
// Handle search hints
var id = item.Id || item.ItemId;
if (item.CollectionType == 'boxsets' || item.Type == 'ManualCollectionsFolder') {
return 'collections.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'trailers' || item.Type == 'TrailerCollectionFolder') {
return 'movietrailers.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'movies') {
return 'movieslatest.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'tvshows') {
return 'tvrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'music') {
return 'musicrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'games') {
return 'gamesrecommended.html?topParentId=' + item.Id;
}
if (item.Type == 'CollectionFolder') {
return 'itemlist.html?topParentId=' + item.Id + '&parentid=' + item.Id;
}
if (item.Type == "TvChannel") {
return "livetvchannel.html?id=" + id;
}

26
dashboard-ui/scripts/librarymenu.js
View file

@ -73,31 +73,7 @@
function getItemHref(item) {
if (item.CollectionType == 'boxsets' || item.Type == 'ManualCollectionsFolder') {
return 'collections.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'trailers' || item.Type == 'TrailerCollectionFolder') {
return 'movietrailers.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'movies') {
return 'movieslatest.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'tvshows') {
return 'tvrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'music') {
return 'musicrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'games') {
return 'gamesrecommended.html?topParentId=' + item.Id;
}
return 'itemlist.html?topParentId=' + item.Id + '&parentid=' + item.Id;
return LibraryBrowser.getHref(item);
}
function insertViews(page, user, counts, items, liveTvInfo) {

15
dashboard-ui/scripts/moviecollections.js
View file

@ -11,6 +11,11 @@
StartIndex: 0
};
function getSavedQueryKey() {
return 'collections' + (query.ParentId || '');
}
function reloadItems(page) {
Dashboard.showLoadingMsg();
@ -62,7 +67,7 @@
reloadItems(page);
});
LibraryBrowser.saveQueryValues('boxsets', query);
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
Dashboard.getCurrentUser().done(function(user) {
@ -192,6 +197,8 @@
}).on('pagebeforeshow', "#boxsetsPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
var limit = LibraryBrowser.getDefaultPageSize();
// If the default page size has changed, the start index will have to be reset
@ -200,7 +207,7 @@
query.StartIndex = 0;
}
LibraryBrowser.loadSavedQueryValues('boxsets', query);
LibraryBrowser.loadSavedQueryValues(getSavedQueryKey(), query);
reloadItems(this);
@ -220,7 +227,9 @@
var url = ApiClient.getUrl("Collections", {
Name: $('#txtNewCollectionName', page).val(),
IsLocked: !$('#chkEnableInternetMetadata', page).checked()
IsLocked: !$('#chkEnableInternetMetadata', page).checked(),
ParentId: getParameterByName('parentId') || getParameterByName('topParentId')
});

17
dashboard-ui/scripts/search.js
View file

@ -70,22 +70,7 @@
var html = '';
var context;
if (hint.Type == "Episode" || hint.Type == "Season" || hint.Type == "Series") {
context = "tv";
}
else if (hint.Type == "Game" || hint.Type == "GameSystem") {
context = "games";
}
else if (hint.Type == "MusicArtist" || hint.Type == "MusicAlbum") {
context = "music";
}
else if (hint.Type == "Movie" || hint.Type == "BoxSet" || hint.Type == "Trailer") {
context = "movie";
}
html += '<a class="searchHint" href="' + LibraryBrowser.getHref(hint, context) + '">';
html += '<a class="searchHint" href="' + LibraryBrowser.getHref(hint) + '">';
var imgUrl;

20
dashboard-ui/scripts/site.js
View file

@ -834,9 +834,9 @@ var Dashboard = {
// Full list
// https://github.com/MediaBrowser/MediaBrowser/blob/master/MediaBrowser.Model/Session/GeneralCommand.cs#L23
switch (cmd.Name) {
case 'GoHome':
Dashboard.navigate('index.html');
break;
@ -971,29 +971,27 @@ var Dashboard = {
onBrowseCommand: function (cmd) {
var context = cmd.Context || "";
var url;
var type = (cmd.ItemType || "").toLowerCase();
if (type == "genre") {
url = "itembynamedetails.html?genre=" + ApiClient.encodeName(cmd.ItemName) + "&context=" + context;
url = "itembynamedetails.html?genre=" + ApiClient.encodeName(cmd.ItemName);
}
else if (type == "musicgenre") {
url = "itembynamedetails.html?musicgenre=" + ApiClient.encodeName(cmd.ItemName) + "&context=" + (context || "music");
url = "itembynamedetails.html?musicgenre=" + ApiClient.encodeName(cmd.ItemName);
}
else if (type == "gamegenre") {
url = "itembynamedetails.html?gamegenre=" + ApiClient.encodeName(cmd.ItemName) + "&context=" + (context || "games");
url = "itembynamedetails.html?gamegenre=" + ApiClient.encodeName(cmd.ItemName);
}
else if (type == "studio") {
url = "itembynamedetails.html?studio=" + ApiClient.encodeName(cmd.ItemName) + "&context=" + context;
url = "itembynamedetails.html?studio=" + ApiClient.encodeName(cmd.ItemName);
}
else if (type == "person") {
url = "itembynamedetails.html?person=" + ApiClient.encodeName(cmd.ItemName) + "&context=" + context;
url = "itembynamedetails.html?person=" + ApiClient.encodeName(cmd.ItemName);
}
else if (type == "musicartist") {
url = "itembynamedetails.html?musicartist=" + ApiClient.encodeName(cmd.ItemName) + "&context=" + (context || "music");
url = "itembynamedetails.html?musicartist=" + ApiClient.encodeName(cmd.ItemName);
}
if (url) {
@ -1003,7 +1001,7 @@ var Dashboard = {
ApiClient.getItem(Dashboard.getCurrentUserId(), cmd.ItemId).done(function (item) {
Dashboard.navigate(LibraryBrowser.getHref(item, context));
Dashboard.navigate(LibraryBrowser.getHref(item));
});