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

3.0.5607.1

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-10 09:06:12 -04:00
parent 5623b7c147
commit 66a896e13d
10 changed files with 169 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dashboard-ui/scripts/itemdetailpage.js
View file

@ -1512,7 +1512,8 @@
imgUrl = ApiClient.getScaledImageUrl(cast.Id, {
width: 100,
tag: cast.PrimaryImageTag,
type: "primary"
type: "primary",
minScale: 2
});
} else {

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

@ -1115,6 +1115,13 @@
options.shape = 'smallSquare';
squareSize = posterInfo.smallSquareSize;
}
else if (options.shape == 'detailPagePortrait') {
posterWidth = 200;
}
else if (options.shape == 'detailPage169') {
posterWidth = 260;
thumbWidth = 260;
}
var dateText;

124
dashboard-ui/scripts/librarylist.js
View file

@ -528,66 +528,82 @@
}
}
var html = '<div data-role="popup" class="groupingMenu" data-theme="a">';
html += '<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-b ui-icon-delete ui-btn-icon-notext ui-btn-right">Close</a>';
html += '<div>';
html += '<ul data-role="listview">';
var html = '<div data-role="popup" class="groupingMenu" data-transition="slide" style="background:rgba(0,0,0,.85);border:0;padding:0;">';
var href = card.href || LibraryBrowser.getHref(item, context);
var header = Globalize.translate('HeaderLatestFromChannel').replace('{0}', '<a href="' + href + '">' + item.Name + '</a>');
html += '<li data-role="list-divider">' + header + '</li>';
html += '</ul>';
var header = Globalize.translate('HeaderLatestFromChannel').replace('{0}', '<a href="' + href + '" style="outline:0;">' + item.Name + '</a>');
html += '<h2 style="padding:.5em 1em;background:#222;margin:0;">' + header + '</h2>';
html += '<div class="groupingMenuScroller">';
html += '<ul data-role="listview">';
html += latestItems.map(function (latestItem) {
var itemHtml = '';
href = LibraryBrowser.getHref(latestItem, context);
itemHtml += '<li class="ui-li-has-thumb"><a href="' + href + '">';
var imgUrl;
if (latestItem.ImageTags.Primary) {
// Scaling 400w episode images to 80 doesn't turn out very well
var width = latestItem.Type == 'Episode' ? 160 : 80;
imgUrl = ApiClient.getScaledImageUrl(latestItem.Id, {
width: width,
tag: latestItem.ImageTags.Primary,
type: "Primary",
index: 0
});
}
if (imgUrl) {
itemHtml += '<div class="listviewImage ui-li-thumb" style="background-image:url(\'' + imgUrl + '\');"></div>';
}
itemHtml += '<h3>';
itemHtml += LibraryBrowser.getPosterViewDisplayName(latestItem);
itemHtml += '</h3>';
var date = parseISO8601Date(latestItem.DateCreated, { toLocal: true });
itemHtml += '<p>';
itemHtml += Globalize.translate('LabelAddedOnDate').replace('{0}', date.toLocaleDateString());
itemHtml += '</p>';
itemHtml += '</a></li>';
return itemHtml;
}).join('');
html += '</ul>';
html += '</div>';
html += LibraryBrowser.getPosterViewHtml({
items: latestItems,
shape: "detailPage169",
showTitle: true,
overlayText: true,
lazy: true,
context: context
});
html += '</div>';
//html += '<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-b ui-icon-delete ui-btn-icon-notext ui-btn-right">Close</a>';
//html += '<div>';
//html += '<ul data-role="listview">';
//var href = card.href || LibraryBrowser.getHref(item, context);
//var header = Globalize.translate('HeaderLatestFromChannel').replace('{0}', '<a href="' + href + '">' + item.Name + '</a>');
//html += '<li data-role="list-divider">' + header + '</li>';
//html += '</ul>';
//html += '<div class="groupingMenuScroller">';
//html += '<ul data-role="listview">';
//html += latestItems.map(function (latestItem) {
// var itemHtml = '';
// href = LibraryBrowser.getHref(latestItem, context);
// itemHtml += '<li class="ui-li-has-thumb"><a href="' + href + '">';
// var imgUrl;
// if (latestItem.ImageTags.Primary) {
// // Scaling 400w episode images to 80 doesn't turn out very well
// var width = latestItem.Type == 'Episode' ? 160 : 80;
// imgUrl = ApiClient.getScaledImageUrl(latestItem.Id, {
// width: width,
// tag: latestItem.ImageTags.Primary,
// type: "Primary",
// index: 0
// });
// }
// if (imgUrl) {
// itemHtml += '<div class="listviewImage ui-li-thumb" style="background-image:url(\'' + imgUrl + '\');"></div>';
// }
// itemHtml += '<h3>';
// itemHtml += LibraryBrowser.getPosterViewDisplayName(latestItem);
// itemHtml += '</h3>';
// var date = parseISO8601Date(latestItem.DateCreated, { toLocal: true });
// itemHtml += '<p>';
// itemHtml += Globalize.translate('LabelAddedOnDate').replace('{0}', date.toLocaleDateString());
// itemHtml += '</p>';
// itemHtml += '</a></li>';
// return itemHtml;
//}).join('');
//html += '</ul>';
//html += '</div>';
//html += '</div>';
html += '</div>';
$($.mobile.activePage).append(html);
@ -597,7 +613,7 @@
$(this).off("popupafterclose").remove();
$(card).removeClass('hasContextMenu');
});
}).lazyChildren();
});
e.preventDefault();

42
dashboard-ui/scripts/nowplayingpage.js
View file

@ -647,33 +647,33 @@
var html = '';
ApiClient.getItems(Dashboard.getCurrentUserId(), {
//ApiClient.getItems(Dashboard.getCurrentUserId(), {
SortBy: "SortName",
SortOrder: "Ascending",
IncludeItemTypes: "Audio",
Recursive: true,
Fields: "PrimaryImageAspectRatio,SortName,MediaSourceCount,IsUnidentified,SyncInfo",
StartIndex: 0,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
Limit: 100
// SortBy: "SortName",
// SortOrder: "Ascending",
// IncludeItemTypes: "Audio",
// Recursive: true,
// Fields: "PrimaryImageAspectRatio,SortName,MediaSourceCount,IsUnidentified,SyncInfo",
// StartIndex: 0,
// ImageTypeLimit: 1,
// EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
// Limit: 100
}).done(function (result) {
//}).done(function (result) {
html += LibraryBrowser.getListViewHtml({
items: result.Items,
smallIcon: true
});
// html += LibraryBrowser.getListViewHtml({
// items: result.Items,
// smallIcon: true
// });
$(".playlist", page).html(html).trigger('create').lazyChildren();
});
//html += LibraryBrowser.getListViewHtml({
// items: MediaController.playlist(),
// smallIcon: true
// $(".playlist", page).html(html).trigger('create').lazyChildren();
//});
html += LibraryBrowser.getListViewHtml({
items: MediaController.playlist(),
smallIcon: true
});
$(".playlist", page).html(html).trigger('create').lazyChildren();
}

4
dashboard-ui/scripts/photos.js
View file

@ -45,8 +45,8 @@
items: result.Items,
shape: "auto",
context: getParameterByName('context') || 'photos',
showTitle: false,
centerText: true,
showTitle: query.MediaTypes != 'Photo',
overlayText: true,
lazy: true
});

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

@ -1510,12 +1510,13 @@ var AppInfo = {};
}
}
AppInfo.enableMusicSongsTab = true;
if (!AppInfo.hasLowImageBandwidth) {
AppInfo.enableLatestChannelItems = true;
AppInfo.enableStudioTabs = true;
AppInfo.enablePeopleTabs = true;
AppInfo.enableTvEpisodesTab = true;
AppInfo.enableMusicSongsTab = true;
AppInfo.enableMusicArtistsTab = true;
AppInfo.enableHomeLatestTab = true;
AppInfo.enableMovieTrailersTab = true;