cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 02:48:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1280 from dmitrylyzo/fix-dependency-loop

Browse Source 
Fix dependency loop
This commit is contained in:
dkanada 2020-05-20 18:58:52 +09:00 committed by GitHub
commit 0155059778
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/appRouter.js
View File

@ -1,4 +1,4 @@
define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinManager', 'pluginManager', 'backdrop', 'browser', 'page', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, layoutManager, skinManager, pluginManager, backdrop, browser, page, appSettings, appHost, connectionManager) { define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdrop', 'browser', 'page', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, skinManager, backdrop, browser, page, appSettings, appHost, connectionManager) {
'use strict'; 'use strict';
var appRouter = { var appRouter = {

10
src/components/pluginManager.js
View File

@ -1,4 +1,4 @@
define(['events', 'globalize', 'appRouter'], function (events, globalize, appRouter) { define(['events', 'globalize'], function (events, globalize) {
'use strict'; 'use strict';
// TODO: replace with each plugin version // TODO: replace with each plugin version
@ -71,14 +71,6 @@ define(['events', 'globalize', 'appRouter'], function (events, globalize, appRou
plugin.installUrl = pluginSpec; plugin.installUrl = pluginSpec;
var urlLower = pluginSpec.toLowerCase();
if (urlLower.indexOf('http:') === -1 && urlLower.indexOf('https:') === -1 && urlLower.indexOf('file:') === -1) {
if (pluginSpec.indexOf(appRouter.baseUrl()) !== 0) {
pluginSpec = appRouter.baseUrl() + '/' + pluginSpec;
}
}
var separatorIndex = Math.max(pluginSpec.lastIndexOf('/'), pluginSpec.lastIndexOf('\\')); var separatorIndex = Math.max(pluginSpec.lastIndexOf('/'), pluginSpec.lastIndexOf('\\'));
plugin.baseUrl = pluginSpec.substring(0, separatorIndex); plugin.baseUrl = pluginSpec.substring(0, separatorIndex);

2
src/components/skinManager.js
View File

@ -1,4 +1,4 @@
define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdrop', 'globalize', 'require', 'appSettings'], function (appHost, userSettings, browser, events, pluginManager, backdrop, globalize, require, appSettings) { define(['apphost', 'userSettings', 'browser', 'events', 'backdrop', 'globalize', 'require', 'appSettings'], function (appHost, userSettings, browser, events, backdrop, globalize, require, appSettings) {
'use strict'; 'use strict';
var themeStyleElement; var themeStyleElement;