Pad: Defer module loading until plugins are loaded

This commit is contained in:
Richard Hansen 2021-08-13 23:05:26 -04:00
parent b805143d1a
commit 2b53c69749

View file

@ -485,10 +485,6 @@
if (window._postPluginUpdateForTesting != null) window._postPluginUpdateForTesting(); if (window._postPluginUpdateForTesting != null) window._postPluginUpdateForTesting();
window._postPluginUpdateForTestingDone = true; window._postPluginUpdateForTestingDone = true;
$(() => hooks.aCallAll('documentReady')); $(() => hooks.aCallAll('documentReady'));
const pad = require('ep_etherpad-lite/static/js/pad');
pad.baseURL = baseURL;
pad.init();
});
// TODO: These globals shouldn't exist. // TODO: These globals shouldn't exist.
window.pad = require('ep_etherpad-lite/static/js/pad').pad; window.pad = require('ep_etherpad-lite/static/js/pad').pad;
@ -497,6 +493,10 @@
window.padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp; window.padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
require('ep_etherpad-lite/static/js/skin_variants'); require('ep_etherpad-lite/static/js/skin_variants');
const pad = require('ep_etherpad-lite/static/js/pad');
pad.baseURL = baseURL;
pad.init();
});
})(); })();
// @license-end // @license-end
</script> </script>