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

added new device profiles

Browse source
This commit is contained in:
Luke Pulverenti 2014-07-16 23:17:14 -04:00
parent b9ac022c81
commit 433cee5164
17 changed files with 296 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -897,7 +897,7 @@
function bindEventsForPlayback() {
var hideElementsOnIdle = !$.browser.mobile;
if (hideElementsOnIdle) {
$('.itemVideo').off('mousemove.videoplayer keydown.videoplayer scroll.videoplayer', idleHandler);
$('.itemVideo').on('mousemove.videoplayer keydown.videoplayer scroll.videoplayer', idleHandler).trigger('mousemove');
@ -1003,7 +1003,8 @@
self.startTimeTicksOffset = isStatic ? 0 : startPosition || 0;
var seekParam = startPosition ? '#t=' + (startPosition / 10000000) : '';
var startPositionInSeekParam = startPosition ? (startPosition / 10000000) : 0;
var seekParam = startPositionInSeekParam ? '#t=' + startPositionInSeekParam : '';
var mp4VideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mp4', $.extend({}, baseParams, {
Static: isStatic,
@ -1158,7 +1159,14 @@
volumeSlider.val(initialVolume).slider('refresh');
updateVolumeButtons(initialVolume);
video.on("volumechange.mediaplayerevent", function (e) {
video.one("loadedmetadata.mediaplayerevent", function (e) {
// Appending #t=xxx to the query string doesn't seem to work with HLS
if (startPositionInSeekParam && this.currentSrc && this.currentSrc.toLowerCase().indexOf('.m3u8') != -1) {
this.currentTime = startPositionInSeekParam;
}
}).on("volumechange.mediaplayerevent", function (e) {
var vol = this.volume;
@ -1234,7 +1242,7 @@
}).on("ended.playbackstopped", function () {
currentTimeElement.empty();
currentTimeElement.html('--:--');
self.onPlaybackStopped.call(this);