fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always include the require kernel.

This commit is contained in:
Chad Weider 2012-01-30 21:37:39 -08:00
parent 348e7ef1d5
commit 4bf9b0c805
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
node/utils/Minify.js
View File

@ -223,6 +223,7 @@ function getAceFile(callback) {
if (!settings.minify) { if (!settings.minify) {
founds = []; founds = [];
} }
founds.push('$$INCLUDE_JS("../static/js/require-kernel.js")');
data += ';\n'; data += ';\n';
data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n'; data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n';

4
static/js/ace.js
View File

@ -217,15 +217,11 @@ function Ace2Editor()
return {embeded: embededFiles, remote: remoteFiles}; return {embeded: embededFiles, remote: remoteFiles};
} }
function pushRequireScriptTo(buffer) { function pushRequireScriptTo(buffer) {
/* Folling is for packaging regular expression. */
/* $$INCLUDE_JS("../static/js/require-kernel.js"); */
var KERNEL_SOURCE = '../static/js/require-kernel.js'; var KERNEL_SOURCE = '../static/js/require-kernel.js';
if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[KERNEL_SOURCE]) { if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[KERNEL_SOURCE]) {
buffer.push('<script type="text/javascript">'); buffer.push('<script type="text/javascript">');
buffer.push(Ace2Editor.EMBEDED[KERNEL_SOURCE]); buffer.push(Ace2Editor.EMBEDED[KERNEL_SOURCE]);
buffer.push('<\/script>'); buffer.push('<\/script>');
} else {
buffer.push('<script type="application/javascript" src="'+KERNEL_SOURCE+'"><\/script>');
} }
} }
function pushScriptsTo(buffer) { function pushScriptsTo(buffer) {