diff --git a/plugins/index.js b/plugins/index.js
index 306d78093e23..588b5eecc485 100644
--- a/plugins/index.js
+++ b/plugins/index.js
@@ -78,13 +78,6 @@ export function getPlugins() {
export function loadPlugin(manifest) {
function onLoad() {
- // Add the plugin's js to the page
- const script = document.createElement('script');
- script.id = 'plugin_' + manifest.id;
- script.type = 'text/javascript';
- script.text = this.responseText;
- document.getElementsByTagName('head')[0].appendChild(script);
-
// Initialize the plugin
console.log('Registering ' + manifest.id + ' plugin...'); //eslint-disable-line no-console
const plugin = window.plugins[manifest.id];
@@ -92,18 +85,18 @@ export function loadPlugin(manifest) {
console.log('...done'); //eslint-disable-line no-console
}
- // Fetch the plugin's bundled js
- const xhrObj = new XMLHttpRequest();
-
// Backwards compatibility for old plugins
let bundlePath = manifest.webapp.bundle_path;
if (bundlePath.includes('/static/') && !bundlePath.includes('/static/plugins/')) {
bundlePath = bundlePath.replace('/static/', '/static/plugins/');
}
- xhrObj.open('GET', getSiteURL() + bundlePath, true);
- xhrObj.addEventListener('load', onLoad);
- xhrObj.send('');
+ const script = document.createElement('script');
+ script.id = 'plugin_' + manifest.id;
+ script.type = 'text/javascript';
+ script.src = getSiteURL() + bundlePath;
+ script.onload = onLoad;
+ document.getElementsByTagName('head')[0].appendChild(script);
}
export function removePlugin(manifest) {
diff --git a/root.html b/root.html
index 019cf4e523bc..65a153488626 100644
--- a/root.html
+++ b/root.html
@@ -1,6 +1,8 @@
+
+
@@ -91,12 +93,6 @@ Cannot connect to Mattermost
-
diff --git a/root.jsx b/root.jsx
index f5d933d0420e..f17828bcde7f 100644
--- a/root.jsx
+++ b/root.jsx
@@ -164,10 +164,10 @@ function appendOnLoadEvent(fn) {
}
}
-global.window.setup_root = () => {
- // Append trackLoadTime function to any exisitng onload events
- appendOnLoadEvent(trackLoadTime);
-
+appendOnLoadEvent(() => {
// Do the pre-render setup and call renderRootComponent when done
preRenderSetup(renderRootComponent);
-};
+});
+
+// Append trackLoadTime function to any exisitng onload events
+appendOnLoadEvent(trackLoadTime);