diff --git a/src/addplugin.html b/src/addplugin.html index adbf9aa0b1..33a418346b 100644 --- a/src/addplugin.html +++ b/src/addplugin.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js index f594e446a2..23612d5a1e 100644 --- a/src/components/viewManager/viewManager.js +++ b/src/components/viewManager/viewManager.js @@ -21,7 +21,7 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi if (!newView.initComplete) { newView.initComplete = true; - if (options.controllerFactory) { + if (typeof options.controllerFactory === 'function') { // Use controller method var controller = new options.controllerFactory(newView, eventDetail.detail.params); diff --git a/src/scripts/dlnaprofile.js b/src/controllers/dlnaprofile.js similarity index 100% rename from src/scripts/dlnaprofile.js rename to src/controllers/dlnaprofile.js diff --git a/src/scripts/dlnaprofiles.js b/src/controllers/dlnaprofiles.js similarity index 99% rename from src/scripts/dlnaprofiles.js rename to src/controllers/dlnaprofiles.js index b77b31e3b3..95350120c5 100644 --- a/src/scripts/dlnaprofiles.js +++ b/src/controllers/dlnaprofiles.js @@ -54,6 +54,7 @@ define(["jQuery", "globalize", "loading", "libraryMenu", "listViewStyle", "emby- name: globalize.translate("TabProfiles") }] } + $(document).on("pageshow", "#dlnaProfilesPage", function() { libraryMenu.setTabs("dlna", 1, getTabs), loadProfiles(this) }) diff --git a/src/scripts/dlnasettings.js b/src/controllers/dlnasettings.js similarity index 100% rename from src/scripts/dlnasettings.js rename to src/controllers/dlnasettings.js diff --git a/src/controllers/edititemmetadata.js b/src/controllers/edititemmetadata.js index c77c947dae..bb5e70695a 100644 --- a/src/controllers/edititemmetadata.js +++ b/src/controllers/edititemmetadata.js @@ -1,4 +1,4 @@ -define(["loading"], function(loading) { +define(["loading", "scripts/editorsidebar"], function(loading) { "use strict"; function reload(context, itemId) { diff --git a/src/scripts/encodingsettings.js b/src/controllers/encodingsettings.js similarity index 99% rename from src/scripts/encodingsettings.js rename to src/controllers/encodingsettings.js index 13b48151b8..20ca44ffad 100644 --- a/src/scripts/encodingsettings.js +++ b/src/controllers/encodingsettings.js @@ -69,6 +69,7 @@ define(["jQuery", "loading", "globalize", "dom"], function($, loading, globalize -1 === c.getAttribute("data-types").split(",").indexOf(value) ? dom.parentWithTag(c, "LABEL").classList.add("hide") : (dom.parentWithTag(c, "LABEL").classList.remove("hide"), any = !0) }), any ? context.querySelector(".decodingCodecsList").classList.remove("hide") : context.querySelector(".decodingCodecsList").classList.add("hide") } + $(document).on("pageinit", "#encodingSettingsPage", function() { var page = this; page.querySelector("#selectVideoDecoder").addEventListener("change", function() { diff --git a/src/scripts/livetvguideprovider.js b/src/controllers/livetvguideprovider.js similarity index 100% rename from src/scripts/livetvguideprovider.js rename to src/controllers/livetvguideprovider.js diff --git a/src/scripts/livetvsettings.js b/src/controllers/livetvsettings.js similarity index 100% rename from src/scripts/livetvsettings.js rename to src/controllers/livetvsettings.js diff --git a/src/scripts/livetvstatus.js b/src/controllers/livetvstatus.js similarity index 100% rename from src/scripts/livetvstatus.js rename to src/controllers/livetvstatus.js diff --git a/src/scripts/medialibrarypage.js b/src/controllers/medialibrarypage.js similarity index 100% rename from src/scripts/medialibrarypage.js rename to src/controllers/medialibrarypage.js diff --git a/src/scripts/metadataimagespage.js b/src/controllers/metadataimagespage.js similarity index 100% rename from src/scripts/metadataimagespage.js rename to src/controllers/metadataimagespage.js diff --git a/src/scripts/metadatanfo.js b/src/controllers/metadatanfo.js similarity index 100% rename from src/scripts/metadatanfo.js rename to src/controllers/metadatanfo.js diff --git a/src/scripts/notificationsetting.js b/src/controllers/notificationsetting.js similarity index 100% rename from src/scripts/notificationsetting.js rename to src/controllers/notificationsetting.js diff --git a/src/scripts/playbackconfiguration.js b/src/controllers/playbackconfiguration.js similarity index 100% rename from src/scripts/playbackconfiguration.js rename to src/controllers/playbackconfiguration.js diff --git a/src/scripts/serversecurity.js b/src/controllers/serversecurity.js similarity index 100% rename from src/scripts/serversecurity.js rename to src/controllers/serversecurity.js diff --git a/src/scripts/streamingsettings.js b/src/controllers/streamingsettings.js similarity index 100% rename from src/scripts/streamingsettings.js rename to src/controllers/streamingsettings.js diff --git a/src/scripts/useredit.js b/src/controllers/useredit.js similarity index 100% rename from src/scripts/useredit.js rename to src/controllers/useredit.js diff --git a/src/scripts/userlibraryaccess.js b/src/controllers/userlibraryaccess.js similarity index 100% rename from src/scripts/userlibraryaccess.js rename to src/controllers/userlibraryaccess.js diff --git a/src/scripts/usernew.js b/src/controllers/usernew.js similarity index 100% rename from src/scripts/usernew.js rename to src/controllers/usernew.js diff --git a/src/scripts/userparentalcontrol.js b/src/controllers/userparentalcontrol.js similarity index 100% rename from src/scripts/userparentalcontrol.js rename to src/controllers/userparentalcontrol.js diff --git a/src/scripts/userprofilespage.js b/src/controllers/userprofilespage.js similarity index 100% rename from src/scripts/userprofilespage.js rename to src/controllers/userprofilespage.js diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html index ded82999e7..93c7207e4c 100644 --- a/src/dlnaprofile.html +++ b/src/dlnaprofile.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/dlnaprofiles.html b/src/dlnaprofiles.html index cbf4d3b69b..ef1c353d46 100644 --- a/src/dlnaprofiles.html +++ b/src/dlnaprofiles.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/dlnasettings.html b/src/dlnasettings.html index 5eb5cd452d..c93aeb226f 100644 --- a/src/dlnasettings.html +++ b/src/dlnasettings.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/edititemmetadata.html b/src/edititemmetadata.html index 86712a24fa..2fe57813dd 100644 --- a/src/edititemmetadata.html +++ b/src/edititemmetadata.html @@ -1,4 +1,4 @@ -
+
+ +
diff --git a/src/library.html b/src/library.html index 23d83044da..6db2e39331 100644 --- a/src/library.html +++ b/src/library.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/livetvguideprovider.html b/src/livetvguideprovider.html index 52dfbdd338..86bf3ea7d6 100644 --- a/src/livetvguideprovider.html +++ b/src/livetvguideprovider.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/livetvsettings.html b/src/livetvsettings.html index 6e91d1ce5b..40c93fb25f 100644 --- a/src/livetvsettings.html +++ b/src/livetvsettings.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/livetvstatus.html b/src/livetvstatus.html index f2e2b4c4bd..e5250c11d4 100644 --- a/src/livetvstatus.html +++ b/src/livetvstatus.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/metadataimages.html b/src/metadataimages.html index e2529f30fd..8250572011 100644 --- a/src/metadataimages.html +++ b/src/metadataimages.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/metadatanfo.html b/src/metadatanfo.html index a493677ba9..7263952b42 100644 --- a/src/metadatanfo.html +++ b/src/metadatanfo.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/notificationsetting.html b/src/notificationsetting.html index ffce9edbe6..661793adaf 100644 --- a/src/notificationsetting.html +++ b/src/notificationsetting.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/playbackconfiguration.html b/src/playbackconfiguration.html index 66d1a29f1c..98e302a5c3 100644 --- a/src/playbackconfiguration.html +++ b/src/playbackconfiguration.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/scripts/routes.js b/src/scripts/routes.js index c96fa0fb68..31121b2c15 100644 --- a/src/scripts/routes.js +++ b/src/scripts/routes.js @@ -1,4 +1,5 @@ define([ + "jQuery", "emby-button", "emby-input", "scripts/livetvcomponents", @@ -10,7 +11,8 @@ define([ "emby-checkbox", "emby-slider", "listViewStyle", - "dashboardcss"], function () { + "dashboardcss", + "detailtablecss"], function () { function defineRoute(newRoute) { var path = newRoute.path; @@ -76,17 +78,20 @@ define([ defineRoute({ path: "/dlnaprofile.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "dlnaprofile" }); defineRoute({ path: "/dlnaprofiles.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "dlnaprofiles" }); defineRoute({ path: "/dlnasettings.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "dlnasettings" }); defineRoute({ path: "/edititemmetadata.html", @@ -96,7 +101,8 @@ define([ defineRoute({ path: "/encodingsettings.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "encodingsettings" }); defineRoute({ path: "/forgotpassword.html", @@ -138,7 +144,8 @@ define([ defineRoute({ path: "/library.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "medialibrarypage" }); defineRoute({ path: "/librarydisplay.html", @@ -161,16 +168,19 @@ define([ defineRoute({ path: "/livetvguideprovider.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "livetvguideprovider" }); defineRoute({ path: "/livetvsettings.html", - autoFocus: false + autoFocus: false, + controller: "livetvsettings" }); defineRoute({ path: "/livetvstatus.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "livetvstatus" }); defineRoute({ path: "/livetvtuner.html", @@ -198,12 +208,14 @@ define([ defineRoute({ path: "/metadataimages.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "metadataimagespage" }); defineRoute({ path: "/metadatanfo.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "metadatanfo" }); defineRoute({ path: "/movies.html", @@ -256,7 +268,8 @@ define([ defineRoute({ path: "/notificationsetting.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "notificationsetting" }); defineRoute({ path: "/notificationsettings.html", @@ -276,7 +289,8 @@ define([ defineRoute({ path: "/playbackconfiguration.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "playbackconfiguration" }); defineRoute({ path: "/availableplugins.html", @@ -322,12 +336,14 @@ define([ defineRoute({ path: "/serversecurity.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "serversecurity" }); defineRoute({ path: "/streamingsettings.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "streamingsettings" }); defineRoute({ path: "/support.html", @@ -343,22 +359,26 @@ define([ defineRoute({ path: "/useredit.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "useredit" }); defineRoute({ path: "/userlibraryaccess.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "userlibraryaccess" }); defineRoute({ path: "/usernew.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "usernew" }); defineRoute({ path: "/userparentalcontrol.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "userparentalcontrol" }); defineRoute({ path: "/userpassword.html", @@ -368,7 +388,8 @@ define([ defineRoute({ path: "/userprofiles.html", autoFocus: false, - roles: "admin" + roles: "admin", + controller: "userprofilespage" }); defineRoute({ path: "/wizardremoteaccess.html", @@ -385,7 +406,8 @@ define([ defineRoute({ path: "/wizardlibrary.html", autoFocus: false, - anonymous: true + anonymous: true, + controller: "medialibrarypage" }); defineRoute({ path: "/wizardsettings.html", diff --git a/src/serversecurity.html b/src/serversecurity.html index 2712875b1c..4df33acc60 100644 --- a/src/serversecurity.html +++ b/src/serversecurity.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/streamingsettings.html b/src/streamingsettings.html index 07a0dfba56..7130480beb 100644 --- a/src/streamingsettings.html +++ b/src/streamingsettings.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/wizardlibrary.html b/src/wizardlibrary.html index 16dd9488a6..71ec0ab9b4 100644 --- a/src/wizardlibrary.html +++ b/src/wizardlibrary.html @@ -1,4 +1,4 @@ -
+