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 video osd

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-11 12:52:22 -05:00
parent 0444d44461
commit 28bb4ffd62
6 changed files with 49 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -392,7 +392,7 @@
}
if (currentTimeElement) {
var timeText = positionTicks == null ? '--:--' : datetime.getDisplayRunningTime(positionTicks);
if (runtimeTicks) {
@ -599,7 +599,20 @@
// Don't call getNowPlayingBar here because we don't want to end up creating it just to hide it
var elem = document.getElementsByClassName('nowPlayingBar')[0];
if (elem) {
slideDown(elem);
// If it's not currently visible, don't bother with the animation
// transitionend events not firing in mobile chrome/safari when hidden
if (document.body.classList.contains('hiddenNowPlayingBar')) {
dom.removeEventListener(elem, dom.whichTransitionEvent(), onSlideDownComplete, {
once: true
});
elem.classList.add('hide');
elem.classList.add('nowPlayingBar-hidden');
} else {
slideDown(elem);
}
}
}

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

@ -2395,6 +2395,10 @@ var AppInfo = {};
list.push('bower_components/emby-webcomponents/htmlaudioplayer/plugin');
}
if (Dashboard.isRunningInCordova() && browser.safari) {
list.push('cordova/chromecast');
}
if (Dashboard.isRunningInCordova() && browser.android) {
// intent player
list.push('cordova/externalplayer');
@ -2536,7 +2540,6 @@ var AppInfo = {};
postInitDependencies.push('cordova/volume');
postInitDependencies.push('cordova/statusbar');
postInitDependencies.push('cordova/chromecast');
postInitDependencies.push('cordova/orientation');
postInitDependencies.push('cordova/remotecontrols');

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

@ -104,13 +104,8 @@
var transitionEndEventName = dom.whichTransitionEvent();
function getHeaderElement() {
return document.querySelector('.skinHeader');
}
function getOsdBottom() {
return view.querySelector('.videoOsdBottom');
}
var headerElement = document.querySelector('.skinHeader');
var osdBottomElement = document.querySelector('.videoOsdBottom');
function updateNowPlayingInfo(state) {
@ -206,15 +201,15 @@
function showOsd() {
slideDownToShow(getHeaderElement());
slideUpToShow(getOsdBottom());
slideDownToShow(headerElement);
slideUpToShow(osdBottomElement);
startHideTimer();
}
function hideOsd() {
slideUpToHide(getHeaderElement());
slideDownToHide(getOsdBottom());
slideUpToHide(headerElement);
slideDownToHide(osdBottomElement);
}
var hideTimeout;
@ -387,7 +382,7 @@
view.addEventListener('viewbeforeshow', function (e) {
getHeaderElement().classList.add('osdHeader');
headerElement.classList.add('osdHeader');
// Make sure the UI is completely transparent
Emby.Page.setTransparency('full');
});
@ -418,8 +413,8 @@
});
stopHideTimer();
getHeaderElement().classList.remove('osdHeader');
getHeaderElement().classList.remove('osdHeader-hidden');
headerElement.classList.remove('osdHeader');
headerElement.classList.remove('osdHeader-hidden');
dom.removeEventListener(document, 'mousemove', onMouseMove, {
passive: true
});
@ -921,7 +916,7 @@
view.addEventListener('viewhide', function () {
getHeaderElement().classList.remove('hide');
headerElement.classList.remove('hide');
});
function onWindowKeyDown(e) {
@ -1020,6 +1015,8 @@
nowPlayingPositionSlider.getBubbleHtml = function (value) {
showOsd();
if (!currentRuntimeTicks) {
return '--:--';
}