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

implement keep up to

This commit is contained in:
Luke Pulverenti 2016-09-27 01:13:56 -04:00
parent 633e2f0222
commit 2efcbc740d
14 changed files with 111 additions and 43 deletions

View file

@ -242,10 +242,14 @@
passwordConfirm: page.querySelector('#txtSignupPasswordConfirm', page).value,
grecaptcha: greResponse
}).then(function () {
}).then(function (result) {
var msg = result.Validated ?
Globalize.translate('MessageThankYouForConnectSignUpNoValidation') :
Globalize.translate('MessageThankYouForConnectSignUp');
Dashboard.alert({
message: Globalize.translate('MessageThankYouForConnectSignUp'),
message: msg,
callback: function () {
Dashboard.navigate('connectlogin.html?mode=welcome');
}

View file

@ -196,7 +196,7 @@
// For now don't do this in edge because we lose some native audio support
if (browser.edge) {
return false;
//return false;
}
// hls.js is only in beta. needs more testing.

View file

@ -1412,13 +1412,13 @@
var userDataIcons = page.querySelectorAll('.userDataIcons');
var html = userdataButtons.getIconsHtml({
item: item,
style: 'fab-mini'
});
for (var i = 0, length = userDataIcons.length; i < length; i++) {
userDataIcons[i].innerHTML = html;
userdataButtons.fill({
item: item,
style: 'fab-mini',
element: userDataIcons[i]
});
}
}

View file

@ -1008,7 +1008,7 @@
// Huge hack alert. Safari doesn't seem to like if the segments aren't available right away when playback starts
// This will start the transcoding process before actually feeding the video url into the player
// Edit: Also seeing stalls from hls.js
if (!mediaSource.RunTimeTicks && isHls && !browser.edge) {
if (!mediaSource.RunTimeTicks && isHls) {
var hlsPlaylistUrl = streamInfo.url.replace('master.m3u8', 'live.m3u8');

View file

@ -163,11 +163,17 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
var playSessionId = getParameterByName('PlaySessionId', currentSrc);
var liveStreamId = getParameterByName('LiveStreamId', currentSrc);
var disableVideoAudioCodecs = [];
if (!AppInfo.isNativeApp && !self.currentMediaSource.RunTimeTicks) {
disableVideoAudioCodecs.push('ac3');
}
Dashboard.getDeviceProfile(null, {
enableMkvProgressive: self.currentMediaSource.RunTimeTicks != null,
enableTsProgressive: self.currentMediaSource.RunTimeTicks != null,
enableHls: !browserInfo.firefox || self.currentMediaSource.RunTimeTicks == null
enableHls: !browserInfo.firefox || self.currentMediaSource.RunTimeTicks == null,
disableVideoAudioCodecs: disableVideoAudioCodecs
}).then(function (deviceProfile) {
@ -677,10 +683,17 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
var onBitrateDetected = function () {
var disableVideoAudioCodecs = [];
if (!AppInfo.isNativeApp && !item.RunTimeTicks) {
disableVideoAudioCodecs.push('ac3');
}
Dashboard.getDeviceProfile(null, {
enableMkvProgressive: item.RunTimeTicks != null,
enableTsProgressive: item.RunTimeTicks != null
enableTsProgressive: item.RunTimeTicks != null,
disableVideoAudioCodecs: disableVideoAudioCodecs
}).then(function (deviceProfile) {
playOnDeviceProfileCreated(deviceProfile, item, startPosition, callback);

View file

@ -596,13 +596,16 @@
if (nowPlayingItem.Id) {
ApiClient.getItem(Dashboard.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
nowPlayingUserData.innerHTML = userdataButtons.getIconsHtml({
userdataButtons.fill({
item: item,
includePlayed: false
includePlayed: false,
element: nowPlayingUserData
});
});
} else {
nowPlayingUserData.innerHTML = '';
userdataButtons.destroy({
element: nowPlayingUserData
});
}
}