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

added missing karma config entries

This commit is contained in:
Heiko Kernbach 2014-08-01 20:38:47 +02:00
parent 2caa3b7a60
commit 342c8f00d8
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/apps/system/aardvark/frontend/js/collections/arangoQueries.js
View File

@ -1,5 +1,5 @@
/*jslint indent: 2, nomen: true, maxlen: 100, vars: true, white: true, plusplus: true, stupid: true*/ /*jslint indent: 2, nomen: true, maxlen: 100, vars: true, white: true, plusplus: true, stupid: true*/
/*global require, exports, Backbone, window, arangoCollectionModel, $, arangoHelper, data, _ */ /*global require, exports, Backbone, window, ArangoQuery, $, data, _ */
(function() { (function() {
"use strict"; "use strict";
@ -8,7 +8,6 @@
initialize: function(models, options) { initialize: function(models, options) {
this.fetch(); this.fetch();
options || (options = {});
if (options.activeUser) { if (options.activeUser) {
this.activeUser = options.activeUser; this.activeUser = options.activeUser;
} }

1
js/apps/system/aardvark/frontend/js/routers/router.js
View File

@ -86,7 +86,6 @@
userCollection: this.userCollection userCollection: this.userCollection
}); });
console.log(this.userCollection.activeUser);
this.queryCollection = new window.ArangoQueries([],{ this.queryCollection = new window.ArangoQueries([],{
activeUser: self.userCollection.activeUser activeUser: self.userCollection.activeUser
}); });

7
js/apps/system/aardvark/frontend/js/views/queryView.js
View File

@ -284,13 +284,6 @@
importCustomQueries: function () { importCustomQueries: function () {
var result; var result;
if (this.allowUpload === true) { if (this.allowUpload === true) {
console.log(this.file.valueOf());
console.log(this.file);
console.log(this.files);
$.getJSON(this.file, function(json) {
console.log(json);
});
} }
}, },

2
js/apps/system/aardvark/test/karma/files.json
View File

@ -106,6 +106,7 @@
"frontend/js/models/foxx.js", "frontend/js/models/foxx.js",
"frontend/js/models/graph.js", "frontend/js/models/graph.js",
"frontend/js/models/notification.js", "frontend/js/models/notification.js",
"frontend/js/models/arangoQuery.js",
"clusterFrontend/js/models/clusterServer.js", "clusterFrontend/js/models/clusterServer.js",
"clusterFrontend/js/models/clusterCoordinator.js", "clusterFrontend/js/models/clusterCoordinator.js",
"clusterFrontend/js/models/clusterDatabase.js", "clusterFrontend/js/models/clusterDatabase.js",
@ -129,6 +130,7 @@
"frontend/js/collections/foxxCollection.js", "frontend/js/collections/foxxCollection.js",
"frontend/js/collections/graphCollection.js", "frontend/js/collections/graphCollection.js",
"frontend/js/collections/notificationCollection.js", "frontend/js/collections/notificationCollection.js",
"frontend/js/collections/arangoQueries.js",
"clusterFrontend/js/collections/clusterServers.js", "clusterFrontend/js/collections/clusterServers.js",
"clusterFrontend/js/collections/clusterCoordinators.js", "clusterFrontend/js/collections/clusterCoordinators.js",
"clusterFrontend/js/collections/clusterDatabases.js", "clusterFrontend/js/collections/clusterDatabases.js",