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

consolidate people access

Browse source
This commit is contained in:
Luke Pulverenti 2015-06-28 12:36:25 -04:00
parent a0b6f768b3
commit 6afe8ad530
4 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,3 +193,7 @@
display: none; display: none;
} }
} }
.nowPlayingPageUserDataButtons iron-icon {
width: 40px;
height: 40px;
}

3
dashboard-ui/nowplaying.html
View file

@ -56,6 +56,9 @@
<paper-fab icon="movie" class="btnChapters videoButton btnPlayStateCommand subdued" title="${ButtonScenes}" data-command="GoToSearch"></paper-fab> <paper-fab icon="movie" class="btnChapters videoButton btnPlayStateCommand subdued" title="${ButtonScenes}" data-command="GoToSearch"></paper-fab>
</div> </div>
</div> </div>
<div class="nowPlayingPageUserDataButtons" style="margin-top:1.5em;">
</div>
</div> </div>
</neon-animatable> </neon-animatable>
<neon-animatable> <neon-animatable>

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

@ -557,7 +557,8 @@
clearProgressInterval(); clearProgressInterval();
Events.off(mediaRenderer, 'ended.playbackstopped').off('ended.playnext'); Events.off(mediaRenderer, 'ended.playbackstopped');
Events.off(mediaRenderer, 'ended.playnext');
$(mediaRenderer).one("play", function () { $(mediaRenderer).one("play", function () {

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

@ -52,7 +52,9 @@
html += "</div>"; html += "</div>";
} }
elem.html(html).trigger('create').lazyChildren(); elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
$(elem).trigger('create');
} }
function selectCurrentChapter(elem, positionTicks) { function selectCurrentChapter(elem, positionTicks) {
@ -69,30 +71,31 @@
var chapterElem = matches[matches.length - 1]; var chapterElem = matches[matches.length - 1];
$(chapterElem).addClass('currentChapter'); chapterElem.classList.add('currentChapter');
chapterElem.scrollIntoView(); chapterElem.scrollIntoView();
elem[0].scrollLeft += 50; elem.scrollLeft += 50;
} }
function showChapterMenu(page, item, currentPositionTicks) { function showChapterMenu(page, item, currentPositionTicks) {
$('.chapterMenuOverlay', page).show(); $('.chapterMenuOverlay', page).show();
var elem = $('.chapterMenu', page).show(); var elem = page.querySelector('.chapterMenu');
$(elem).show();
if (item.Id == elem.attr('data-itemid')) { if (item.Id == elem.getAttribute('data-itemid')) {
selectCurrentChapter(elem, currentPositionTicks); selectCurrentChapter(elem, currentPositionTicks);
return; return;
} }
var innerElem = $('.chapterMenuInner', elem); var innerElem = elem.querySelector('.chapterMenuInner');
populateChapters(innerElem, item.Chapters, item.Id, item.RunTimeTicks); populateChapters(innerElem, item.Chapters, item.Id, item.RunTimeTicks);
elem.attr('data-itemid', item.Id); elem.setAttribute('data-itemid', item.Id);
selectCurrentChapter(elem, currentPositionTicks); selectCurrentChapter(elem, currentPositionTicks);
} }
@ -349,7 +352,7 @@
loadPlaylist(page); loadPlaylist(page);
}); });
$(page).on('click', '.mediaItem', onListItemClick); Events.on(page, 'click', '.mediaItem', onListItemClick);
} }
function onPlaybackStart(e, state) { function onPlaybackStart(e, state) {
@ -533,6 +536,14 @@
setImageUrl(page, url); setImageUrl(page, url);
Backdrops.setBackdropUrl(page, backdropUrl); Backdrops.setBackdropUrl(page, backdropUrl);
if (item) {
ApiClient.getItem(Dashboard.getCurrentUserId(), item.Id).done(function (fullItem) {
page.querySelector('.nowPlayingPageUserDataButtons').innerHTML = LibraryBrowser.getUserDataIconsHtml(fullItem, false);
});
} else {
page.querySelector('.nowPlayingPageUserDataButtons').innerHTML = '';
}
} }
function setImageUrl(page, url) { function setImageUrl(page, url) {
@ -619,9 +630,10 @@
smallIcon: true smallIcon: true
}); });
var itemsContainer = elem.querySelector('.playlist'); var itemsContainer = page.querySelector('.playlist');
itemsContainer.innerHTML = html; itemsContainer.innerHTML = html;
ImageLoader.lazyChildren(html).trigger('create'); ImageLoader.lazyChildren(itemsContainer);
$(itemsContainer).trigger('create');
} }
function onListItemClick(e) { function onListItemClick(e) {