cleanup data-require in views

src/addplugin.html

@@ -1,4 +1,4 @@
-<div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-backbutton="true" data-require="emby-select,emby-collapse,emby-button">
+<div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-backbutton="true">
 
     <div>
         <div class="content-primary">

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);

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)
     })

src/controllers/edititemmetadata.js

@@ -1,4 +1,4 @@
-define(["loading"], function(loading) {
+define(["loading", "scripts/editorsidebar"], function(loading) {
     "use strict";
 
     function reload(context, itemId) {

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() {

src/dlnaprofile.html

@@ -1,4 +1,4 @@
-<div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage withTabs" data-require="jQuery,emby-collapse,scripts/dlnaprofile,emby-button">
+<div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage withTabs">
 
     <div data-role="content">
         <div class="content-primary">

src/dlnaprofiles.html

@@ -1,4 +1,4 @@
-<div id="dlnaProfilesPage" data-role="page" class="page type-interior dlnaPage withTabs" data-require="scripts/dlnaprofiles,emby-button">
+<div id="dlnaProfilesPage" data-role="page" class="page type-interior dlnaPage withTabs">
 
     <div>
         <div class="content-primary">

src/dlnasettings.html

@@ -1,4 +1,4 @@
-<div id="dlnaSettingsPage" data-role="page" class="page type-interior withTabs" data-require="scripts/dlnasettings,emby-select,emby-input,emby-checkbox,emby-button">
+<div id="dlnaSettingsPage" data-role="page" class="page type-interior withTabs">
 
     <div>
         <div class="content-primary">

src/edititemmetadata.html

@@ -1,4 +1,4 @@
-<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-title="${MetadataManager}" data-require="scripts/editorsidebar,controllers/edititemmetadata">
+<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-title="${MetadataManager}">
 
     <style>
         #editItemMetadataPage .editMetadataForm {

src/encodingsettings.html

@@ -1,4 +1,4 @@
-<div id="encodingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage" data-require="scripts/encodingsettings,emby-input,emby-checkbox,emby-button,emby-select">
+<div id="encodingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage">
 
     <div>
         <div class="content-primary">

src/index.html

@@ -56,6 +56,8 @@
         }
     </style>
 
+    <script src="bower_components/alameda/alameda.js"></script>
+    <script src="scripts/site.js"></script>
 </head>
 <body>
     <div class="backdropContainer"></div>

src/library.html

@@ -1,4 +1,4 @@
-<div id="mediaLibraryPage" data-role="page" class="page type-interior mediaLibraryPage librarySectionPage withTabs fullWidthContent" data-require="scripts/medialibrarypage">
+<div id="mediaLibraryPage" data-role="page" class="page type-interior mediaLibraryPage librarySectionPage withTabs fullWidthContent">
 
     <div>
         <div class="content-primary">

src/livetvguideprovider.html

@@ -1,4 +1,4 @@
-<div id="liveTvGuideProviderPage" data-role="page" class="page type-interior liveTvSettingsPage" data-require="scripts/livetvguideprovider">
+<div id="liveTvGuideProviderPage" data-role="page" class="page type-interior liveTvSettingsPage">
 
     <div>
         <div class="content-primary">

src/livetvsettings.html

@@ -1,4 +1,4 @@
-<div id="liveTvSettingsPage" data-role="page" class="page type-interior liveTvPage" data-require="scripts/livetvsettings,emby-checkbox,emby-input,emby-select,emby-collapse,emby-button">
+<div id="liveTvSettingsPage" data-role="page" class="page type-interior liveTvPage">
     <div>
         <div class="content-primary">
             <div class="verticalSection">

src/livetvstatus.html

@@ -1,4 +1,4 @@
-<div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage" data-require="scripts/livetvstatus,emby-button">
+<div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage">
     <div>
         <div class="content-primary">
             <div class="verticalSection verticalSection-extrabottompadding">

src/metadataimages.html

@@ -1,4 +1,4 @@
-<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="emby-collapse,scripts/metadataimagespage,emby-checkbox,emby-button,emby-input,emby-select">
+<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs">
 
     <div>
 

src/metadatanfo.html

@@ -1,4 +1,4 @@
-<div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadatanfo,emby-checkbox,emby-button,emby-select">
+<div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs">
 
     <div>
 

src/notificationsetting.html

@@ -1,4 +1,4 @@
-<div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage withTabs" data-require="scripts/notificationsetting,emby-select,emby-input,emby-checkbox,emby-button">
+<div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage withTabs">
 
     <div>
         <div class="content-primary">

src/playbackconfiguration.html

@@ -1,4 +1,4 @@
-<div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-require="scripts/playbackconfiguration,emby-input,emby-button">
+<div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs">
 
     <div>
         <div class="content-primary">

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",

src/serversecurity.html

@@ -1,4 +1,4 @@
-<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs fullWidthContent" data-require="scripts/serversecurity,detailtablecss,emby-button">
+<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs fullWidthContent">
     <div>
         <div class="content-primary">
             <div class="detailSectionHeader">

src/streamingsettings.html

@@ -1,4 +1,4 @@
-<div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-require="scripts/streamingsettings,emby-input,emby-button,emby-select">
+<div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs">
 
     <div>
         <div class="content-primary">

src/wizardlibrary.html

@@ -1,4 +1,4 @@
-<div id="wizardLibraryPage" data-role="page" class="page standalonePage wizardPage mediaLibraryPage" data-require="scripts/medialibrarypage,scripts/taskbutton,emby-button">
+<div id="wizardLibraryPage" data-role="page" class="page standalonePage wizardPage mediaLibraryPage">
 
     <div class="padded-left padded-right padded-top">