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 remote-tracking branch 'upstream/master' into webpack

Browse source
This commit is contained in:
Bill Thornton 2019-08-06 11:16:32 -04:00
commit 4b5aec42f7
134 changed files with 4360 additions and 3712 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/scripts/site.js
View file

@ -213,17 +213,14 @@ var Dashboard = {
}
},
capabilities: function (appHost) {
var caps = {
var capabilities = {
PlayableMediaTypes: ["Audio", "Video"],
SupportedCommands: ["MoveUp", "MoveDown", "MoveLeft", "MoveRight", "PageUp", "PageDown", "PreviousLetter", "NextLetter", "ToggleOsd", "ToggleContextMenu", "Select", "Back", "SendKey", "SendString", "GoHome", "GoToSettings", "VolumeUp", "VolumeDown", "Mute", "Unmute", "ToggleMute", "SetVolume", "SetAudioStreamIndex", "SetSubtitleStreamIndex", "DisplayContent", "GoToSearch", "DisplayMessage", "SetRepeatMode", "ChannelUp", "ChannelDown", "PlayMediaSource", "PlayTrailers"],
SupportsPersistentIdentifier: "cordova" === self.appMode || "android" === self.appMode,
SupportsMediaControl: true
};
caps.IconUrl = appHost.deviceIconUrl();
caps.SupportsSync = appHost.supports("sync");
caps.SupportsContentUploading = appHost.supports("cameraupload");
appHost.getPushTokenInfo();
return caps = Object.assign(caps, appHost.getPushTokenInfo());
return capabilities = Object.assign(capabilities, appHost.getPushTokenInfo());
}
};
var AppInfo = {};
@ -484,6 +481,9 @@ var AppInfo = {};
onGlobalizeInit(browser);
});
});
require(["keyboardnavigation"], function(keyboardnavigation) {
keyboardnavigation.enable();
});
});
});
}
@ -521,13 +521,13 @@ var AppInfo = {};
}
require(["apphost", "css!css/librarybrowser"], function (appHost) {
loadPlugins([], appHost, browser).then(function () {
loadPlugins(appHost, browser).then(function () {
onAppReady(browser);
});
});
}
function loadPlugins(externalPlugins, appHost, browser, shell) {
function loadPlugins(appHost, browser, shell) {
console.log("Loading installed plugins");
var list = [
"components/playback/playaccessvalidation",
@ -546,8 +546,8 @@ var AppInfo = {};
}
}
for (var index = 0, length = externalPlugins.length; index < length; index++) {
list.push(externalPlugins[index]);
if (window.NativeShell) {
list = list.concat(window.NativeShell.getPlugins());
}
return new Promise(function (resolve, reject) {
@ -880,6 +880,7 @@ var AppInfo = {};
define("serverNotifications", [componentsPath + "/serverNotifications/serverNotifications"], returnFirstDependency);
define("appFooter-shared", ["appFooter"], createSharedAppFooter);
define("skinManager", [componentsPath + "/skinManager"], returnFirstDependency);
define("keyboardnavigation", [componentsPath + "/keyboardnavigation"], returnFirstDependency);
define("connectionManager", [], function () {
return ConnectionManager;
});
@ -1015,6 +1016,9 @@ var AppInfo = {};
}
if ("livetv" === item) {
if ("programs" === options.section) {
return "livetv.html?tab=0&serverId=" + options.serverId;
}
if ("guide" === options.section) {
return "livetv.html?tab=1&serverId=" + options.serverId;
}
@ -1047,6 +1051,10 @@ var AppInfo = {};
return "livetv.html?tab=4&serverId=" + options.serverId;
}
if ("seriesrecording" === options.section) {
return "livetv.html?tab=5&serverId=" + options.serverId;
}
return "livetv.html?serverId=" + options.serverId;
}