From 29b9dac5f4aae7c21364ccef26ddd90635c4e2bc Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Wed, 20 May 2020 00:35:19 +0300 Subject: [PATCH 1/2] Fix dependency loop --- src/components/pluginManager.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/components/pluginManager.js b/src/components/pluginManager.js index 8ccb8b1361..6cb56d767b 100644 --- a/src/components/pluginManager.js +++ b/src/components/pluginManager.js @@ -1,4 +1,4 @@ -define(['events', 'globalize', 'appRouter'], function (events, globalize, appRouter) { +define(['events', 'globalize'], function (events, globalize) { 'use strict'; // TODO: replace with each plugin version @@ -71,14 +71,6 @@ define(['events', 'globalize', 'appRouter'], function (events, globalize, appRou 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('\\')); plugin.baseUrl = pluginSpec.substring(0, separatorIndex); From 5d87fb865fde243269b83ed826d1ddc6452e0f70 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Wed, 20 May 2020 00:35:51 +0300 Subject: [PATCH 2/2] Remove unused dependency --- src/components/appRouter.js | 2 +- src/components/skinManager.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/appRouter.js b/src/components/appRouter.js index 2e11ef88d9..a7496b2759 100644 --- a/src/components/appRouter.js +++ b/src/components/appRouter.js @@ -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'; var appRouter = { diff --git a/src/components/skinManager.js b/src/components/skinManager.js index 871b6d999f..6937c1cb6c 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'], 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'; var themeStyleElement;