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-15 16:29:00 -05:00
parent b2bab22271
commit ba2ccfb17a
13 changed files with 54 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/components/dockedtabs/dockedtabs.js
View file

@ -326,7 +326,7 @@
var instance;
function onViewShow(e) {
if (e.detail.type === 'video-osd') {
if (e.detail.type === 'video-osd' || !Dashboard.getCurrentUserId()) {
instance.hide();
} else {
instance.show();
@ -341,12 +341,12 @@
self.element = render(options);
events.on(connectionManager, 'localusersignedin', function (e, user) {
self.element.classList.remove('hide');
self.show();
showUserTabs(user, self.element);
});
events.on(connectionManager, 'localusersignedout', function () {
self.element.classList.add('hide');
self.hide();
});
showCurrentUserTabs(self.element);

33
dashboard-ui/components/remotecontrol.js
View file

@ -35,7 +35,7 @@
positionTo: button,
callback: function (id) {
player.setAudioStreamIndex(parseInt(id));
playbackManager.setAudioStreamIndex(parseInt(id), player);
}
});
@ -76,7 +76,7 @@
positionTo: button,
callback: function (id) {
player.setSubtitleStreamIndex(parseInt(id));
playbackManager.setSubtitleStreamIndex(parseInt(id), player);
}
});
@ -382,22 +382,14 @@
var context = dlg;
var btnPause = context.querySelector('.btnPause');
var btnPlay = context.querySelector('.btnPlay');
buttonEnabled(btnPause, isActive);
buttonEnabled(btnPlay, isActive);
var btnPlayPause = context.querySelector('.btnPlayPause');
if (isPaused) {
hideButton(btnPause);
showButton(btnPlay);
btnPlayPause.querySelector('i').innerHTML = 'play_arrow';
} else {
showButton(btnPause);
hideButton(btnPlay);
btnPlayPause.querySelector('i').innerHTML = 'pause';
}
buttonEnabled(btnPlayPause, isActive);
}
function updateTimeDisplay(positionTicks, runtimeTicks) {
@ -681,17 +673,10 @@
}
});
context.querySelector('.btnPlay').addEventListener('click', function () {
context.querySelector('.btnPlayPause').addEventListener('click', function () {
if (currentPlayer) {
currentPlayer.unpause();
}
});
context.querySelector('.btnPause').addEventListener('click', function () {
if (currentPlayer) {
currentPlayer.pause();
playbackManager.playPause(currentPlayer);
}
});