Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Minify serves the require kernel.

  • Loading branch information...
commit 3da1464ae053bb0e098b35b950906e41d6439ce4 1 parent e33c5a3
@cweider authored
Showing with 15 additions and 15 deletions.
  1. +0 −5 node/server.js
  2. +15 −10 node/utils/Minify.js
View
5 node/server.js
@@ -143,11 +143,6 @@ async.waterfall([
});
//serve static files
- app.get('/static/js/require-kernel.js', function (req, res, next) {
- res.header("Content-Type","application/javascript; charset: utf-8");
- res.write(minify.requireDefinition());
- res.end();
- });
var assetCache = new CachingMiddleware;
app.all('/static/js/:filename', assetCache.handle, minify.minifyJS);
app.get('/static/*', function(req, res)
View
25 node/utils/Minify.js
@@ -201,7 +201,6 @@ function lastModifiedDate(callback) {
});
}
-exports.requireDefinition = requireDefinition;
function requireDefinition() {
return 'var require = ' + RequireKernel.kernelSource + ';\n';
}
@@ -226,23 +225,29 @@ function getFileCompressed(filename, callback) {
function getFile(filename, callback) {
if (filename == 'ace.js') {
getAceFile(callback);
+ } else if (filename == 'require-kernel.js') {
+ callback(undefined, requireDefinition());
} else {
fs.readFile(JS_DIR + filename, "utf8", callback);
}
}
function fileExists(filename, callback) {
- fs.stat(JS_DIR + filename, function (error, stats) {
- if (error) {
- if (error.code == "ENOENT") {
- callback(undefined, false);
+ if (filename == 'require-kernel.js') {
+ callback(undefined, true);
+ } else {
+ fs.stat(JS_DIR + filename, function (error, stats) {
+ if (error) {
+ if (error.code == "ENOENT") {
+ callback(undefined, false);
+ } else {
+ callback(error, undefined);
+ }
} else {
- callback(error, undefined);
+ callback(undefined, stats.isFile());
}
- } else {
- callback(undefined, stats.isFile());
- }
- })
+ });
+ }
}
function tarCode(jsFiles, write, callback) {
Please sign in to comment.
Something went wrong with that request. Please try again.