Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2014-07-14 11:25:38 +02:00
parent e80b0d0c0a 15372670e0
commit 9e3ccdc2e0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/server/modules/org/arangodb/foxx/manager.js
View File

@ -780,6 +780,7 @@ function routingAalApp (app, mount, options) {
appContextTempl.isProduction = ! devel; appContextTempl.isProduction = ! devel;
appContextTempl.manifest = app._manifest; appContextTempl.manifest = app._manifest;
extendContext(appContextTempl, app, root);
var appContext; var appContext;
var file; var file;
@ -794,9 +795,8 @@ function routingAalApp (app, mount, options) {
var result = {}; var result = {};
var context = { exports: result }; var context = { exports: result };
appContext = Object.create(appContextTempl); appContext = _.extend({}, appContextTempl);
appContext.prefix = "/"; appContext.prefix = "/";
extendContext(appContext, app, root);
app.loadAppScript(appContext, file, { context: context }); app.loadAppScript(appContext, file, { context: context });
@ -813,11 +813,10 @@ function routingAalApp (app, mount, options) {
file = controllers[i]; file = controllers[i];
// set up a context for the application start function // set up a context for the application start function
appContext = Object.create(appContextTempl); appContext = _.extend({}, appContextTempl);
appContext.prefix = arangodb.normalizeURL("/" + i); // app mount appContext.prefix = arangodb.normalizeURL("/" + i); // app mount
appContext.routingInfo = {}; appContext.routingInfo = {};
appContext.foxxes = []; appContext.foxxes = [];
extendContext(appContext, app, root);
app.loadAppScript(appContext, file, { transform: transformScript(file) }); app.loadAppScript(appContext, file, { transform: transformScript(file) });