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 osd

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-03 02:02:47 -05:00
parent 407f137095
commit 3e2ad02767
5 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.432", "version": "1.4.434",
"_release": "1.4.432", "_release": "1.4.434",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.432", "tag": "1.4.434",
"commit": "c3372557ec7525f1dafea755825bc6a0b353a8e6" "commit": "7272c3f5081280de5b30ba3cdbe90c1a925dd96a"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

7
dashboard-ui/bower_components/emby-webcomponents/htmlvideoplayer/plugin.js vendored
View file

@ -196,7 +196,9 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
requireHlsPlayer(function () { requireHlsPlayer(function () {
var hls = new Hls({ var hls = new Hls({
manifestLoadingTimeOut: 20000 manifestLoadingTimeOut: 20000,
//appendErrorMaxRetry: 6,
//debug: true
}); });
hls.loadSource(val); hls.loadSource(val);
hls.attachMedia(elem); hls.attachMedia(elem);
@ -205,6 +207,9 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
}); });
hls.on(Hls.Events.ERROR, function (event, data) { hls.on(Hls.Events.ERROR, function (event, data) {
console.log('HLS Error: Type: ' + data.type + ' Details: ' + (data.details || '') + ' Fatal: ' + data.fatal);
if (data.fatal) { if (data.fatal) {
switch (data.type) { switch (data.type) {
case Hls.ErrorTypes.NETWORK_ERROR: case Hls.ErrorTypes.NETWORK_ERROR:

4
dashboard-ui/bower_components/emby-webcomponents/htmlvideoplayer/style.css vendored
View file

@ -6,6 +6,9 @@
right: 0; right: 0;
display: flex; display: flex;
align-items: center; align-items: center;
}
.videoPlayerContainer:not(.videoPlayerContainer-withBackdrop) {
background: #000 !important; background: #000 !important;
} }
@ -14,6 +17,7 @@
background-position: center center; background-position: center center;
background-size: cover; background-size: cover;
background-attachment: fixed; background-attachment: fixed;
background-color: #000;
} }
.videoPlayerContainer-onTop { .videoPlayerContainer-onTop {

0
dashboard-ui/components/remotecontrolautoplay.js → dashboard-ui/bower_components/emby-webcomponents/playback/remotecontrolautoplay.js vendored
View file

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

@ -2695,7 +2695,7 @@ var AppInfo = {};
postInitDependencies.push('scripts/nowplayingbar'); postInitDependencies.push('scripts/nowplayingbar');
postInitDependencies.push('components/remotecontrolautoplay'); postInitDependencies.push('bower_components/emby-webcomponents/playback/remotecontrolautoplay');
// Prefer custom font over Segoe if on desktop windows // Prefer custom font over Segoe if on desktop windows
if (!browserInfo.mobile && navigator.userAgent.toLowerCase().indexOf('windows') != -1) { if (!browserInfo.mobile && navigator.userAgent.toLowerCase().indexOf('windows') != -1) {