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

js/actions/api-endpoint.js

@@ -30,9 +30,6 @@
 
 var arangodb = require("org/arangodb");
 var actions = require("org/arangodb/actions");
-
-var db = arangodb.db;
-
 var internal = require("internal");
 
 // -----------------------------------------------------------------------------

js/actions/api-explain.js

@@ -30,7 +30,6 @@
 
 var actions = require("org/arangodb/actions");
 
-var ArangoError = require("org/arangodb").ArangoError; 
 var ERRORS = require("internal").errors;
 var EXPLAIN = require("internal").AQL_EXPLAIN;
 

js/actions/api-simple.js

@@ -29,7 +29,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 var actions = require("org/arangodb/actions");
-var simple = require("org/arangodb/simple-query");
 var db = require("org/arangodb").db;
 var ERRORS = require("internal").errors;
 

js/actions/api-structure.js

@@ -40,7 +40,6 @@ var console = require("console");
 var actions = require("org/arangodb/actions");
 var arangodb = require("org/arangodb");
 var db = arangodb.db;
-var ERRORS = arangodb.errors;
 
 var DEFAULT_KEY = "default";
 var API = "_api/structure";

js/actions/api-system.js

@@ -30,9 +30,6 @@
 
 var arangodb = require("org/arangodb");
 var actions = require("org/arangodb/actions");
-
-var db = arangodb.db;
-
 var internal = require("internal");
 var console = require("console");
 

js/actions/api-user.js

@@ -32,8 +32,6 @@ var arangodb = require("org/arangodb");
 var actions = require("org/arangodb/actions");
 var users = require("org/arangodb/users");
 
-var ArangoError = arangodb.ArangoError; 
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                                 private functions
 // -----------------------------------------------------------------------------
@@ -163,7 +161,7 @@ function post_api_user (req, res) {
     return;
   }
 
-  var result = users.save(json.username, json.passwd, json.active, json.extra);
+  users.save(json.username, json.passwd, json.active, json.extra);
   users.reload();
 
   actions.resultOk(req, res, actions.HTTP_CREATED, { });
@@ -251,7 +249,7 @@ function put_api_user (req, res) {
   }
   
   try {
-    var result = users.replace(username, json.passwd, json.active, json.extra);
+    users.replace(username, json.passwd, json.active, json.extra);
     users.reload();
   
     actions.resultOk(req, res, actions.HTTP_OK, { });
@@ -350,7 +348,7 @@ function patch_api_user (req, res) {
   }
   
   try {
-    var result = users.update(username, json.passwd, json.active, json.extra);
+    users.update(username, json.passwd, json.active, json.extra);
     users.reload();
     actions.resultOk(req, res, actions.HTTP_OK, { });
   }
@@ -419,7 +417,7 @@ function delete_api_user (req, res) {
 
   var username = decodeURIComponent(req.suffix[0]);
   try {
-    var result = users.remove(username);
+    users.remove(username);
     users.reload();
     actions.resultOk(req, res, actions.HTTP_ACCEPTED, { });
   }

js/actions/key-value.js

@@ -39,7 +39,6 @@
 // -----------------------------------------------------------------------------
 
 var actions = require("org/arangodb/actions");
-var simple = require("org/arangodb/simple-query");
 var db = require("org/arangodb").db;
 var internal = require("internal");
 var arangodb = require("org/arangodb");

js/apps/system/aardvark/frontend/js/views/dbSelectionView.js

@@ -11,7 +11,6 @@
     },
 
     initialize: function(opts) {
-      var self = this;
       this.current = opts.current;
       this.collection.fetch({
         async: false

js/apps/system/aardvark/frontend/js/views/footerView.js

@@ -94,7 +94,6 @@
     },
 
     renderVersion: function () {
-      var self = this;
       if (this.system.hasOwnProperty('database') && this.system.hasOwnProperty('name')) {
         $(this.el).html(this.template.render({
           name: this.system.name,
@@ -116,7 +115,6 @@
     },
 
     render: function () {
-      var self = this;
       if (!this.system.version) {
         this.getVersion();
       }

js/apps/system/aardvark/lib/swagger.js

@@ -31,9 +31,7 @@
 exports.Swagger = function () {
   "use strict";
   
-  // Define the Repository
-  var Foxx = require("org/arangodb/foxx"),
-    db = require("internal").db,
+  var db = require("internal").db,
     _routing = db._collection("_routing"),
     _aal = db._collection("_aal"),
     _ = require("underscore"),