milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge branch master into controllers

Browse source
This commit is contained in:
dkanada 2020-01-12 02:24:54 +09:00
commit 19861962af
200 changed files with 5829 additions and 2799 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/editorsidebar.js
View file

@ -299,7 +299,7 @@ define(["datetime", "jQuery", "material-icons"], function (datetime, $) {
$(document).on("itemsaved", ".metadataEditorPage", function (e, item) {
updateEditorNode(this, item);
}).on("pagebeforeshow", ".metadataEditorPage", function () {
require(["css!css/metadataeditor.css"]);
require(["css!assets/css/metadataeditor.css"]);
}).on("pagebeforeshow", ".metadataEditorPage", function () {
var page = this;
Dashboard.getCurrentUser().then(function (user) {

39
src/scripts/imagehelper.js
View file

@ -2,27 +2,34 @@ define(["browser"], function (browser) {
"use strict";
function getDeviceIcon(device) {
var baseUrl = "img/devices/";
switch (device) {
case "Opera":
case "Opera TV":
return baseUrl + "opera.svg";
var baseUrl = "assets/img/devices/";
switch (device.AppName) {
case "Samsung Smart TV":
return baseUrl + "samsung.svg";
case "Xbox One":
return baseUrl + "xbox.svg";
case "Sony PS4":
return baseUrl + "playstation.svg";
case "Chrome":
return baseUrl + "chrome.svg";
case "Firefox":
return baseUrl + "firefox.svg";
case "Edge":
return baseUrl + "edge.svg";
case "Internet Explorer":
return baseUrl + "msie.svg";
case "Web Browser":
return baseUrl + "html5.svg";
case "Kodi":
return baseUrl + "kodi.svg";
case "Jellyfin Android":
return baseUrl + "android.svg";
case "Jellyfin Web":
switch (device.Name) {
case "Opera":
case "Opera TV":
return baseUrl + "opera.svg";
case "Chrome":
return baseUrl + "chrome.svg";
case "Firefox":
return baseUrl + "firefox.svg";
case "Edge":
return baseUrl + "edge.svg";
case "Internet Explorer":
return baseUrl + "msie.svg";
default:
return baseUrl + "html5.svg";
}
default:
return baseUrl + "other.svg";
}
@ -61,4 +68,4 @@ define(["browser"], function (browser) {
getDeviceIcon: getDeviceIcon,
getLibraryIcon: getLibraryIcon
};
});
});

11
src/scripts/librarymenu.js
View file

@ -47,7 +47,9 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
headerSearchButton.classList.remove("hide");
}
headerCastButton.classList.remove("hide");
if (!layoutManager.tv) {
headerCastButton.classList.remove("hide");
}
} else {
headerHomeButton.classList.add("hide");
headerCastButton.classList.add("hide");
@ -101,7 +103,10 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
headerUserButton.addEventListener("click", onHeaderUserButtonClick);
headerHomeButton.addEventListener("click", onHeaderHomeButtonClick);
headerCastButton.addEventListener("click", onCastButtonClicked);
if (!layoutManager.tv) {
headerCastButton.addEventListener("click", onCastButtonClicked);
}
initHeadRoom(skinHeader);
}
@ -419,7 +424,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
return getToolsMenuHtml(apiClient).then(function (toolsMenuHtml) {
var html = "";
html += '<a class="adminDrawerLogo clearLink" is="emby-linkbutton" href="home.html">';
html += '<img src="img/logo.png" />';
html += '<img src="assets/img/logo.png" />';
html += "</a>";
html += toolsMenuHtml;
navDrawerScrollContainer.innerHTML = html;

63
src/scripts/site.js
View file

@ -453,8 +453,8 @@ var AppInfo = {};
}
function init() {
define("livetvcss", ["css!css/livetv.css"], returnFirstDependency);
define("detailtablecss", ["css!css/detailtable.css"], returnFirstDependency);
define("livetvcss", ["css!assets/css/livetv.css"], returnFirstDependency);
define("detailtablecss", ["css!assets/css/detailtable.css"], returnFirstDependency);
var promises = [];
if (!window.fetch) {
@ -517,7 +517,7 @@ var AppInfo = {};
require(["systemFontsCss"]);
}
require(["apphost", "css!css/librarybrowser"], function (appHost) {
require(["apphost", "css!assets/css/librarybrowser"], function (appHost) {
loadPlugins(appHost, browser).then(function () {
onAppReady(browser);
});
@ -532,7 +532,9 @@ var AppInfo = {};
"components/htmlaudioplayer/plugin",
"components/htmlvideoplayer/plugin",
"components/photoplayer/plugin",
"components/youtubeplayer/plugin"
"components/youtubeplayer/plugin",
"components/backdropscreensaver/plugin",
"components/logoscreensaver/plugin"
];
if (appHost.supports("remotecontrol")) {
@ -573,7 +575,7 @@ var AppInfo = {};
console.log("onAppReady - loading dependencies");
if (browser.iOS) {
require(['css!css/ios.css']);
require(['css!assets/css/ios.css']);
}
window.Emby.Page = appRouter;
@ -594,6 +596,8 @@ var AppInfo = {};
require(["playerSelectionMenu", "components/playback/remotecontrolautoplay"]);
}
require(["components/screensavermanager"]);
if (!appHost.supports("physicalvolumecontrol") || browser.touch) {
require(["components/playback/volumeosd"]);
}
@ -671,7 +675,8 @@ var AppInfo = {};
autoPlayDetect: componentsPath + "/playback/autoplaydetect",
nowPlayingHelper: componentsPath + "/playback/nowplayinghelper",
pluginManager: componentsPath + "/pluginManager",
packageManager: componentsPath + "/packagemanager"
packageManager: componentsPath + "/packagemanager",
screensaverManager: componentsPath + "/screensavermanager"
};
requirejs.onError = onRequireJsError;
@ -712,21 +717,21 @@ var AppInfo = {};
window.jQuery = jQuery;
});
require(["css!css/site"]);
require(["css!assets/css/site"]);
// define styles
// TODO determine which of these files can be moved to the components themselves
define("material-icons", ["css!css/material-icons/style"], returnFirstDependency);
define("systemFontsCss", ["css!css/fonts"], returnFirstDependency);
define("systemFontsSizedCss", ["css!css/fonts.sized"], returnFirstDependency);
define("scrollStyles", ["css!css/scrollstyles"], returnFirstDependency);
define("dashboardcss", ["css!css/dashboard"], returnFirstDependency);
define("material-icons", ["css!assets/css/material-icons/style"], returnFirstDependency);
define("systemFontsCss", ["css!assets/css/fonts"], returnFirstDependency);
define("systemFontsSizedCss", ["css!assets/css/fonts.sized"], returnFirstDependency);
define("scrollStyles", ["css!assets/css/scrollstyles"], returnFirstDependency);
define("dashboardcss", ["css!assets/css/dashboard"], returnFirstDependency);
define("programStyles", ["css!" + componentsPath + "/guide/programs"], returnFirstDependency);
define("listViewStyle", ["css!" + componentsPath + "/listview/listview"], returnFirstDependency);
define("formDialogStyle", ["css!" + componentsPath + "/formdialog"], returnFirstDependency);
define("clearButtonStyle", ["css!css/clearbutton"], returnFirstDependency);
define("clearButtonStyle", ["css!assets/css/clearbutton"], returnFirstDependency);
define("cardStyle", ["css!" + componentsPath + "/cardbuilder/card"], returnFirstDependency);
define("flexStyles", ["css!css/flexstyles"], returnFirstDependency);
define("flexStyles", ["css!assets/css/flexstyles"], returnFirstDependency);
// define legacy features
// TODO delete the rest of these
@ -751,13 +756,28 @@ var AppInfo = {};
define("useractionrepository", [bowerPath + "/apiclient/sync/useractionrepository"], returnFirstDependency);
// TODO remove these libraries
// all three have been modified so we need to fix that first
// all of these have been modified so we need to fix that first
define("page", [bowerPath + "/pagejs/page"], returnFirstDependency);
define("headroom", [componentsPath + "/headroom/headroom"], returnFirstDependency);
define("scroller", [componentsPath + "/scroller"], returnFirstDependency);
define("navdrawer", [componentsPath + "/navdrawer/navdrawer"], returnFirstDependency);
define("queryString", [bowerPath + "/query-string/index"], function () {
return queryString;
});
var elementsPath = "elements"
define("emby-button", [elementsPath + "/emby-button/emby-button"], returnFirstDependency);
define("paper-icon-button-light", [elementsPath + "/emby-button/paper-icon-button-light"], returnFirstDependency);
define("emby-checkbox", [elementsPath + "/emby-checkbox/emby-checkbox"], returnFirstDependency);
define("emby-collapse", [elementsPath + "/emby-collapse/emby-collapse"], returnFirstDependency);
define("emby-input", [elementsPath + "/emby-input/emby-input"], returnFirstDependency);
define("emby-progressring", [elementsPath + "/emby-progressring/emby-progressring"], returnFirstDependency);
define("emby-radio", [elementsPath + "/emby-radio/emby-radio"], returnFirstDependency);
define("emby-select", [elementsPath + "/emby-select/emby-select"], returnFirstDependency);
define("emby-slider", [elementsPath + "/emby-slider/emby-slider"], returnFirstDependency);
define("emby-textarea", [elementsPath + "/emby-textarea/emby-textarea"], returnFirstDependency);
define("emby-toggle", [elementsPath + "/emby-toggle/emby-toggle"], returnFirstDependency);
define("chromecastHelper", [componentsPath + "/chromecast/chromecasthelpers"], returnFirstDependency);
define("mediaSession", [componentsPath + "/playback/mediasession"], returnFirstDependency);
define("actionsheet", [componentsPath + "/actionsheet/actionsheet"], returnFirstDependency);
@ -771,27 +791,16 @@ var AppInfo = {};
define("playerSettingsMenu", [componentsPath + "/playback/playersettingsmenu"], returnFirstDependency);
define("playMethodHelper", [componentsPath + "/playback/playmethodhelper"], returnFirstDependency);
define("brightnessOsd", [componentsPath + "/playback/brightnessosd"], returnFirstDependency);
define("emby-collapse", [componentsPath + "/emby-collapse/emby-collapse"], returnFirstDependency);
define("emby-button", [componentsPath + "/emby-button/emby-button"], returnFirstDependency);
define("emby-itemscontainer", [componentsPath + "/emby-itemscontainer/emby-itemscontainer"], returnFirstDependency);
define("alphaNumericShortcuts", [componentsPath + "/alphanumericshortcuts/alphanumericshortcuts"], returnFirstDependency);
define("emby-scroller", [componentsPath + "/emby-scroller/emby-scroller"], returnFirstDependency);
define("emby-tabs", [componentsPath + "/emby-tabs/emby-tabs"], returnFirstDependency);
define("emby-scrollbuttons", [componentsPath + "/emby-scrollbuttons/emby-scrollbuttons"], returnFirstDependency);
define("emby-progressring", [componentsPath + "/emby-progressring/emby-progressring"], returnFirstDependency);
define("emby-itemrefreshindicator", [componentsPath + "/emby-itemrefreshindicator/emby-itemrefreshindicator"], returnFirstDependency);
define("multiSelect", [componentsPath + "/multiselect/multiselect"], returnFirstDependency);
define("alphaPicker", [componentsPath + "/alphapicker/alphapicker"], returnFirstDependency);
define("paper-icon-button-light", [componentsPath + "/emby-button/paper-icon-button-light"], returnFirstDependency);
define("tabbedView", [componentsPath + "/tabbedview/tabbedview"], returnFirstDependency);
define("itemsTab", [componentsPath + "/tabbedview/itemstab"], returnFirstDependency);
define("emby-input", [componentsPath + "/emby-input/emby-input"], returnFirstDependency);
define("emby-select", [componentsPath + "/emby-select/emby-select"], returnFirstDependency);
define("emby-slider", [componentsPath + "/emby-slider/emby-slider"], returnFirstDependency);
define("emby-checkbox", [componentsPath + "/emby-checkbox/emby-checkbox"], returnFirstDependency);
define("emby-toggle", [componentsPath + "/emby-toggle/emby-toggle"], returnFirstDependency);
define("emby-radio", [componentsPath + "/emby-radio/emby-radio"], returnFirstDependency);
define("emby-textarea", [componentsPath + "/emby-textarea/emby-textarea"], returnFirstDependency);
define("collectionEditor", [componentsPath + "/collectioneditor/collectioneditor"], returnFirstDependency);
define("serverRestartDialog", [componentsPath + "/serverRestartDialog"], returnFirstDependency);
define("playlistEditor", [componentsPath + "/playlisteditor/playlisteditor"], returnFirstDependency);
@ -816,7 +825,6 @@ var AppInfo = {};
define("upNextDialog", [componentsPath + "/upnextdialog/upnextdialog"], returnFirstDependency);
define("fullscreen-doubleclick", [componentsPath + "/fullscreen/fullscreen-dc"], returnFirstDependency);
define("fullscreenManager", [componentsPath + "/fullscreenManager", "events"], returnFirstDependency);
define("headroom", [componentsPath + "/headroom/headroom"], returnFirstDependency);
define("subtitleAppearanceHelper", [componentsPath + "/subtitlesettings/subtitleappearancehelper"], returnFirstDependency);
define("subtitleSettings", [componentsPath + "/subtitlesettings/subtitlesettings"], returnFirstDependency);
define("displaySettings", [componentsPath + "/displaysettings/displaysettings"], returnFirstDependency);
@ -861,7 +869,6 @@ var AppInfo = {};
define("userSettings", [componentsPath + "/usersettings/usersettings"], returnFirstDependency);
define("userSettingsBuilder", [componentsPath + "/usersettings/usersettingsbuilder", "layoutManager", "browser"], returnFirstDependency);
define("imageUploader", [componentsPath + "/imageuploader/imageuploader"], returnFirstDependency);
define("navdrawer", [componentsPath + "/navdrawer/navdrawer"], returnFirstDependency);
define("htmlMediaHelper", [componentsPath + "/htmlMediaHelper"], returnFirstDependency);
define("viewContainer", [componentsPath + "/viewContainer"], returnFirstDependency);
define("dialogHelper", [componentsPath + "/dialogHelper/dialogHelper"], returnFirstDependency);