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

Merge pull request #491 from dkanada/shaka

Browse source 
Bundle flvjs and shaka and move all libs to one folder
This commit is contained in:
dkanada 2019-10-09 04:06:17 +09:00 • committed by GitHub
commit b725d137a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 181 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

0
src/controllers/mypreferencesdisplay.js → src/controllers/user/display.js
View file

0
src/controllers/mypreferenceshome.js → src/controllers/user/home.js
View file

2
src/controllers/mypreferencescommon.js → src/controllers/user/menu.js
View file

@ -14,7 +14,7 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-button"], functio
page.querySelector(".lnkMyProfile").setAttribute("href", "myprofile.html?userId=" + userId);
page.querySelector(".lnkDisplayPreferences").setAttribute("href", "mypreferencesdisplay.html?userId=" + userId);
page.querySelector(".lnkHomePreferences").setAttribute("href", "mypreferenceshome.html?userId=" + userId);
page.querySelector(".lnkLanguagePreferences").setAttribute("href", "mypreferenceslanguages.html?userId=" + userId);
page.querySelector(".lnkPlaybackPreferences").setAttribute("href", "mypreferencesplayback.html?userId=" + userId);
page.querySelector(".lnkSubtitlePreferences").setAttribute("href", "mypreferencessubtitles.html?userId=" + userId);
if (appHost.supports("multiserver")) {

0
src/controllers/mypreferenceslanguages.js → src/controllers/user/playback.js
View file

0
src/controllers/myprofile.js → src/controllers/user/profile.js
View file

0
src/controllers/mypreferencessubtitles.js → src/controllers/user/subtitles.js
View file

6
src/controllers/videoosd.js
View file

@ -1,4 +1,4 @@
define(["playbackManager", "dom", "inputmanager", "datetime", "itemHelper", "mediaInfo", "focusManager", "imageLoader", "scrollHelper", "events", "connectionManager", "browser", "globalize", "apphost", "layoutManager", "userSettings", "scrollStyles", "emby-slider", "paper-icon-button-light", "css!css/videoosd"], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager, userSettings) {
define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "mediaInfo", "focusManager", "imageLoader", "scrollHelper", "events", "connectionManager", "browser", "globalize", "apphost", "layoutManager", "userSettings", "scrollStyles", "emby-slider", "paper-icon-button-light", "css!css/videoosd"], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager, userSettings) {
"use strict";
function seriesImageUrl(item, options) {
@ -925,7 +925,7 @@ define(["playbackManager", "dom", "inputmanager", "datetime", "itemHelper", "med
if (player) {
// show subtitle offset feature only if player and media support it
var showSubOffset = playbackManager.supportSubtitleOffset(player) &&
var showSubOffset = playbackManager.supportSubtitleOffset(player) &&
playbackManager.canHandleOffsetOnCurrentSubtitle(player);
playerSettingsMenu.show({
@ -1047,7 +1047,7 @@ define(["playbackManager", "dom", "inputmanager", "datetime", "itemHelper", "med
playbackManager.setSubtitleStreamIndex(index, player);
}
toggleSubtitleSync();
toggleSubtitleSync();
});
});
}