diff --git a/src/components/skinmanager.js b/src/components/skinManager.js similarity index 95% rename from src/components/skinmanager.js rename to src/components/skinManager.js index 555da63650..d5dd0aa07a 100644 --- a/src/components/skinmanager.js +++ b/src/components/skinManager.js @@ -1,4 +1,4 @@ -define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdrop', 'globalize', 'require', 'appSettings', 'appRouter'], function (appHost, userSettings, browser, events, pluginManager, backdrop, globalize, require, appSettings, appRouter) { +define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdrop', 'globalize', 'require', 'appSettings'], function (appHost, userSettings, browser, events, pluginManager, backdrop, globalize, require, appSettings) { 'use strict'; var themeStyleElement; @@ -18,9 +18,9 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr options = options || {}; if (options.start) { - appRouter.invokeShortcut(options.start); + Emby.Page.invokeShortcut(options.start); } else { - appRouter.goHome(); + Emby.Page.goHome(); } }; diff --git a/src/scripts/site.js b/src/scripts/site.js index d450aeaa01..280ee85a1e 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -588,7 +588,7 @@ var AppInfo = {}; console.log("Begin onAppReady"); // ensure that appHost is loaded in this point - require(['apphost'], function (appHost) { + require(['apphost', 'appRouter'], function (appHost, appRouter) { var isInBackground = -1 !== self.location.href.toString().toLowerCase().indexOf("start=backgroundsync"); window.Emby = {}; @@ -603,10 +603,9 @@ var AppInfo = {}; require(['css!devices/ios/ios.css']); } - require(['appRouter', 'scripts/themeloader', 'libraryMenu'], function (pageObjects) { - window.Emby.Page = pageObjects; + window.Emby.Page = appRouter; - require(['scripts/routes'], function () { + require(['scripts/themeloader', 'libraryMenu', 'scripts/routes'], function () { Emby.Page.start({ click: false, hashbang: true