1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

fixed some bugs with merge from upstream

This commit is contained in:
vitorsemeano 2019-03-16 15:48:53 +00:00
parent 5b26405c06
commit 0b71b0b493
2 changed files with 6 additions and 7 deletions

View file

@ -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