2
0
Fork 0

fix bugs, more tests

This commit is contained in:
Willem 2015-02-27 21:50:19 +01:00
parent 0a44f24813
commit cc4952ac7c
11 changed files with 309 additions and 104 deletions

View file

@ -1,3 +1,4 @@
'use strict';
var express = require('express');
var async = require('async');
@ -25,14 +26,14 @@ var assetsConfig = {
'/static/js/lib/angularjs-1.4.0-b4/angular-resource.js@https://code.angularjs.org/1.4.0-beta.4/angular-resource.js',
'/static/js/lib/angularjs-1.4.0-b4/angular-touch.js@https://code.angularjs.org/1.4.0-beta.4/angular-touch.js',
],
}
};
//callback helper to return an assembler config per asset type
function createBuildConfig(type) {
return function(callback) {
var singleResult = 'false' != process.env.DEV_ASSETS_SINGLE_RESULT;
var singleResult = 'false' !== process.env.DEV_ASSETS_SINGLE_RESULT;
console.info('Asset single page result: '+singleResult+' for: '+type);
if (type == 'css') {
if (type === 'css') {
callback(null,{
linkMapping: assetsConfig.linkMapping,
linkTargetSingleResult: singleResult,
@ -42,7 +43,6 @@ function createBuildConfig(type) {
});
} else {
callback(null, {
downloadStartDelay: 200,
linkTargetSingleResult: singleResult,
linkMapping: assetsConfig.linkMapping,
linkTarget: '/static/js/lib/assets.js',
@ -50,7 +50,7 @@ function createBuildConfig(type) {
assetType: type,
});
}
}
};
}
function buildAssets(server,callbackDone) {
@ -87,29 +87,29 @@ function buildAssets(server,callbackDone) {
},callbackDone);
}
function renderTemplate(server) {
return function (req, res, next) {
function renderTemplate() {
return function (req, res) {
if (req.params.sub) {
res.render('include/' + req.params.page + '/' + req.params.sub);
} else {
res.render('include/' + req.params.page);
}
}
};
}
function renderPage(server) {
return function (req, res, next) {
return function (req, res) {
res.render('index', {
includeCssFiles: server.get('ff_assets_css'),
includeJsFiles: server.get('ff_assets_js'),
});
}
};
}
function sendRedirect() {
return function (req, res, next) {
return function (req, res) {
res.redirect('/example-ui');
}
};
}