diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index 32f33bf3..b5ac28b1 100644 --- a/src/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -226,8 +226,6 @@ const getAceFile = async () => { filenames.push(matches[2]); } } - // Always include the require kernel. - filenames.push('../static/js/require-kernel.js'); data += ';\n'; data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n'; diff --git a/src/static/js/ace.js b/src/static/js/ace.js index e648df07..40b8625c 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -24,8 +24,6 @@ // requires: top // requires: undefined -const KERNEL_SOURCE = '../static/js/require-kernel.js'; - const hooks = require('./pluginfw/hooks'); const pluginUtils = require('./pluginfw/shared'); @@ -196,15 +194,10 @@ const Ace2Editor = function () { `../static/skins/${clientVars.skinName}/pad.css?v=${clientVars.randomVersionString}`); pushStyleTagsFor(iframeHTML, includedCSS); - - if (!Ace2Editor.EMBEDED || !Ace2Editor.EMBEDED[KERNEL_SOURCE]) { - // Remotely src'd script tag will not work in IE; it must be embedded, so - // throw an error if it is not. - throw new Error('Require kernel could not be found.'); - } + iframeHTML.push(``); iframeHTML.push(scriptTag( - `${Ace2Editor.EMBEDED[KERNEL_SOURCE]}\n\ + `\n\ require.setRootURI("../javascripts/src");\n\ require.setLibraryURI("../javascripts/lib");\n\ require.setGlobalKeyPath("require");\n\