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 live tv image

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-28 00:19:08 -04:00
parent 9599bbbd35
commit 06b74be1fd
16 changed files with 122 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -242,9 +242,8 @@
console.log('iron-select');
// When transition animations are used, add a content loading delay to allow the animations to finish
// Otherwise with both operations happening at the same time, it can cause the animation to not run at full speed.
var enablePaperTabs = LibraryBrowser.enableFullPaperTabs();
var delay = enablePaperTabs ? 500 : 0;
var pgs = this;
var delay = pgs.entryAnimation ? 500 : 0;
setTimeout(function () {
$(pgs).trigger('tabchange');
@ -274,7 +273,24 @@
}
} else {
Events.trigger(page.querySelector('neon-animated-pages'), 'tabchange');
var pages = page.querySelector('neon-animated-pages');
if (!NavHelper.isBack()) {
if (pages.selected) {
var entryAnimation = pages.entryAnimation;
var exitAnimation = pages.exitAnimation;
pages.entryAnimation = null;
pages.exitAnimation = null;
tabs.selected = 0;
pages.entryAnimation = entryAnimation;
pages.exitAnimation = exitAnimation;
return;
}
}
Events.trigger(pages, 'tabchange');
}
},
@ -718,16 +734,16 @@
var href = LibraryBrowser.getHrefInternal(item, context);
if (context != 'livetv') {
if (topParentId == null && context != 'playlists') {
topParentId = LibraryMenu.getTopParentId();
}
//if (context != 'livetv') {
// if (topParentId == null && context != 'playlists') {
// topParentId = LibraryMenu.getTopParentId();
// }
if (topParentId) {
href += href.indexOf('?') == -1 ? "?topParentId=" : "&topParentId=";
href += topParentId;
}
}
// if (topParentId) {
// href += href.indexOf('?') == -1 ? "?topParentId=" : "&topParentId=";
// href += topParentId;
// }
//}
return href;
},
@ -983,11 +999,6 @@
var cssClass = options.smallIcon ? 'ui-li-has-icon listItem' : 'ui-li-has-thumb listItem';
if (item.UserData) {
cssClass += ' ' + LibraryBrowser.getUserDataCssClass(item.UserData.Key);
}
var href = LibraryBrowser.getHref(item, options.context);
html += '<li class="' + cssClass + '"' + dataAttributes + ' data-itemid="' + item.Id + '" data-playlistitemid="' + (item.PlaylistItemId || '') + '" data-href="' + href + '" data-icon="false">';
@ -1219,7 +1230,7 @@
itemCommands.push('trailer');
}
if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "MusicGenre") {
if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "MusicGenre" || item.CollectionType == "music") {
itemCommands.push('instantmix');
}
@ -1690,10 +1701,6 @@
var href = options.linkItem === false ? '#' : LibraryBrowser.getHref(item, options.context);
if (item.UserData) {
cssClass += ' ' + LibraryBrowser.getUserDataCssClass(item.UserData.Key);
}
if (options.showChildCountIndicator && item.ChildCount && options.showLatestItemsPopup !== false) {
cssClass += ' groupedCard';
}

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

@ -1163,14 +1163,14 @@
function playAllFromHere(index, itemsContainer, method) {
var ids = $('.mediaItem', itemsContainer).get().map(function(i) {
var ids = $('.mediaItem', itemsContainer).get().map(function (i) {
return i.getAttribute('data-itemid') || i.parentNode.getAttribute('data-itemid');
});
ids = ids.slice(index);
ApiClient.getItems(Dashboard.getCurrentUserId(), {
Ids: ids.join(','),
Fields: 'MediaSources,Chapters',
Limit: 100
@ -1281,13 +1281,7 @@
function onUserDataChanged(userData) {
var cssClass = LibraryBrowser.getUserDataCssClass(userData.Key);
if (!cssClass) {
return;
}
$('.' + cssClass).each(function () {
$(document.querySelectorAll("*[data-itemid='" + userData.ItemId + "']")).each(function () {
var mediaType = this.getAttribute('data-mediatype');

62
dashboard-ui/scripts/mediaplayer.js
View file

@ -1411,56 +1411,11 @@
var promise;
var itemLimit = 100;
if (item.Type == "MusicArtist") {
promise = ApiClient.getInstantMixFromArtist({
UserId: Dashboard.getCurrentUserId(),
Fields: getItemFields,
Limit: itemLimit,
Id: id
});
}
else if (item.Type == "MusicGenre") {
promise = ApiClient.getInstantMixFromMusicGenre({
UserId: Dashboard.getCurrentUserId(),
Fields: getItemFields,
Limit: itemLimit,
Id: id
});
}
else if (item.Type == "MusicAlbum") {
promise = ApiClient.getInstantMixFromAlbum(id, {
UserId: Dashboard.getCurrentUserId(),
Fields: getItemFields,
Limit: itemLimit
});
}
else if (item.Type == "Playlist") {
promise = ApiClient.getInstantMixFromPlaylist(id, {
UserId: Dashboard.getCurrentUserId(),
Fields: getItemFields,
Limit: itemLimit
});
}
else if (item.Type == "Audio") {
promise = ApiClient.getInstantMixFromSong(id, {
UserId: Dashboard.getCurrentUserId(),
Fields: getItemFields,
Limit: itemLimit
});
}
else {
return;
}
promise = ApiClient.getInstantMixFromItem(id, {
UserId: Dashboard.getCurrentUserId(),
Fields: getItemFields,
Limit: itemLimit
});
promise.done(function (result) {
@ -1760,7 +1715,12 @@
function canPlayH264() {
if (navigator.userAgent.toLowerCase().indexOf('firefox') != -1) {
var userAgent = navigator.userAgent.toLowerCase();
if (userAgent.indexOf('firefox') != -1) {
if (userAgent.indexOf('windows') != -1) {
return true;
}
return false;
}

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

@ -2082,6 +2082,8 @@ var AppInfo = {};
capabilities.DeviceProfile = MediaPlayer.getDeviceProfile(Math.max(screen.height, screen.width));
createConnectionManager(capabilities).done(function () { onConnectionManagerCreated(deferred); });
//$(document.body).append('<div style="background:#3F51B5;position:fixed;z-index:999999;top:0;right:0;left:0;bottom:0;padding:50px;"><iron-icon icon="live-tv" style="width:640px;height:640px;color:#fff;"></iron-icon></div>');
});
}