mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update card layouts

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-13 00:55:19 -04:00
parent 8f4f29888e
commit bb38230c23
46 changed files with 1086 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/connectlogin.html
View file

@ -29,7 +29,7 @@
</span>
<i class="fa fa-check"></i>
</button>
<p class="forgotPassword" style="display:none;">
<p class="forgotPassword">
<a href="http://emby.media/community/index.php?app=core&module=global&section=lostpass" target="_blank">${ButtonForgotPassword}</a>
</p>
<div class="skip">
@ -43,7 +43,7 @@
<div class="fieldDescription">${TextConnectToServerManually}</div>
</div>
<div class="newUsers" style="display:none;">
<div class="newUsers">
<br />
<h2 style="text-align: left;">${HeaderNewUsers}</h2>
<a data-role="button" data-icon="action" href="http://emby.media/community/index.php?app=core&module=global&section=register" target="_blank">${ButtonSignUp}</a>

15
dashboard-ui/cordovaindex.html
View file

@ -27,12 +27,23 @@
<script type="text/javascript">
document.addEventListener("deviceready", function () {
var deviceId = device.uuid;
function setDeviceId(deviceId) {
localStorage.setItem('cordovaDeviceName', device.model);
localStorage.setItem('cordovaDeviceId', device.uuid);
localStorage.setItem('cordovaDeviceId', deviceId);
window.location.replace('index.html');
}
window.plugins.uniqueDeviceID.get(function (uuid) {
setDeviceId(uuid);
}, function () {
// Failure. Use cordova uuid
setDeviceId(device.uuid);
});
}, false);
</script>

79
dashboard-ui/css/card.css
View file

@ -48,7 +48,7 @@
}
.largeCardMargin .cardBox {
margin: 6px;
margin: 10px;
}
/*@media all and (max-width: 600px) {
@ -68,13 +68,7 @@
margin-bottom: 5px;
}
.visualFooterCard .outerCardFooter {
background: #111;
padding-bottom: 4px;
}
.visualCardBox {
padding: 5px;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px;
@ -83,16 +77,15 @@
-webkit-box-shadow: 0 2px 4px rgba(0,0,0,0.1);
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
background: #fff;
margin: 1px;
margin: 8px;
}
/*.visualCardBox .cardFooter {
padding: 0 2px;
}*/
.largeCardMargin .visualCardBox {
margin: 18px;
}
.ui-page-theme-b .visualCardBox {
background: rgba(45,45,45,.85);
border: 1px solid #1f1f1f;
border-radius: 3px;
}
@ -187,6 +180,18 @@
right: 0;
}
.visualCardBox .outerCardFooter {
padding: 5px;
position: relative;
}
.btnCardOptions {
padding: 10px !important;
margin: 0 !important;
color: inherit;
font-size: 20px;
}
.cardText {
text-overflow: ellipsis;
overflow: hidden;
@ -221,16 +226,6 @@
padding: 0 6px 4px 5px;
}
.outerCardFooter .cardText + .cardText {
color: #ddd;
}
/*.cardBox:not(.visualCardBox) .outerCardFooter .cardText {
font-size: 14px;
background: rgba(51, 51, 51,.6);
padding: 5px;
}*/
.cardBox:not(.visualCardBox) .outerCardFooter .cardText:last-child {
margin-bottom: 2em;
}
@ -250,6 +245,11 @@
height: 100%;
}
.cardImage canvas {
width: 100%;
height: 100%;
}
.coveredCardImage {
background-size: cover;
}
@ -298,7 +298,7 @@
}
.smallPortraitCard {
width: 25%;
width: 33.334%;
}
.cardProgress {
@ -319,17 +319,6 @@
}
}
@media all and (min-width: 500px) {
.squareCard {
width: 33.3%;
}
.smallSquareCard {
width: 25%;
}
}
@media all and (min-width: 400px) {
.smallBackdropCard {
@ -337,23 +326,25 @@
}
}
@media all and (min-width: 500px) {
@media all and (min-width: 540px) {
.smallBackdropCard {
width: 25%;
.squareCard {
width: 33.3%;
}
}
@media all and (min-width: 640px) {
.smallSquareCard {
width: 25%;
}
.portraitCard {
width: 25%;
}
.smallPortraitCard {
width: 20%;
width: 25%;
}
}
@ -377,11 +368,15 @@
width: 20%;
}
.smallBackdropCard {
.smallSquareCard {
width: 20%;
}
.smallSquareCard {
.smallBackdropCard {
width: 25%;
}
.smallPortraitCard {
width: 20%;
}
}

4
dashboard-ui/css/librarybrowser.css
View file

@ -1535,3 +1535,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
.movieTrailersTabDisabled .movieTrailersTab {
display: none !important;
}
.homeFavoritesTabDisabled .homeFavoritesTab {
display: none !important;
}

2
dashboard-ui/favorites.html
View file

@ -10,7 +10,7 @@
<a href="index.html">${TabHome}</a>
<a href="homelatest.html" class="homeLatestTab">${TabLatest}</a>
<a href="tvrecommended.html">${TabNextUp}</a>
<a href="favorites.html" class="ui-btn-active">${TabFavorites}</a>
<a href="favorites.html" class="ui-btn-active homeFavoritesTab">${TabFavorites}</a>
<a href="tvupcoming.html">${TabUpcoming}</a>
</div>

2
dashboard-ui/homelatest.html
View file

@ -10,7 +10,7 @@
<a href="index.html">${TabHome}</a>
<a href="#" class="ui-btn-active">${TabLatest}</a>
<a href="tvrecommended.html">${TabNextUp}</a>
<a href="favorites.html">${TabFavorites}</a>
<a href="favorites.html" class="homeFavoritesTab">${TabFavorites}</a>
<a href="tvupcoming.html">${TabUpcoming}</a>
</div>

2
dashboard-ui/index.html
View file

@ -10,7 +10,7 @@
<a href="#" class="ui-btn-active">${TabHome}</a>
<a href="homelatest.html" class="homeLatestTab">${TabLatest}</a>
<a href="tvrecommended.html">${TabNextUp}</a>
<a href="favorites.html">${TabFavorites}</a>
<a href="favorites.html" class="homeFavoritesTab">${TabFavorites}</a>
<a href="tvupcoming.html">${TabUpcoming}</a>
</div>

2
dashboard-ui/itemdetails.html
View file

@ -10,7 +10,7 @@
<div class="libraryViewNav scopedLibraryViewNav">
<a href="index.html" class="lnkHomeHome">${TabHome}</a>
<a href="homelatest.html" class="lnkHomeLatest homeLatestTab">${TabLatest}</a>
<a href="tvrecommended.html" class="lnkHomeNextUp">${TabNextUp}</a>
<a href="tvrecommended.html" class="lnkHomeNextUp homeFavoritesTab">${TabNextUp}</a>
<a href="favorites.html" class="lnkHomeFavorites">${TabFavorites}</a>
<a href="tvupcoming.html" class="lnkHomeUpcoming">${TabUpcoming}</a>
</div>

16
dashboard-ui/scripts/backdrops.js
View file

@ -97,6 +97,19 @@
});
}
function setDefault(page) {
var backdropContainer = $('.backdropContainer');
if (backdropContainer.length) {
backdropContainer.css('backgroundImage', 'url(css/images/splash.jpg)');
} else {
$(document.body).prepend('<div class="backdropContainer" style="background-image:url(css/images/splash.jpg);top:0;"></div>');
}
$(page).addClass('backdropPage staticBackdropPage');
}
function clearBackdrop() {
$('.backdropContainer').css('backgroundImage', '');
@ -213,7 +226,8 @@
window.Backdrops = {
setBackdrops: setBackdrops,
setBackdropUrl: setBackdropUrl
setBackdropUrl: setBackdropUrl,
setDefault: setDefault
};
})(jQuery, document);

6
dashboard-ui/scripts/channelitems.js
View file

@ -146,8 +146,10 @@
defaultShape: 'square',
context: 'channels',
showTitle: true,
centerText: true,
coverImage: true
coverImage: true,
cardLayout: true,
showYear: true,
lazy: true
});
var elem = $('#items', page).html(html).lazyChildren();

18
dashboard-ui/scripts/channels.js
View file

@ -21,6 +21,10 @@
updateFilterControls(page);
var view = 'Thumb';
if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
@ -30,6 +34,20 @@
preferThumb: true
});
}
else if (view == "ThumbCard") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
preferThumb: true,
context: 'channels',
lazy: true,
cardLayout: true,
showTitle: true
});
}
$('#items', page).html(html).lazyChildren();
LibraryBrowser.saveQueryValues('channels', query);

30
dashboard-ui/scripts/connectlogin.js
View file

@ -2,12 +2,13 @@
function onLoggedIn() {
Dashboard.hideModalLoadingMsg();
Dashboard.navigate('selectserver.html');
}
function login(page, username, password) {
Dashboard.showLoadingMsg();
Dashboard.showModalLoadingMsg();
ConnectionManager.loginToConnect(username, password).done(function () {
@ -30,6 +31,8 @@
function handleConnectionResult(page, result) {
Dashboard.hideLoadingMsg();
switch (result.State) {
case MediaBrowser.ConnectionState.SignedIn:
@ -71,12 +74,10 @@
function loadAppConnection(page) {
Dashboard.showLoadingMsg();
Dashboard.showModalLoadingMsg();
ConnectionManager.connect().done(function (result) {
Dashboard.hideLoadingMsg();
handleConnectionResult(page, result);
});
@ -99,8 +100,7 @@
}
function loadMode(page, mode) {
$(document.body).prepend('<div class="backdropContainer" style="background-image:url(css/images/splash.jpg);top:0;"></div>');
$(page).addClass('backdropPage staticBackdropPage');
Backdrops.setDefault(page);
if (mode == 'welcome') {
$('.connectLoginForm', page).hide();
@ -119,13 +119,17 @@
}
}
function skip() {
Dashboard.navigate('selectserver.html');
}
$(document).on('pageinit', "#connectLoginPage", function () {
var page = this;
$('.btnSkipConnect', page).on('click', function () {
Dashboard.navigate('connectlogin.html?mode=manualserver');
skip();
});
}).on('pageshow', "#connectLoginPage", function () {
@ -138,13 +142,9 @@
$('.embyIntroDownloadMessage', page).html(Globalize.translate('EmbyIntroDownloadMessage', link));
if (Dashboard.isRunningInCordova()) {
$('.newUsers', page).hide();
$('.forgotPassword', page).hide();
$('.skip', page).show();
} else {
$('.skip', page).hide();
$('.newUsers', page).show();
$('.forgotPassword', page).show();
}
});
@ -157,18 +157,14 @@
host += ':' + port;
}
Dashboard.showLoadingMsg();
Dashboard.showModalLoadingMsg();
ConnectionManager.connectToAddress(host).done(function (result) {
Dashboard.hideLoadingMsg();
handleConnectionResult(page, result);
}).fail(function () {
Dashboard.hideLoadingMsg();
handleConnectionResult(page, {
State: MediaBrowser.ConnectionState.Unavailable
});

2
dashboard-ui/scripts/dashboardpage.js
View file

@ -626,7 +626,7 @@
imgUrl = 'css/images/clients/html5.png';
}
return "<img src='" + imgUrl + "' alt='Emby Web Client' />";
return "<img src='" + imgUrl + "' alt='Emby Mobile' />";
}
if (clientLowered == "mb-classic") {

8
dashboard-ui/scripts/episodes.js
View file

@ -1,6 +1,6 @@
(function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard');
// The base query options
var query = {
@ -46,6 +46,12 @@
updateFilterControls();
var trigger = false;
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "List") {
html = LibraryBrowser.getListViewHtml({

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

@ -139,6 +139,8 @@
var html = '';
var cardLayout = AppInfo.hasLowImageBandwidth;
if (items.length) {
html += '<div>';
html += '<h1 style="display:inline-block; vertical-align:middle;" class="listHeader">' + Globalize.translate('HeaderLatestMedia') + '</h1>';
@ -157,6 +159,9 @@
showUnplayedIndicator: false,
showChildCountIndicator: true,
lazy: true,
cardLayout: cardLayout,
showTitle: cardLayout,
showYear: cardLayout
});
html += '</div>';
}
@ -275,6 +280,8 @@
var html = '';
var cardLayout = AppInfo.hasLowImageBandwidth;
if (result.Items.length) {
html += '<h1 class="listHeader">' + Globalize.translate('HeaderResume') + '</h1>';
html += '<div>';
@ -282,11 +289,12 @@
items: result.Items,
preferThumb: true,
shape: 'backdrop',
overlayText: screenWidth >= 800 && !AppInfo.hasLowImageBandwidth,
overlayText: screenWidth >= 800 && !cardLayout,
showTitle: true,
showParentTitle: true,
context: 'home',
lazy: true
lazy: true,
cardLayout: cardLayout
});
html += '</div>';
}
@ -542,10 +550,10 @@
function dismissWelcome(page, userId) {
ApiClient.getDisplayPreferences('home', userId, 'webclient').done(function (result) {
getDisplayPreferences('home', userId).done(function (result) {
result.CustomPrefs[homePageTourKey] = homePageDismissValue;
ApiClient.updateDisplayPreferences('home', result, userId, 'webclient');
ApiClient.updateDisplayPreferences('home', result, userId, getDisplayPreferencesAppName());
});
}
@ -635,7 +643,7 @@
var userId = Dashboard.getCurrentUserId();
ApiClient.getDisplayPreferences('home', userId, 'webclient').done(function (result) {
getDisplayPreferences('home', userId).done(function (result) {
Dashboard.getCurrentUser().done(function (user) {
@ -648,4 +656,20 @@
});
function getDisplayPreferencesAppName() {
if (Dashboard.isRunningInCordova()) {
return 'Emby Mobile';
}
return 'webclient';
}
function getDisplayPreferences(key, userId) {
return ApiClient.getDisplayPreferences(key, userId, getDisplayPreferencesAppName()).done(function (result) {
});
}
})(jQuery, document);

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

@ -342,7 +342,7 @@
var chapters = item.Chapters || [];
if (!chapters.length) {
if (!chapters.length || AppInfo.hasLowImageBandwidth) {
$('#scenesCollapsible', page).hide();
} else {
$('#scenesCollapsible', page).show();
@ -616,9 +616,11 @@
var promise;
var screenWidth = $(window).width();
var options = {
userId: Dashboard.getCurrentUserId(),
limit: 5,
limit: screenWidth > 800 ? 5 : 4,
fields: "PrimaryImageAspectRatio,UserData,SyncInfo"
};

16
dashboard-ui/scripts/itemlistpage.js
View file

@ -55,6 +55,12 @@
context = 'folders';
}
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "Backdrop") {
html = LibraryBrowser.getPosterViewHtml({
@ -75,6 +81,16 @@
context: context
});
}
else if (view == "PosterCard") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "auto",
showTitle: true,
context: context,
cardLayout: true,
showYear: true
});
}
var elem = $('#items', page).html(html).lazyChildren();

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

@ -1006,9 +1006,7 @@
var imagesPerRow = LibraryBrowser.getPostersPerRow(screenWidth);
if (AppInfo.hasLowImageBandwidth) {
screenWidth *= .95;
} else {
if (!AppInfo.hasLowImageBandwidth) {
screenWidth *= 1.25;
}
@ -1565,7 +1563,8 @@
if (options.cardLayout) {
html += '<div class="cardText" style="text-align:right; float:right;">';
// Render out the jqm classes so that we don't have to call trigger create
html += '<button class="listviewMenuButton ui-btn ui-icon-ellipsis-v ui-btn-icon-notext ui-btn-inline ui-shadow ui-corner-all" type="button" data-inline="true" data-iconpos="notext" data-icon="ellipsis-v" style="margin: 4px 0 0;"></button>';
//html += '<button class="listviewMenuButton ui-btn ui-icon-ellipsis-v ui-btn-icon-notext ui-btn-inline ui-shadow ui-corner-all" type="button" data-inline="true" data-iconpos="notext" data-icon="ellipsis-v" style="margin: 4px 0 0;"></button>';
html += '<button class="listviewMenuButton imageButton btnCardOptions" type="button" data-role="none" style="margin: 4px 0 0;"><i class="fa fa-ellipsis-v"></i></button>';
html += "</div>";
}
@ -1618,8 +1617,9 @@
lines.push(songLine);
}
if (options.showPremiereDate && item.PremiereDate) {
if (options.showPremiereDate) {
if (item.PremiereDate) {
try {
lines.push(LibraryBrowser.getPremiereDateText(item));
@ -1628,6 +1628,9 @@
lines.push('');
}
} else {
lines.push('');
}
}
if (options.showYear) {

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

@ -11,7 +11,8 @@
return LibraryBrowser.getPosterViewHtml({
items: channels,
shape: "smallBackdrop",
centerText: true
centerText: true,
lazy: true
});
}

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

@ -1,6 +1,6 @@
(function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard');
// The base query options
var query = {
@ -53,6 +53,15 @@
updateFilterControls(page);
var trigger = false;
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Thumb') {
view = 'ThumbCard';
}
else if (view == 'Poster') {
view = 'PosterCard';
}
}
if (result.TotalRecordCount) {
if (view == "List") {
@ -74,6 +83,17 @@
lazy: true
});
}
else if (view == "PosterCard") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "auto",
context: 'movies',
showTitle: true,
cardLayout: true,
lazy: true,
showItemCounts: true
});
}
else if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
@ -85,6 +105,18 @@
preferThumb: true
});
}
else if (view == "ThumbCard") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
context: 'movies',
showTitle: true,
lazy: true,
preferThumb: true,
cardLayout: true,
showItemCounts: true
});
}
$('.noItemsMessage', page).hide();

22
dashboard-ui/scripts/moviegenres.js
View file

@ -1,6 +1,6 @@
(function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Thumb', 'Thumb');
var view = LibraryBrowser.getDefaultItemsView('Thumb', 'ThumbCard');
// The base query options
var query = {
@ -39,6 +39,15 @@
updateFilterControls(page);
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Thumb') {
view = 'ThumbCard';
}
else if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
@ -63,6 +72,17 @@
lazy: true
});
}
else if (view == "PosterCard") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "portrait",
context: 'movies',
showItemCounts: true,
lazy: true,
cardLayout: true,
showTitle: true
});
}
else if (view == "Poster") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,

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

@ -1,6 +1,6 @@
(function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard');
// The base query options
var query = {
@ -48,6 +48,15 @@
updateFilterControls(page);
var trigger = false;
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Thumb') {
view = 'ThumbCard';
}
else if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
@ -55,8 +64,7 @@
preferThumb: true,
context: 'movies',
lazy: true,
overlayText: true,
showTitle: false
overlayText: true
});
}
else if (view == "ThumbCard") {
@ -96,7 +104,6 @@
items: result.Items,
shape: "portrait",
context: 'movies',
showTitle: false,
centerText: true,
lazy: true,
overlayText: true

96
dashboard-ui/scripts/moviesrecommended.js
View file

@ -1,10 +1,29 @@
(function ($, document) {
function getView() {
if (AppInfo.hasLowImageBandwidth) {
return 'PosterCard';
}
return 'PosterCard';
}
function getResumeView() {
if (AppInfo.hasLowImageBandwidth) {
return 'ThumbCard';
}
return 'ThumbCard';
}
function loadLatest(page, userId, parentId) {
var limit = AppInfo.hasLowImageBandwidth ?
15 :
18;
var limit = 18;
if (AppInfo.hasLowImageBandwidth) {
limit = 10;
}
var options = {
@ -18,13 +37,34 @@
ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) {
$('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({
var view = getView();
var html = '';
if (view == 'PosterCard') {
html += LibraryBrowser.getPosterViewHtml({
items: items,
lazy: true,
shape: 'portrait',
overlayText: false
overlayText: false,
showTitle: true,
showYear: true,
cardLayout: true
})).lazyChildren().trigger('create');
});
} else if (view == 'Poster') {
html += LibraryBrowser.getPosterViewHtml({
items: items,
shape: "portrait",
centerText: true,
lazy: true,
overlayText: true
});
}
$('#recentlyAddedItems', page).html(html).lazyChildren().trigger('create');
});
}
@ -55,15 +95,35 @@
$('#resumableSection', page).hide();
}
$('#resumableItems', page).html(LibraryBrowser.getPosterViewHtml({
var view = getResumeView();
var html = '';
if (view == 'ThumbCard') {
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
preferThumb: true,
shape: 'backdrop',
showTitle: true,
showYear: true,
lazy: true,
cardLayout: true
});
} else if (view == 'Thumb') {
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
preferThumb: true,
shape: 'backdrop',
overlayText: true,
showTitle: true,
lazy: true
});
}
})).lazyChildren().trigger('create');
$('#resumableItems', page).html(html).lazyChildren().trigger('create');
});
}
@ -95,12 +155,32 @@
html += '<h1 class="listHeader">' + title + '</h1>';
html += '<div>';
var view = getView();
if (view == 'PosterCard') {
html += LibraryBrowser.getPosterViewHtml({
items: recommendation.Items,
lazy: true,
shape: 'portrait',
overlayText: false,
showTitle: true,
showYear: true,
cardLayout: true
});
} else if (view == 'Poster') {
html += LibraryBrowser.getPosterViewHtml({
items: recommendation.Items,
shape: "portrait",
centerText: true,
lazy: true,
overlayText: true
});
}
html += '</div>';
return html;

8
dashboard-ui/scripts/movietrailers.js
View file

@ -1,6 +1,6 @@
(function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
var view = LibraryBrowser.getDefaultItemsView('PosterCard', 'PosterCard');
// The base query options
var query = {
@ -54,10 +54,10 @@
items: result.Items,
shape: "portrait",
context: 'movies-trailers',
showTitle: false,
centerText: true,
showTitle: true,
showYear: true,
lazy: true,
overlayText: false
cardLayout: true
});
var elem = $('.itemsContainer', page).html(html).lazyChildren();

6
dashboard-ui/scripts/musicalbumartists.js
View file

@ -46,6 +46,12 @@
updateFilterControls(page);
var trigger = false;
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "List") {
html = LibraryBrowser.getListViewHtml({

6
dashboard-ui/scripts/musicalbums.js
View file

@ -44,6 +44,12 @@
updateFilterControls(page);
var trigger = false;
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "Poster") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,

6
dashboard-ui/scripts/musicartists.js
View file

@ -47,6 +47,12 @@
updateFilterControls(page);
var trigger = false;
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "List") {
html = LibraryBrowser.getListViewHtml({

22
dashboard-ui/scripts/musicgenres.js
View file

@ -26,6 +26,13 @@
$(document).scrollTop(0);
var html = '';
var view = 'Thumb';
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Thumb') {
view = 'ThumbCard';
}
}
$('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex,
@ -38,6 +45,7 @@
updateFilterControls(page);
if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
@ -47,6 +55,20 @@
centerText: true,
lazy: true
});
}
else if (view == "ThumbCard") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
preferThumb: true,
context: 'music',
showItemCounts: true,
cardLayout: true,
lazy: true,
showTitle: true
});
}
$('#items', page).html(html).lazyChildren();

24
dashboard-ui/scripts/musicvideos.js
View file

@ -37,13 +37,37 @@
updateFilterControls(page);
var view = 'Poster';
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "Poster") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "square",
context: 'music',
showTitle: true,
lazy: true,
centerText: true
});
}
else if (view == "PosterCard") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "square",
context: 'music',
showTitle: true,
centerText: true,
cardLayout: true,
lazy: true,
showParentTitle: true
});
}
$('#items', page).html(html).trigger('create');

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

@ -1,6 +1,6 @@
(function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard');
// The base query options
var query = {
@ -40,6 +40,13 @@
updateFilterControls(page);
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "Poster") {
// Poster
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
@ -49,6 +56,20 @@
overlayText: true,
lazy: true
});
}
else if (view == "PosterCard") {
// Poster
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "auto",
context: getParameterByName('context') || 'photos',
showTitle: true,
lazy: true,
cardLayout: true,
showPremiereDate: true
});
}
var elem = $('#items', page).html(html).lazyChildren();

28
dashboard-ui/scripts/selectserver.js
View file

@ -154,7 +154,7 @@
// Need the timeout because jquery mobile will not show a popup if there's currently already one in the process of closing
setTimeout(function () {
Dashboard.hideLoadingMsg();
Dashboard.hideModalLoadingMsg();
Dashboard.alert({
message: Globalize.translate('DefaultErrorMessage')
});
@ -164,12 +164,12 @@
function acceptInvitation(page, id) {
Dashboard.showLoadingMsg();
Dashboard.showModalLoadingMsg();
// Add/Update connect info
ConnectionManager.acceptServer(id).done(function () {
Dashboard.hideLoadingMsg();
Dashboard.hideModalLoadingMsg();
loadPage(page);
}).fail(function () {
@ -180,12 +180,12 @@
function deleteServer(page, id) {
Dashboard.showLoadingMsg();
Dashboard.showModalLoadingMsg();
// Add/Update connect info
ConnectionManager.deleteServer(id).done(function () {
Dashboard.hideLoadingMsg();
Dashboard.hideModalLoadingMsg();
loadPage(page);
}).fail(function () {
@ -197,12 +197,12 @@
function rejectInvitation(page, id) {
Dashboard.showLoadingMsg();
Dashboard.showModalLoadingMsg();
// Add/Update connect info
ConnectionManager.rejectServer(id).done(function () {
Dashboard.hideLoadingMsg();
Dashboard.hideModalLoadingMsg();
loadPage(page);
}).fail(function () {
@ -372,6 +372,8 @@
Dashboard.showLoadingMsg();
Backdrops.setDefault(page);
ConnectionManager.getAvailableServers().done(function (servers) {
servers = servers.slice(0);
@ -400,7 +402,17 @@
loadInvitations(page);
}
$(document).on('pageshow', "#selectServerPage", function () {
$(document).on('pagebeforecreate', "#selectServerPage", function () {
var page = this;
if (ConnectionManager.isLoggedIntoConnect()) {
$(page).addClass('libraryPage').addClass(' noSecondaryNavPage').removeClass('standalonePage');
} else {
$(page).removeClass('libraryPage').removeClass(' noSecondaryNavPage').addClass('standalonePage');
}
}).on('pagebeforeshow', "#selectServerPage", function () {
var page = this;

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

@ -87,7 +87,7 @@ var Dashboard = {
}
Dashboard.hideLoadingMsg();
if (!Dashboard.suppressAjaxErrors) {
if (!Dashboard.suppressAjaxErrors && data.type != 'GET') {
setTimeout(function () {
@ -428,6 +428,10 @@ var Dashboard = {
navigate: function (url, preserveQueryString) {
if (!url) {
throw new Error('url cannot be null or empty');
}
var queryString = getWindowLocationSearch();
if (preserveQueryString && queryString) {
url += queryString;
@ -1363,10 +1367,10 @@ var Dashboard = {
if (AppInfo.hasLowImageBandwidth) {
quality -= 10;
quality -= 20;
if (isBackdrop) {
quality -= 10;
quality -= 20;
}
}
@ -1421,6 +1425,8 @@ var Dashboard = {
if (Dashboard.isRunningInCordova()) {
appName = "Emby Mobile";
deviceName = store.getItem('cordovaDeviceName');
deviceId = store.getItem('cordovaDeviceId');
}
@ -1501,6 +1507,7 @@ var AppInfo = {};
AppInfo.enableLatestChannelItems = true;
AppInfo.enableStudioTabs = true;
AppInfo.enablePeopleTabs = true;
AppInfo.enableHomeFavoritesTab = true;
AppInfo.enableTvEpisodesTab = true;
AppInfo.enableMusicArtistsTab = true;
AppInfo.enableHomeLatestTab = true;
@ -1617,6 +1624,10 @@ var AppInfo = {};
$(document.body).addClass('peopleTabDisabled');
}
if (!AppInfo.enableHomeFavoritesTab) {
$(document.body).addClass('homeFavoritesTabDisabled');
}
if (!AppInfo.enableTvEpisodesTab) {
$(document.body).addClass('tvEpisodesTabDisabled');
}
@ -1780,6 +1791,7 @@ var AppInfo = {};
$(onReady);
}
})();
Dashboard.jQueryMobileInit();

2
dashboard-ui/scripts/syncactivity.js
View file

@ -103,7 +103,7 @@
// cardScalable
html += "</div>";
html += '<div class="cardFooter">';
html += '<div class="cardFooter outerCardFooter">';
var textLines = [];

22
dashboard-ui/scripts/tvgenres.js
View file

@ -1,6 +1,6 @@
(function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Thumb', 'Thumb');
var view = LibraryBrowser.getDefaultItemsView('Thumb', 'ThumbCard');
// The base query options
var query = {
@ -39,6 +39,15 @@
updateFilterControls(page);
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Thumb') {
view = 'ThumbCard';
}
else if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
@ -63,6 +72,17 @@
lazy: true
});
}
else if (view == "PosterCard") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "portrait",
context: 'tv',
showItemCounts: true,
lazy: true,
cardLayout: true,
showTitle: true
});
}
else if (view == "Poster") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,

50
dashboard-ui/scripts/tvlatest.js
View file

@ -1,5 +1,14 @@
(function ($, document) {
function getView() {
if (AppInfo.hasLowImageBandwidth) {
return 'ThumbCard';
}
return 'Thumb';
}
$(document).on('pagebeforeshow', "#tvNextUpPage", function () {
var userId = Dashboard.getCurrentUserId();
@ -8,9 +17,11 @@
var page = this;
var limit = AppInfo.hasLowImageBandwidth ?
20 :
30;
var limit = 30;
if (AppInfo.hasLowImageBandwidth) {
limit = 16;
}
var options = {
@ -24,7 +35,28 @@
ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) {
$('#latestEpisodes', page).html(LibraryBrowser.getPosterViewHtml({
var view = getView();
var html = '';
if (view == 'ThumbCard') {
html += LibraryBrowser.getPosterViewHtml({
items: items,
shape: "backdrop",
preferThumb: true,
inheritThumb: false,
showUnplayedIndicator: false,
showChildCountIndicator: true,
overlayText: false,
showParentTitle: true,
lazy: true,
showTitle: true,
cardLayout: true
});
} else if (view == 'Thumb') {
html += LibraryBrowser.getPosterViewHtml({
items: items,
shape: "backdrop",
preferThumb: true,
@ -32,10 +64,14 @@
showParentTitle: false,
showUnplayedIndicator: false,
showChildCountIndicator: true,
overlayText: true,
lazy: true
overlayText: false,
centerText: true,
lazy: true,
showTitle: false
});
}
})).lazyChildren();
$('#latestEpisodes', page).html(html).lazyChildren();
});
});

65
dashboard-ui/scripts/tvrecommended.js
View file

@ -1,5 +1,23 @@
(function ($, document) {
function getView() {
if (AppInfo.hasLowImageBandwidth) {
return 'ThumbCard';
}
return 'Thumb';
}
function getResumeView() {
if (AppInfo.hasLowImageBandwidth) {
return 'PosterCard';
}
return 'Poster';
}
function reload(page) {
var context = '';
@ -50,7 +68,25 @@
$('.noNextUpItems', page).show();
}
$('#nextUpItems', page).html(LibraryBrowser.getPosterViewHtml({
var view = getView();
var html = '';
if (view == 'ThumbCard') {
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
showTitle: true,
preferThumb: true,
showParentTitle: true,
lazy: true,
cardLayout: true,
context: 'tv'
});
} else if (view == 'Thumb') {
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
showTitle: true,
@ -59,8 +95,10 @@
context: context,
lazy: true,
preferThumb: true
});
}
})).lazyChildren();
$('#nextUpItems', page).html(html).lazyChildren();
});
}
@ -99,7 +137,24 @@
$('.nextUpHeader', page).addClass('firstListHeader');
}
$('#resumableItems', page).html(LibraryBrowser.getPosterViewHtml({
var view = getResumeView();
var html = '';
if (view == 'PosterCard') {
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
showTitle: true,
showParentTitle: true,
lazy: true,
cardLayout: true,
context: 'tv'
});
} else if (view == 'Poster') {
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
showTitle: true,
@ -107,8 +162,10 @@
overlayText: screenWidth >= 800 && !AppInfo.hasLowImageBandwidth,
lazy: true,
context: 'tv'
});
}
})).lazyChildren();
$('#resumableItems', page).html(html).lazyChildren();
});
}

18
dashboard-ui/scripts/tvshows.js
View file

@ -1,6 +1,6 @@
(function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard');
// The base query options
var query = {
@ -43,6 +43,15 @@
updateFilterControls(page);
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Thumb') {
view = 'ThumbCard';
}
else if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
@ -50,7 +59,8 @@
shape: "backdrop",
preferThumb: true,
context: 'tv',
lazy: true
lazy: true,
overlayText: true
});
}
@ -104,9 +114,9 @@
items: result.Items,
shape: "portrait",
context: 'tv',
showTitle: false,
centerText: true,
lazy: true
lazy: true,
overlayText: true
});
}

2
dashboard-ui/scripts/tvupcoming.js
View file

@ -5,7 +5,7 @@
var page = this;
var limit = AppInfo.hasLowImageBandwidth ?
20 :
18 :
40;
var query = {

2
dashboard-ui/selectserver.html
View file

@ -4,7 +4,7 @@
<title>Emby</title>
</head>
<body>
<div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage">
<div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b">
<div data-role="content">

1
dashboard-ui/thirdparty/apiclient/apiclient.js vendored
View file

@ -126,6 +126,7 @@
Events.trigger(self, 'requestfail', [
{
url: this.url,
type: this.type,
status: e.status,
errorCode: e.getResponseHeader("X-Application-Error-Code")
}]);

35
dashboard-ui/thirdparty/apiclient/connectionmanager.js vendored
View file

@ -1070,6 +1070,25 @@
self.deleteServer = function (serverId) {
var credentials = credentialProvider.credentials();
var serverInfo = credentials.servers = credentials.servers.filter(function (s) {
return s.ConnectServerId == serverId;
});
function onDone() {
credentials = credentialProvider.credentials();
credentials.servers = credentials.servers.filter(function (s) {
return s.ConnectServerId != serverId;
});
credentialProvider.credentials(credentials);
}
if (serverInfo.ExchangeToken) {
var connectToken = self.connectToken();
if (!serverId) {
@ -1092,17 +1111,15 @@
"X-Application": appName + "/" + appVersion
}
}).done(function () {
}).done(onDone);
var credentials = credentialProvider.credentials();
} else {
credentials.servers = credentials.servers.filter(function (s) {
return s.ConnectServerId != serverId;
});
credentialProvider.credentials(credentials);
});
onDone();
var deferred = DeferredBuilder.Deferred();
deferred.resolve();
return deferred.promise();
}
};
self.rejectServer = function (serverId) {

24
dashboard-ui/thirdparty/cordova/remotecontrols.js vendored
View file

@ -57,18 +57,15 @@
}
var params = [artist, title, album, url, duration, elapsedTime];
try {
window.remoteControls.updateMetas(onUpdateMetasSuccess, onUpdateMetasFail, params);
} catch (err) {
onUpdateMetasFail(err);
}
}
function onStateChanged(e, state) {
//console.log('nowplaying event: ' + e.type);
var player = this;
if (player.isDefaultPlayer && state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video') {
return;
}
updatePlayerState(state);
}
@ -115,7 +112,12 @@
var elapsedTime = 0;
var params = [artist, title, album, image, duration, elapsedTime];
try {
window.remoteControls.updateMetas(onUpdateMetasSuccess, onUpdateMetasFail, params);
} catch (err) {
onUpdateMetasFail(err);
}
}
function onUpdateMetasSuccess() {
@ -125,7 +127,7 @@
function onUpdateMetasFail(fail) {
console.log('onUpdateMetasFail' + fail);
console.log('onUpdateMetasFail: ' + fail);
}
function bindToPlayer(player) {
@ -138,6 +140,8 @@
return;
}
console.log('binding remotecontrols to MediaPlayer');
player.getPlayerState().done(function (state) {
if (state.NowPlayingItem) {
@ -153,8 +157,12 @@
.on('positionchange.cordovaremote', onStateChanged);
}
console.log('binding remotecontrols to MediaController');
document.addEventListener("deviceready", function () {
console.log('binding remotecontrols to MediaController');
$(function () {
$(MediaController).on('playerchange', function () {

63
dashboard-ui/thirdparty/cordova/serverdiscovery.js vendored
View file

@ -14,9 +14,7 @@
return String.fromCharCode.apply(null, new Uint16Array(buf));
}
globalScope.ServerDiscovery = {
findServers: function (timeoutMs) {
function findServersInternal(timeoutMs) {
var deferred = DeferredBuilder.Deferred();
@ -33,9 +31,12 @@
}
var isTimedOut = false;
var timeout;
var socketId;
var timeout = setTimeout(function () {
function startTimer() {
timeout = setTimeout(function () {
isTimedOut = true;
deferred.resolveWith(null, [servers]);
@ -43,11 +44,10 @@
if (socketId) {
chrome.sockets.udp.onReceive.removeListener(onReceive);
chrome.sockets.udp.close(socketId);
}
}, timeoutMs);
}
function onReceive(info) {
@ -57,8 +57,9 @@
if (info.socketId == socketId) {
try {
var json = arrayBufferToString(info.data);
console.log('Server discovery json: ' + json);
var server = JSON.parse(json);
server.RemoteAddress = info.remoteAddress;
@ -68,42 +69,76 @@
}
servers.push(server);
} catch (err) {
console.log('Error receiving server info: ' + err);
}
}
}
var port = 7359;
console.log('chrome.sockets.udp.create');
chrome.sockets.udp.create(function (createInfo) {
socketId = createInfo.socketId;
console.log('chrome.sockets.udp.bind');
chrome.sockets.udp.bind(createInfo.socketId, '0.0.0.0', port, function (result) {
var data = stringToArrayBuffer('who is EmbyServer?');
console.log('chrome.sockets.udp.send');
chrome.sockets.udp.send(createInfo.socketId, data, '255.255.255.255', port, function (result) {
if (result < 0) {
console.log('send fail: ' + result);
chrome.sockets.udp.close(createInfo.socketId);
if (!isTimedOut) {
clearTimeout(timeout);
deferred.resolveWith(null, [servers]);
}
chrome.sockets.udp.close(createInfo.socketId);
} else {
console.log('sendTo: success ' + port);
if (!isTimedOut) {
startTimer();
chrome.sockets.udp.onReceive.addListener(onReceive);
}
}
});
});
});
return deferred.promise();
}
globalScope.ServerDiscovery = {
findServers: function (timeoutMs) {
var deferred = DeferredBuilder.Deferred();
deviceReadyPromise.done(function () {
findServersInternal(timeoutMs).done(function (result) {
deferred.resolveWith(null, [result]);
}).fail(function () {
deferred.reject();
});
});
return deferred.promise();
}
};
var deviceReadyDeferred = DeferredBuilder.Deferred();
var deviceReadyPromise = deviceReadyDeferred.promise();
document.addEventListener("deviceready", function () {
deviceReadyDeferred.resolve();
}, false);
})(window);

302
dashboard-ui/thirdparty/jquery.unveil-custom.js vendored
View file

@ -12,13 +12,23 @@
var unveilId = 0;
// Test search before setting to 0
function getThreshold() {
var threshold = 100;
if (window.AppInfo && AppInfo.hasLowImageBandwidth) {
return 0;
}
// Test search before setting to 0
return 100;
}
$.fn.unveil = function () {
var $w = $(window),
th = threshold || 0,
th = getThreshold(),
attrib = "data-src",
images = this,
loaded;
@ -90,7 +100,7 @@
var indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB || window.OIndexedDB || window.msIndexedDB,
dbVersion = 1.0;
var dbName = "emby3";
var dbName = "emby4";
var imagesStoreName = "images";
function createObjectStore(dataBase) {
@ -160,9 +170,10 @@
var self = this;
var openPromise = openDb().done(function (db) {
openDb().done(function (db) {
self._db = db;
window.ImageStore = self;
});
self.addImageToDatabase = function (blob, key) {
@ -176,13 +187,6 @@
var put = transaction.objectStore(imagesStoreName).put(blob, key);
};
self.revokeUrl = function (url) {
// Get window.URL object
var URL = window.URL || window.webkitURL;
URL.revokeObjectURL(url);
};
self.db = function () {
return self._db;
@ -283,6 +287,7 @@
self.addImageToDatabase(dataURL, key);
deferred.resolve();
} catch (err) {
console.log("Error adding image to database");
deferred.reject();
}
} else {
@ -301,16 +306,12 @@
setImageIntoElement(elem, url);
}
openPromise.done(function () {
self.getImageUrl(url).done(function (localUrl) {
setImageIntoElement(elem, localUrl);
}).fail(onFail);
}).fail(onFail);
};
}
@ -318,9 +319,10 @@
var self = this;
var openPromise = openDb().done(function (db) {
openDb().done(function (db) {
self._db = db;
window.ImageStore = self;
});
self.addImageToDatabase = function (blob, key) {
@ -334,13 +336,6 @@
var put = transaction.objectStore(imagesStoreName).put(blob, key);
};
self.revokeUrl = function (url) {
// Get window.URL object
var URL = window.URL || window.webkitURL;
URL.revokeObjectURL(url);
};
self.db = function () {
return self._db;
@ -437,6 +432,8 @@
self.addImageToDatabase(blob, key);
deferred.resolve();
} catch (err) {
console.log("Error adding blob to database");
alert("Error adding blob to database");
deferred.reject();
}
} else {
@ -455,16 +452,250 @@
setImageIntoElement(elem, url);
}
openPromise.done(function () {
self.getImageUrl(url).done(function (localUrl) {
setImageIntoElement(elem, localUrl);
}).fail(onFail);
};
}
}).fail(onFail);
function indexedDbWebpImageStore() {
var self = this;
openDb().done(function (db) {
self._db = db;
window.ImageStore = self;
});
self.addImageToDatabase = function (blob, key) {
console.log("addImageToDatabase");
// Open a transaction to the database
var transaction = self.db().transaction([imagesStoreName], "readwrite");
// Put the blob into the dabase
var put = transaction.objectStore(imagesStoreName).put(blob, key);
};
self.db = function () {
return self._db;
};
self.get = function (key) {
var deferred = DeferredBuilder.Deferred();
var transaction = self.db().transaction([imagesStoreName], "readonly");
// Open a transaction to the database
var getRequest = transaction.objectStore(imagesStoreName).get(key);
getRequest.onsuccess = function (event) {
var imgFile = event.target.result;
if (imgFile) {
deferred.resolveWith(null, [imgFile]);
} else {
deferred.reject();
}
};
getRequest.onerror = function () {
deferred.reject();
};
return deferred.promise();
};
self.getImageUrl = function (originalUrl) {
console.log('getImageUrl:' + originalUrl);
var key = CryptoJS.SHA1(originalUrl).toString();
var deferred = DeferredBuilder.Deferred();
self.get(key).done(function (url) {
deferred.resolveWith(null, [url]);
}).fail(function () {
self.downloadImage(originalUrl, key).done(function () {
self.get(key).done(function (url) {
deferred.resolveWith(null, [url]);
}).fail(function () {
deferred.reject();
});
}).fail(function () {
deferred.reject();
});
});
return deferred.promise();
};
self.downloadImage = function (url, key) {
var deferred = DeferredBuilder.Deferred();
console.log('downloadImage:' + url);
// Create XHR
var xhr = new XMLHttpRequest();
xhr.open("GET", url, true);
// Set the responseType to blob
xhr.responseType = "arraybuffer";
xhr.addEventListener("load", function () {
if (xhr.status === 200) {
console.log("Image retrieved");
try {
self.addImageToDatabase(this.response, key);
deferred.resolve();
} catch (err) {
console.log("Error adding image to database");
deferred.reject();
}
} else {
deferred.reject();
}
}, false);
// Send XHR
xhr.send();
return deferred.promise();
};
function decode(data, elem) {
console.log('decoding webp');
var WebPImage = { width: { value: 0 }, height: { value: 0 } }
var decoder = new WebPDecoder();
//Config, you can set all arguments or what you need, nothing no objeect
var config = decoder.WebPDecoderConfig;
var output_buffer = config.j;
var bitstream = config.input;
if (!decoder.WebPInitDecoderConfig(config)) {
throw new Error("Library version mismatch!\n");
}
var StatusCode = decoder.VP8StatusCode;
var status = decoder.WebPGetFeatures(data, data.length, bitstream);
if (status != 0) {
console.log('error');
}
var mode = decoder.WEBP_CSP_MODE;
output_buffer.J = 4;
status = decoder.WebPDecode(data, data.length, config);
var ok = (status == 0);
if (!ok) {
throw new Error("Decoding of %s failed.\n");
}
drawIntoElement(output_buffer, elem);
}
function drawIntoElement(output_buffer, elem) {
console.log('drawing canvas');
var bitmap = output_buffer.c.RGBA.ma;
var canvas = document.createElement("canvas");
var biHeight = output_buffer.height; var biWidth = output_buffer.width;
canvas.height = biHeight;
canvas.width = biWidth;
var context = canvas.getContext('2d');
var output = context.createImageData(canvas.width, canvas.height);
var outputData = output.data;
for (var h = 0; h < biHeight; h++) {
for (var w = 0; w < biWidth; w++) {
outputData[0 + w * 4 + (biWidth * 4) * h] = bitmap[1 + w * 4 + (biWidth * 4) * h];
outputData[1 + w * 4 + (biWidth * 4) * h] = bitmap[2 + w * 4 + (biWidth * 4) * h];
outputData[2 + w * 4 + (biWidth * 4) * h] = bitmap[3 + w * 4 + (biWidth * 4) * h];
outputData[3 + w * 4 + (biWidth * 4) * h] = bitmap[0 + w * 4 + (biWidth * 4) * h];
};
}
context.putImageData(output, 0, 0);
elem.appendChild(canvas);
}
self.setImageInto = function (elem, url) {
if (url.indexOf('format=webp') == -1 || elem.tagName != 'DIV') {
setImageIntoElement(elem, url);
return;
}
// Create XHR
var xhr = new XMLHttpRequest();
xhr.open("GET", url, true);
// Set the responseType to blob
xhr.responseType = "arraybuffer";
xhr.addEventListener("load", function () {
if (xhr.status === 200) {
console.log("Image retrieved");
try {
var arr = new Uint8Array(this.response);
//// Convert the int array to a binary string
//// We have to use apply() as we are converting an *array*
//// and String.fromCharCode() takes one or more single values, not
//// an array.
//var raw = String.fromCharCode.apply(null, arr);
//// This works!!!
//var b64 = btoa(raw);
//var dataURL = "data:image/jpeg;base64," + b64;
console.log(url);
decode(arr, elem);
} catch (err) {
console.log("Error adding image to database");
}
} else {
}
}, false);
// Send XHR
xhr.send();
};
}
@ -475,17 +706,16 @@
self.setImageInto = setImageIntoElement;
}
if ($.browser.safari && indexedDB && window.Blob) {
console.log('creating indexedDbBlobImageStore');
window.ImageStore = new indexedDbBlobImageStore();
}
else if ($.browser.safari && indexedDB) {
console.log('creating indexedDbImageStore');
window.ImageStore = new indexedDbImageStore();
}
else {
console.log('creating simpleImageStore');
window.ImageStore = new simpleImageStore();
}
//if ($.browser.safari && indexedDB && window.Blob) {
// console.log('creating indexedDbBlobImageStore');
// new indexedDbBlobImageStore();
//}
//else if ($.browser.safari && indexedDB) {
// console.log('creating indexedDbImageStore');
// new indexedDbImageStore();
//}
})();

2
dashboard-ui/tvrecommended.html
View file

@ -10,7 +10,7 @@
<a href="index.html">${TabHome}</a>
<a href="homelatest.html" class="homeLatestTab">${TabLatest}</a>
<a href="#" class="ui-btn-active">${TabNextUp}</a>
<a href="favorites.html">${TabFavorites}</a>
<a href="favorites.html" class="homeFavoritesTab">${TabFavorites}</a>
<a href="tvupcoming.html">${TabUpcoming}</a>
</div>
<div class="libraryViewNav scopedLibraryViewNav" style="display: none;">

2
dashboard-ui/tvupcoming.html
View file

@ -9,7 +9,7 @@
<a href="index.html">${TabHome}</a>
<a href="homelatest.html" class="homeLatestTab">${TabLatest}</a>
<a href="tvrecommended.html">${TabNextUp}</a>
<a href="favorites.html">${TabFavorites}</a>
<a href="favorites.html" class="homeFavoritesTab">${TabFavorites}</a>
<a href="#" class="ui-btn-active">${TabUpcoming}</a>
</div>
<div class="libraryViewNav scopedLibraryViewNav" style="display: none;">