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

Linting.

This commit is contained in:
Alan Plum 2015-04-10 10:19:42 +02:00
parent 215644f224
commit f108ecd86b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/server/modules/org/arangodb/foxx/arangoApp.js
View File

@ -39,6 +39,7 @@
var internal = require("internal"); var internal = require("internal");
var db = internal.db; var db = internal.db;
var _= require("underscore"); var _= require("underscore");
var Foxx = require("org/arangodb/foxx");
var utils = require("org/arangodb/foxx/manager-utils"); var utils = require("org/arangodb/foxx/manager-utils");
var console = require("console"); var console = require("console");
var arangodb = require("org/arangodb"); var arangodb = require("org/arangodb");
@ -194,7 +195,7 @@ var computeRootAppPath = function(mount, isValidation) {
configurable: true, configurable: true,
enumerable: true, enumerable: true,
get: function () { get: function () {
return require('org/arangodb/foxx').requireApp(mount); return Foxx.requireApp(mount);
} }
}); });
}, this); }, this);

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

@ -42,7 +42,6 @@ var joi = require("joi");
var utils = require("org/arangodb/foxx/manager-utils"); var utils = require("org/arangodb/foxx/manager-utils");
var store = require("org/arangodb/foxx/store"); var store = require("org/arangodb/foxx/store");
var console = require("console"); var console = require("console");
var Foxx = require("org/arangodb/foxx");
var ArangoApp = require("org/arangodb/foxx/arangoApp").ArangoApp; var ArangoApp = require("org/arangodb/foxx/arangoApp").ArangoApp;
var TemplateEngine = require("org/arangodb/foxx/templateEngine").Engine; var TemplateEngine = require("org/arangodb/foxx/templateEngine").Engine;
var routeApp = require("org/arangodb/foxx/routing").routeApp; var routeApp = require("org/arangodb/foxx/routing").routeApp;
@ -1293,15 +1292,15 @@ var upgrade = function(appInfo, mount, options) {
var oldApp = lookupApp(mount); var oldApp = lookupApp(mount);
var oldConf = oldApp.getConfiguration(true); var oldConf = oldApp.getConfiguration(true);
options.configuration = options.configuration || {}; options.configuration = options.configuration || {};
Object.keys(oldConf).forEach(function (attr) { Object.keys(oldConf).forEach(function (key) {
if (!options.configuration.hasOwnProperty(attr)) { if (!options.configuration.hasOwnProperty(key)) {
options.configuration[attr] = oldConf[attr]; options.configuration[key] = oldConf[key];
} }
}); });
var oldDeps = oldApp._options.dependencies || {}; var oldDeps = oldApp._options.dependencies || {};
options.dependencies = options.dependencies || {}; options.dependencies = options.dependencies || {};
Object.keys(oldDeps).forEach(function (key) { Object.keys(oldDeps).forEach(function (key) {
if (!options.dependencies.hasOwnProperty(attr)) { if (!options.dependencies.hasOwnProperty(key)) {
options.dependencies[key] = oldDeps[key]; options.dependencies[key] = oldDeps[key];
} }
}); });