From 3aad09c5fd984a72d7e13dddddfa6505f8b94dd1 Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 11 Dec 2019 23:41:16 +0900 Subject: [PATCH 1/5] move all static assets into a single folder --- src/{ => assets}/css/clearbutton.css | 0 src/{ => assets}/css/dashboard.css | 0 src/{ => assets}/css/detailtable.css | 0 src/{ => assets}/css/flexstyles.css | 0 src/{ => assets}/css/fonts.css | 0 src/{ => assets}/css/fonts.sized.css | 0 src/{ => assets}/css/ios.css | 0 src/{ => assets}/css/librarybrowser.css | 0 src/{ => assets}/css/livetv.css | 0 .../flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff | Bin .../flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 | Bin src/{ => assets}/css/material-icons/style.css | 0 src/{ => assets}/css/metadataeditor.css | 0 src/{ => assets}/css/scrollstyles.css | 0 src/{ => assets}/css/site.css | 0 src/{ => assets}/css/videoosd.css | 0 .../img/avatar.png} | Bin src/{ => assets}/img/devices/chrome.svg | 0 src/{ => assets}/img/devices/edge.svg | 0 src/{ => assets}/img/devices/firefox.svg | 0 src/{ => assets}/img/devices/html5.svg | 0 src/{ => assets}/img/devices/msie.svg | 0 src/{ => assets}/img/devices/opera.svg | 0 src/{ => assets}/img/devices/other.svg | 0 src/{ => assets}/img/devices/playstation.svg | 0 src/{ => assets}/img/devices/safari.svg | 0 src/{ => assets}/img/devices/samsungtv.svg | 0 src/{ => assets}/img/devices/windows.svg | 0 src/{ => assets}/img/devices/xbox.svg | 0 src/{ => assets}/img/equalizer.gif | Bin src/{ => assets}/img/logo.png | Bin .../splash}/ipad_splash.png | Bin .../splash}/ipad_splash_l.png | Bin .../splash}/ipadpro1_splash.png | Bin .../splash}/ipadpro1_splash_l.png | Bin .../splash}/ipadpro2_splash.png | Bin .../splash}/ipadpro2_splash_l.png | Bin .../splash}/ipadpro3_splash.png | Bin .../splash}/ipadpro3_splash_l.png | Bin .../splash}/iphone5_splash.png | Bin .../splash}/iphone5_splash_l.png | Bin .../splash}/iphone6_splash.png | Bin .../splash}/iphone6_splash_l.png | Bin .../splash}/iphoneplus_splash.png | Bin .../splash}/iphoneplus_splash_l.png | Bin .../splash}/iphonex_splash.png | Bin .../splash}/iphonex_splash_l.png | Bin .../splash}/iphonexr_splash.png | Bin .../splash}/iphonexr_splash_l.png | Bin .../splash}/iphonexsmax_splash.png | Bin .../splash}/iphonexsmax_splash_l.png | Bin .../remotecontrol/remotecontrol.css | 2 +- src/controllers/loginpage.js | 2 +- src/controllers/user/profile.js | 2 +- src/controllers/videoosd.js | 2 +- src/index.html | 40 +++++++++--------- src/scripts/editorsidebar.js | 2 +- src/scripts/imagehelper.js | 2 +- src/scripts/librarymenu.js | 2 +- src/scripts/site.js | 24 +++++------ 60 files changed, 39 insertions(+), 39 deletions(-) rename src/{ => assets}/css/clearbutton.css (100%) rename src/{ => assets}/css/dashboard.css (100%) rename src/{ => assets}/css/detailtable.css (100%) rename src/{ => assets}/css/flexstyles.css (100%) rename src/{ => assets}/css/fonts.css (100%) rename src/{ => assets}/css/fonts.sized.css (100%) rename src/{ => assets}/css/ios.css (100%) rename src/{ => assets}/css/librarybrowser.css (100%) rename src/{ => assets}/css/livetv.css (100%) rename src/{ => assets}/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff (100%) rename src/{ => assets}/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 (100%) rename src/{ => assets}/css/material-icons/style.css (100%) rename src/{ => assets}/css/metadataeditor.css (100%) rename src/{ => assets}/css/scrollstyles.css (100%) rename src/{ => assets}/css/site.css (100%) rename src/{ => assets}/css/videoosd.css (100%) rename src/{img/logindefault.png => assets/img/avatar.png} (100%) rename src/{ => assets}/img/devices/chrome.svg (100%) rename src/{ => assets}/img/devices/edge.svg (100%) rename src/{ => assets}/img/devices/firefox.svg (100%) rename src/{ => assets}/img/devices/html5.svg (100%) rename src/{ => assets}/img/devices/msie.svg (100%) rename src/{ => assets}/img/devices/opera.svg (100%) rename src/{ => assets}/img/devices/other.svg (100%) rename src/{ => assets}/img/devices/playstation.svg (100%) rename src/{ => assets}/img/devices/safari.svg (100%) rename src/{ => assets}/img/devices/samsungtv.svg (100%) rename src/{ => assets}/img/devices/windows.svg (100%) rename src/{ => assets}/img/devices/xbox.svg (100%) rename src/{ => assets}/img/equalizer.gif (100%) rename src/{ => assets}/img/logo.png (100%) rename src/{splashscreens => assets/splash}/ipad_splash.png (100%) rename src/{splashscreens => assets/splash}/ipad_splash_l.png (100%) rename src/{splashscreens => assets/splash}/ipadpro1_splash.png (100%) rename src/{splashscreens => assets/splash}/ipadpro1_splash_l.png (100%) rename src/{splashscreens => assets/splash}/ipadpro2_splash.png (100%) rename src/{splashscreens => assets/splash}/ipadpro2_splash_l.png (100%) rename src/{splashscreens => assets/splash}/ipadpro3_splash.png (100%) rename src/{splashscreens => assets/splash}/ipadpro3_splash_l.png (100%) rename src/{splashscreens => assets/splash}/iphone5_splash.png (100%) rename src/{splashscreens => assets/splash}/iphone5_splash_l.png (100%) rename src/{splashscreens => assets/splash}/iphone6_splash.png (100%) rename src/{splashscreens => assets/splash}/iphone6_splash_l.png (100%) rename src/{splashscreens => assets/splash}/iphoneplus_splash.png (100%) rename src/{splashscreens => assets/splash}/iphoneplus_splash_l.png (100%) rename src/{splashscreens => assets/splash}/iphonex_splash.png (100%) rename src/{splashscreens => assets/splash}/iphonex_splash_l.png (100%) rename src/{splashscreens => assets/splash}/iphonexr_splash.png (100%) rename src/{splashscreens => assets/splash}/iphonexr_splash_l.png (100%) rename src/{splashscreens => assets/splash}/iphonexsmax_splash.png (100%) rename src/{splashscreens => assets/splash}/iphonexsmax_splash_l.png (100%) diff --git a/src/css/clearbutton.css b/src/assets/css/clearbutton.css similarity index 100% rename from src/css/clearbutton.css rename to src/assets/css/clearbutton.css diff --git a/src/css/dashboard.css b/src/assets/css/dashboard.css similarity index 100% rename from src/css/dashboard.css rename to src/assets/css/dashboard.css diff --git a/src/css/detailtable.css b/src/assets/css/detailtable.css similarity index 100% rename from src/css/detailtable.css rename to src/assets/css/detailtable.css diff --git a/src/css/flexstyles.css b/src/assets/css/flexstyles.css similarity index 100% rename from src/css/flexstyles.css rename to src/assets/css/flexstyles.css diff --git a/src/css/fonts.css b/src/assets/css/fonts.css similarity index 100% rename from src/css/fonts.css rename to src/assets/css/fonts.css diff --git a/src/css/fonts.sized.css b/src/assets/css/fonts.sized.css similarity index 100% rename from src/css/fonts.sized.css rename to src/assets/css/fonts.sized.css diff --git a/src/css/ios.css b/src/assets/css/ios.css similarity index 100% rename from src/css/ios.css rename to src/assets/css/ios.css diff --git a/src/css/librarybrowser.css b/src/assets/css/librarybrowser.css similarity index 100% rename from src/css/librarybrowser.css rename to src/assets/css/librarybrowser.css diff --git a/src/css/livetv.css b/src/assets/css/livetv.css similarity index 100% rename from src/css/livetv.css rename to src/assets/css/livetv.css diff --git a/src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff b/src/assets/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff similarity index 100% rename from src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff rename to src/assets/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff diff --git a/src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 b/src/assets/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 similarity index 100% rename from src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 rename to src/assets/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 diff --git a/src/css/material-icons/style.css b/src/assets/css/material-icons/style.css similarity index 100% rename from src/css/material-icons/style.css rename to src/assets/css/material-icons/style.css diff --git a/src/css/metadataeditor.css b/src/assets/css/metadataeditor.css similarity index 100% rename from src/css/metadataeditor.css rename to src/assets/css/metadataeditor.css diff --git a/src/css/scrollstyles.css b/src/assets/css/scrollstyles.css similarity index 100% rename from src/css/scrollstyles.css rename to src/assets/css/scrollstyles.css diff --git a/src/css/site.css b/src/assets/css/site.css similarity index 100% rename from src/css/site.css rename to src/assets/css/site.css diff --git a/src/css/videoosd.css b/src/assets/css/videoosd.css similarity index 100% rename from src/css/videoosd.css rename to src/assets/css/videoosd.css diff --git a/src/img/logindefault.png b/src/assets/img/avatar.png similarity index 100% rename from src/img/logindefault.png rename to src/assets/img/avatar.png diff --git a/src/img/devices/chrome.svg b/src/assets/img/devices/chrome.svg similarity index 100% rename from src/img/devices/chrome.svg rename to src/assets/img/devices/chrome.svg diff --git a/src/img/devices/edge.svg b/src/assets/img/devices/edge.svg similarity index 100% rename from src/img/devices/edge.svg rename to src/assets/img/devices/edge.svg diff --git a/src/img/devices/firefox.svg b/src/assets/img/devices/firefox.svg similarity index 100% rename from src/img/devices/firefox.svg rename to src/assets/img/devices/firefox.svg diff --git a/src/img/devices/html5.svg b/src/assets/img/devices/html5.svg similarity index 100% rename from src/img/devices/html5.svg rename to src/assets/img/devices/html5.svg diff --git a/src/img/devices/msie.svg b/src/assets/img/devices/msie.svg similarity index 100% rename from src/img/devices/msie.svg rename to src/assets/img/devices/msie.svg diff --git a/src/img/devices/opera.svg b/src/assets/img/devices/opera.svg similarity index 100% rename from src/img/devices/opera.svg rename to src/assets/img/devices/opera.svg diff --git a/src/img/devices/other.svg b/src/assets/img/devices/other.svg similarity index 100% rename from src/img/devices/other.svg rename to src/assets/img/devices/other.svg diff --git a/src/img/devices/playstation.svg b/src/assets/img/devices/playstation.svg similarity index 100% rename from src/img/devices/playstation.svg rename to src/assets/img/devices/playstation.svg diff --git a/src/img/devices/safari.svg b/src/assets/img/devices/safari.svg similarity index 100% rename from src/img/devices/safari.svg rename to src/assets/img/devices/safari.svg diff --git a/src/img/devices/samsungtv.svg b/src/assets/img/devices/samsungtv.svg similarity index 100% rename from src/img/devices/samsungtv.svg rename to src/assets/img/devices/samsungtv.svg diff --git a/src/img/devices/windows.svg b/src/assets/img/devices/windows.svg similarity index 100% rename from src/img/devices/windows.svg rename to src/assets/img/devices/windows.svg diff --git a/src/img/devices/xbox.svg b/src/assets/img/devices/xbox.svg similarity index 100% rename from src/img/devices/xbox.svg rename to src/assets/img/devices/xbox.svg diff --git a/src/img/equalizer.gif b/src/assets/img/equalizer.gif similarity index 100% rename from src/img/equalizer.gif rename to src/assets/img/equalizer.gif diff --git a/src/img/logo.png b/src/assets/img/logo.png similarity index 100% rename from src/img/logo.png rename to src/assets/img/logo.png diff --git a/src/splashscreens/ipad_splash.png b/src/assets/splash/ipad_splash.png similarity index 100% rename from src/splashscreens/ipad_splash.png rename to src/assets/splash/ipad_splash.png diff --git a/src/splashscreens/ipad_splash_l.png b/src/assets/splash/ipad_splash_l.png similarity index 100% rename from src/splashscreens/ipad_splash_l.png rename to src/assets/splash/ipad_splash_l.png diff --git a/src/splashscreens/ipadpro1_splash.png b/src/assets/splash/ipadpro1_splash.png similarity index 100% rename from src/splashscreens/ipadpro1_splash.png rename to src/assets/splash/ipadpro1_splash.png diff --git a/src/splashscreens/ipadpro1_splash_l.png b/src/assets/splash/ipadpro1_splash_l.png similarity index 100% rename from src/splashscreens/ipadpro1_splash_l.png rename to src/assets/splash/ipadpro1_splash_l.png diff --git a/src/splashscreens/ipadpro2_splash.png b/src/assets/splash/ipadpro2_splash.png similarity index 100% rename from src/splashscreens/ipadpro2_splash.png rename to src/assets/splash/ipadpro2_splash.png diff --git a/src/splashscreens/ipadpro2_splash_l.png b/src/assets/splash/ipadpro2_splash_l.png similarity index 100% rename from src/splashscreens/ipadpro2_splash_l.png rename to src/assets/splash/ipadpro2_splash_l.png diff --git a/src/splashscreens/ipadpro3_splash.png b/src/assets/splash/ipadpro3_splash.png similarity index 100% rename from src/splashscreens/ipadpro3_splash.png rename to src/assets/splash/ipadpro3_splash.png diff --git a/src/splashscreens/ipadpro3_splash_l.png b/src/assets/splash/ipadpro3_splash_l.png similarity index 100% rename from src/splashscreens/ipadpro3_splash_l.png rename to src/assets/splash/ipadpro3_splash_l.png diff --git a/src/splashscreens/iphone5_splash.png b/src/assets/splash/iphone5_splash.png similarity index 100% rename from src/splashscreens/iphone5_splash.png rename to src/assets/splash/iphone5_splash.png diff --git a/src/splashscreens/iphone5_splash_l.png b/src/assets/splash/iphone5_splash_l.png similarity index 100% rename from src/splashscreens/iphone5_splash_l.png rename to src/assets/splash/iphone5_splash_l.png diff --git a/src/splashscreens/iphone6_splash.png b/src/assets/splash/iphone6_splash.png similarity index 100% rename from src/splashscreens/iphone6_splash.png rename to src/assets/splash/iphone6_splash.png diff --git a/src/splashscreens/iphone6_splash_l.png b/src/assets/splash/iphone6_splash_l.png similarity index 100% rename from src/splashscreens/iphone6_splash_l.png rename to src/assets/splash/iphone6_splash_l.png diff --git a/src/splashscreens/iphoneplus_splash.png b/src/assets/splash/iphoneplus_splash.png similarity index 100% rename from src/splashscreens/iphoneplus_splash.png rename to src/assets/splash/iphoneplus_splash.png diff --git a/src/splashscreens/iphoneplus_splash_l.png b/src/assets/splash/iphoneplus_splash_l.png similarity index 100% rename from src/splashscreens/iphoneplus_splash_l.png rename to src/assets/splash/iphoneplus_splash_l.png diff --git a/src/splashscreens/iphonex_splash.png b/src/assets/splash/iphonex_splash.png similarity index 100% rename from src/splashscreens/iphonex_splash.png rename to src/assets/splash/iphonex_splash.png diff --git a/src/splashscreens/iphonex_splash_l.png b/src/assets/splash/iphonex_splash_l.png similarity index 100% rename from src/splashscreens/iphonex_splash_l.png rename to src/assets/splash/iphonex_splash_l.png diff --git a/src/splashscreens/iphonexr_splash.png b/src/assets/splash/iphonexr_splash.png similarity index 100% rename from src/splashscreens/iphonexr_splash.png rename to src/assets/splash/iphonexr_splash.png diff --git a/src/splashscreens/iphonexr_splash_l.png b/src/assets/splash/iphonexr_splash_l.png similarity index 100% rename from src/splashscreens/iphonexr_splash_l.png rename to src/assets/splash/iphonexr_splash_l.png diff --git a/src/splashscreens/iphonexsmax_splash.png b/src/assets/splash/iphonexsmax_splash.png similarity index 100% rename from src/splashscreens/iphonexsmax_splash.png rename to src/assets/splash/iphonexsmax_splash.png diff --git a/src/splashscreens/iphonexsmax_splash_l.png b/src/assets/splash/iphonexsmax_splash_l.png similarity index 100% rename from src/splashscreens/iphonexsmax_splash_l.png rename to src/assets/splash/iphonexsmax_splash_l.png diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css index 0b6a2dbbc5..19e8e38ca2 100644 --- a/src/components/remotecontrol/remotecontrol.css +++ b/src/components/remotecontrol/remotecontrol.css @@ -182,7 +182,7 @@ .playlistIndexIndicatorImage { -webkit-background-size: initial initial !important; background-size: initial !important; - background-image: url(../../img/equalizer.gif) !important; + background-image: url(../../assets/img/equalizer.gif) !important; } .hideVideoButtons .videoButton { diff --git a/src/controllers/loginpage.js b/src/controllers/loginpage.js index 8dd041a9f1..54fb6ce5e9 100644 --- a/src/controllers/loginpage.js +++ b/src/controllers/loginpage.js @@ -92,7 +92,7 @@ define(["apphost", "appSettings", "dom", "connectionManager", "loading", "layout html += '
"; } else { var background = getMetroColor(user.Id); - imgUrl = "img/logindefault.png"; + imgUrl = "assets/img/avatar.png"; html += '
'; } html += ""; diff --git a/src/controllers/user/profile.js b/src/controllers/user/profile.js index 8bd2bdd376..3b85cb1d8c 100644 --- a/src/controllers/user/profile.js +++ b/src/controllers/user/profile.js @@ -8,7 +8,7 @@ define(["controllers/userpasswordpage", "loading", "libraryMenu", "apphost", "em page.querySelector(".username").innerHTML = user.Name; libraryMenu.setTitle(user.Name); - var imageUrl = "img/logindefault.png"; + var imageUrl = "assets/img/avatar.png"; if (user.PrimaryImageTag) { imageUrl = ApiClient.getUserImageUrl(user.Id, { tag: user.PrimaryImageTag, diff --git a/src/controllers/videoosd.js b/src/controllers/videoosd.js index a93b5b61a8..3c211cb50e 100644 --- a/src/controllers/videoosd.js +++ b/src/controllers/videoosd.js @@ -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!assets/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) { diff --git a/src/index.html b/src/index.html index ad42c2618a..5924ec5e6f 100644 --- a/src/index.html +++ b/src/index.html @@ -22,44 +22,44 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js index bcb3883755..1ec70cc7cd 100644 --- a/src/scripts/editorsidebar.js +++ b/src/scripts/editorsidebar.js @@ -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) { diff --git a/src/scripts/imagehelper.js b/src/scripts/imagehelper.js index 486a030a54..e3b8aa54f0 100644 --- a/src/scripts/imagehelper.js +++ b/src/scripts/imagehelper.js @@ -2,7 +2,7 @@ define(["browser"], function (browser) { "use strict"; function getDeviceIcon(device) { - var baseUrl = "img/devices/"; + var baseUrl = "assets/img/devices/"; switch (device) { case "Opera": case "Opera TV": diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index 7e3b109500..70be73b659 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -419,7 +419,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " return getToolsMenuHtml(apiClient).then(function (toolsMenuHtml) { var html = ""; html += '"; html += toolsMenuHtml; navDrawerScrollContainer.innerHTML = html; diff --git a/src/scripts/site.js b/src/scripts/site.js index 14d7d01bbb..7859a85ee8 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -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); }); @@ -573,7 +573,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; @@ -712,21 +712,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 From 758477f1aee8e472449dea913548bd5c868e893b Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 11 Dec 2019 23:43:48 +0900 Subject: [PATCH 2/5] give themes their own directory to encourage custom entries --- src/components/skinManager.js | 2 +- src/{components => }/themes/appletv/theme.css | 0 src/{components => }/themes/blueradiance/bg.jpg | Bin src/{components => }/themes/blueradiance/theme.css | 0 src/{components => }/themes/dark/theme.css | 0 src/{components => }/themes/emby/theme.css | 0 src/{components => }/themes/light/theme.css | 0 src/{components => }/themes/logodark.png | Bin src/{components => }/themes/logowhite.png | Bin src/{components => }/themes/purple-haze/bg.jpg | Bin src/{components => }/themes/purple-haze/theme.css | 0 src/{components => }/themes/wmc/theme.css | 0 12 files changed, 1 insertion(+), 1 deletion(-) rename src/{components => }/themes/appletv/theme.css (100%) rename src/{components => }/themes/blueradiance/bg.jpg (100%) rename src/{components => }/themes/blueradiance/theme.css (100%) rename src/{components => }/themes/dark/theme.css (100%) rename src/{components => }/themes/emby/theme.css (100%) rename src/{components => }/themes/light/theme.css (100%) rename src/{components => }/themes/logodark.png (100%) rename src/{components => }/themes/logowhite.png (100%) rename src/{components => }/themes/purple-haze/bg.jpg (100%) rename src/{components => }/themes/purple-haze/theme.css (100%) rename src/{components => }/themes/wmc/theme.css (100%) diff --git a/src/components/skinManager.js b/src/components/skinManager.js index 9f96516422..06125e947a 100644 --- a/src/components/skinManager.js +++ b/src/components/skinManager.js @@ -72,7 +72,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr selectedTheme = selectedTheme || defaultTheme; return { - stylesheetPath: require.toUrl('components/themes/' + selectedTheme.id + '/theme.css'), + stylesheetPath: require.toUrl('themes/' + selectedTheme.id + '/theme.css'), themeId: selectedTheme.id }; } diff --git a/src/components/themes/appletv/theme.css b/src/themes/appletv/theme.css similarity index 100% rename from src/components/themes/appletv/theme.css rename to src/themes/appletv/theme.css diff --git a/src/components/themes/blueradiance/bg.jpg b/src/themes/blueradiance/bg.jpg similarity index 100% rename from src/components/themes/blueradiance/bg.jpg rename to src/themes/blueradiance/bg.jpg diff --git a/src/components/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css similarity index 100% rename from src/components/themes/blueradiance/theme.css rename to src/themes/blueradiance/theme.css diff --git a/src/components/themes/dark/theme.css b/src/themes/dark/theme.css similarity index 100% rename from src/components/themes/dark/theme.css rename to src/themes/dark/theme.css diff --git a/src/components/themes/emby/theme.css b/src/themes/emby/theme.css similarity index 100% rename from src/components/themes/emby/theme.css rename to src/themes/emby/theme.css diff --git a/src/components/themes/light/theme.css b/src/themes/light/theme.css similarity index 100% rename from src/components/themes/light/theme.css rename to src/themes/light/theme.css diff --git a/src/components/themes/logodark.png b/src/themes/logodark.png similarity index 100% rename from src/components/themes/logodark.png rename to src/themes/logodark.png diff --git a/src/components/themes/logowhite.png b/src/themes/logowhite.png similarity index 100% rename from src/components/themes/logowhite.png rename to src/themes/logowhite.png diff --git a/src/components/themes/purple-haze/bg.jpg b/src/themes/purple-haze/bg.jpg similarity index 100% rename from src/components/themes/purple-haze/bg.jpg rename to src/themes/purple-haze/bg.jpg diff --git a/src/components/themes/purple-haze/theme.css b/src/themes/purple-haze/theme.css similarity index 100% rename from src/components/themes/purple-haze/theme.css rename to src/themes/purple-haze/theme.css diff --git a/src/components/themes/wmc/theme.css b/src/themes/wmc/theme.css similarity index 100% rename from src/components/themes/wmc/theme.css rename to src/themes/wmc/theme.css From f036ccc674b0f36aff3289aecfbb3f87d341db2c Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 11 Dec 2019 23:54:56 +0900 Subject: [PATCH 3/5] move some elements to a new directory --- .../serverNotifications.js | 17 ----------- .../emby-button/emby-button.css | 0 .../emby-button/emby-button.js | 0 .../emby-button/paper-icon-button-light.js | 0 .../emby-checkbox/emby-checkbox.css | 0 .../emby-checkbox/emby-checkbox.js | 0 .../emby-collapse/emby-collapse.css | 0 .../emby-collapse/emby-collapse.js | 0 .../emby-input/emby-input.css | 0 .../emby-input/emby-input.js | 0 .../emby-progressring/emby-progressring.css | 0 .../emby-progressring/emby-progressring.js | 0 .../emby-progressring.template.html | 0 .../emby-radio/emby-radio.css | 0 .../emby-radio/emby-radio.js | 0 .../emby-select/emby-select.css | 0 .../emby-select/emby-select.js | 0 .../emby-slider/emby-slider.css | 0 .../emby-slider/emby-slider.js | 0 .../emby-textarea/emby-textarea.css | 0 .../emby-textarea/emby-textarea.js | 0 .../emby-toggle/emby-toggle.css | 0 .../emby-toggle/emby-toggle.js | 0 src/scripts/site.js | 28 ++++++++++--------- 24 files changed, 15 insertions(+), 30 deletions(-) rename src/{components => elements}/emby-button/emby-button.css (100%) rename src/{components => elements}/emby-button/emby-button.js (100%) rename src/{components => elements}/emby-button/paper-icon-button-light.js (100%) rename src/{components => elements}/emby-checkbox/emby-checkbox.css (100%) rename src/{components => elements}/emby-checkbox/emby-checkbox.js (100%) rename src/{components => elements}/emby-collapse/emby-collapse.css (100%) rename src/{components => elements}/emby-collapse/emby-collapse.js (100%) rename src/{components => elements}/emby-input/emby-input.css (100%) rename src/{components => elements}/emby-input/emby-input.js (100%) rename src/{components => elements}/emby-progressring/emby-progressring.css (100%) rename src/{components => elements}/emby-progressring/emby-progressring.js (100%) rename src/{components => elements}/emby-progressring/emby-progressring.template.html (100%) rename src/{components => elements}/emby-radio/emby-radio.css (100%) rename src/{components => elements}/emby-radio/emby-radio.js (100%) rename src/{components => elements}/emby-select/emby-select.css (100%) rename src/{components => elements}/emby-select/emby-select.js (100%) rename src/{components => elements}/emby-slider/emby-slider.css (100%) rename src/{components => elements}/emby-slider/emby-slider.js (100%) rename src/{components => elements}/emby-textarea/emby-textarea.css (100%) rename src/{components => elements}/emby-textarea/emby-textarea.js (100%) rename src/{components => elements}/emby-toggle/emby-toggle.css (100%) rename src/{components => elements}/emby-toggle/emby-toggle.js (100%) diff --git a/src/components/serverNotifications/serverNotifications.js b/src/components/serverNotifications/serverNotifications.js index ff571b1e1a..1941881b7a 100644 --- a/src/components/serverNotifications/serverNotifications.js +++ b/src/components/serverNotifications/serverNotifications.js @@ -4,20 +4,15 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus var serverNotifications = {}; function notifyApp() { - inputManager.notify(); } function displayMessage(cmd) { - var args = cmd.Arguments; - if (args.TimeoutMs) { - require(['toast'], function (toast) { toast({ title: args.Header, text: args.Text }); }); - } else { require(['alert'], function (alert) { alert({ title: args.Header, text: args.Text }); @@ -146,14 +141,10 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus } function onMessageReceived(e, msg) { - var apiClient = this; - if (msg.MessageType === "Play") { - notifyApp(); var serverId = apiClient.serverInfo().Id; - if (msg.Data.PlayCommand === "PlayNext") { playbackManager.queueNext({ ids: msg.Data.ItemIds, serverId: serverId }); } else if (msg.Data.PlayCommand === "PlayLast") { @@ -169,9 +160,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus serverId: serverId }); } - } else if (msg.MessageType === "Playstate") { - if (msg.Data.Command === 'Stop') { inputManager.trigger('stop'); } else if (msg.Data.Command === 'Pause') { @@ -193,22 +182,17 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus var cmd = msg.Data; processGeneralCommand(cmd, apiClient); } else if (msg.MessageType === "UserDataChanged") { - if (msg.Data.UserId === apiClient.getCurrentUserId()) { - for (var i = 0, length = msg.Data.UserDataList.length; i < length; i++) { events.trigger(serverNotifications, 'UserDataChanged', [apiClient, msg.Data.UserDataList[i]]); } } } else { - events.trigger(serverNotifications, msg.MessageType, [apiClient, msg.Data]); } - } function bindEvents(apiClient) { - events.off(apiClient, "message", onMessageReceived); events.on(apiClient, "message", onMessageReceived); } @@ -229,7 +213,6 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus connectionManager.getApiClients().forEach(bindEvents); events.on(connectionManager, 'apiclientcreated', function (e, newApiClient) { - bindEvents(newApiClient); }); diff --git a/src/components/emby-button/emby-button.css b/src/elements/emby-button/emby-button.css similarity index 100% rename from src/components/emby-button/emby-button.css rename to src/elements/emby-button/emby-button.css diff --git a/src/components/emby-button/emby-button.js b/src/elements/emby-button/emby-button.js similarity index 100% rename from src/components/emby-button/emby-button.js rename to src/elements/emby-button/emby-button.js diff --git a/src/components/emby-button/paper-icon-button-light.js b/src/elements/emby-button/paper-icon-button-light.js similarity index 100% rename from src/components/emby-button/paper-icon-button-light.js rename to src/elements/emby-button/paper-icon-button-light.js diff --git a/src/components/emby-checkbox/emby-checkbox.css b/src/elements/emby-checkbox/emby-checkbox.css similarity index 100% rename from src/components/emby-checkbox/emby-checkbox.css rename to src/elements/emby-checkbox/emby-checkbox.css diff --git a/src/components/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js similarity index 100% rename from src/components/emby-checkbox/emby-checkbox.js rename to src/elements/emby-checkbox/emby-checkbox.js diff --git a/src/components/emby-collapse/emby-collapse.css b/src/elements/emby-collapse/emby-collapse.css similarity index 100% rename from src/components/emby-collapse/emby-collapse.css rename to src/elements/emby-collapse/emby-collapse.css diff --git a/src/components/emby-collapse/emby-collapse.js b/src/elements/emby-collapse/emby-collapse.js similarity index 100% rename from src/components/emby-collapse/emby-collapse.js rename to src/elements/emby-collapse/emby-collapse.js diff --git a/src/components/emby-input/emby-input.css b/src/elements/emby-input/emby-input.css similarity index 100% rename from src/components/emby-input/emby-input.css rename to src/elements/emby-input/emby-input.css diff --git a/src/components/emby-input/emby-input.js b/src/elements/emby-input/emby-input.js similarity index 100% rename from src/components/emby-input/emby-input.js rename to src/elements/emby-input/emby-input.js diff --git a/src/components/emby-progressring/emby-progressring.css b/src/elements/emby-progressring/emby-progressring.css similarity index 100% rename from src/components/emby-progressring/emby-progressring.css rename to src/elements/emby-progressring/emby-progressring.css diff --git a/src/components/emby-progressring/emby-progressring.js b/src/elements/emby-progressring/emby-progressring.js similarity index 100% rename from src/components/emby-progressring/emby-progressring.js rename to src/elements/emby-progressring/emby-progressring.js diff --git a/src/components/emby-progressring/emby-progressring.template.html b/src/elements/emby-progressring/emby-progressring.template.html similarity index 100% rename from src/components/emby-progressring/emby-progressring.template.html rename to src/elements/emby-progressring/emby-progressring.template.html diff --git a/src/components/emby-radio/emby-radio.css b/src/elements/emby-radio/emby-radio.css similarity index 100% rename from src/components/emby-radio/emby-radio.css rename to src/elements/emby-radio/emby-radio.css diff --git a/src/components/emby-radio/emby-radio.js b/src/elements/emby-radio/emby-radio.js similarity index 100% rename from src/components/emby-radio/emby-radio.js rename to src/elements/emby-radio/emby-radio.js diff --git a/src/components/emby-select/emby-select.css b/src/elements/emby-select/emby-select.css similarity index 100% rename from src/components/emby-select/emby-select.css rename to src/elements/emby-select/emby-select.css diff --git a/src/components/emby-select/emby-select.js b/src/elements/emby-select/emby-select.js similarity index 100% rename from src/components/emby-select/emby-select.js rename to src/elements/emby-select/emby-select.js diff --git a/src/components/emby-slider/emby-slider.css b/src/elements/emby-slider/emby-slider.css similarity index 100% rename from src/components/emby-slider/emby-slider.css rename to src/elements/emby-slider/emby-slider.css diff --git a/src/components/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js similarity index 100% rename from src/components/emby-slider/emby-slider.js rename to src/elements/emby-slider/emby-slider.js diff --git a/src/components/emby-textarea/emby-textarea.css b/src/elements/emby-textarea/emby-textarea.css similarity index 100% rename from src/components/emby-textarea/emby-textarea.css rename to src/elements/emby-textarea/emby-textarea.css diff --git a/src/components/emby-textarea/emby-textarea.js b/src/elements/emby-textarea/emby-textarea.js similarity index 100% rename from src/components/emby-textarea/emby-textarea.js rename to src/elements/emby-textarea/emby-textarea.js diff --git a/src/components/emby-toggle/emby-toggle.css b/src/elements/emby-toggle/emby-toggle.css similarity index 100% rename from src/components/emby-toggle/emby-toggle.css rename to src/elements/emby-toggle/emby-toggle.css diff --git a/src/components/emby-toggle/emby-toggle.js b/src/elements/emby-toggle/emby-toggle.js similarity index 100% rename from src/components/emby-toggle/emby-toggle.js rename to src/elements/emby-toggle/emby-toggle.js diff --git a/src/scripts/site.js b/src/scripts/site.js index 7859a85ee8..871ac988ba 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -753,11 +753,26 @@ var AppInfo = {}; // TODO remove these libraries // all three 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 +786,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 +820,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 +864,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); From ad91c897d7dc2afbd692e60ccd22d4e500c1e98e Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 5 Jan 2020 14:17:25 +0900 Subject: [PATCH 4/5] update comment about dependencies --- src/scripts/site.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/site.js b/src/scripts/site.js index 871ac988ba..f7448f47b1 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -751,7 +751,7 @@ 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); From baf7d31c55d931efa2cc1f6e6e1f85946192d573 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 6 Jan 2020 21:28:57 +0900 Subject: [PATCH 5/5] add code suggestions --- .../remotecontrol/remotecontrol.css | 2 +- src/index.html | 40 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css index 19e8e38ca2..502d859306 100644 --- a/src/components/remotecontrol/remotecontrol.css +++ b/src/components/remotecontrol/remotecontrol.css @@ -182,7 +182,7 @@ .playlistIndexIndicatorImage { -webkit-background-size: initial initial !important; background-size: initial !important; - background-image: url(../../assets/img/equalizer.gif) !important; + background-image: url(assets/img/equalizer.gif) !important; } .hideVideoButtons .videoButton { diff --git a/src/index.html b/src/index.html index 5924ec5e6f..8e9c8db3b7 100644 --- a/src/index.html +++ b/src/index.html @@ -22,44 +22,44 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +