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

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

This commit is contained in:
Frank Celler 2013-03-27 15:53:34 +01:00
parent 0be696bac1 1aecbd3f84
commit d3ebb6bae2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/admin/js/views/queryView.js
View File

@ -25,7 +25,7 @@ var queryView = Backbone.View.extend({
editor2.setHighlightActiveLine(false);
editor.getSession().setMode("ace/mode/javascript");
editor2.getSession().setMode("ace/mode/javascript");
editor2.getSession().setMode("ace/mode/json");
editor.setTheme("ace/theme/merbivore_soft");
editor.resize();
editor2.setValue('');

4
js/common/tests/shell-foxx.js
View File

@ -34,7 +34,7 @@ function CreateFoxxApplicationSpec () {
assertEqual(routingInfo.routes.length, 0);
assertNotNull(templateCollection);
assertEqual(routingInfo.templateCollection, templateCollection);
assertEqual(app.templateCollection, templateCollection);
},
testCreationWithTemplateCollectionIfCollectionDoesExist: function () {
@ -48,7 +48,7 @@ function CreateFoxxApplicationSpec () {
assertEqual(routingInfo.routes.length, 0);
assertNotNull(templateCollection);
assertEqual(routingInfo.templateCollection, templateCollection);
assertEqual(app.templateCollection, templateCollection);
},
testAdditionOfBaseMiddlewareInRoutingInfo: function () {

2
js/server/modules/org/arangodb/foxx.js
View File

@ -107,7 +107,7 @@ FoxxApplication = function (options) {
this.routingInfo.urlPrefix = urlPrefix;
if (_.isString(templateCollection)) {
this.routingInfo.templateCollection = db._collection(templateCollection) ||
this.templateCollection = db._collection(templateCollection) ||
db._create(templateCollection);
myMiddleware = new BaseMiddleware(templateCollection, this.helperCollection);
} else {