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

Merge branch 'master' into migrate-to-ES6-48

This commit is contained in:
Cameron 2020-08-02 15:16:13 +01:00 committed by GitHub
commit ce2b2d70ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 20 additions and 0 deletions

View file

@ -1,6 +1,8 @@
define(['browser'], function (browser) {
'use strict';
browser = browser.default || browser;
function canPlayH264(videoTestElement) {
return !!(videoTestElement.canPlayType && videoTestElement.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, ''));
}

View file

@ -2,6 +2,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
'use strict';
playbackManager = playbackManager.default || playbackManager;
browser = browser.default || browser;
function renderHeader() {
var html = '';

View file

@ -1,6 +1,8 @@
define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'dom'], function (inputManager, focusManager, browser, layoutManager, events, dom) {
'use strict';
browser = browser.default || browser;
var self = {};
var lastMouseInputTime = new Date().getTime();