mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use Yajsml to combine files.

Browse source 
Minify only constructs individual files and optionally compresses them with UglifyJS.
This commit is contained in:
Chad Weider 2012-01-29 03:30:31 -08:00
parent b661ef5960
commit dcc0740621
6 changed files with 61 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

17
node/server.js
View file

@ -32,6 +32,7 @@ var express = require('express');
var path = require('path');
var minify = require('./utils/Minify');
var CachingMiddleware = require('./utils/caching_middleware');
var Yajsml = require('yajsml');
var formidable = require('formidable');
var apiHandler;
var exportHandler;
@ -147,6 +148,8 @@ async.waterfall([
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)
{
var filePath = path.normalize(__dirname + "/.." +
@ -155,8 +158,18 @@ async.waterfall([
});
//serve minified files
var assetCache = new CachingMiddleware;
app.all('/minified/:filename', assetCache.handle, minify.minifyJS);
var jsServer = new (Yajsml.Server)({
rootPath: 'minified/'
, rootURI: 'http://' + settings.ip + ":" + settings.port + '/static/js/'
});
var StaticAssociator = Yajsml.associators.StaticAssociator;
var associations =
Yajsml.associators.associationsForSimpleMapping(minify.tar);
var associator = new StaticAssociator(associations);
jsServer.setAssociator(associator);
var assetCache_other = new CachingMiddleware;
app.all('/minified/:filename', assetCache_other.handle);
app.use(jsServer);
//checks for padAccess
function hasPadAccess(req, res, callback)