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

fixed some bugs with merge from upstream

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
src/components/skinmanager.js → src/components/skinManager.js
View file

@ -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'; 'use strict';
var themeStyleElement; var themeStyleElement;
@ -18,9 +18,9 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
options = options || {}; options = options || {};
if (options.start) { if (options.start) {
appRouter.invokeShortcut(options.start); Emby.Page.invokeShortcut(options.start);
} else { } else {
appRouter.goHome(); Emby.Page.goHome();
} }
}; };

7
src/scripts/site.js
View file

@ -588,7 +588,7 @@ var AppInfo = {};
console.log("Begin onAppReady"); console.log("Begin onAppReady");
// ensure that appHost is loaded in this point // 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"); var isInBackground = -1 !== self.location.href.toString().toLowerCase().indexOf("start=backgroundsync");
window.Emby = {}; window.Emby = {};
@ -603,10 +603,9 @@ var AppInfo = {};
require(['css!devices/ios/ios.css']); require(['css!devices/ios/ios.css']);
} }
require(['appRouter', 'scripts/themeloader', 'libraryMenu'], function (pageObjects) { window.Emby.Page = appRouter;
window.Emby.Page = pageObjects;
require(['scripts/routes'], function () { require(['scripts/themeloader', 'libraryMenu', 'scripts/routes'], function () {
Emby.Page.start({ Emby.Page.start({
click: false, click: false,
hashbang: true hashbang: true