diff --git a/js/.jshintrc b/js/.jshintrc index c701f27fe5..ebc12c04bb 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -4,10 +4,12 @@ "eqeqeq": true, "forin": true, "freeze": true, + "globalstrict": true, "immed": true, "laxbreak": true, "newcap": true, "noarg": true, + "node": true, "noempty": true, "nonbsp": true, "nonew": true, diff --git a/js/actions/_admin/app.js b/js/actions/_admin/app.js index 4237ff50e7..26b686974c 100644 --- a/js/actions/_admin/app.js +++ b/js/actions/_admin/app.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief administration actions diff --git a/js/actions/_admin/database/app.js b/js/actions/_admin/database/app.js index a74417e8d0..3998e9dc41 100644 --- a/js/actions/_admin/database/app.js +++ b/js/actions/_admin/database/app.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief administration actions diff --git a/js/actions/_admin/routing/app.js b/js/actions/_admin/routing/app.js index 30c3e7ab81..115cf271c6 100644 --- a/js/actions/_admin/routing/app.js +++ b/js/actions/_admin/routing/app.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief administration actions diff --git a/js/actions/_admin/server/app.js b/js/actions/_admin/server/app.js index 5fbc9b640b..14bf33ad85 100644 --- a/js/actions/_admin/server/app.js +++ b/js/actions/_admin/server/app.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, ArangoServerState */ +/*global ArangoServerState */ //////////////////////////////////////////////////////////////////////////////// /// @brief administration actions diff --git a/js/actions/_admin/wal/app.js b/js/actions/_admin/wal/app.js index 2b1b7cf21b..b8629b7073 100644 --- a/js/actions/_admin/wal/app.js +++ b/js/actions/_admin/wal/app.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief administration actions diff --git a/js/actions/_api/collection/app.js b/js/actions/_api/collection/app.js index 2967e9a434..acf1a4f886 100644 --- a/js/actions/_api/collection/app.js +++ b/js/actions/_api/collection/app.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief querying and managing collections diff --git a/js/actions/_api/foxx/app.js b/js/actions/_api/foxx/app.js index daf4243b38..2a730d8960 100644 --- a/js/actions/_api/foxx/app.js +++ b/js/actions/_api/foxx/app.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief foxx administration actions diff --git a/js/actions/_api/user/app.js b/js/actions/_api/user/app.js index 7e883e9490..855906a145 100644 --- a/js/actions/_api/user/app.js +++ b/js/actions/_api/user/app.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief user management diff --git a/js/actions/api-aqlfunction.js b/js/actions/api-aqlfunction.js index 0474e4ed98..fb3cfcf7a3 100644 --- a/js/actions/api-aqlfunction.js +++ b/js/actions/api-aqlfunction.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief AQL user functions management diff --git a/js/actions/api-cluster.js b/js/actions/api-cluster.js index 9ac836ee09..99974a28df 100644 --- a/js/actions/api-cluster.js +++ b/js/actions/api-cluster.js @@ -1,5 +1,5 @@ /*jshint strict: false, unused: false */ -/*global require, AQL_EXECUTE, SYS_CLUSTER_TEST, UPGRADE_ARGS: true, +/*global AQL_EXECUTE, SYS_CLUSTER_TEST, UPGRADE_ARGS: true, ArangoServerState, ArangoClusterComm, ArangoClusterInfo */ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/actions/api-configuration.js b/js/actions/api-configuration.js index bac2c16995..25c2a1dc50 100644 --- a/js/actions/api-configuration.js +++ b/js/actions/api-configuration.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief global configuration diff --git a/js/actions/api-database.js b/js/actions/api-database.js index 07483a355c..10d79fa307 100644 --- a/js/actions/api-database.js +++ b/js/actions/api-database.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, ArangoAgency */ +/*global ArangoAgency */ //////////////////////////////////////////////////////////////////////////////// /// @brief database management diff --git a/js/actions/api-edges.js b/js/actions/api-edges.js index dae7221676..2420da21ce 100644 --- a/js/actions/api-edges.js +++ b/js/actions/api-edges.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief managing edges diff --git a/js/actions/api-endpoint.js b/js/actions/api-endpoint.js index 6ccf4ecc7b..67c8007081 100644 --- a/js/actions/api-endpoint.js +++ b/js/actions/api-endpoint.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief endpoint management diff --git a/js/actions/api-explain.js b/js/actions/api-explain.js index ba6638f44c..195392e302 100644 --- a/js/actions/api-explain.js +++ b/js/actions/api-explain.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, AQL_EXPLAIN */ +/*global AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief query explain actions diff --git a/js/actions/api-graph.js b/js/actions/api-graph.js index a0f57260a6..a0da6fb062 100644 --- a/js/actions/api-graph.js +++ b/js/actions/api-graph.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, AQL_EXECUTE */ +/*global AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief graph api diff --git a/js/actions/api-index.js b/js/actions/api-index.js index 42904cf935..daabc24a6c 100644 --- a/js/actions/api-index.js +++ b/js/actions/api-index.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief querying and managing indexes diff --git a/js/actions/api-open.js b/js/actions/api-open.js index 3414e1f5e3..5c7aeddb5c 100644 --- a/js/actions/api-open.js +++ b/js/actions/api-open.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief open actions diff --git a/js/actions/api-simple.js b/js/actions/api-simple.js index b6a66c5010..1cf6da20e8 100644 --- a/js/actions/api-simple.js +++ b/js/actions/api-simple.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, CREATE_CURSOR */ +/*global CREATE_CURSOR */ //////////////////////////////////////////////////////////////////////////////// /// @brief simple queries diff --git a/js/actions/api-structure.js b/js/actions/api-structure.js index 954e9b7f1a..7aff92dc16 100644 --- a/js/actions/api-structure.js +++ b/js/actions/api-structure.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief querying and managing structures diff --git a/js/actions/api-system.js b/js/actions/api-system.js index 46801e7b44..f6c203f0e0 100644 --- a/js/actions/api-system.js +++ b/js/actions/api-system.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief administration actions diff --git a/js/actions/api-tasks.js b/js/actions/api-tasks.js index a5979c9adf..a14ee50677 100644 --- a/js/actions/api-tasks.js +++ b/js/actions/api-tasks.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief querying and managing collections diff --git a/js/actions/api-transaction.js b/js/actions/api-transaction.js index 72ee78739c..cdb0de5b26 100644 --- a/js/actions/api-transaction.js +++ b/js/actions/api-transaction.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, TRANSACTION */ +/*global TRANSACTION */ //////////////////////////////////////////////////////////////////////////////// /// @brief transaction actions diff --git a/js/actions/api-traversal.js b/js/actions/api-traversal.js index 4d9d011e73..86b8cffb69 100644 --- a/js/actions/api-traversal.js +++ b/js/actions/api-traversal.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief traversal actions diff --git a/js/apps/system/_admin/aardvark/APP/aardvark.js b/js/apps/system/_admin/aardvark/APP/aardvark.js index 9950edb294..bc768750bc 100644 --- a/js/apps/system/_admin/aardvark/APP/aardvark.js +++ b/js/apps/system/_admin/aardvark/APP/aardvark.js @@ -1,5 +1,5 @@ /*jshint globalstrict: true */ -/*global require, applicationContext*/ +/*global applicationContext*/ //////////////////////////////////////////////////////////////////////////////// /// @brief A Foxx.Controller to show all Foxx Applications diff --git a/js/apps/system/_admin/aardvark/APP/cluster.js b/js/apps/system/_admin/aardvark/APP/cluster.js index aa636ebe3e..f393a63f0a 100644 --- a/js/apps/system/_admin/aardvark/APP/cluster.js +++ b/js/apps/system/_admin/aardvark/APP/cluster.js @@ -1,4 +1,4 @@ -/*global require, applicationContext*/ +/*global applicationContext*/ //////////////////////////////////////////////////////////////////////////////// /// @brief A Foxx.Controller to show all Foxx Applications diff --git a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js index 0770f5e5c7..7d741c8e32 100644 --- a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js +++ b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js @@ -602,7 +602,7 @@ return returnVal; }); }()); -/*global require, exports, Backbone, window */ +/*global Backbone, window */ window.ClusterStatisticsCollection = Backbone.Collection.extend({ model: window.Statistics, @@ -1256,7 +1256,7 @@ window.StatisticsDescription = Backbone.Model.extend({ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, window */ +/*global Backbone, window */ window.StatisticsCollection = Backbone.Collection.extend({ model: window.Statistics, url: "/_admin/statistics" @@ -1264,7 +1264,7 @@ window.StatisticsCollection = Backbone.Collection.extend({ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, window, Backbone, arangoDocumentModel, _, arangoHelper, $*/ +/*global window, Backbone, arangoDocumentModel, _, arangoHelper, $*/ (function() { "use strict"; @@ -1727,7 +1727,7 @@ window.StatisticsCollection = Backbone.Collection.extend({ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, EJS, $, flush, window, arangoHelper, nv, d3, localStorage*/ +/*global Backbone, EJS, $, flush, window, arangoHelper, nv, d3, localStorage*/ /*global document, console, Dygraph, _,templateEngine */ (function () { @@ -2902,7 +2902,7 @@ window.StatisticsCollection = Backbone.Collection.extend({ }); }()); -/*global require, _, Dygraph, window, document */ +/*global _, Dygraph, window, document */ (function () { "use strict"; @@ -3196,7 +3196,7 @@ window.StatisticsCollection = Backbone.Collection.extend({ /*jshint browser: true */ /*jshint strict: false, unused: false */ -/*global require, exports, Backbone, window */ +/*global Backbone, window */ window.StatisticsDescriptionCollection = Backbone.Collection.extend({ model: window.StatisticsDescription, url: "/_admin/statistics-description", @@ -3383,7 +3383,7 @@ window.StatisticsDescriptionCollection = Backbone.Collection.extend({ }); }()); -/*global require, exports, Backbone, EJS, $, flush, window, arangoHelper, nv, d3, localStorage*/ +/*global Backbone, EJS, $, flush, window, arangoHelper, nv, d3, localStorage*/ /*global document, Dygraph, _,templateEngine */ (function() { diff --git a/js/apps/system/_admin/aardvark/APP/clusterFrontend/js/collections/arangoClusterStatisticsCollection.js b/js/apps/system/_admin/aardvark/APP/clusterFrontend/js/collections/arangoClusterStatisticsCollection.js index c1293b0216..a8de926774 100644 --- a/js/apps/system/_admin/aardvark/APP/clusterFrontend/js/collections/arangoClusterStatisticsCollection.js +++ b/js/apps/system/_admin/aardvark/APP/clusterFrontend/js/collections/arangoClusterStatisticsCollection.js @@ -1,4 +1,4 @@ -/*global require, exports, Backbone, window */ +/*global Backbone, window */ window.ClusterStatisticsCollection = Backbone.Collection.extend({ model: window.Statistics, diff --git a/js/apps/system/_admin/aardvark/APP/clusterFrontend/js/views/dbServerDashboardView.js b/js/apps/system/_admin/aardvark/APP/clusterFrontend/js/views/dbServerDashboardView.js index ec9e0a1b76..c2a8641ae4 100644 --- a/js/apps/system/_admin/aardvark/APP/clusterFrontend/js/views/dbServerDashboardView.js +++ b/js/apps/system/_admin/aardvark/APP/clusterFrontend/js/views/dbServerDashboardView.js @@ -1,4 +1,4 @@ -/*global require, exports, Backbone, EJS, $, flush, window, arangoHelper, nv, d3, localStorage*/ +/*global Backbone, EJS, $, flush, window, arangoHelper, nv, d3, localStorage*/ /*global document, Dygraph, _,templateEngine */ (function() { diff --git a/js/apps/system/_admin/aardvark/APP/foxxTemplates.js b/js/apps/system/_admin/aardvark/APP/foxxTemplates.js index f666aeb783..0f63ccf26a 100644 --- a/js/apps/system/_admin/aardvark/APP/foxxTemplates.js +++ b/js/apps/system/_admin/aardvark/APP/foxxTemplates.js @@ -1,4 +1,4 @@ -/*global require, applicationContext*/ +/*global applicationContext*/ //////////////////////////////////////////////////////////////////////////////// /// @brief A Foxx.Controller to generate new FoxxApps diff --git a/js/apps/system/_admin/aardvark/APP/foxxes.js b/js/apps/system/_admin/aardvark/APP/foxxes.js index 8a03e0187a..c46d22925a 100644 --- a/js/apps/system/_admin/aardvark/APP/foxxes.js +++ b/js/apps/system/_admin/aardvark/APP/foxxes.js @@ -1,4 +1,4 @@ -/*global require, applicationContext */ +/*global applicationContext */ //////////////////////////////////////////////////////////////////////////////// /// @brief A Foxx.Controller to show all Foxx Applications diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/errors.js b/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/errors.js index 003512792d..cfce39b3e2 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/errors.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/errors.js @@ -1,12 +1,11 @@ /*jshint maxlen: 240 */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief auto-generated file generated from errors.dat //////////////////////////////////////////////////////////////////////////////// (function () { - "use strict"; + 'use strict'; var internal = require("internal"); internal.errors = { diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/module-console.js b/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/module-console.js index ef76c08b3b..349ce4266f 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/module-console.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/module-console.js @@ -1,5 +1,6 @@ -/*jshint -W051: true */ -/*global require, SYS_GETLINE, SYS_LOG, jqconsole, Symbol */ +/*jshint -W051:true */ +/*global jqconsole, Symbol */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief module "console" @@ -28,38 +29,37 @@ /// @author Copyright 2010-2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -(function () { - /*jshint strict: false */ - var exports = require("console"); - - var sprintf = require("internal").sprintf; - var inspect = require("internal").inspect; - // ----------------------------------------------------------------------------- // --SECTION-- Module "console" // ----------------------------------------------------------------------------- +(function () { + // ----------------------------------------------------------------------------- // --SECTION-- private variables // ----------------------------------------------------------------------------- +var exports = require("console"); +var sprintf = require("internal").sprintf; +var inspect = require("internal").inspect; + //////////////////////////////////////////////////////////////////////////////// /// @brief group level //////////////////////////////////////////////////////////////////////////////// - var groupLevel = ""; +var groupLevel = ""; //////////////////////////////////////////////////////////////////////////////// /// @brief timers //////////////////////////////////////////////////////////////////////////////// - var timers; - try { - timers = Object.create(null); - } - catch (err) { - timers = {}; - } +var timers; +try { + timers = Object.create(null); +} +catch (e) { + timers = {}; +} // ----------------------------------------------------------------------------- // --SECTION-- private functions @@ -69,69 +69,66 @@ /// @brief internal logging //////////////////////////////////////////////////////////////////////////////// - var log; +var log; - try { - // this will work when we are in arangod but not in the browser / web interface - log = SYS_LOG; - delete SYS_LOG; - } - catch (err) { - // this will work in the web interface - log = function (level, message) { - if (jqconsole) { - jqconsole.Write(message + "\n", 'jssuccess'); - } - }; - } +if (global.SYS_LOG) { + // this will work when we are in arangod but not in the browser / web interface + log = global.SYS_LOG; + delete global.SYS_LOG; +} +else { + // this will work in the web interface + log = function (level, message) { + if (typeof jqconsole !== 'undefined') { + jqconsole.Write(message + "\n", 'jssuccess'); + } + }; +} //////////////////////////////////////////////////////////////////////////////// /// @brief internal logging with group level //////////////////////////////////////////////////////////////////////////////// - function logGroup (level, msg) { - 'use strict'; - - log(level, groupLevel + msg); - } +function logGroup (level, msg) { + log(level, groupLevel + msg); +} //////////////////////////////////////////////////////////////////////////////// /// @brief try to prettify //////////////////////////////////////////////////////////////////////////////// - function prepareArgs (args) { - var ShapedJson = require("internal").ShapedJson; - var result = []; - var i; +function prepareArgs (args) { + var ShapedJson = require("internal").ShapedJson; + var result = []; - if (0 < args.length && typeof args[0] !== "string") { - result.push("%s"); - } - - for (i = 0; i < args.length; ++i) { - var arg = args[i]; - - if (typeof arg === "object") { - if (ShapedJson !== undefined && arg instanceof ShapedJson) { - arg = inspect(arg, {prettyPrint: false}); - } - else if (arg === null) { - arg = "null"; - } - else if (arg instanceof Date || arg instanceof RegExp) { - arg = String(arg); - } - else if (Object.prototype.isPrototypeOf(arg) || Array.isArray(arg)) { - arg = inspect(arg, {prettyPrint: false}); - } - } - - result.push(arg); - } - - return result; + if (0 < args.length && typeof args[0] !== "string") { + result.push("%s"); } + for (var i = 0; i < args.length; ++i) { + var arg = args[i]; + + if (typeof arg === "object") { + if (ShapedJson !== undefined && arg instanceof ShapedJson) { + arg = inspect(arg, {prettyPrint: false}); + } + else if (arg === null) { + arg = "null"; + } + else if (arg instanceof Date || arg instanceof RegExp) { + arg = String(arg); + } + else if (Object.prototype.isPrototypeOf(arg) || Array.isArray(arg)) { + arg = inspect(arg, {prettyPrint: false}); + } + } + + result.push(arg); + } + + return result; +} + // ----------------------------------------------------------------------------- // --SECTION-- public functions // ----------------------------------------------------------------------------- @@ -140,329 +137,297 @@ /// @brief assert //////////////////////////////////////////////////////////////////////////////// - exports.assert = function (condition) { - 'use strict'; +exports.assert = function (condition) { + if (condition) { + return; + } - if (condition) { - return; - } + var args = Array.prototype.slice.call(arguments, 1); + var msg; - var args = Array.prototype.slice.call(arguments, 1); - var msg; + try { + msg = sprintf.apply(sprintf, prepareArgs(args)); + } + catch (e) { + msg = e + ": " + args; + } - try { - msg = sprintf.apply(sprintf, prepareArgs(args)); - } - catch (err) { - msg = err + ": " + args; - } + logGroup("error", msg); - logGroup("error", msg); - - require('assert').ok(condition, msg); - }; + require('assert').ok(condition, msg); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief debug //////////////////////////////////////////////////////////////////////////////// - exports.debug = function () { - 'use strict'; +exports.debug = function () { + var msg; - var msg; + try { + msg = sprintf.apply(sprintf, prepareArgs(arguments)); + } + catch (e) { + msg = e + ": " + arguments; + } - try { - msg = sprintf.apply(sprintf, prepareArgs(arguments)); - } - catch (err) { - msg = err + ": " + arguments; - } - - logGroup("debug", msg); - }; + logGroup("debug", msg); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief debugLines //////////////////////////////////////////////////////////////////////////////// - exports.debugLines = function () { - 'use strict'; +exports.debugLines = function () { + var msg; - var msg; + try { + msg = sprintf.apply(sprintf, prepareArgs(arguments)); + } + catch (e) { + msg = e + ": " + arguments; + } - try { - msg = sprintf.apply(sprintf, prepareArgs(arguments)); - } - catch (err) { - msg = err + ": " + arguments; - } + var a = msg.split("\n"); + var i; - var a = msg.split("\n"); - var i; - - for (i = 0; i < a.length; ++i) { - logGroup("debug", a[i]); - } - }; + for (i = 0; i < a.length; ++i) { + logGroup("debug", a[i]); + } +}; //////////////////////////////////////////////////////////////////////////////// /// @brief dir //////////////////////////////////////////////////////////////////////////////// - exports.dir = function (object) { - 'use strict'; - - logGroup("info", inspect(object)); - }; +exports.dir = function (object) { + logGroup("info", inspect(object)); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief error //////////////////////////////////////////////////////////////////////////////// - exports.error = function () { - 'use strict'; +exports.error = function () { + var msg; - var msg; + try { + msg = sprintf.apply(sprintf, prepareArgs(arguments)); + } + catch (e) { + msg = e + ": " + arguments; + } - try { - msg = sprintf.apply(sprintf, prepareArgs(arguments)); - } - catch (err) { - msg = err + ": " + arguments; - } - - logGroup("error", msg); - }; + logGroup("error", msg); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief errorLines //////////////////////////////////////////////////////////////////////////////// - exports.errorLines = function () { - 'use strict'; +exports.errorLines = function () { + var msg; - var msg; + try { + msg = sprintf.apply(sprintf, prepareArgs(arguments)); + } + catch (e) { + msg = e + ": " + arguments; + } - try { - msg = sprintf.apply(sprintf, prepareArgs(arguments)); - } - catch (err) { - msg = err + ": " + arguments; - } - - var a = msg.split("\n"); - var i; - - for (i = 0; i < a.length; ++i) { - logGroup("error", a[i]); - } - }; + var a = msg.split("\n"); + for (var i = 0; i < a.length; ++i) { + logGroup("error", a[i]); + } +}; //////////////////////////////////////////////////////////////////////////////// /// @brief getline //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_GETLINE !== "undefined") { - exports.getline = SYS_GETLINE; - delete SYS_GETLINE; - } +if (global.SYS_GETLINE) { + exports.getline = global.SYS_GETLINE; + delete global.SYS_GETLINE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief group //////////////////////////////////////////////////////////////////////////////// - exports.group = function () { - 'use strict'; +exports.group = function () { + var msg; - var msg; + try { + msg = sprintf.apply(sprintf, prepareArgs(arguments)); + } + catch (e) { + msg = e + ": " + arguments; + } - try { - msg = sprintf.apply(sprintf, prepareArgs(arguments)); - } - catch (err) { - msg = err + ": " + arguments; - } - - groupLevel = groupLevel + " "; - logGroup("info", msg); - }; + groupLevel = groupLevel + " "; + logGroup("info", msg); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief groupCollapsed //////////////////////////////////////////////////////////////////////////////// - exports.groupCollapsed = function () { - 'use strict'; +exports.groupCollapsed = function () { + var msg; - var msg; + try { + msg = sprintf.apply(sprintf, prepareArgs(arguments)); + } + catch (e) { + msg = e + ": " + arguments; + } - try { - msg = sprintf.apply(sprintf, prepareArgs(arguments)); - } - catch (err) { - msg = err + ": " + arguments; - } - - logGroup("info", msg); - groupLevel = groupLevel + " "; - }; + logGroup("info", msg); + groupLevel = groupLevel + " "; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief groupEnd //////////////////////////////////////////////////////////////////////////////// - exports.groupEnd = function () { - 'use strict'; - - groupLevel = groupLevel.substr(2); - }; +exports.groupEnd = function () { + groupLevel = groupLevel.substr(2); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief info //////////////////////////////////////////////////////////////////////////////// - exports.info = function () { - 'use strict'; +exports.info = function () { + var msg; - var msg; + try { + msg = sprintf.apply(sprintf, prepareArgs(arguments)); + } + catch (e) { + msg = e + ": " + arguments; + } - try { - msg = sprintf.apply(sprintf, prepareArgs(arguments)); - } - catch (err) { - msg = err + ": " + arguments; - } - - logGroup("info", msg); - }; + logGroup("info", msg); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief infoLines //////////////////////////////////////////////////////////////////////////////// - exports.infoLines = function () { - 'use strict'; +exports.infoLines = function () { + var msg; - var msg; + try { + msg = sprintf.apply(sprintf, prepareArgs(arguments)); + } + catch (e) { + msg = e + ": " + arguments; + } - try { - msg = sprintf.apply(sprintf, prepareArgs(arguments)); - } - catch (err) { - msg = err + ": " + arguments; - } + var a = msg.split("\n"); + var i; - var a = msg.split("\n"); - var i; - - for (i = 0; i < a.length; ++i) { - logGroup("info", a[i]); - } - }; + for (i = 0; i < a.length; ++i) { + logGroup("info", a[i]); + } +}; //////////////////////////////////////////////////////////////////////////////// /// @brief log //////////////////////////////////////////////////////////////////////////////// - exports.log = exports.info; +exports.log = exports.info; //////////////////////////////////////////////////////////////////////////////// /// @brief logLines //////////////////////////////////////////////////////////////////////////////// - exports.logLines = exports.infoLines; +exports.logLines = exports.infoLines; //////////////////////////////////////////////////////////////////////////////// /// @brief time //////////////////////////////////////////////////////////////////////////////// - exports.time = function (label) { - 'use strict'; +exports.time = function (label) { + if (typeof label !== 'string') { + throw new Error('label must be a string'); + } - if (typeof label !== 'string') { - throw new Error('label must be a string'); - } + var symbol = typeof Symbol === 'undefined' ? '%' + label : Symbol.for(label); - var symbol = typeof Symbol === 'undefined' ? '%' + label : Symbol.for(label); - - timers[symbol] = Date.now(); - }; + timers[symbol] = Date.now(); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief timeEnd //////////////////////////////////////////////////////////////////////////////// - exports.timeEnd = function(label) { - 'use strict'; +exports.timeEnd = function(label) { + var symbol = typeof Symbol === 'undefined' ? '%' + label : Symbol.for(label); + var time = timers[symbol]; - var symbol = typeof Symbol === 'undefined' ? '%' + label : Symbol.for(label); - var time = timers[symbol]; + if (! time) { + throw new Error('No such label: ' + label); + } - if (! time) { - throw new Error('No such label: ' + label); - } + var duration = Date.now() - time; - var duration = Date.now() - time; + delete timers[symbol]; - delete timers[symbol]; - - logGroup("info", sprintf('%s: %dms', label, duration)); + logGroup("info", sprintf('%s: %dms', label, duration)); }; //////////////////////////////////////////////////////////////////////////////// /// @brief trace //////////////////////////////////////////////////////////////////////////////// - exports.trace = function () { - var err = new Error(); - err.name = 'trace'; - err.message = sprintf.apply(sprintf, prepareArgs(arguments)); - Error.captureStackTrace(err, exports.trace); - logGroup("info", err.stack); - }; +exports.trace = function () { + var err = new Error(); + err.name = 'trace'; + err.message = sprintf.apply(sprintf, prepareArgs(arguments)); + Error.captureStackTrace(err, exports.trace); + logGroup("info", err.stack); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief warn //////////////////////////////////////////////////////////////////////////////// - exports.warn = function () { - 'use strict'; +exports.warn = function () { + var msg; - var msg; + try { + msg = sprintf.apply(sprintf, prepareArgs(arguments)); + } + catch (e) { + msg = e + ": " + arguments; + } - try { - msg = sprintf.apply(sprintf, prepareArgs(arguments)); - } - catch (err) { - msg = err + ": " + arguments; - } - - logGroup("warning", msg); - }; + logGroup("warning", msg); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief warnLines //////////////////////////////////////////////////////////////////////////////// - exports.warnLines = function () { - 'use strict'; +exports.warnLines = function () { + var msg; - var msg; + try { + msg = sprintf.apply(sprintf, prepareArgs(arguments)); + } + catch (e) { + msg = e + ": " + arguments; + } - try { - msg = sprintf.apply(sprintf, prepareArgs(arguments)); - } - catch (err) { - msg = err + ": " + arguments; - } + var a = msg.split("\n"); + var i; - var a = msg.split("\n"); - var i; - - for (i = 0; i < a.length; ++i) { - logGroup("warning", a[i]); - } - }; + for (i = 0; i < a.length; ++i) { + logGroup("warning", a[i]); + } +}; }()); diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/module-internal.js b/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/module-internal.js index a6bcb89791..df1fc34860 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/module-internal.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/module-internal.js @@ -1,25 +1,5 @@ -/*jshint esnext: true, strict: false, unused: false, -W051: true */ -/*global Symbol, require, module, Module, ArangoError, SleepAndRequeue, - CONFIGURE_ENDPOINT, REMOVE_ENDPOINT, LIST_ENDPOINTS, STARTUP_PATH, - SYS_BASE64DECODE, SYS_BASE64ENCODE, SYS_DEBUG_SEGFAULT, - SYS_DEBUG_CAN_USE_FAILAT, SYS_DEBUG_SET_FAILAT, SYS_DEBUG_REMOVE_FAILAT, SYS_DEBUG_CLEAR_FAILAT, - SYS_DOWNLOAD, SYS_EXECUTE, SYS_GET_CURRENT_REQUEST, SYS_GET_CURRENT_RESPONSE, - SYS_LOAD, SYS_LOG_LEVEL, SYS_MD5, SYS_OUTPUT, SYS_PROCESS_STATISTICS, - SYS_RAND, SYS_SERVER_STATISTICS, SYS_SPRINTF, SYS_TIME, SYS_START_PAGER, SYS_STOP_PAGER, - SYS_HMAC, SYS_PBKDF2, SYS_SHA512, SYS_SHA384, SYS_SHA256, SYS_SHA224, SYS_SHA1, SYS_SLEEP, SYS_WAIT, - SYS_PARSE, SYS_PARSE_FILE, SYS_IMPORT_CSV_FILE, SYS_IMPORT_JSON_FILE, SYS_LOG, - SYS_GEN_RANDOM_NUMBERS, SYS_GEN_RANDOM_ALPHA_NUMBERS, SYS_GEN_RANDOM_SALT, SYS_CREATE_NONCE, - SYS_CHECK_AND_MARK_NONCE, SYS_CLIENT_STATISTICS, SYS_HTTP_STATISTICS, SYS_UNIT_TESTS, SYS_UNIT_TESTS_RESULT:true, - SYS_PROCESS_CSV_FILE, SYS_PROCESS_JSON_FILE, ARANGO_QUIET, COLORS, COLOR_OUTPUT, - COLOR_OUTPUT_RESET, COLOR_BRIGHT, COLOR_BLACK, COLOR_BOLD_BLACK, COLOR_BLINK, COLOR_BLUE, - COLOR_BOLD_BLUE, COLOR_BOLD_GREEN, COLOR_RED, COLOR_BOLD_RED, COLOR_GREEN, COLOR_WHITE, - COLOR_BOLD_WHITE, COLOR_YELLOW, COLOR_BOLD_YELLOW, COLOR_CYAN, COLOR_BOLD_CYAN, COLOR_MAGENTA, - COLOR_BOLD_MAGENTA, PRETTY_PRINT, VALGRIND, COVERAGE, VERSION, - BYTES_SENT_DISTRIBUTION, BYTES_RECEIVED_DISTRIBUTION, CONNECTION_TIME_DISTRIBUTION, - REQUEST_TIME_DISTRIBUTION, THREAD_NUMBER, LOGFILE_PATH, - SYS_PLATFORM, SYS_EXECUTE_EXTERNAL, SYS_STATUS_EXTERNAL, SYS_EXECUTE_EXTERNAL_AND_WAIT, - SYS_KILL_EXTERNAL, SYS_REGISTER_TASK, SYS_UNREGISTER_TASK, SYS_GET_TASK, SYS_TEST_PORT, - SYS_IS_IP, SYS_OPTIONS, ENV */ +/*jshint esnext:true, -W051:true */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief module "internal" @@ -49,9 +29,8 @@ //////////////////////////////////////////////////////////////////////////////// (function () { - /*jshint strict: false */ - var exports = require("internal"); +var exports = require("internal"); // ----------------------------------------------------------------------------- // --SECTION-- Module "internal" @@ -65,53 +44,53 @@ /// @brief ArangoError //////////////////////////////////////////////////////////////////////////////// - if (typeof ArangoError !== "undefined") { - exports.ArangoError = ArangoError; - delete ArangoError; - } - else { - exports.ArangoError = function (error) { - if (error !== undefined) { - this.error = error.error; - this.code = error.code; - this.errorNum = error.errorNum; - this.errorMessage = error.errorMessage; - } +if (global.ArangoError) { + exports.ArangoError = global.ArangoError; + delete global.ArangoError; +} +else { + exports.ArangoError = function (error) { + if (error !== undefined) { + this.error = error.error; + this.code = error.code; + this.errorNum = error.errorNum; + this.errorMessage = error.errorMessage; + } - this.message = this.toString(); - }; - - exports.ArangoError.prototype = new Error(); - } - - exports.ArangoError.prototype._PRINT = function (context) { - context.output += this.toString(); + this.message = this.toString(); }; - exports.ArangoError.prototype.toString = function() { - var errorNum = this.errorNum; - var errorMessage = this.errorMessage || this.message; + exports.ArangoError.prototype = new Error(); +} - return "[ArangoError " + errorNum + ": " + errorMessage + "]"; - }; +exports.ArangoError.prototype._PRINT = function (context) { + context.output += this.toString(); +}; + +exports.ArangoError.prototype.toString = function() { + var errorNum = this.errorNum; + var errorMessage = this.errorMessage || this.message; + + return "[ArangoError " + errorNum + ": " + errorMessage + "]"; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief SleepAndRequeue //////////////////////////////////////////////////////////////////////////////// - if (typeof SleepAndRequeue !== "undefined") { - exports.SleepAndRequeue = SleepAndRequeue; - delete SleepAndRequeue; +if (global.SleepAndRequeue) { + exports.SleepAndRequeue = global.SleepAndRequeue; + delete global.SleepAndRequeue; - exports.SleepAndRequeue.prototype._PRINT = function (context) { - context.output += this.toString(); - }; - - exports.SleepAndRequeue.prototype.toString = function() { - return "[SleepAndRequeue sleep: " + this.sleep + "]"; + exports.SleepAndRequeue.prototype._PRINT = function (context) { + context.output += this.toString(); }; - } + exports.SleepAndRequeue.prototype.toString = function() { + return "[SleepAndRequeue sleep: " + this.sleep + "]"; +}; + +} // ----------------------------------------------------------------------------- // --SECTION-- public constants // ----------------------------------------------------------------------------- @@ -120,141 +99,141 @@ /// @brief threadNumber //////////////////////////////////////////////////////////////////////////////// - exports.threadNumber = 0; +exports.threadNumber = 0; - if (typeof THREAD_NUMBER !== "undefined") { - exports.threadNumber = THREAD_NUMBER; - delete THREAD_NUMBER; - } +if (global.THREAD_NUMBER) { + exports.threadNumber = global.THREAD_NUMBER; + delete global.THREAD_NUMBER; +} //////////////////////////////////////////////////////////////////////////////// /// @brief developmentMode. this is only here for backwards compatibility //////////////////////////////////////////////////////////////////////////////// - exports.developmentMode = false; +exports.developmentMode = false; //////////////////////////////////////////////////////////////////////////////// /// @brief logfilePath //////////////////////////////////////////////////////////////////////////////// - if (typeof LOGFILE_PATH !== "undefined") { - exports.logfilePath = LOGFILE_PATH; - delete LOGFILE_PATH; - } +if (global.LOGFILE_PATH) { + exports.logfilePath = global.LOGFILE_PATH; + delete global.LOGFILE_PATH; +} //////////////////////////////////////////////////////////////////////////////// /// @brief quiet //////////////////////////////////////////////////////////////////////////////// - exports.quiet = false; +exports.quiet = false; - if (typeof ARANGO_QUIET !== "undefined") { - exports.quiet = ARANGO_QUIET; - delete ARANGO_QUIET; - } +if (global.ARANGO_QUIET) { + exports.quiet = global.ARANGO_QUIET; + delete global.ARANGO_QUIET; +} //////////////////////////////////////////////////////////////////////////////// /// @brief valgrind //////////////////////////////////////////////////////////////////////////////// - exports.valgrind = false; +exports.valgrind = false; - if (typeof VALGRIND !== "undefined") { - exports.valgrind = VALGRIND; - delete VALGRIND; - } +if (global.VALGRIND) { + exports.valgrind = global.VALGRIND; + delete global.VALGRIND; +} //////////////////////////////////////////////////////////////////////////////// /// @brief valgrind //////////////////////////////////////////////////////////////////////////////// - exports.coverage = false; +exports.coverage = false; - if (typeof COVERAGE !== "undefined") { - exports.coverage = COVERAGE; - delete COVERAGE; - } +if (global.COVERAGE) { + exports.coverage = global.COVERAGE; + delete global.COVERAGE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief version //////////////////////////////////////////////////////////////////////////////// - exports.version = "unknown"; +exports.version = "unknown"; - if (typeof VERSION !== "undefined") { - exports.version = VERSION; - delete VERSION; - } +if (global.VERSION) { + exports.version = global.VERSION; + delete global.VERSION; +} //////////////////////////////////////////////////////////////////////////////// /// @brief platform //////////////////////////////////////////////////////////////////////////////// - exports.platform = "unknown"; +exports.platform = "unknown"; - if (typeof SYS_PLATFORM !== "undefined") { - exports.platform = SYS_PLATFORM; - delete SYS_PLATFORM; - } +if (global.SYS_PLATFORM) { + exports.platform = global.SYS_PLATFORM; + delete global.SYS_PLATFORM; +} //////////////////////////////////////////////////////////////////////////////// /// @brief bytesSentDistribution //////////////////////////////////////////////////////////////////////////////// - exports.bytesSentDistribution = []; +exports.bytesSentDistribution = []; - if (typeof BYTES_SENT_DISTRIBUTION !== "undefined") { - exports.bytesSentDistribution = BYTES_SENT_DISTRIBUTION; - delete BYTES_SENT_DISTRIBUTION; - } +if (global.BYTES_SENT_DISTRIBUTION) { + exports.bytesSentDistribution = global.BYTES_SENT_DISTRIBUTION; + delete global.BYTES_SENT_DISTRIBUTION; +} //////////////////////////////////////////////////////////////////////////////// /// @brief bytesReceivedDistribution //////////////////////////////////////////////////////////////////////////////// - exports.bytesReceivedDistribution = []; +exports.bytesReceivedDistribution = []; - if (typeof BYTES_RECEIVED_DISTRIBUTION !== "undefined") { - exports.bytesReceivedDistribution = BYTES_RECEIVED_DISTRIBUTION; - delete BYTES_RECEIVED_DISTRIBUTION; - } +if (global.BYTES_RECEIVED_DISTRIBUTION) { + exports.bytesReceivedDistribution = global.BYTES_RECEIVED_DISTRIBUTION; + delete global.BYTES_RECEIVED_DISTRIBUTION; +} //////////////////////////////////////////////////////////////////////////////// /// @brief connectionTimeDistribution //////////////////////////////////////////////////////////////////////////////// - exports.connectionTimeDistribution = []; +exports.connectionTimeDistribution = []; - if (typeof CONNECTION_TIME_DISTRIBUTION !== "undefined") { - exports.connectionTimeDistribution = CONNECTION_TIME_DISTRIBUTION; - delete CONNECTION_TIME_DISTRIBUTION; - } +if (global.CONNECTION_TIME_DISTRIBUTION) { + exports.connectionTimeDistribution = global.CONNECTION_TIME_DISTRIBUTION; + delete global.CONNECTION_TIME_DISTRIBUTION; +} //////////////////////////////////////////////////////////////////////////////// /// @brief requestTimeDistribution //////////////////////////////////////////////////////////////////////////////// - exports.requestTimeDistribution = []; +exports.requestTimeDistribution = []; - if (typeof REQUEST_TIME_DISTRIBUTION !== "undefined") { - exports.requestTimeDistribution = REQUEST_TIME_DISTRIBUTION; - delete REQUEST_TIME_DISTRIBUTION; - } +if (global.REQUEST_TIME_DISTRIBUTION) { + exports.requestTimeDistribution = global.REQUEST_TIME_DISTRIBUTION; + delete global.REQUEST_TIME_DISTRIBUTION; +} //////////////////////////////////////////////////////////////////////////////// /// @brief startupPath //////////////////////////////////////////////////////////////////////////////// - exports.startupPath = ""; +exports.startupPath = ""; - if (typeof STARTUP_PATH !== "undefined") { - exports.startupPath = STARTUP_PATH; - delete STARTUP_PATH; - } +if (global.STARTUP_PATH) { + exports.startupPath = global.STARTUP_PATH; + delete global.STARTUP_PATH; +} - if (exports.startupPath === "") { - exports.startupPath = "."; - } +if (exports.startupPath === "") { + exports.startupPath = "."; +} // ----------------------------------------------------------------------------- // --SECTION-- public functions @@ -264,496 +243,498 @@ /// @brief configureEndpoint //////////////////////////////////////////////////////////////////////////////// - if (typeof CONFIGURE_ENDPOINT !== "undefined") { - exports.configureEndpoint = CONFIGURE_ENDPOINT; - delete CONFIGURE_ENDPOINT; - } +if (global.CONFIGURE_ENDPOINT) { + exports.configureEndpoint = global.CONFIGURE_ENDPOINT; + delete global.CONFIGURE_ENDPOINT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief removeEndpoint //////////////////////////////////////////////////////////////////////////////// - if (typeof REMOVE_ENDPOINT !== "undefined") { - exports.removeEndpoint = REMOVE_ENDPOINT; - delete REMOVE_ENDPOINT; - } +if (global.REMOVE_ENDPOINT) { + exports.removeEndpoint = global.REMOVE_ENDPOINT; + delete global.REMOVE_ENDPOINT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief listEndpoints //////////////////////////////////////////////////////////////////////////////// - if (typeof LIST_ENDPOINTS !== "undefined") { - exports.listEndpoints = LIST_ENDPOINTS; - delete LIST_ENDPOINTS; - } +if (global.LIST_ENDPOINTS) { + exports.listEndpoints = global.LIST_ENDPOINTS; + delete global.LIST_ENDPOINTS; +} //////////////////////////////////////////////////////////////////////////////// /// @brief base64Decode //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_BASE64DECODE !== "undefined") { - exports.base64Decode = SYS_BASE64DECODE; - delete SYS_BASE64DECODE; - } +if (global.SYS_BASE64DECODE) { + exports.base64Decode = global.SYS_BASE64DECODE; + delete global.SYS_BASE64DECODE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief base64Encode //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_BASE64ENCODE !== "undefined") { - exports.base64Encode = SYS_BASE64ENCODE; - delete SYS_BASE64ENCODE; - } +if (global.SYS_BASE64ENCODE) { + exports.base64Encode = global.SYS_BASE64ENCODE; + delete global.SYS_BASE64ENCODE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief debugSegfault //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_DEBUG_SEGFAULT !== "undefined") { - exports.debugSegfault = SYS_DEBUG_SEGFAULT; - delete SYS_DEBUG_SEGFAULT; - } +if (global.SYS_DEBUG_SEGFAULT) { + exports.debugSegfault = global.SYS_DEBUG_SEGFAULT; + delete global.SYS_DEBUG_SEGFAULT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief debugSetFailAt //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_DEBUG_SET_FAILAT !== "undefined") { - exports.debugSetFailAt = SYS_DEBUG_SET_FAILAT; - delete SYS_DEBUG_SET_FAILAT; - } +if (global.SYS_DEBUG_SET_FAILAT) { + exports.debugSetFailAt = global.SYS_DEBUG_SET_FAILAT; + delete global.SYS_DEBUG_SET_FAILAT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief debugRemoveFailAt //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_DEBUG_REMOVE_FAILAT !== "undefined") { - exports.debugRemoveFailAt = SYS_DEBUG_REMOVE_FAILAT; - delete SYS_DEBUG_REMOVE_FAILAT; - } +if (global.SYS_DEBUG_REMOVE_FAILAT) { + exports.debugRemoveFailAt = global.SYS_DEBUG_REMOVE_FAILAT; + delete global.SYS_DEBUG_REMOVE_FAILAT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief debugClearFailAt //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_DEBUG_CLEAR_FAILAT !== "undefined") { - exports.debugClearFailAt = SYS_DEBUG_CLEAR_FAILAT; - delete SYS_DEBUG_CLEAR_FAILAT; - } +if (global.SYS_DEBUG_CLEAR_FAILAT) { + exports.debugClearFailAt = global.SYS_DEBUG_CLEAR_FAILAT; + delete global.SYS_DEBUG_CLEAR_FAILAT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief debugCanUseFailAt //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_DEBUG_CAN_USE_FAILAT !== "undefined") { - exports.debugCanUseFailAt = SYS_DEBUG_CAN_USE_FAILAT; - delete SYS_DEBUG_CAN_USE_FAILAT; - } +if (global.SYS_DEBUG_CAN_USE_FAILAT) { + exports.debugCanUseFailAt = global.SYS_DEBUG_CAN_USE_FAILAT; + delete global.SYS_DEBUG_CAN_USE_FAILAT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief download //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_DOWNLOAD !== "undefined") { - exports.download = SYS_DOWNLOAD; - delete SYS_DOWNLOAD; - } +if (global.SYS_DOWNLOAD) { + exports.download = global.SYS_DOWNLOAD; + delete global.SYS_DOWNLOAD; +} //////////////////////////////////////////////////////////////////////////////// /// @brief executeScript //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_EXECUTE !== "undefined") { - exports.executeScript = SYS_EXECUTE; - delete SYS_EXECUTE; - } +if (global.SYS_EXECUTE) { + exports.executeScript = global.SYS_EXECUTE; + delete global.SYS_EXECUTE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief getCurrentRequest //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_GET_CURRENT_REQUEST !== "undefined") { - exports.getCurrentRequest = SYS_GET_CURRENT_REQUEST; - delete SYS_GET_CURRENT_REQUEST; - } +if (global.SYS_GET_CURRENT_REQUEST) { + exports.getCurrentRequest = global.SYS_GET_CURRENT_REQUEST; + delete global.SYS_GET_CURRENT_REQUEST; +} //////////////////////////////////////////////////////////////////////////////// /// @brief getCurrentResponse //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_GET_CURRENT_RESPONSE !== "undefined") { - exports.getCurrentResponse = SYS_GET_CURRENT_RESPONSE; - delete SYS_GET_CURRENT_RESPONSE; - } +if (global.SYS_GET_CURRENT_RESPONSE) { + exports.getCurrentResponse = global.SYS_GET_CURRENT_RESPONSE; + delete global.SYS_GET_CURRENT_RESPONSE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief extend //////////////////////////////////////////////////////////////////////////////// - exports.extend = function (target, source) { - 'use strict'; +exports.extend = function (target, source) { - Object.getOwnPropertyNames(source) - .forEach(function(propName) { - Object.defineProperty(target, propName, - Object.getOwnPropertyDescriptor(source, propName)); - }); + Object.getOwnPropertyNames(source) + .forEach(function(propName) { + Object.defineProperty( + target, + propName, + Object.getOwnPropertyDescriptor(source, propName) + ); + }); - return target; - }; + return target; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief load //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_LOAD !== "undefined") { - exports.load = SYS_LOAD; - delete SYS_LOAD; - } +if (global.SYS_LOAD) { + exports.load = global.SYS_LOAD; + delete global.SYS_LOAD; +} //////////////////////////////////////////////////////////////////////////////// /// @brief logLevel //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_LOG_LEVEL !== "undefined") { - exports.logLevel = SYS_LOG_LEVEL; - delete SYS_LOG_LEVEL; - } +if (global.SYS_LOG_LEVEL) { + exports.logLevel = global.SYS_LOG_LEVEL; + delete global.SYS_LOG_LEVEL; +} //////////////////////////////////////////////////////////////////////////////// /// @brief md5 //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_MD5 !== "undefined") { - exports.md5 = SYS_MD5; - delete SYS_MD5; - } +if (global.SYS_MD5) { + exports.md5 = global.SYS_MD5; + delete global.SYS_MD5; +} //////////////////////////////////////////////////////////////////////////////// /// @brief genRandomNumbers //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_GEN_RANDOM_NUMBERS !== "undefined") { - exports.genRandomNumbers = SYS_GEN_RANDOM_NUMBERS; - delete SYS_GEN_RANDOM_NUMBERS; - } +if (global.SYS_GEN_RANDOM_NUMBERS) { + exports.genRandomNumbers = global.SYS_GEN_RANDOM_NUMBERS; + delete global.SYS_GEN_RANDOM_NUMBERS; +} //////////////////////////////////////////////////////////////////////////////// /// @brief genRandomAlphaNumbers //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_GEN_RANDOM_ALPHA_NUMBERS !== "undefined") { - exports.genRandomAlphaNumbers = SYS_GEN_RANDOM_ALPHA_NUMBERS; - delete SYS_GEN_RANDOM_ALPHA_NUMBERS; - } +if (global.SYS_GEN_RANDOM_ALPHA_NUMBERS) { + exports.genRandomAlphaNumbers = global.SYS_GEN_RANDOM_ALPHA_NUMBERS; + delete global.SYS_GEN_RANDOM_ALPHA_NUMBERS; +} //////////////////////////////////////////////////////////////////////////////// /// @brief genRandomSalt //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_GEN_RANDOM_SALT !== "undefined") { - exports.genRandomSalt = SYS_GEN_RANDOM_SALT; - delete SYS_GEN_RANDOM_SALT; - } +if (global.SYS_GEN_RANDOM_SALT) { + exports.genRandomSalt = global.SYS_GEN_RANDOM_SALT; + delete global.SYS_GEN_RANDOM_SALT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief hmac //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_HMAC !== "undefined") { - exports.hmac = SYS_HMAC; - delete SYS_HMAC; - } +if (global.SYS_HMAC) { + exports.hmac = global.SYS_HMAC; + delete global.SYS_HMAC; +} //////////////////////////////////////////////////////////////////////////////// /// @brief pbkdf2-hmac //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_PBKDF2 !== "undefined") { - exports.pbkdf2 = SYS_PBKDF2; - delete SYS_PBKDF2; - } +if (global.SYS_PBKDF2) { + exports.pbkdf2 = global.SYS_PBKDF2; + delete global.SYS_PBKDF2; +} //////////////////////////////////////////////////////////////////////////////// /// @brief createNonce //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_CREATE_NONCE !== "undefined") { - exports.createNonce = SYS_CREATE_NONCE; - delete SYS_CREATE_NONCE; - } +if (global.SYS_CREATE_NONCE) { + exports.createNonce = global.SYS_CREATE_NONCE; + delete global.SYS_CREATE_NONCE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief checkAndMarkNonce //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_CHECK_AND_MARK_NONCE !== "undefined") { - exports.checkAndMarkNonce = SYS_CHECK_AND_MARK_NONCE; - delete SYS_CHECK_AND_MARK_NONCE; - } +if (global.SYS_CHECK_AND_MARK_NONCE) { + exports.checkAndMarkNonce = global.SYS_CHECK_AND_MARK_NONCE; + delete global.SYS_CHECK_AND_MARK_NONCE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief output //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_OUTPUT !== "undefined") { - exports.stdOutput = SYS_OUTPUT; - exports.output = exports.stdOutput; - delete SYS_OUTPUT; - } +if (global.SYS_OUTPUT) { + exports.stdOutput = global.SYS_OUTPUT; + exports.output = exports.stdOutput; + delete global.SYS_OUTPUT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief parse //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_PARSE !== "undefined") { - exports.parse = SYS_PARSE; - delete SYS_PARSE; - } +if (global.SYS_PARSE) { + exports.parse = global.SYS_PARSE; + delete global.SYS_PARSE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief parseFile //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_PARSE_FILE !== "undefined") { - exports.parseFile = SYS_PARSE_FILE; - delete SYS_PARSE_FILE; - } +if (global.SYS_PARSE_FILE) { + exports.parseFile = global.SYS_PARSE_FILE; + delete global.SYS_PARSE_FILE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief processStatistics //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_PROCESS_STATISTICS !== "undefined") { - exports.processStatistics = SYS_PROCESS_STATISTICS; - delete SYS_PROCESS_STATISTICS; - } +if (global.SYS_PROCESS_STATISTICS) { + exports.processStatistics = global.SYS_PROCESS_STATISTICS; + delete global.SYS_PROCESS_STATISTICS; +} //////////////////////////////////////////////////////////////////////////////// /// @brief rand //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_RAND !== "undefined") { - exports.rand = SYS_RAND; - delete SYS_RAND; - } +if (global.SYS_RAND) { + exports.rand = global.SYS_RAND; + delete global.SYS_RAND; +} //////////////////////////////////////////////////////////////////////////////// /// @brief sha512 //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_SHA512 !== "undefined") { - exports.sha512 = SYS_SHA512; - delete SYS_SHA512; - } +if (global.SYS_SHA512) { + exports.sha512 = global.SYS_SHA512; + delete global.SYS_SHA512; +} //////////////////////////////////////////////////////////////////////////////// /// @brief sha384 //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_SHA384 !== "undefined") { - exports.sha384 = SYS_SHA384; - delete SYS_SHA384; - } +if (global.SYS_SHA384) { + exports.sha384 = global.SYS_SHA384; + delete global.SYS_SHA384; +} //////////////////////////////////////////////////////////////////////////////// /// @brief sha256 //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_SHA256 !== "undefined") { - exports.sha256 = SYS_SHA256; - delete SYS_SHA256; - } +if (global.SYS_SHA256) { + exports.sha256 = global.SYS_SHA256; + delete global.SYS_SHA256; +} //////////////////////////////////////////////////////////////////////////////// /// @brief sha224 //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_SHA224 !== "undefined") { - exports.sha224 = SYS_SHA224; - delete SYS_SHA224; - } +if (global.SYS_SHA224) { + exports.sha224 = global.SYS_SHA224; + delete global.SYS_SHA224; +} //////////////////////////////////////////////////////////////////////////////// /// @brief sha1 //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_SHA1 !== "undefined") { - exports.sha1 = SYS_SHA1; - delete SYS_SHA1; - } +if (global.SYS_SHA1) { + exports.sha1 = global.SYS_SHA1; + delete global.SYS_SHA1; +} //////////////////////////////////////////////////////////////////////////////// /// @brief serverStatistics //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_SERVER_STATISTICS !== "undefined") { - exports.serverStatistics = SYS_SERVER_STATISTICS; - delete SYS_SERVER_STATISTICS; - } +if (global.SYS_SERVER_STATISTICS) { + exports.serverStatistics = global.SYS_SERVER_STATISTICS; + delete global.SYS_SERVER_STATISTICS; +} //////////////////////////////////////////////////////////////////////////////// /// @brief sleep //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_SLEEP !== "undefined") { - exports.sleep = SYS_SLEEP; - delete SYS_SLEEP; - } +if (global.SYS_SLEEP) { + exports.sleep = global.SYS_SLEEP; + delete global.SYS_SLEEP; +} //////////////////////////////////////////////////////////////////////////////// /// @brief time //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_TIME !== "undefined") { - exports.time = SYS_TIME; - delete SYS_TIME; - } +if (global.SYS_TIME) { + exports.time = global.SYS_TIME; + delete global.SYS_TIME; +} //////////////////////////////////////////////////////////////////////////////// /// @brief wait //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_WAIT !== "undefined") { - exports.wait = SYS_WAIT; - delete SYS_WAIT; - } +if (global.SYS_WAIT) { + exports.wait = global.SYS_WAIT; + delete global.SYS_WAIT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief importCsvFile //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_IMPORT_CSV_FILE !== "undefined") { - exports.importCsvFile = SYS_IMPORT_CSV_FILE; - delete SYS_IMPORT_CSV_FILE; - } +if (global.SYS_IMPORT_CSV_FILE) { + exports.importCsvFile = global.SYS_IMPORT_CSV_FILE; + delete global.SYS_IMPORT_CSV_FILE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief importJsonFile //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_IMPORT_JSON_FILE !== "undefined") { - exports.importJsonFile = SYS_IMPORT_JSON_FILE; - delete SYS_IMPORT_JSON_FILE; - } +if (global.SYS_IMPORT_JSON_FILE) { + exports.importJsonFile = global.SYS_IMPORT_JSON_FILE; + delete global.SYS_IMPORT_JSON_FILE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief processCsvFile //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_PROCESS_CSV_FILE !== "undefined") { - exports.processCsvFile = SYS_PROCESS_CSV_FILE; - delete SYS_PROCESS_CSV_FILE; - } +if (global.SYS_PROCESS_CSV_FILE) { + exports.processCsvFile = global.SYS_PROCESS_CSV_FILE; + delete global.SYS_PROCESS_CSV_FILE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief processJsonFile //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_PROCESS_JSON_FILE !== "undefined") { - exports.processJsonFile = SYS_PROCESS_JSON_FILE; - delete SYS_PROCESS_JSON_FILE; - } +if (global.SYS_PROCESS_JSON_FILE) { + exports.processJsonFile = global.SYS_PROCESS_JSON_FILE; + delete global.SYS_PROCESS_JSON_FILE; +} //////////////////////////////////////////////////////////////////////////////// /// @brief clientStatistics //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_CLIENT_STATISTICS !== "undefined") { - exports.clientStatistics = SYS_CLIENT_STATISTICS; - delete SYS_CLIENT_STATISTICS; - } +if (global.SYS_CLIENT_STATISTICS) { + exports.clientStatistics = global.SYS_CLIENT_STATISTICS; + delete global.SYS_CLIENT_STATISTICS; +} //////////////////////////////////////////////////////////////////////////////// /// @brief httpStatistics //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_HTTP_STATISTICS !== "undefined") { - exports.httpStatistics = SYS_HTTP_STATISTICS; - delete SYS_HTTP_STATISTICS; - } +if (global.SYS_HTTP_STATISTICS) { + exports.httpStatistics = global.SYS_HTTP_STATISTICS; + delete global.SYS_HTTP_STATISTICS; +} //////////////////////////////////////////////////////////////////////////////// /// @brief executeExternal //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_EXECUTE_EXTERNAL !== "undefined") { - exports.executeExternal = SYS_EXECUTE_EXTERNAL; - delete SYS_EXECUTE_EXTERNAL; - } +if (global.SYS_EXECUTE_EXTERNAL) { + exports.executeExternal = global.SYS_EXECUTE_EXTERNAL; + delete global.SYS_EXECUTE_EXTERNAL; +} //////////////////////////////////////////////////////////////////////////////// -/// @brief executeExternalAndWait - instantly waits for the exit, returns -/// joint result. +/// @brief executeExternalAndWait - instantly waits for the exit, returns +/// joint result. //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_EXECUTE_EXTERNAL_AND_WAIT !== "undefined") { - exports.executeExternalAndWait = SYS_EXECUTE_EXTERNAL_AND_WAIT; - delete SYS_EXECUTE_EXTERNAL_AND_WAIT; - } +if (global.SYS_EXECUTE_EXTERNAL_AND_WAIT) { + exports.executeExternalAndWait = global.SYS_EXECUTE_EXTERNAL_AND_WAIT; + delete global.SYS_EXECUTE_EXTERNAL_AND_WAIT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief killExternal //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_KILL_EXTERNAL !== "undefined") { - exports.killExternal = SYS_KILL_EXTERNAL; - delete SYS_KILL_EXTERNAL; - } +if (global.SYS_KILL_EXTERNAL) { + exports.killExternal = global.SYS_KILL_EXTERNAL; + delete global.SYS_KILL_EXTERNAL; +} //////////////////////////////////////////////////////////////////////////////// /// @brief statusExternal //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_STATUS_EXTERNAL !== "undefined") { - exports.statusExternal = SYS_STATUS_EXTERNAL; - delete SYS_STATUS_EXTERNAL; - } +if (global.SYS_STATUS_EXTERNAL) { + exports.statusExternal = global.SYS_STATUS_EXTERNAL; + delete global.SYS_STATUS_EXTERNAL; +} //////////////////////////////////////////////////////////////////////////////// /// @brief registerTask //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_REGISTER_TASK !== "undefined") { - exports.registerTask = SYS_REGISTER_TASK; - delete SYS_REGISTER_TASK; - } +if (global.SYS_REGISTER_TASK) { + exports.registerTask = global.SYS_REGISTER_TASK; + delete global.SYS_REGISTER_TASK; +} //////////////////////////////////////////////////////////////////////////////// /// @brief unregisterTask //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_UNREGISTER_TASK !== "undefined") { - exports.unregisterTask = SYS_UNREGISTER_TASK; - delete SYS_UNREGISTER_TASK; - } +if (global.SYS_UNREGISTER_TASK) { + exports.unregisterTask = global.SYS_UNREGISTER_TASK; + delete global.SYS_UNREGISTER_TASK; +} //////////////////////////////////////////////////////////////////////////////// /// @brief getTasks //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_GET_TASK !== "undefined") { - exports.getTask = SYS_GET_TASK; - delete SYS_GET_TASK; - } +if (global.SYS_GET_TASK) { + exports.getTask = global.SYS_GET_TASK; + delete global.SYS_GET_TASK; +} //////////////////////////////////////////////////////////////////////////////// /// @brief testPort //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_TEST_PORT !== "undefined") { - exports.testPort = SYS_TEST_PORT; - delete SYS_TEST_PORT; - } +if (global.SYS_TEST_PORT) { + exports.testPort = global.SYS_TEST_PORT; + delete global.SYS_TEST_PORT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief isIP //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_IS_IP !== "undefined") { - exports.isIP = SYS_IS_IP; - delete SYS_IS_IP; - } +if (global.SYS_IS_IP) { + exports.isIP = global.SYS_IS_IP; + delete global.SYS_IS_IP; +} // ----------------------------------------------------------------------------- // --SECTION-- private functions @@ -763,20 +744,17 @@ /// @brief unitTests //////////////////////////////////////////////////////////////////////////////// - exports.unitTests = function () { - 'use strict'; - - return SYS_UNIT_TESTS; - }; +exports.unitTests = function () { + return global.SYS_UNIT_TESTS; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief setUnitTestsResult //////////////////////////////////////////////////////////////////////////////// - exports.setUnitTestsResult = function (value) { - // do not use strict here - SYS_UNIT_TESTS_RESULT = value; - }; +exports.setUnitTestsResult = function (value) { + global.SYS_UNIT_TESTS_RESULT = value; +}; // ----------------------------------------------------------------------------- // --SECTION-- Commandline argument handling @@ -788,140 +766,130 @@ /// or --opt value //////////////////////////////////////////////////////////////////////////////// - exports.toArgv = function (structure, longOptsEqual) { - "use strict"; - if (typeof(longOptsEqual) === 'undefined') { - longOptsEqual = false; - } - var vec = []; - for (var key in structure) { - if (structure.hasOwnProperty(key)) { - if (key === 'commandSwitches') { - var multivec = ""; - for (var i = 0; i < structure[key].length; i ++) { - if (structure[key][i].length > 1) { - vec.push(structure[key][i]); - } - else { - multivec += structure[key][i]; - } - } - if (multivec.length > 0) { - vec.push(multivec); - } - } - else if (key === 'flatCommands') { - vec = vec.concat(structure[key]); - } - else { - if (longOptsEqual) { - vec.push('--' + key + '=' + structure[key]); +exports.toArgv = function (structure, longOptsEqual) { + if (typeof(longOptsEqual) === 'undefined') { + longOptsEqual = false; + } + var vec = []; + for (var key in structure) { + if (structure.hasOwnProperty(key)) { + if (key === 'commandSwitches') { + var multivec = ""; + for (var i = 0; i < structure[key].length; i ++) { + if (structure[key][i].length > 1) { + vec.push(structure[key][i]); } else { - vec.push('--' + key); - vec.push(structure[key]); + multivec += structure[key][i]; } } + if (multivec.length > 0) { + vec.push(multivec); + } + } + else if (key === 'flatCommands') { + vec = vec.concat(structure[key]); + } + else { + if (longOptsEqual) { + vec.push('--' + key + '=' + structure[key]); + } + else { + vec.push('--' + key); + vec.push(structure[key]); + } } } - return vec; - }; + } + return vec; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief argv to structured //////////////////////////////////////////////////////////////////////////////// - exports.parseArgv = function (argv, startOffset) { - "use strict"; - - function setOption(ret, option, value) { - if (option.indexOf(':') > 0) { - var n = option.indexOf(':'); - var topOption = option.slice(0, n); - if (! ret.hasOwnProperty(topOption)) { - ret[topOption] = {}; - } - setOption(ret[topOption], option.slice(n + 1, option.length), value); - } - else if (argv[i + 1] === 'true') { - ret[option] = true; - } - else if (argv[i + 1] === 'false') { - ret[option] = false; - } - else if (! isNaN(argv[i + 1])) { - ret[option] = parseInt(argv[i + 1]); - } - else { - ret[option] = argv[i + 1]; +exports.parseArgv = function (argv, startOffset) { + function setOption(ret, option, value) { + if (option.indexOf(':') > 0) { + var n = option.indexOf(':'); + var topOption = option.slice(0, n); + if (! ret.hasOwnProperty(topOption)) { + ret[topOption] = {}; } + setOption(ret[topOption], option.slice(n + 1, option.length), value); } - function setSwitch(ret, option) { - if (! ret.hasOwnProperty('commandSwitches')) { - ret.commandSwitches = []; - } - ret.commandSwitches.push(option); + else if (argv[i + 1] === 'true') { + ret[option] = true; } - - function setSwitchVec(ret, option) { - for (var i = 0; i < option.length; i++) { - setSwitch(ret, option[i]); - } + else if (argv[i + 1] === 'false') { + ret[option] = false; } - - function setFlatCommand(ret, thisString) { - if (! ret.hasOwnProperty('flatCommands')) { - ret.flatCommands = []; - } - ret.flatCommands.push(thisString); + else if (! isNaN(argv[i + 1])) { + ret[option] = parseInt(argv[i + 1]); } + else { + ret[option] = argv[i + 1]; + } + } + function setSwitch(ret, option) { + if (! ret.hasOwnProperty('commandSwitches')) { + ret.commandSwitches = []; + } + ret.commandSwitches.push(option); + } - var inFlat = false; - var ret = {}; - for (var i = startOffset; i < argv.length; i++) { - var thisString = argv[i]; - if (! inFlat) { - if ((thisString.length > 2) && - (thisString.slice(0,2) === '--')) { - var option = thisString.slice(2, thisString.length); - if ((argv.length > i) && - (argv[i + 1].slice(0,1) !== '-')) { - setOption(ret, option, argv[i + 1]); - i++; - } - else { - setSwitch(ret, option); - } - } - else if (thisString === '--') { - inFlat = true; - } - else if ((thisString.length > 1) && - (thisString.slice(0, 1) === '-')) { - setSwitchVec(ret, thisString.slice(1, thisString.length)); + function setSwitchVec(ret, option) { + for (var i = 0; i < option.length; i++) { + setSwitch(ret, option[i]); + } + } + + function setFlatCommand(ret, thisString) { + if (! ret.hasOwnProperty('flatCommands')) { + ret.flatCommands = []; + } + ret.flatCommands.push(thisString); + } + + var inFlat = false; + var ret = {}; + for (var i = startOffset; i < argv.length; i++) { + var thisString = argv[i]; + if (! inFlat) { + if ((thisString.length > 2) && + (thisString.slice(0,2) === '--')) { + var option = thisString.slice(2, thisString.length); + if ((argv.length > i) && + (argv[i + 1].slice(0,1) !== '-')) { + setOption(ret, option, argv[i + 1]); + i++; } else { - setFlatCommand(ret, thisString); + setSwitch(ret, option); } } + else if (thisString === '--') { + inFlat = true; + } + else if ((thisString.length > 1) && + (thisString.slice(0, 1) === '-')) { + setSwitchVec(ret, thisString.slice(1, thisString.length)); + } else { setFlatCommand(ret, thisString); } } - return ret; - }; - -}()); + else { + setFlatCommand(ret, thisString); + } + } + return ret; +}; // ----------------------------------------------------------------------------- // --SECTION-- PRINTING // ----------------------------------------------------------------------------- -(function () { - // cannot use strict here as we are going to delete globals - - var exports = require("internal"); - // ----------------------------------------------------------------------------- // --SECTION-- public printing variables // ----------------------------------------------------------------------------- @@ -930,30 +898,30 @@ /// @brief COLORS //////////////////////////////////////////////////////////////////////////////// - exports.COLORS = {}; +exports.COLORS = {}; - if (typeof COLORS !== "undefined") { - exports.COLORS = COLORS; - delete COLORS; - } - else { - [ 'COLOR_RED', 'COLOR_BOLD_RED', 'COLOR_GREEN', 'COLOR_BOLD_GREEN', - 'COLOR_BLUE', 'COLOR_BOLD_BLUE', 'COLOR_YELLOW', 'COLOR_BOLD_YELLOW', - 'COLOR_WHITE', 'COLOR_BOLD_WHITE', 'COLOR_CYAN', 'COLOR_BOLD_CYAN', - 'COLOR_MAGENTA', 'COLOR_BOLD_MAGENTA', 'COLOR_BLACK', 'COLOR_BOLD_BLACK', - 'COLOR_BLINK', 'COLOR_BRIGHT', 'COLOR_RESET' ].forEach(function(color) { - exports.COLORS[color] = ''; - }); - } +if (global.COLORS) { + exports.COLORS = global.COLORS; + delete global.COLORS; +} +else { + [ 'COLOR_RED', 'COLOR_BOLD_RED', 'COLOR_GREEN', 'COLOR_BOLD_GREEN', + 'COLOR_BLUE', 'COLOR_BOLD_BLUE', 'COLOR_YELLOW', 'COLOR_BOLD_YELLOW', + 'COLOR_WHITE', 'COLOR_BOLD_WHITE', 'COLOR_CYAN', 'COLOR_BOLD_CYAN', + 'COLOR_MAGENTA', 'COLOR_BOLD_MAGENTA', 'COLOR_BLACK', 'COLOR_BOLD_BLACK', + 'COLOR_BLINK', 'COLOR_BRIGHT', 'COLOR_RESET' ].forEach(function(color) { + exports.COLORS[color] = ''; + }); +} - exports.COLORS.COLOR_PUNCTUATION = exports.COLORS.COLOR_RESET; - exports.COLORS.COLOR_STRING = exports.COLORS.COLOR_BRIGHT; - exports.COLORS.COLOR_NUMBER = exports.COLORS.COLOR_BRIGHT; - exports.COLORS.COLOR_INDEX = exports.COLORS.COLOR_BRIGHT; - exports.COLORS.COLOR_TRUE = exports.COLORS.COLOR_BRIGHT; - exports.COLORS.COLOR_FALSE = exports.COLORS.COLOR_BRIGHT; - exports.COLORS.COLOR_NULL = exports.COLORS.COLOR_BRIGHT; - exports.COLORS.COLOR_UNDEFINED = exports.COLORS.COLOR_BRIGHT; +exports.COLORS.COLOR_PUNCTUATION = exports.COLORS.COLOR_RESET; +exports.COLORS.COLOR_STRING = exports.COLORS.COLOR_BRIGHT; +exports.COLORS.COLOR_NUMBER = exports.COLORS.COLOR_BRIGHT; +exports.COLORS.COLOR_INDEX = exports.COLORS.COLOR_BRIGHT; +exports.COLORS.COLOR_TRUE = exports.COLORS.COLOR_BRIGHT; +exports.COLORS.COLOR_FALSE = exports.COLORS.COLOR_BRIGHT; +exports.COLORS.COLOR_NULL = exports.COLORS.COLOR_BRIGHT; +exports.COLORS.COLOR_UNDEFINED = exports.COLORS.COLOR_BRIGHT; // ----------------------------------------------------------------------------- // --SECTION-- private printing variables @@ -963,236 +931,151 @@ /// @brief quote cache //////////////////////////////////////////////////////////////////////////////// - var characterQuoteCache = { - '\b': '\\b', // ASCII 8, Backspace - '\t': '\\t', // ASCII 9, Tab - '\n': '\\n', // ASCII 10, Newline - '\f': '\\f', // ASCII 12, Formfeed - '\r': '\\r', // ASCII 13, Carriage Return - '\"': '\\"', - '\\': '\\\\' - }; +var characterQuoteCache = { + '\b': '\\b', // ASCII 8, Backspace + '\t': '\\t', // ASCII 9, Tab + '\n': '\\n', // ASCII 10, Newline + '\f': '\\f', // ASCII 12, Formfeed + '\r': '\\r', // ASCII 13, Carriage Return + '\"': '\\"', + '\\': '\\\\' +}; //////////////////////////////////////////////////////////////////////////////// /// @brief colors //////////////////////////////////////////////////////////////////////////////// - var colors = exports.COLORS; +var colors = exports.COLORS; //////////////////////////////////////////////////////////////////////////////// /// @brief useColor //////////////////////////////////////////////////////////////////////////////// - var useColor = false; +var useColor = false; - if (typeof COLOR_OUTPUT !== "undefined") { - useColor = COLOR_OUTPUT; - delete COLOR_OUTPUT; - } +if (global.COLOR_OUTPUT) { + useColor = global.COLOR_OUTPUT; + delete global.COLOR_OUTPUT; +} //////////////////////////////////////////////////////////////////////////////// /// @brief usePrettyPrint //////////////////////////////////////////////////////////////////////////////// - var usePrettyPrint = false; +var usePrettyPrint = false; - if (typeof PRETTY_PRINT !== "undefined") { - usePrettyPrint = PRETTY_PRINT; - delete PRETTY_PRINT; - } +if (global.PRETTY_PRINT) { + usePrettyPrint = global.PRETTY_PRINT; + delete global.PRETTY_PRINT; +} // ----------------------------------------------------------------------------- // --SECTION-- private printing functions // ----------------------------------------------------------------------------- - var printRecursive; +var printRecursive; //////////////////////////////////////////////////////////////////////////////// /// @brief quotes a single character //////////////////////////////////////////////////////////////////////////////// - function quoteSingleJsonCharacter (c) { - 'use strict'; +function quoteSingleJsonCharacter (c) { - if (characterQuoteCache.hasOwnProperty(c)) { - return characterQuoteCache[c]; - } - - var charCode = c.charCodeAt(0); - var result; - - if (charCode < 16) { - result = '\\u000'; - } - else if (charCode < 256) { - result = '\\u00'; - } - else if (charCode < 4096) { - result = '\\u0'; - } - else { - result = '\\u'; - } - - result += charCode.toString(16); - characterQuoteCache[c] = result; - - return result; + if (characterQuoteCache.hasOwnProperty(c)) { + return characterQuoteCache[c]; } + var charCode = c.charCodeAt(0); + var result; + + if (charCode < 16) { + result = '\\u000'; + } + else if (charCode < 256) { + result = '\\u00'; + } + else if (charCode < 4096) { + result = '\\u0'; + } + else { + result = '\\u'; + } + + result += charCode.toString(16); + characterQuoteCache[c] = result; + + return result; +} + //////////////////////////////////////////////////////////////////////////////// /// @brief quotes a string character //////////////////////////////////////////////////////////////////////////////// - var quotable = /[\\\"\x00-\x1f]/g; +var quotable = /[\\\"\x00-\x1f]/g; - function quoteJsonString (str) { - 'use strict'; +function quoteJsonString (str) { - return '"' + str.replace(quotable, quoteSingleJsonCharacter) + '"'; - } + return '"' + str.replace(quotable, quoteSingleJsonCharacter) + '"'; +} //////////////////////////////////////////////////////////////////////////////// /// @brief prints the ident for pretty printing //////////////////////////////////////////////////////////////////////////////// - function printIndent (context) { - 'use strict'; +function printIndent (context) { - var j; - var indent = ""; + var j; + var indent = ""; - if (context.prettyPrint) { - indent += "\n"; + if (context.prettyPrint) { + indent += "\n"; - for (j = 0; j < context.level; ++j) { - indent += " "; - } + for (j = 0; j < context.level; ++j) { + indent += " "; } - - context.output += indent; } + context.output += indent; +} + //////////////////////////////////////////////////////////////////////////////// /// @brief prints the JSON representation of an array //////////////////////////////////////////////////////////////////////////////// - function printArray (object, context) { - 'use strict'; +function printArray (object, context) { - var useColor = context.useColor; + var useColor = context.useColor; - if (object.length === 0) { - if (useColor) { - context.output += colors.COLOR_PUNCTUATION; - } - - context.output += "[ ]"; - - if (useColor) { - context.output += colors.COLOR_RESET; - } + if (object.length === 0) { + if (useColor) { + context.output += colors.COLOR_PUNCTUATION; } - else { - var i; - if (useColor) { - context.output += colors.COLOR_PUNCTUATION; - } + context.output += "[ ]"; - context.output += "["; - - if (useColor) { - context.output += colors.COLOR_RESET; - } - - var newLevel = context.level + 1; - var sep = " "; - - context.level = newLevel; - - for (i = 0; i < object.length; i++) { - if (useColor) { - context.output += colors.COLOR_PUNCTUATION; - } - - context.output += sep; - - if (useColor) { - context.output += colors.COLOR_RESET; - } - - printIndent(context); - - var path = context.path; - context.path += "[" + i + "]"; - - printRecursive(object[i], context); - - if (context.emit && context.output.length >= context.emit) { - exports.output(context.output); - context.output = ""; - } - - context.path = path; - sep = ", "; - } - - context.level = newLevel - 1; - context.output += " "; - - printIndent(context); - - if (useColor) { - context.output += colors.COLOR_PUNCTUATION; - } - - context.output += "]"; - - if (useColor) { - context.output += colors.COLOR_RESET; - } + if (useColor) { + context.output += colors.COLOR_RESET; } } - -//////////////////////////////////////////////////////////////////////////////// -/// @brief prints an object -//////////////////////////////////////////////////////////////////////////////// - - function printObject (object, context) { - 'use strict'; - - var useColor = context.useColor; - var sep = " "; + else { + var i; if (useColor) { context.output += colors.COLOR_PUNCTUATION; } - context.output += "{"; + context.output += "["; if (useColor) { context.output += colors.COLOR_RESET; } var newLevel = context.level + 1; + var sep = " "; context.level = newLevel; - var keys; - try { - keys = Object.keys(object); - } - catch (err) { - // ES6 proxy objects don't support key enumeration - keys = [ ]; - } - var i, n = keys.length; - - for (i = 0; i < n; ++i) { - var k = keys[i]; - var val = object[k]; - + for (i = 0; i < object.length; i++) { if (useColor) { context.output += colors.COLOR_PUNCTUATION; } @@ -1205,30 +1088,18 @@ printIndent(context); - if (useColor) { - context.output += colors.COLOR_INDEX; - } - - context.output += quoteJsonString(k); - - if (useColor) { - context.output += colors.COLOR_RESET; - } - - context.output += " : "; - var path = context.path; - context.path += "[" + k + "]"; + context.path += "[" + i + "]"; - printRecursive(val, context); - - context.path = path; - sep = ", "; + printRecursive(object[i], context); if (context.emit && context.output.length >= context.emit) { exports.output(context.output); context.output = ""; } + + context.path = path; + sep = ", "; } context.level = newLevel - 1; @@ -1240,260 +1111,350 @@ context.output += colors.COLOR_PUNCTUATION; } - context.output += "}"; + context.output += "]"; if (useColor) { context.output += colors.COLOR_RESET; } } +} + +//////////////////////////////////////////////////////////////////////////////// +/// @brief prints an object +//////////////////////////////////////////////////////////////////////////////// + +function printObject (object, context) { + + var useColor = context.useColor; + var sep = " "; + + if (useColor) { + context.output += colors.COLOR_PUNCTUATION; + } + + context.output += "{"; + + if (useColor) { + context.output += colors.COLOR_RESET; + } + + var newLevel = context.level + 1; + + context.level = newLevel; + + var keys; + try { + keys = Object.keys(object); + } + catch (err) { + // ES6 proxy objects don't support key enumeration + keys = [ ]; + } + var i, n = keys.length; + + for (i = 0; i < n; ++i) { + var k = keys[i]; + var val = object[k]; + + if (useColor) { + context.output += colors.COLOR_PUNCTUATION; + } + + context.output += sep; + + if (useColor) { + context.output += colors.COLOR_RESET; + } + + printIndent(context); + + if (useColor) { + context.output += colors.COLOR_INDEX; + } + + context.output += quoteJsonString(k); + + if (useColor) { + context.output += colors.COLOR_RESET; + } + + context.output += " : "; + + var path = context.path; + context.path += "[" + k + "]"; + + printRecursive(val, context); + + context.path = path; + sep = ", "; + + if (context.emit && context.output.length >= context.emit) { + exports.output(context.output); + context.output = ""; + } + } + + context.level = newLevel - 1; + context.output += " "; + + printIndent(context); + + if (useColor) { + context.output += colors.COLOR_PUNCTUATION; + } + + context.output += "}"; + + if (useColor) { + context.output += colors.COLOR_RESET; + } +} //////////////////////////////////////////////////////////////////////////////// /// @brief prints objects to standard output without a new-line //////////////////////////////////////////////////////////////////////////////// - var funcRE = /function ([^\(]*)?\(\) \{ \[native code\] \}/; - var func2RE = /function ([^\(]*)?\((.*)\) \{/; +var funcRE = /function ([^\(]*)?\(\) \{ \[native code\] \}/; +var func2RE = /function ([^\(]*)?\((.*)\) \{/; - exports.printRecursive = printRecursive = function (value, context) { - 'use strict'; +exports.printRecursive = printRecursive = function (value, context) { - var useColor = context.useColor; - var customInspect = context.customInspect; - var useToString = context.useToString; - var limitString = context.limitString; - var showFunction = context.showFunction; + var useColor = context.useColor; + var customInspect = context.customInspect; + var useToString = context.useToString; + var limitString = context.limitString; + var showFunction = context.showFunction; - if (typeof context.seen === "undefined") { - context.seen = []; - context.names = []; - } + if (typeof context.seen === "undefined") { + context.seen = []; + context.names = []; + } - var p = context.seen.indexOf(value); + var p = context.seen.indexOf(value); - if (0 <= p) { - context.output += context.names[p]; - } - else { - if (value && (value instanceof Object || (typeof value === 'object' && Object.getPrototypeOf(value) === null))) { - context.seen.push(value); - context.names.push(context.path); - if (customInspect && typeof value._PRINT === "function") { - value._PRINT(context); + if (0 <= p) { + context.output += context.names[p]; + } + else { + if (value && (value instanceof Object || (typeof value === 'object' && Object.getPrototypeOf(value) === null))) { + context.seen.push(value); + context.names.push(context.path); + if (customInspect && typeof value._PRINT === "function") { + value._PRINT(context); - if (context.emit && context.output.length >= context.emit) { - exports.output(context.output); - context.output = ""; + if (context.emit && context.output.length >= context.emit) { + exports.output(context.output); + context.output = ""; + } + } + else if (value instanceof Array) { + printArray(value, context); + } + else if ( + value.toString === Object.prototype.toString + || (typeof value === 'object' && Object.getPrototypeOf(value) === null) + ) { + var handled = false; + try { + if (value instanceof Set || + value instanceof Map || + value instanceof WeakSet || + value instanceof WeakMap || + typeof value[Symbol.iterator] === "function") { + // ES6 iterators + context.output += value.toString(); + handled = true; } } - else if (value instanceof Array) { - printArray(value, context); + catch (err) { + // ignore any errors thrown above, and simply fall back to normal printing } - else if ( - value.toString === Object.prototype.toString - || (typeof value === 'object' && Object.getPrototypeOf(value) === null) - ) { - var handled = false; - try { - if (value instanceof Set || - value instanceof Map || - value instanceof WeakSet || - value instanceof WeakMap || - typeof value[Symbol.iterator] === "function") { - // ES6 iterators - context.output += value.toString(); - handled = true; - } - } - catch (err) { - // ignore any errors thrown above, and simply fall back to normal printing - } - if (! handled) { - // all other objects - printObject(value, context); - } - - if (context.emit && context.output.length >= context.emit) { - exports.output(context.output); - context.output = ""; - } + if (! handled) { + // all other objects + printObject(value, context); } - else if (typeof value === "function") { - // it's possible that toString() throws, and this looks quite ugly - try { - var s = value.toString(); - if (0 < context.level && ! showFunction) { - var a = s.split("\n"); - var f = a[0]; + if (context.emit && context.output.length >= context.emit) { + exports.output(context.output); + context.output = ""; + } + } + else if (typeof value === "function") { + // it's possible that toString() throws, and this looks quite ugly + try { + var s = value.toString(); - var m = funcRE.exec(f); + if (0 < context.level && ! showFunction) { + var a = s.split("\n"); + var f = a[0]; - if (m !== null) { - if (m[1] === undefined) { - context.output += 'function { [native code] }'; - } - else { - context.output += 'function ' + m[1] + ' { [native code] }'; - } + var m = funcRE.exec(f); + + if (m !== null) { + if (m[1] === undefined) { + context.output += 'function { [native code] }'; } else { - m = func2RE.exec(f); - - if (m !== null) { - if (m[1] === undefined) { - context.output += 'function ' + '(' + m[2] +') { ... }'; - } - else { - context.output += 'function ' + m[1] + ' (' + m[2] +') { ... }'; - } - } - else { - f = f.substr(8, f.length - 10).trim(); - context.output += '[Function "' + f + '" ...]'; - } + context.output += 'function ' + m[1] + ' { [native code] }'; } } else { - context.output += s; + m = func2RE.exec(f); + + if (m !== null) { + if (m[1] === undefined) { + context.output += 'function ' + '(' + m[2] +') { ... }'; + } + else { + context.output += 'function ' + m[1] + ' (' + m[2] +') { ... }'; + } + } + else { + f = f.substr(8, f.length - 10).trim(); + context.output += '[Function "' + f + '" ...]'; + } } } - catch (e1) { - exports.stdOutput(String(e1)); - context.output += "[Function]"; + else { + context.output += s; } } - else if (useToString && typeof value.toString === "function") { - try { - context.output += value.toString(); - } - catch (e2) { - context.output += "[Object "; - printObject(value, context); - context.output += "]"; - } + catch (e1) { + exports.stdOutput(String(e1)); + context.output += "[Function]"; } - else { + } + else if (useToString && typeof value.toString === "function") { + try { + context.output += value.toString(); + } + catch (e2) { context.output += "[Object "; printObject(value, context); context.output += "]"; } } - else if (value === undefined) { - if (useColor) { - context.output += colors.COLOR_UNDEFINED; - } - - context.output += "undefined"; - - if (useColor) { - context.output += colors.COLOR_RESET; - } - } - else if (typeof(value) === "string") { - if (useColor) { - context.output += colors.COLOR_STRING; - } - - if (limitString) { - if (limitString < value.length) { - value = value.substr(0, limitString) + "..."; - } - } - - context.output += quoteJsonString(value); - - if (useColor) { - context.output += colors.COLOR_RESET; - } - } - else if (typeof(value) === "boolean") { - if (useColor) { - context.output += value ? colors.COLOR_TRUE : colors.COLOR_FALSE; - } - - context.output += String(value); - - if (useColor) { - context.output += colors.COLOR_RESET; - } - } - else if (typeof(value) === "number") { - if (useColor) { - context.output += colors.COLOR_NUMBER; - } - - context.output += String(value); - - if (useColor) { - context.output += colors.COLOR_RESET; - } - } - else if (value === null) { - if (useColor) { - context.output += colors.COLOR_NULL; - } - - context.output += String(value); - - if (useColor) { - context.output += colors.COLOR_RESET; - } - } - /* jshint notypeof: true */ - else if (typeof(value) === "symbol") { - /* jshint notypeof: false */ - // handle ES6 symbols - if (useColor) { - context.output += colors.COLOR_NULL; - } - - context.output += value.toString(); - - if (useColor) { - context.output += colors.COLOR_RESET; - } - } else { - context.output += String(value); + context.output += "[Object "; + printObject(value, context); + context.output += "]"; } } - }; + else if (value === undefined) { + if (useColor) { + context.output += colors.COLOR_UNDEFINED; + } + + context.output += "undefined"; + + if (useColor) { + context.output += colors.COLOR_RESET; + } + } + else if (typeof(value) === "string") { + if (useColor) { + context.output += colors.COLOR_STRING; + } + + if (limitString) { + if (limitString < value.length) { + value = value.substr(0, limitString) + "..."; + } + } + + context.output += quoteJsonString(value); + + if (useColor) { + context.output += colors.COLOR_RESET; + } + } + else if (typeof(value) === "boolean") { + if (useColor) { + context.output += value ? colors.COLOR_TRUE : colors.COLOR_FALSE; + } + + context.output += String(value); + + if (useColor) { + context.output += colors.COLOR_RESET; + } + } + else if (typeof(value) === "number") { + if (useColor) { + context.output += colors.COLOR_NUMBER; + } + + context.output += String(value); + + if (useColor) { + context.output += colors.COLOR_RESET; + } + } + else if (value === null) { + if (useColor) { + context.output += colors.COLOR_NULL; + } + + context.output += String(value); + + if (useColor) { + context.output += colors.COLOR_RESET; + } + } + /* jshint notypeof: true */ + else if (typeof(value) === "symbol") { + /* jshint notypeof: false */ + // handle ES6 symbols + if (useColor) { + context.output += colors.COLOR_NULL; + } + + context.output += value.toString(); + + if (useColor) { + context.output += colors.COLOR_RESET; + } + } + else { + context.output += String(value); + } + } +}; //////////////////////////////////////////////////////////////////////////////// /// @brief buffers output instead of printing it //////////////////////////////////////////////////////////////////////////////// - function bufferOutput () { - 'use strict'; +function bufferOutput () { - var i; + var i; - for (i = 0; i < arguments.length; ++i) { - var value = arguments[i]; - var text; + for (i = 0; i < arguments.length; ++i) { + var value = arguments[i]; + var text; - if (value === null) { - text = "null"; + if (value === null) { + text = "null"; + } + else if (value === undefined) { + text = "undefined"; + } + else if (typeof(value) === "object") { + try { + text = JSON.stringify(value); } - else if (value === undefined) { - text = "undefined"; - } - else if (typeof(value) === "object") { - try { - text = JSON.stringify(value); - } - catch (err) { - text = String(value); - } - } - else { + catch (err) { text = String(value); } - - exports.outputBuffer += text; } + else { + text = String(value); + } + + exports.outputBuffer += text; } +} //////////////////////////////////////////////////////////////////////////////// /// @brief prints all arguments @@ -1506,45 +1467,44 @@ /// @FN{_PRINT}, then this function is called. A final newline is printed. //////////////////////////////////////////////////////////////////////////////// - function printShell () { - 'use strict'; +function printShell () { - var output = exports.output; - var i; + var output = exports.output; + var i; - for (i = 0; i < arguments.length; ++i) { - if (0 < i) { - output(" "); - } - - if (typeof(arguments[i]) === "string") { - output(arguments[i]); - } - else { - var context = { - customInspect: true, - emit: 16384, - level: 0, - limitString: 80, - names: [], - output: "", - path: "~", - prettyPrint: usePrettyPrint, - seen: [], - showFunction: false, - useColor: useColor, - useToString: true - }; - - printRecursive(arguments[i], context); - - output(context.output); - } + for (i = 0; i < arguments.length; ++i) { + if (0 < i) { + output(" "); } - output("\n"); + if (typeof(arguments[i]) === "string") { + output(arguments[i]); + } + else { + var context = { + customInspect: true, + emit: 16384, + level: 0, + limitString: 80, + names: [], + output: "", + path: "~", + prettyPrint: usePrettyPrint, + seen: [], + showFunction: false, + useColor: useColor, + useToString: true + }; + + printRecursive(arguments[i], context); + + output(context.output); + } } + output("\n"); +} + // ----------------------------------------------------------------------------- // --SECTION-- public printing functions // ----------------------------------------------------------------------------- @@ -1553,297 +1513,280 @@ /// @brief flatten //////////////////////////////////////////////////////////////////////////////// - var hasOwnProperty = Function.prototype.call.bind(Object.prototype.hasOwnProperty); +var hasOwnProperty = Function.prototype.call.bind(Object.prototype.hasOwnProperty); - exports.flatten = function (obj, seen) { - 'use strict'; +exports.flatten = function (obj, seen) { - if (!obj || (typeof obj !== 'object' && typeof obj !== 'function')) { - return obj; + if (!obj || (typeof obj !== 'object' && typeof obj !== 'function')) { + return obj; + } + + if (obj instanceof Date) { + return obj.toJSON(); + } + + if (!seen) { + seen = []; + } + + var result = Object.create(null), + src = obj, + keys, + i, + key, + val; + + if (typeof obj === 'function') { + result.__exec = String(obj); + } + + while (src) { + if ( + seen.indexOf(src) !== -1 + || (obj.constructor && src === obj.constructor.prototype) + ) { + break; } - - if (obj instanceof Date) { - return obj.toJSON(); - } - - if (!seen) { - seen = []; - } - - var result = Object.create(null), - src = obj, - keys, - i, - key, - val; - - if (typeof obj === 'function') { - result.__exec = String(obj); - } - - while (src) { - if ( - seen.indexOf(src) !== -1 - || (obj.constructor && src === obj.constructor.prototype) - ) { - break; - } - seen.push(src); - keys = Object.getOwnPropertyNames(src); - for (i = 0; i < keys.length; i++) { - key = keys[i]; - if (typeof src !== 'function' || ( - key !== 'arguments' && key !== 'caller' && key !== 'callee' - )) { - if (key.charAt(0) !== '_' && !hasOwnProperty(result, key)) { - val = obj[key]; - if (seen.indexOf(val) !== -1 && ( - typeof val === 'object' || typeof val === 'function' - )) { - result[key] = '[Circular]'; - } else { - result[key] = exports.flatten(val, seen); - } + seen.push(src); + keys = Object.getOwnPropertyNames(src); + for (i = 0; i < keys.length; i++) { + key = keys[i]; + if (typeof src !== 'function' || ( + key !== 'arguments' && key !== 'caller' && key !== 'callee' + )) { + if (key.charAt(0) !== '_' && !hasOwnProperty(result, key)) { + val = obj[key]; + if (seen.indexOf(val) !== -1 && ( + typeof val === 'object' || typeof val === 'function' + )) { + result[key] = '[Circular]'; + } else { + result[key] = exports.flatten(val, seen); } } } - src = Object.getPrototypeOf(src); } + src = Object.getPrototypeOf(src); + } - if (obj.constructor && obj.constructor.name) { - if (obj instanceof Error && obj.name === Error.name) { - result.name = obj.constructor.name; - } else if (!hasOwnProperty(result, 'constructor')) { - result.constructor = {name: obj.constructor.name}; - } + if (obj.constructor && obj.constructor.name) { + if (obj instanceof Error && obj.name === Error.name) { + result.name = obj.constructor.name; + } else if (!hasOwnProperty(result, 'constructor')) { + result.constructor = {name: obj.constructor.name}; } + } - return result; - }; + return result; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief inspect //////////////////////////////////////////////////////////////////////////////// - exports.inspect = function (object, options) { - 'use strict'; +exports.inspect = function (object, options) { - var context = { - customInspect: options && options.customInspect, - emit: false, - level: 0, - limitString: false, - names: [], - output: "", - prettyPrint: true, - path: "~", - seen: [], - showFunction: true, - useColor: false, - useToString: false - }; - - if (options && options.hasOwnProperty("prettyPrint")) { - context.prettyPrint = options.prettyPrint; - } - - printRecursive(object, context); - - return context.output; + var context = { + customInspect: options && options.customInspect, + emit: false, + level: 0, + limitString: false, + names: [], + output: "", + prettyPrint: true, + path: "~", + seen: [], + showFunction: true, + useColor: false, + useToString: false }; + if (options && options.hasOwnProperty("prettyPrint")) { + context.prettyPrint = options.prettyPrint; + } + + printRecursive(object, context); + + return context.output; +}; + //////////////////////////////////////////////////////////////////////////////// /// @brief sprintf //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_SPRINTF !== "undefined") { - exports.sprintf = SYS_SPRINTF; - delete SYS_SPRINTF; - } +if (global.SYS_SPRINTF) { + exports.sprintf = global.SYS_SPRINTF; + delete global.SYS_SPRINTF; +} //////////////////////////////////////////////////////////////////////////////// /// @brief printf //////////////////////////////////////////////////////////////////////////////// - var sprintf = exports.sprintf; +var sprintf = exports.sprintf; - exports.printf = function () { - 'use strict'; - - exports.output(sprintf.apply(sprintf, arguments)); - }; +exports.printf = function () { + exports.output(sprintf.apply(sprintf, arguments)); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief print //////////////////////////////////////////////////////////////////////////////// - if (typeof exports.printBrowser === "function") { - exports.printShell = printShell; - exports.print = exports.printBrowser; - } - else { - exports.print = printShell; - } +if (typeof exports.printBrowser === "function") { + exports.printShell = printShell; + exports.print = exports.printBrowser; +} +else { + exports.print = printShell; +} //////////////////////////////////////////////////////////////////////////////// /// @brief printObject //////////////////////////////////////////////////////////////////////////////// - exports.printObject = printObject; +exports.printObject = printObject; //////////////////////////////////////////////////////////////////////////////// /// @brief startCaptureMode //////////////////////////////////////////////////////////////////////////////// - exports.startCaptureMode = function () { - 'use strict'; - - exports.outputBuffer = ""; - exports.output = bufferOutput; - }; +exports.startCaptureMode = function () { + exports.outputBuffer = ""; + exports.output = bufferOutput; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief stopCaptureMode //////////////////////////////////////////////////////////////////////////////// - exports.stopCaptureMode = function () { - 'use strict'; +exports.stopCaptureMode = function () { + var buffer = exports.outputBuffer; - var buffer = exports.outputBuffer; + exports.outputBuffer = ""; + exports.output = exports.stdOutput; - exports.outputBuffer = ""; - exports.output = exports.stdOutput; - - return buffer; - }; + return buffer; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief startPager //////////////////////////////////////////////////////////////////////////////// - exports.startPager = function () {}; +exports.startPager = function () {}; - if (typeof SYS_START_PAGER !== "undefined") { - exports.startPager = SYS_START_PAGER; - delete SYS_START_PAGER; - } +if (global.SYS_START_PAGER) { + exports.startPager = global.SYS_START_PAGER; + delete global.SYS_START_PAGER; +} //////////////////////////////////////////////////////////////////////////////// /// @brief stopPager //////////////////////////////////////////////////////////////////////////////// - exports.stopPager = function () {}; +exports.stopPager = function () {}; - if (typeof SYS_STOP_PAGER !== "undefined") { - exports.stopPager = SYS_STOP_PAGER; - delete SYS_STOP_PAGER; - } +if (global.SYS_STOP_PAGER) { + exports.stopPager = global.SYS_STOP_PAGER; + delete global.SYS_STOP_PAGER; +} //////////////////////////////////////////////////////////////////////////////// /// @brief startPrettyPrint //////////////////////////////////////////////////////////////////////////////// - exports.startPrettyPrint = function (silent) { - 'use strict'; +exports.startPrettyPrint = function (silent) { + if (! usePrettyPrint && !silent) { + exports.print("using pretty printing"); + } - if (! usePrettyPrint && ! silent) { - exports.print("using pretty printing"); - } - - usePrettyPrint = true; - }; + usePrettyPrint = true; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief stopPrettyPrint //////////////////////////////////////////////////////////////////////////////// - exports.stopPrettyPrint = function (silent) { - 'use strict'; +exports.stopPrettyPrint = function (silent) { + if (usePrettyPrint && !silent) { + exports.print("disabled pretty printing"); + } - if (usePrettyPrint && ! silent) { - exports.print("disabled pretty printing"); - } - - usePrettyPrint = false; - }; + usePrettyPrint = false; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief startColorPrint //////////////////////////////////////////////////////////////////////////////// - exports.startColorPrint = function (color, silent) { - 'use strict'; - - var schemes = { - arangodb: { - COLOR_PUNCTUATION: exports.COLORS.COLOR_RESET, - COLOR_STRING: exports.COLORS.COLOR_BOLD_MAGENTA, - COLOR_NUMBER: exports.COLORS.COLOR_BOLD_GREEN, - COLOR_INDEX: exports.COLORS.COLOR_BOLD_CYAN, - COLOR_TRUE: exports.COLORS.COLOR_BOLD_MAGENTA, - COLOR_FALSE: exports.COLORS.COLOR_BOLD_MAGENTA, - COLOR_NULL: exports.COLORS.COLOR_BOLD_YELLOW, - COLOR_UNDEFINED: exports.COLORS.COLOR_BOLD_YELLOW - } - }; - - if (! useColor && ! silent) { - exports.print("starting color printing"); +exports.startColorPrint = function (color, silent) { + var schemes = { + arangodb: { + COLOR_PUNCTUATION: exports.COLORS.COLOR_RESET, + COLOR_STRING: exports.COLORS.COLOR_BOLD_MAGENTA, + COLOR_NUMBER: exports.COLORS.COLOR_BOLD_GREEN, + COLOR_INDEX: exports.COLORS.COLOR_BOLD_CYAN, + COLOR_TRUE: exports.COLORS.COLOR_BOLD_MAGENTA, + COLOR_FALSE: exports.COLORS.COLOR_BOLD_MAGENTA, + COLOR_NULL: exports.COLORS.COLOR_BOLD_YELLOW, + COLOR_UNDEFINED: exports.COLORS.COLOR_BOLD_YELLOW } - - if (color === undefined || color === null) { - color = null; - } - else if (typeof color === "string") { - var c; - - color = color.toLowerCase(); - - if (schemes.hasOwnProperty(color)) { - colors = schemes[color]; - - for (c in exports.COLORS) { - if (exports.COLORS.hasOwnProperty(c) && ! colors.hasOwnProperty(c)) { - colors[c] = exports.COLORS[c]; - } - } - } - else { - colors = exports.COLORS; - - var setColor = function (key) { - [ 'COLOR_STRING', 'COLOR_NUMBER', 'COLOR_INDEX', 'COLOR_TRUE', - 'COLOR_FALSE', 'COLOR_NULL', 'COLOR_UNDEFINED' ].forEach(function (what) { - colors[what] = exports.COLORS[key]; - }); - }; - - for (c in exports.COLORS) { - if (exports.COLORS.hasOwnProperty(c) && - c.replace(/^COLOR_/, '').toLowerCase() === color) { - setColor(c); - break; - } - } - } - } - - useColor = true; }; + if (!useColor && !silent) { + exports.print("starting color printing"); + } + + if (color === undefined || color === null) { + color = null; + } + else if (typeof color === "string") { + color = color.toLowerCase(); + var c; + + if (schemes.hasOwnProperty(color)) { + colors = schemes[color]; + + for (c in exports.COLORS) { + if (exports.COLORS.hasOwnProperty(c) && ! colors.hasOwnProperty(c)) { + colors[c] = exports.COLORS[c]; + } + } + } + else { + colors = exports.COLORS; + + var setColor = function (key) { + [ 'COLOR_STRING', 'COLOR_NUMBER', 'COLOR_INDEX', 'COLOR_TRUE', + 'COLOR_FALSE', 'COLOR_NULL', 'COLOR_UNDEFINED' ].forEach(function (what) { + colors[what] = exports.COLORS[key]; + }); + }; + + for (c in exports.COLORS) { + if (exports.COLORS.hasOwnProperty(c) && + c.replace(/^COLOR_/, '').toLowerCase() === color) { + setColor(c); + break; + } + } + } + } + + useColor = true; +}; + //////////////////////////////////////////////////////////////////////////////// /// @brief stopColorPrint //////////////////////////////////////////////////////////////////////////////// - exports.stopColorPrint = function (silent) { - 'use strict'; +exports.stopColorPrint = function (silent) { + if (useColor && !silent) { + exports.print("disabled color printing"); + } - if (useColor && ! silent) { - exports.print("disabled color printing"); - } - - useColor = false; - }; + useColor = false; +}; // ----------------------------------------------------------------------------- // --SECTION-- public utility functions @@ -1853,39 +1796,36 @@ /// @brief exponentialBackoff //////////////////////////////////////////////////////////////////////////////// - exports.exponentialBackOff = function (n, i) { - 'use strict'; - if (i === 0) { - return 0; - } - if (n === 0) { - return 0; - } - if (n === 1) { - return Math.random() < 0.5 ? 0 : i; - } - return Math.floor(Math.random() * (n + 1)) * i; - }; +exports.exponentialBackOff = function (n, i) { + if (i === 0) { + return 0; + } + if (n === 0) { + return 0; + } + if (n === 1) { + return Math.random() < 0.5 ? 0 : i; + } + return Math.floor(Math.random() * (n + 1)) * i; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief env //////////////////////////////////////////////////////////////////////////////// - if (typeof ENV !== 'undefined') { - exports.env = new ENV(); - delete ENV; - } +if (typeof ENV !== 'undefined') { + exports.env = new global.ENV(); + delete global.ENV; +} //////////////////////////////////////////////////////////////////////////////// /// @brief options //////////////////////////////////////////////////////////////////////////////// - if (typeof SYS_OPTIONS !== 'undefined') { - exports.options = SYS_OPTIONS; - delete SYS_OPTIONS; - } - -}()); +if (typeof SYS_OPTIONS !== 'undefined') { + exports.options = global.SYS_OPTIONS; + delete global.SYS_OPTIONS; +} // ----------------------------------------------------------------------------- // --SECTION-- global printing functions @@ -1895,31 +1835,25 @@ /// @brief print //////////////////////////////////////////////////////////////////////////////// -function print () { - 'use strict'; - +global.print = function print () { var internal = require("internal"); internal.print.apply(internal.print, arguments); -} +}; //////////////////////////////////////////////////////////////////////////////// /// @brief printf //////////////////////////////////////////////////////////////////////////////// -function printf () { - 'use strict'; - +global.printf = function printf () { var internal = require("internal"); internal.printf.apply(internal.printf, arguments); -} +}; //////////////////////////////////////////////////////////////////////////////// /// @brief print_plain //////////////////////////////////////////////////////////////////////////////// -function print_plain () { - 'use strict'; - +global.print_plain = function print_plain () { var output = require("internal").output; var printRecursive = require("internal").printRecursive; var i; @@ -1951,47 +1885,41 @@ function print_plain () { } output("\n"); -} +}; //////////////////////////////////////////////////////////////////////////////// /// @brief start_pretty_print //////////////////////////////////////////////////////////////////////////////// -function start_pretty_print () { - 'use strict'; - +global.start_pretty_print = function start_pretty_print () { require("internal").startPrettyPrint(); -} +}; //////////////////////////////////////////////////////////////////////////////// /// @brief stop_pretty_print //////////////////////////////////////////////////////////////////////////////// -function stop_pretty_print () { - 'use strict'; - +global.stop_pretty_print = function stop_pretty_print () { require("internal").stopPrettyPrint(); -} +}; //////////////////////////////////////////////////////////////////////////////// /// @brief start_color_print //////////////////////////////////////////////////////////////////////////////// -function start_color_print (color) { - 'use strict'; - +global.start_color_print = function start_color_print (color) { require("internal").startColorPrint(color, false); -} +}; //////////////////////////////////////////////////////////////////////////////// /// @brief stop_color_print //////////////////////////////////////////////////////////////////////////////// -function stop_color_print () { - 'use strict'; - +global.stop_color_print = function stop_color_print () { require("internal").stopColorPrint(); -} +}; + +}()); // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/monkeypatches.js b/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/monkeypatches.js index 7c7c152fc3..9b450ea1c7 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/monkeypatches.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/monkeypatches.js @@ -1,4 +1,3 @@ -/*jshint globalstrict:true */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/client/bootstrap/module-internal.js b/js/apps/system/_admin/aardvark/APP/frontend/js/client/bootstrap/module-internal.js index 95b3495dfe..e108bc925b 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/client/bootstrap/module-internal.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/client/bootstrap/module-internal.js @@ -1,5 +1,5 @@ -/*jshint strict: false, -W051: true */ -/*global require, ArangoConnection, SYS_ARANGO, window */ +/*jshint -W051:true */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief module "internal" @@ -32,26 +32,23 @@ // --SECTION-- Module "internal" // ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- -// --SECTION-- private variables -// ----------------------------------------------------------------------------- - (function () { - var internal = require("internal"); + +var exports = require("internal"); //////////////////////////////////////////////////////////////////////////////// /// @brief hide global variables //////////////////////////////////////////////////////////////////////////////// - if (typeof ArangoConnection !== "undefined") { - internal.ArangoConnection = ArangoConnection; - delete ArangoConnection; - } +if (global.ArangoConnection) { + exports.ArangoConnection = global.ArangoConnection; + delete global.ArangoConnection; +} - if (typeof SYS_ARANGO !== "undefined") { - internal.arango = SYS_ARANGO; - delete SYS_ARANGO; - } +if (global.SYS_ARANGO) { + exports.arango = global.SYS_ARANGO; + delete global.SYS_ARANGO; +} // ----------------------------------------------------------------------------- // --SECTION-- private functions @@ -61,212 +58,212 @@ /// @brief write-ahead log functionality //////////////////////////////////////////////////////////////////////////////// - internal.wal = { - flush: function (waitForSync, waitForCollector) { - if (typeof internal.arango !== 'undefined') { - var wfs = waitForSync ? "true" : "false"; - var wfc = waitForCollector ? "true" : "false"; - internal.arango.PUT("/_admin/wal/flush?waitForSync=" + wfs + "&waitForCollector=" + wfc, ""); - return; - } - - throw "not connected"; - }, - - properties: function (value) { - if (typeof internal.arango !== 'undefined') { - if (value !== undefined) { - return internal.arango.PUT("/_admin/wal/properties", JSON.stringify(value)); - } - - return internal.arango.GET("/_admin/wal/properties", ""); - } - - throw "not connected"; +exports.wal = { + flush: function (waitForSync, waitForCollector) { + if (exports.arango) { + var wfs = waitForSync ? "true" : "false"; + var wfc = waitForCollector ? "true" : "false"; + exports.arango.PUT("/_admin/wal/flush?waitForSync=" + wfs + "&waitForCollector=" + wfc, ""); + return; } - }; + + throw "not connected"; + }, + + properties: function (value) { + if (exports.arango) { + if (value !== undefined) { + return exports.arango.PUT("/_admin/wal/properties", JSON.stringify(value)); + } + + return exports.arango.GET("/_admin/wal/properties", ""); + } + + throw "not connected"; + } +}; //////////////////////////////////////////////////////////////////////////////// /// @brief reloads the AQL user functions //////////////////////////////////////////////////////////////////////////////// - internal.reloadAqlFunctions = function () { - if (typeof internal.arango !== 'undefined') { - internal.arango.POST("/_admin/aql/reload", ""); - return; - } +exports.reloadAqlFunctions = function () { + if (exports.arango) { + exports.arango.POST("/_admin/aql/reload", ""); + return; + } - throw "not connected"; - }; + throw "not connected"; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief rebuilds the routing cache //////////////////////////////////////////////////////////////////////////////// - internal.reloadRouting = function () { - if (typeof internal.arango !== 'undefined') { - internal.arango.POST("/_admin/routing/reload", ""); - return; - } +exports.reloadRouting = function () { + if (exports.arango) { + exports.arango.POST("/_admin/routing/reload", ""); + return; + } - throw "not connected"; - }; + throw "not connected"; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief rebuilds the routing cache //////////////////////////////////////////////////////////////////////////////// - internal.routingCache = function () { - if (typeof internal.arango !== 'undefined') { - return internal.arango.GET("/_admin/routing/routes", ""); +exports.routingCache = function () { + if (exports.arango) { + return exports.arango.GET("/_admin/routing/routes", ""); - } + } - throw "not connected"; - }; + throw "not connected"; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief rebuilds the authentication cache //////////////////////////////////////////////////////////////////////////////// - internal.reloadAuth = function () { - if (typeof internal.arango !== 'undefined') { - internal.arango.POST("/_admin/auth/reload", ""); - return; - } +exports.reloadAuth = function () { + if (exports.arango) { + exports.arango.POST("/_admin/auth/reload", ""); + return; + } - throw "not connected"; - }; + throw "not connected"; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief execute javascript file on the server //////////////////////////////////////////////////////////////////////////////// - internal.executeServer = function (body) { - if (typeof internal.arango !== 'undefined') { - return internal.arango.POST("/_admin/execute", body); - } +exports.executeServer = function (body) { + if (exports.arango) { + return exports.arango.POST("/_admin/execute", body); + } - throw "not connected"; - }; + throw "not connected"; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief logs a request in curl format //////////////////////////////////////////////////////////////////////////////// - internal.appendCurlRequest = function (appender) { - return function (method, url, body, headers) { - var response; - var curl; - var i; +exports.appendCurlRequest = function (appender) { + return function (method, url, body, headers) { + var response; + var curl; + var i; - if (typeof body !== 'string') { - body = internal.inspect(body); - } + if (typeof body !== 'string') { + body = exports.inspect(body); + } - curl = "shell> curl "; + curl = "shell> curl "; - if (method === 'POST') { - response = internal.arango.POST_RAW(url, body, headers); - curl += "-X " + method + " "; - } - else if (method === 'PUT') { - response = internal.arango.PUT_RAW(url, body, headers); - curl += "-X " + method + " "; - } - else if (method === 'GET') { - response = internal.arango.GET_RAW(url, headers); - } - else if (method === 'DELETE') { - response = internal.arango.DELETE_RAW(url, headers); - curl += "-X " + method + " "; - } - else if (method === 'PATCH') { - response = internal.arango.PATCH_RAW(url, body, headers); - curl += "-X " + method + " "; - } - else if (method === 'HEAD') { - response = internal.arango.HEAD_RAW(url, headers); - curl += "-X " + method + " "; - } - else if (method === 'OPTION') { - response = internal.arango.OPTION_RAW(url, body, headers); - curl += "-X " + method + " "; - } - if (headers !== undefined && headers !== "") { - for (i in headers) { - if (headers.hasOwnProperty(i)) { - curl += "--header \'" + i + ": " + headers[i] + "\' "; - } + if (method === 'POST') { + response = exports.arango.POST_RAW(url, body, headers); + curl += "-X " + method + " "; + } + else if (method === 'PUT') { + response = exports.arango.PUT_RAW(url, body, headers); + curl += "-X " + method + " "; + } + else if (method === 'GET') { + response = exports.arango.GET_RAW(url, headers); + } + else if (method === 'DELETE') { + response = exports.arango.DELETE_RAW(url, headers); + curl += "-X " + method + " "; + } + else if (method === 'PATCH') { + response = exports.arango.PATCH_RAW(url, body, headers); + curl += "-X " + method + " "; + } + else if (method === 'HEAD') { + response = exports.arango.HEAD_RAW(url, headers); + curl += "-X " + method + " "; + } + else if (method === 'OPTION') { + response = exports.arango.OPTION_RAW(url, body, headers); + curl += "-X " + method + " "; + } + if (headers !== undefined && headers !== "") { + for (i in headers) { + if (headers.hasOwnProperty(i)) { + curl += "--header \'" + i + ": " + headers[i] + "\' "; } } + } - if (body !== undefined && body !== "") { - curl += "--data-binary @- "; - } + if (body !== undefined && body !== "") { + curl += "--data-binary @- "; + } - curl += "--dump - http://localhost:8529" + url; + curl += "--dump - http://localhost:8529" + url; - appender(curl + "\n"); + appender(curl + "\n"); - if (body !== undefined && body !== "" && body !== "undefined") { - appender(body + "\n"); - } + if (body !== undefined && body !== "" && body) { + appender(body + "\n"); + } - appender("\n"); + appender("\n"); - return response; - }; + return response; }; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief logs a raw response //////////////////////////////////////////////////////////////////////////////// - internal.appendRawResponse = function (appender) { - return function (response) { - var key; - var headers = response.headers; +exports.appendRawResponse = function (appender) { + return function (response) { + var key; + var headers = response.headers; - // generate header - appender("HTTP/1.1 " + headers['http/1.1'] + "\n"); + // generate header + appender("HTTP/1.1 " + headers['http/1.1'] + "\n"); - for (key in headers) { - if (headers.hasOwnProperty(key)) { - if (key !== 'http/1.1' && key !== 'server' && key !== 'connection' - && key !== 'content-length') { - appender(key + ": " + headers[key] + "\n"); - } + for (key in headers) { + if (headers.hasOwnProperty(key)) { + if (key !== 'http/1.1' && key !== 'server' && key !== 'connection' + && key !== 'content-length') { + appender(key + ": " + headers[key] + "\n"); } } + } + appender("\n"); + + // append body + if (response.body !== undefined) { + appender(exports.inspect(response.body)); appender("\n"); - - // append body - if (response.body !== undefined) { - appender(internal.inspect(response.body)); - appender("\n"); - } - }; + } }; +}; //////////////////////////////////////////////////////////////////////////////// /// @brief logs a response in JSON //////////////////////////////////////////////////////////////////////////////// - internal.appendJsonResponse = function (appender) { - return function (response) { - var rawAppend = internal.appendRawResponse(appender); +exports.appendJsonResponse = function (appender) { + return function (response) { + var rawAppend = exports.appendRawResponse(appender); - // copy original body (this is necessary because "response" is passed by reference) - var copy = response.body; - // overwrite body with parsed JSON && append - response.body = JSON.parse(response.body); - rawAppend(response); - // restore original body - response.body = copy; - }; + // copy original body (this is necessary because "response" is passed by reference) + var copy = response.body; + // overwrite body with parsed JSON && append + response.body = JSON.parse(response.body); + rawAppend(response); + // restore original body + response.body = copy; }; +}; // ----------------------------------------------------------------------------- // --SECTION-- public functions @@ -276,40 +273,39 @@ /// @brief log function //////////////////////////////////////////////////////////////////////////////// - internal.log = function (level, msg) { - internal.output(level, ": ", msg, "\n"); - }; +exports.log = function (level, msg) { + exports.output(level, ": ", msg, "\n"); +}; //////////////////////////////////////////////////////////////////////////////// /// @brief sprintf wrapper //////////////////////////////////////////////////////////////////////////////// - try { - if (window) { - internal.sprintf = function (format) { - var n = arguments.length; - if (n === 0) { - return ""; - } - if (n <= 1) { - return String(format); - } +try { + if (typeof window !== 'undefined') { + exports.sprintf = function (format) { + var n = arguments.length; + if (n === 0) { + return ""; + } + if (n <= 1) { + return String(format); + } - var i; - var args = [ ]; - for (i = 1; i < arguments.length; ++i) { - args.push(arguments[i]); - } - i = 0; + var i; + var args = [ ]; + for (i = 1; i < arguments.length; ++i) { + args.push(arguments[i]); + } + i = 0; - return format.replace(/%[dfs]/, function () { - return String(args[i++]); - }); - }; - } - } - catch (err) { + return format.replace(/%[dfs]/, function () { + return String(args[i++]); + }); + }; } +} +catch (e) {} }()); diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/client/client.js b/js/apps/system/_admin/aardvark/APP/frontend/js/client/client.js index 529415f9b4..309db04560 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/client/client.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/client/client.js @@ -1,4 +1,4 @@ -/*jshint globalstrict:true, -W051:true */ +/*jshint -W051:true */ /*global global:true, window, require */ 'use strict'; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoCollections.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoCollections.js index 8e3be113b1..9a5dac56e2 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoCollections.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoCollections.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, window, arangoCollectionModel, $, arangoHelper, data, _ */ +/*global Backbone, window, arangoCollectionModel, $, arangoHelper, data, _ */ (function() { "use strict"; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocument.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocument.js index 8f49bb9821..88d49c2a46 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocument.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocument.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint strict: false, unused: false */ -/*global require, exports, Backbone, window, arangoDocument, arangoDocumentModel, $, arangoHelper */ +/*global Backbone, window, arangoDocument, arangoDocumentModel, $, arangoHelper */ window.arangoDocument = Backbone.Collection.extend({ url: '/_api/document/', diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js index b7f87eaf9d..d2a07a0a45 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, window, Backbone, arangoDocumentModel, _, arangoHelper, $*/ +/*global window, Backbone, arangoDocumentModel, _, arangoHelper, $*/ (function() { "use strict"; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoQueries.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoQueries.js index 49b9a6c8d3..f8d7a321ae 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoQueries.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoQueries.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, activeUser, window, ArangoQuery, $, data, _, arangoHelper*/ +/*global Backbone, activeUser, window, ArangoQuery, $, data, _, arangoHelper*/ (function() { "use strict"; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoStatisticsCollection.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoStatisticsCollection.js index 75c92a6d42..b4137674fb 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoStatisticsCollection.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoStatisticsCollection.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, window */ +/*global Backbone, window */ window.StatisticsCollection = Backbone.Collection.extend({ model: window.Statistics, url: "/_admin/statistics" diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoStatisticsDescriptionCollection.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoStatisticsDescriptionCollection.js index 446e1cca9d..ed6bebdd15 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoStatisticsDescriptionCollection.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoStatisticsDescriptionCollection.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint strict: false, unused: false */ -/*global require, exports, Backbone, window */ +/*global Backbone, window */ window.StatisticsDescriptionCollection = Backbone.Collection.extend({ model: window.StatisticsDescription, url: "/_admin/statistics-description", diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/config/dygraphConfig.js b/js/apps/system/_admin/aardvark/APP/frontend/js/config/dygraphConfig.js index 36e21f3264..9d06ed04d5 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/config/dygraphConfig.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/config/dygraphConfig.js @@ -1,4 +1,4 @@ -/*global require, _, Dygraph, window, document */ +/*global _, Dygraph, window, document */ (function () { "use strict"; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/documentation/documentation.js b/js/apps/system/_admin/aardvark/APP/frontend/js/documentation/documentation.js index 40b7019b93..47c789cdcd 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/documentation/documentation.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/documentation/documentation.js @@ -1,5 +1,5 @@ /*jshint browser: true */ -/*global require, SwaggerUi, $, hljs*/ +/*global SwaggerUi, $, hljs*/ (function() { "use strict"; var internal = require("internal"); diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb-common.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb-common.js index bde28c7bef..4ad425f86f 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb-common.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb-common.js @@ -1,5 +1,5 @@ module.define("org/arangodb-common", function(exports, module) { -/*global require, module, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief JavaScript base module @@ -46,17 +46,10 @@ var mimetypes = require("org/arangodb/mimetypes").mimeTypes; /// @brief errors //////////////////////////////////////////////////////////////////////////////// -(function () { - 'use strict'; - var name; - - for (name in internal.errors) { - if (internal.errors.hasOwnProperty(name)) { - exports[name] = internal.errors[name].code; - } - } -}()); +Object.keys(internal.errors).forEach(function (key) { + exports[key] = internal.errors[key].code; +}); exports.errors = internal.errors; @@ -79,8 +72,6 @@ exports.ArangoError = internal.ArangoError; //////////////////////////////////////////////////////////////////////////////// exports.defineModule = function (path, file) { - 'use strict'; - var content; var m; var mc; @@ -109,8 +100,6 @@ exports.defineModule = function (path, file) { //////////////////////////////////////////////////////////////////////////////// exports.guessContentType = function (filename, defaultValue) { - 'use strict'; - var re = /\.([a-zA-Z0-9]+)$/; var match = re.exec(filename); @@ -149,8 +138,6 @@ exports.guessContentType = function (filename, defaultValue) { //////////////////////////////////////////////////////////////////////////////// exports.normalizeURL = function (path) { - 'use strict'; - var i; var n; var p; @@ -231,8 +218,6 @@ exports.inspect = internal.inspect; //////////////////////////////////////////////////////////////////////////////// exports.output = function () { - 'use strict'; - internal.output.apply(internal.output, arguments); }; @@ -265,8 +250,6 @@ exports.printObject = internal.printObject; //////////////////////////////////////////////////////////////////////////////// exports.printTable = function (list, columns, options) { - 'use strict'; - options = options || { }; if (options.totalString === undefined) { options.totalString = "%s document(s)\n"; @@ -417,8 +400,6 @@ exports.printTable = function (list, columns, options) { //////////////////////////////////////////////////////////////////////////////// exports.stringPadding = function (str, len, pad, dir) { - 'use strict'; - // yes, this is more code than new Array(length).join(chr), but it makes jslint happy function fill (length, chr) { var result = '', i; @@ -465,8 +446,6 @@ exports.stringPadding = function (str, len, pad, dir) { //////////////////////////////////////////////////////////////////////////////// exports.throwDownloadError = function (msg) { - 'use strict'; - throw new exports.ArangoError({ errorNum: exports.errors.ERROR_APPLICATION_DOWNLOAD_FAILED.code, errorMessage: exports.errors.ERROR_APPLICATION_DOWNLOAD_FAILED.message + ': ' + String(msg) @@ -478,8 +457,6 @@ exports.throwDownloadError = function (msg) { //////////////////////////////////////////////////////////////////////////////// exports.throwFileNotFound = function (msg) { - 'use strict'; - throw new exports.ArangoError({ errorNum: exports.errors.ERROR_FILE_NOT_FOUND.code, errorMessage: exports.errors.ERROR_FILE_NOT_FOUND.message + ': ' + String(msg) @@ -491,8 +468,6 @@ exports.throwFileNotFound = function (msg) { //////////////////////////////////////////////////////////////////////////////// exports.throwBadParameter = function (msg) { - 'use strict'; - throw new exports.ArangoError({ errorNum: exports.errors.ERROR_BAD_PARAMETER.code, errorMessage: exports.errors.ERROR_BAD_PARAMETER.message + ': ' + String(msg) @@ -504,8 +479,6 @@ exports.throwBadParameter = function (msg) { //////////////////////////////////////////////////////////////////////////////// exports.checkParameter = function (usage, descs, vars) { - 'use strict'; - var i; for (i = 0; i < descs.length; ++i) { diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb.js index 0a5fe02de9..181c8fde54 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb.js @@ -1,5 +1,5 @@ module.define("org/arangodb", function(exports, module) { -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief JavaScript base module @@ -31,13 +31,9 @@ module.define("org/arangodb", function(exports, module) { var internal = require("internal"); var common = require("org/arangodb-common"); -var key; - -for (key in common) { - if (common.hasOwnProperty(key)) { - exports[key] = common[key]; - } -} +Object.keys(common).forEach(function (key) { + exports[key] = common[key]; +}); // ----------------------------------------------------------------------------- // --SECTION-- MODULE EXPORTS diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/explainer.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/explainer.js index fd87cdcb6c..9551146ee0 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/explainer.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/explainer.js @@ -1,6 +1,5 @@ module.define("org/arangodb/aql/explainer", function(exports, module) { /*jshint strict: false, maxlen: 300 */ -/*global require, exports */ var db = require("org/arangodb").db, internal = require("internal"), @@ -14,7 +13,7 @@ if (typeof internal.printBrowser === "function") { /* set colors for output */ function setColors (useSystemColors) { - "use strict"; + 'use strict'; [ "COLOR_RESET", "COLOR_CYAN", "COLOR_BLUE", "COLOR_GREEN", "COLOR_MAGENTA", "COLOR_YELLOW", "COLOR_RED", "COLOR_WHITE", @@ -27,27 +26,27 @@ function setColors (useSystemColors) { /* colorizer and output helper functions */ function passthru (v) { - "use strict"; + 'use strict'; return v; } function keyword (v) { - "use strict"; + 'use strict'; return colors.COLOR_CYAN + v + colors.COLOR_RESET; } function annotation (v) { - "use strict"; + 'use strict'; return colors.COLOR_BLUE + v + colors.COLOR_RESET; } function value (v) { - "use strict"; + 'use strict'; return colors.COLOR_GREEN + v + colors.COLOR_RESET; } function variable (v) { - "use strict"; + 'use strict'; if (v[0] === "#") { return colors.COLOR_MAGENTA + v + colors.COLOR_RESET; } @@ -55,37 +54,37 @@ function variable (v) { } function func (v) { - "use strict"; + 'use strict'; return colors.COLOR_GREEN + v + colors.COLOR_RESET; } function collection (v) { - "use strict"; + 'use strict'; return colors.COLOR_RED + v + colors.COLOR_RESET; } function attribute (v) { - "use strict"; + 'use strict'; return "`" + colors.COLOR_YELLOW + v + colors.COLOR_RESET + "`"; } function header (v) { - "use strict"; + 'use strict'; return colors.COLOR_MAGENTA + v + colors.COLOR_RESET; } function section (v) { - "use strict"; + 'use strict'; return colors.COLOR_BOLD_BLUE + v + colors.COLOR_RESET; } function pad (n) { - "use strict"; + 'use strict'; return new Array(n).join(" "); } function wrap (str, width) { - "use strict"; + 'use strict'; var re = ".{1," + width + "}(\\s|$)|\\S+?(\\s|$)"; return str.match(new RegExp(re, "g")).join("\n"); } @@ -95,7 +94,7 @@ function wrap (str, width) { /* print query string */ function printQuery (query) { - "use strict"; + 'use strict'; print(section("Query string:")); print(" " + value(wrap(query, 100).replace(/\n/g, "\n ", query))); print(); @@ -103,7 +102,7 @@ function printQuery (query) { /* print write query modification flags */ function printModificationFlags (flags) { - "use strict"; + 'use strict'; if (flags === undefined) { return; } @@ -123,7 +122,7 @@ function printModificationFlags (flags) { /* print optimizer rules */ function printRules (rules) { - "use strict"; + 'use strict'; print(section("Optimization rules applied:")); if (rules.length === 0) { print(" " + value("none")); @@ -140,7 +139,7 @@ function printRules (rules) { /* print warnings */ function printWarnings (warnings) { - "use strict"; + 'use strict'; if (! Array.isArray(warnings) || warnings.length === 0) { return; } @@ -156,7 +155,7 @@ function printWarnings (warnings) { /* print indexes used */ function printIndexes (indexes) { - "use strict"; + 'use strict'; print(section("Indexes used:")); if (indexes.length === 0) { print(" " + value("none")); @@ -224,7 +223,7 @@ function printIndexes (indexes) { /* analzye and print execution plan */ function processQuery (query, explain) { - "use strict"; + 'use strict'; var nodes = { }, parents = { }, rootNode = null, @@ -584,7 +583,7 @@ function processQuery (query, explain) { /* the exposed function */ function explain (data, options) { - "use strict"; + 'use strict'; if (typeof data === "string") { data = { query: data }; } diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/functions.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/functions.js index 85293d1f99..4632314559 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/functions.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/functions.js @@ -1,6 +1,5 @@ module.define("org/arangodb/aql/functions", function(exports, module) { /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief AQL user functions management @@ -48,7 +47,7 @@ var ArangoError = arangodb.ArangoError; //////////////////////////////////////////////////////////////////////////////// var getStorage = function () { - "use strict"; + 'use strict'; var functions = db._collection("_aqlfunctions"); @@ -68,7 +67,7 @@ var getStorage = function () { //////////////////////////////////////////////////////////////////////////////// var getFiltered = function (group) { - "use strict"; + 'use strict'; var result = [ ]; @@ -97,7 +96,7 @@ var getFiltered = function (group) { //////////////////////////////////////////////////////////////////////////////// var validateName = function (name) { - "use strict"; + 'use strict'; if (typeof name !== 'string' || ! name.match(/^[a-zA-Z0-9_]+(::[a-zA-Z0-9_]+)+$/) || @@ -115,7 +114,7 @@ var validateName = function (name) { //////////////////////////////////////////////////////////////////////////////// var stringifyFunction = function (code, name) { - "use strict"; + 'use strict'; if (typeof code === 'function') { code = String(code) + "\n"; @@ -173,7 +172,7 @@ var stringifyFunction = function (code, name) { //////////////////////////////////////////////////////////////////////////////// var unregisterFunction = function (name) { - "use strict"; + 'use strict'; var func = null; @@ -221,7 +220,7 @@ var unregisterFunction = function (name) { //////////////////////////////////////////////////////////////////////////////// var unregisterFunctionsGroup = function (group) { - "use strict"; + 'use strict'; if (group.length === 0) { var err = new ArangoError(); @@ -388,7 +387,7 @@ var registerFunction = function (name, code, isDeterministic) { //////////////////////////////////////////////////////////////////////////////// var toArrayFunctions = function (group) { - "use strict"; + 'use strict'; var result = [ ]; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/queries.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/queries.js index e511d921b8..4e91fb6bf8 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/queries.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/aql/queries.js @@ -1,5 +1,5 @@ module.define("org/arangodb/aql/queries", function(exports, module) { -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief AQL query management @@ -40,8 +40,6 @@ var arangosh = require("org/arangodb/arangosh"); //////////////////////////////////////////////////////////////////////////////// exports.clearSlow = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.DELETE("/_api/query/slow", ""); @@ -55,8 +53,6 @@ exports.clearSlow = function () { //////////////////////////////////////////////////////////////////////////////// exports.slow = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.GET("/_api/query/slow", ""); @@ -70,8 +66,6 @@ exports.slow = function () { //////////////////////////////////////////////////////////////////////////////// exports.current = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.GET("/_api/query/current", ""); @@ -85,8 +79,6 @@ exports.current = function () { //////////////////////////////////////////////////////////////////////////////// exports.properties = function (config) { - 'use strict'; - var db = internal.db; var requestResult; @@ -108,8 +100,6 @@ exports.properties = function (config) { //////////////////////////////////////////////////////////////////////////////// exports.kill = function (id) { - 'use strict'; - if (typeof id === 'object' && id.hasOwnProperty('id')) { id = id.id; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection-common.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection-common.js index 8938ed46fa..1a194ea632 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection-common.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection-common.js @@ -1,6 +1,5 @@ module.define("org/arangodb/arango-collection-common", function(exports, module) { /*jshint strict: false, unused: false, maxlen: 200 */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoCollection diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection.js index b03446ddde..a74d62bf31 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection.js @@ -1,6 +1,5 @@ module.define("org/arangodb/arango-collection", function(exports, module) { /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoCollection diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-database.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-database.js index 5a059e562a..4fbc8fd6f3 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-database.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-database.js @@ -1,6 +1,5 @@ module.define("org/arangodb/arango-database", function(exports, module) { /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoDatabase diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-query-cursor.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-query-cursor.js index 6a5269d0e6..d2013083f6 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-query-cursor.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-query-cursor.js @@ -1,6 +1,6 @@ module.define("org/arangodb/arango-query-cursor", function(exports, module) { /*jshint strict: false */ -/*global require, exports, more:true */ +/*global more:true */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoQueryCursor diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-statement-common.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-statement-common.js index e018494325..3d7b487a2c 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-statement-common.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-statement-common.js @@ -1,6 +1,5 @@ module.define("org/arangodb/arango-statement-common", function(exports, module) { /*jshint strict: false */ -/*global exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Arango statements diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-statement.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-statement.js index c62708148c..627e494f14 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-statement.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-statement.js @@ -1,6 +1,5 @@ module.define("org/arangodb/arango-statement", function(exports, module) { /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoStatement diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arangosh.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arangosh.js index 24a04d0a0c..51ea4c5e56 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arangosh.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arangosh.js @@ -1,6 +1,5 @@ module.define("org/arangodb/arangosh", function(exports, module) { /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoShell client API diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/general-graph.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/general-graph.js index 43903e58f8..9b7e77a8bf 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/general-graph.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/general-graph.js @@ -1,6 +1,6 @@ module.define("org/arangodb/general-graph", function(exports, module) { /*jshint strict: false */ -/*global require, exports, ArangoClusterComm */ +/*global ArangoClusterComm */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph functionality diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph-blueprint.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph-blueprint.js index c8b82347f6..0fae8813e4 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph-blueprint.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph-blueprint.js @@ -1,6 +1,5 @@ module.define("org/arangodb/graph-blueprint", function(exports, module) { /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph functionality diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph-common.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph-common.js index 4e7bb6b5ad..e5ddea77ae 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph-common.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph-common.js @@ -1,6 +1,5 @@ module.define("org/arangodb/graph-common", function(exports, module) { /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph functionality diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph.js index 6e147874ed..2b11f0f06a 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph.js @@ -1,6 +1,5 @@ module.define("org/arangodb/graph", function(exports, module) { /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph functionality diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph/traversal.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph/traversal.js index 3b380e1b9e..723893b62f 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph/traversal.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/graph/traversal.js @@ -1,6 +1,6 @@ module.define("org/arangodb/graph/traversal", function(exports, module) { /*jshint strict: false, unused: false */ -/*global require, exports, ArangoClusterComm, AQL_QUERY_IS_KILLED */ +/*global ArangoClusterComm, AQL_QUERY_IS_KILLED */ //////////////////////////////////////////////////////////////////////////////// /// @brief Traversal "classes" diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/is.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/is.js index 2724a2de12..9ced9eb511 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/is.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/is.js @@ -1,5 +1,5 @@ module.define("org/arangodb/is", function(exports, module) { -/*global exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Check if something is something @@ -29,28 +29,24 @@ module.define("org/arangodb/is", function(exports, module) { //////////////////////////////////////////////////////////////////////////////// // Check if a value is not undefined or null -var existy = function (x) { - "use strict"; +function existy (x) { return x !== null && x !== undefined; -}; +} // Check if a value is undefined or null -var notExisty = function (x) { - "use strict"; +function notExisty (x) { return !existy(x); -}; +} // Check if a value is existy and not false -var truthy = function (x) { - "use strict"; +function truthy (x) { return (x !== false) && existy(x); -}; +} // Check if a value is not truthy -var falsy = function (x) { - "use strict"; +function falsy (x) { return !truthy(x); -}; +} // is.object, is.noObject, is.array, is.noArray... [ @@ -63,12 +59,11 @@ var falsy = function (x) { 'String', 'RegExp' ].forEach(function(type) { - "use strict"; - exports[type.toLowerCase()] = function(obj) { + exports[type.toLowerCase()] = function (obj) { return Object.prototype.toString.call(obj) === '[object '+type+']'; }; - exports["no" + type] = function(obj) { + exports["no" + type] = function (obj) { return Object.prototype.toString.call(obj) !== '[object '+type+']'; }; }); diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/mimetypes.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/mimetypes.js index afc4107012..372b2bdf66 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/mimetypes.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/mimetypes.js @@ -6,7 +6,6 @@ module.define("org/arangodb/mimetypes", function(exports, module) { vars: true, white: true, plusplus: true */ -/*global exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief auto-generated file generated from mimetypes.dat diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/replication.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/replication.js index fcc17b2875..8b1afbfc86 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/replication.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/replication.js @@ -1,5 +1,5 @@ module.define("org/arangodb/replication", function(exports, module) { -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Replication management @@ -47,8 +47,6 @@ var applier = { }; //////////////////////////////////////////////////////////////////////////////// logger.state = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.GET("/_api/replication/logger-state"); @@ -62,8 +60,6 @@ logger.state = function () { //////////////////////////////////////////////////////////////////////////////// applier.start = function (initialTick) { - 'use strict'; - var db = internal.db; var append = ""; @@ -82,8 +78,6 @@ applier.start = function (initialTick) { //////////////////////////////////////////////////////////////////////////////// applier.stop = applier.shutdown = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.PUT("/_api/replication/applier-stop", ""); @@ -97,8 +91,6 @@ applier.stop = applier.shutdown = function () { //////////////////////////////////////////////////////////////////////////////// applier.state = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.GET("/_api/replication/applier-state"); @@ -112,8 +104,6 @@ applier.state = function () { //////////////////////////////////////////////////////////////////////////////// applier.forget = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.DELETE("/_api/replication/applier-state"); @@ -127,8 +117,6 @@ applier.forget = function () { //////////////////////////////////////////////////////////////////////////////// applier.properties = function (config) { - 'use strict'; - var db = internal.db; var requestResult; @@ -154,8 +142,6 @@ applier.properties = function (config) { //////////////////////////////////////////////////////////////////////////////// var sync = function (config) { - 'use strict'; - var db = internal.db; var body = JSON.stringify(config || { }); @@ -171,8 +157,6 @@ var sync = function (config) { //////////////////////////////////////////////////////////////////////////////// var serverId = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.GET("/_api/replication/server-id"); diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/simple-query-common.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/simple-query-common.js index c3989474ee..9a71b5986f 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/simple-query-common.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/simple-query-common.js @@ -1,6 +1,5 @@ module.define("org/arangodb/simple-query-common", function(exports, module) { /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Arango Simple Query Language diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/simple-query.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/simple-query.js index 90126d9758..c85711afe3 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/simple-query.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/simple-query.js @@ -1,6 +1,5 @@ module.define("org/arangodb/simple-query", function(exports, module) { /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Arango Simple Query Language diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/tutorial.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/tutorial.js index 78eb60259a..b3f09fbe99 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/tutorial.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/tutorial.js @@ -1,6 +1,5 @@ module.define("org/arangodb/tutorial", function(exports, module) { /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Shell tutorial diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/shell/browser.js b/js/apps/system/_admin/aardvark/APP/frontend/js/shell/browser.js index bb1e7be6d8..86f017c40e 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/shell/browser.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/shell/browser.js @@ -1,5 +1,5 @@ -/*jshint strict: false, unused: false */ -/*global $, jqconsole, window, document */ +/*jshint node:false, browser:true, strict: false, unused: false */ +/*global global:true, $, jqconsole */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoDB web browser shell @@ -67,6 +67,10 @@ Module.prototype.moduleCache["/internal"] = new Module("/internal"); // --SECTION-- public variables // ----------------------------------------------------------------------------- +if (typeof global === 'undefined' && typeof window !== 'undefined') { + global = window; +} + //////////////////////////////////////////////////////////////////////////////// /// @addtogroup ArangoShell /// @{ @@ -76,7 +80,7 @@ Module.prototype.moduleCache["/internal"] = new Module("/internal"); /// @brief module //////////////////////////////////////////////////////////////////////////////// -var module = Module.prototype.moduleCache["/"] = new Module("/"); +global.module = Module.prototype.moduleCache["/"] = new Module("/"); //////////////////////////////////////////////////////////////////////////////// /// @} @@ -201,7 +205,7 @@ Module.prototype.require = function (path) { }; function require (path) { - return module.require(path); + return global.module.require(path); } //////////////////////////////////////////////////////////////////////////////// diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/_paginationView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/_paginationView.js index 41815de0ef..6350af5efe 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/_paginationView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/_paginationView.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, EJS, $, window, arangoHelper, templateEngine */ +/*global Backbone, EJS, $, window, arangoHelper, templateEngine */ (function() { "use strict"; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/appDocumentationView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/appDocumentationView.js index d32b7cdf97..55013a7def 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/appDocumentationView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/appDocumentationView.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, EJS, window, SwaggerUi, hljs, document, $, arango */ +/*global Backbone, EJS, window, SwaggerUi, hljs, document, $, arango */ /*global templateEngine*/ (function() { diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js index 8c30e6c12f..355bfac42f 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, window, exports, Backbone, EJS, $, templateEngine, arangoHelper, Joi*/ +/*global window, exports, Backbone, EJS, $, templateEngine, arangoHelper, Joi*/ (function() { "use strict"; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js index 5fcc049068..00c70d42dd 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, EJS, $, flush, window, arangoHelper, nv, d3, localStorage*/ +/*global Backbone, EJS, $, flush, window, arangoHelper, nv, d3, localStorage*/ /*global document, console, Dygraph, _,templateEngine */ (function () { diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js index 0dc29bf71c..5735a75a95 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, EJS, $, window, arangoHelper, jsoneditor, templateEngine */ +/*global Backbone, EJS, $, window, arangoHelper, jsoneditor, templateEngine */ /*global document, _ */ (function() { diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js index 51be713b83..383e63eef7 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, arangoHelper, _, $, window, arangoHelper, templateEngine, Joi, btoa */ +/*global arangoHelper, _, $, window, arangoHelper, templateEngine, Joi, btoa */ (function() { "use strict"; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxInstallView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxInstallView.js index ba5cadb567..382551bede 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxInstallView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxInstallView.js @@ -1,5 +1,5 @@ /*jshint browser: true */ -/*global require, $, Joi, _, alert, templateEngine*/ +/*global $, Joi, _, alert, templateEngine*/ (function() { "use strict"; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/loginView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/loginView.js index 604c7b6b26..58bee9350c 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/loginView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/loginView.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, EJS, arangoHelper, window, setTimeout, $, templateEngine*/ +/*global Backbone, EJS, arangoHelper, window, setTimeout, $, templateEngine*/ (function() { "use strict"; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryManagementView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryManagementView.js index e14de85797..4d09ea8d7f 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryManagementView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryManagementView.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, EJS, $, setTimeout, localStorage, ace, Storage, window, _ */ +/*global Backbone, EJS, $, setTimeout, localStorage, ace, Storage, window, _ */ /*global _, arangoHelper, templateEngine, jQuery, Joi*/ (function () { diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js index 0c162aa9f4..ac6d258e90 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, exports, Backbone, EJS, $, setTimeout, localStorage, ace, Storage, window, _, console */ +/*global Backbone, EJS, $, setTimeout, localStorage, ace, Storage, window, _, console */ /*global _, arangoHelper, templateEngine, jQuery, Joi, d3*/ (function () { diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/shellView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/shellView.js index 5c92f6dc2f..c92f3fe6ac 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/shellView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/shellView.js @@ -1,6 +1,6 @@ /*jshint browser: true, evil: true */ /*jshint unused: false */ -/*global require, exports, Backbone, EJS, $, window, ace, jqconsole, handler, help, location*/ +/*global Backbone, EJS, $, window, ace, jqconsole, handler, help, location*/ /*global templateEngine*/ (function() { diff --git a/js/apps/system/_admin/aardvark/APP/lib/defaultThumbnail.js b/js/apps/system/_admin/aardvark/APP/lib/defaultThumbnail.js index 1d991776cb..c168e78a8e 100644 --- a/js/apps/system/_admin/aardvark/APP/lib/defaultThumbnail.js +++ b/js/apps/system/_admin/aardvark/APP/lib/defaultThumbnail.js @@ -1,4 +1,4 @@ -/*global exports, appCollection*/ +/*global appCollection*/ //////////////////////////////////////////////////////////////////////////////// /// @brief The default thumbnail for foxx apps diff --git a/js/apps/system/_admin/aardvark/APP/lib/foxxes.js b/js/apps/system/_admin/aardvark/APP/lib/foxxes.js index f9b5ef1958..2ea93d34ec 100644 --- a/js/apps/system/_admin/aardvark/APP/lib/foxxes.js +++ b/js/apps/system/_admin/aardvark/APP/lib/foxxes.js @@ -1,4 +1,4 @@ -/*global exports, appCollection*/ +/*global appCollection*/ //////////////////////////////////////////////////////////////////////////////// /// @brief A TODO-List Foxx-Application written for ArangoDB diff --git a/js/apps/system/_admin/aardvark/APP/lib/swagger.js b/js/apps/system/_admin/aardvark/APP/lib/swagger.js index 8fc6491285..a8295bd56b 100644 --- a/js/apps/system/_admin/aardvark/APP/lib/swagger.js +++ b/js/apps/system/_admin/aardvark/APP/lib/swagger.js @@ -1,4 +1,3 @@ -/*global exports, require*/ //////////////////////////////////////////////////////////////////////////////// /// @brief functionality to expose API documentation for Foxx apps diff --git a/js/apps/system/_admin/aardvark/APP/models/configuration.js b/js/apps/system/_admin/aardvark/APP/models/configuration.js index 17bfd3565d..0c7e9fdb89 100644 --- a/js/apps/system/_admin/aardvark/APP/models/configuration.js +++ b/js/apps/system/_admin/aardvark/APP/models/configuration.js @@ -1,5 +1,4 @@ /*jslint indent: 2, nomen: true, maxlen: 100 */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief A configuration model for foxx templates diff --git a/js/apps/system/_admin/aardvark/APP/repositories/plans.js b/js/apps/system/_admin/aardvark/APP/repositories/plans.js index 1d89f9c9ec..f3724c78e9 100644 --- a/js/apps/system/_admin/aardvark/APP/repositories/plans.js +++ b/js/apps/system/_admin/aardvark/APP/repositories/plans.js @@ -1,4 +1,3 @@ -/*global require, exports*/ //////////////////////////////////////////////////////////////////////////////// /// @brief A TODO-List Foxx-Application written for ArangoDB diff --git a/js/apps/system/_admin/aardvark/APP/statistics.js b/js/apps/system/_admin/aardvark/APP/statistics.js index c0cc3a2e9b..7911b56d53 100644 --- a/js/apps/system/_admin/aardvark/APP/statistics.js +++ b/js/apps/system/_admin/aardvark/APP/statistics.js @@ -1,4 +1,4 @@ -/*global require, applicationContext, ArangoServerState, ArangoClusterInfo, ArangoClusterComm*/ +/*global applicationContext, ArangoServerState, ArangoClusterInfo, ArangoClusterComm*/ //////////////////////////////////////////////////////////////////////////////// /// @brief A Foxx.Controller to handle the statistics diff --git a/js/apps/system/_admin/aardvark/APP/test/specs/collections/foxxCollectionSpec.js b/js/apps/system/_admin/aardvark/APP/test/specs/collections/foxxCollectionSpec.js index 3d096861a1..a31ac83206 100644 --- a/js/apps/system/_admin/aardvark/APP/test/specs/collections/foxxCollectionSpec.js +++ b/js/apps/system/_admin/aardvark/APP/test/specs/collections/foxxCollectionSpec.js @@ -1,6 +1,6 @@ /*jshint browser: true */ /*jshint unused: false */ -/*global require, describe, beforeEach, it, expect, exports, Backbone, window, $, arangoLog */ +/*global describe, beforeEach, it, expect, exports, Backbone, window, $, arangoLog */ /*global runs, waitsFor, spyOn, jasmine */ (function () { "use strict"; diff --git a/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/commMock.js b/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/commMock.js index 60ed546142..851520cbfc 100644 --- a/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/commMock.js +++ b/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/commMock.js @@ -1,4 +1,4 @@ -/*jshint unused: false */ +/*jshint globalstrict:false, unused: false */ /*global document, window, d3*/ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/eventHelper.js b/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/eventHelper.js index 7e45cef4c2..04618d68a6 100644 --- a/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/eventHelper.js +++ b/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/eventHelper.js @@ -1,4 +1,4 @@ -/*jshint unused: false */ +/*jshint globalstrict:false, unused: false */ /*global document, window, $*/ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/mocks.js b/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/mocks.js index 6448506f77..ae821ea3c7 100644 --- a/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/mocks.js +++ b/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/mocks.js @@ -1,4 +1,4 @@ -/*jshint unused: false */ +/*jshint globalstrict:false, unused: false */ /*global document, window*/ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/objectsHelper.js b/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/objectsHelper.js index 30874286c4..55b3839671 100644 --- a/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/objectsHelper.js +++ b/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/objectsHelper.js @@ -1,4 +1,4 @@ -/*jshint unused: false */ +/*jshint globalstrict:false, unused: false */ /*global _, document, window*/ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/uiMatchers.js b/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/uiMatchers.js index 5434904487..607c5bde0f 100644 --- a/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/uiMatchers.js +++ b/js/apps/system/_admin/aardvark/APP/test/specs/graphViewer/helper/uiMatchers.js @@ -1,4 +1,4 @@ -/*jshint unused: false */ +/*jshint globalstrict:false, unused: false */ /*global expect, _, $ */ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/apps/system/_api/gharial/APP/gharial.js b/js/apps/system/_api/gharial/APP/gharial.js index 182706dd9b..564a7c7ee9 100644 --- a/js/apps/system/_api/gharial/APP/gharial.js +++ b/js/apps/system/_api/gharial/APP/gharial.js @@ -1,4 +1,4 @@ -/*global require, applicationContext*/ +/*global applicationContext*/ //////////////////////////////////////////////////////////////////////////////// /// @brief A Foxx.Controller to show all Foxx Applications diff --git a/js/apps/system/_system/cerberus/APP/cerberus.js b/js/apps/system/_system/cerberus/APP/cerberus.js index b89ebfee1e..553088839c 100644 --- a/js/apps/system/_system/cerberus/APP/cerberus.js +++ b/js/apps/system/_system/cerberus/APP/cerberus.js @@ -1,4 +1,4 @@ -/*global require, applicationContext */ +/*global applicationContext */ (function () { "use strict"; diff --git a/js/apps/system/_system/sessions/APP/app.js b/js/apps/system/_system/sessions/APP/app.js index 2457785c75..a9188b2bb3 100644 --- a/js/apps/system/_system/sessions/APP/app.js +++ b/js/apps/system/_system/sessions/APP/app.js @@ -1,4 +1,4 @@ -/*global require, applicationContext */ +/*global applicationContext */ (function () { 'use strict'; var _ = require('underscore'), diff --git a/js/apps/system/_system/sessions/APP/errors.js b/js/apps/system/_system/sessions/APP/errors.js index c189df0a54..d43887f1d9 100644 --- a/js/apps/system/_system/sessions/APP/errors.js +++ b/js/apps/system/_system/sessions/APP/errors.js @@ -1,5 +1,3 @@ -/*jshint globalstrict:true */ -/*global exports */ 'use strict'; function SessionNotFound(sid) { this.message = 'Session with session id ' + sid + ' not found.'; diff --git a/js/apps/system/_system/sessions/APP/setup.js b/js/apps/system/_system/sessions/APP/setup.js index 67f657a584..1c4476418d 100644 --- a/js/apps/system/_system/sessions/APP/setup.js +++ b/js/apps/system/_system/sessions/APP/setup.js @@ -1,4 +1,4 @@ -/*global require, applicationContext */ +/*global applicationContext */ (function () { 'use strict'; var db = require('org/arangodb').db, diff --git a/js/apps/system/_system/sessions/APP/storage.js b/js/apps/system/_system/sessions/APP/storage.js index bee6adc8cd..6a140303ca 100644 --- a/js/apps/system/_system/sessions/APP/storage.js +++ b/js/apps/system/_system/sessions/APP/storage.js @@ -1,4 +1,4 @@ -/*global require, exports, applicationContext */ +/*global applicationContext */ (function () { 'use strict'; var _ = require('underscore'), diff --git a/js/apps/system/_system/sessions/APP/test/errors.js b/js/apps/system/_system/sessions/APP/test/errors.js index f6f2e6c92a..b9f0c85c4c 100644 --- a/js/apps/system/_system/sessions/APP/test/errors.js +++ b/js/apps/system/_system/sessions/APP/test/errors.js @@ -1,4 +1,4 @@ -/*global require, describe, it */ +/*global describe, it */ (function () { 'use strict'; var expect = require('expect.js'), diff --git a/js/apps/system/_system/sessions/APP/test/setup.js b/js/apps/system/_system/sessions/APP/test/setup.js index a8672a319b..f046ce0188 100644 --- a/js/apps/system/_system/sessions/APP/test/setup.js +++ b/js/apps/system/_system/sessions/APP/test/setup.js @@ -1,4 +1,4 @@ -/*global require, module, describe, it, beforeEach */ +/*global describe, it, beforeEach */ (function () { 'use strict'; var sinon = require('sinon'), diff --git a/js/apps/system/_system/simple-auth/APP/auth.js b/js/apps/system/_system/simple-auth/APP/auth.js index 32459ca220..b35816a83d 100644 --- a/js/apps/system/_system/simple-auth/APP/auth.js +++ b/js/apps/system/_system/simple-auth/APP/auth.js @@ -1,4 +1,4 @@ -/*global require, exports, applicationContext */ +/*global applicationContext */ (function () { 'use strict'; var crypto = require('org/arangodb/crypto'), diff --git a/js/apps/system/_system/simple-auth/APP/test/hashPassword.js b/js/apps/system/_system/simple-auth/APP/test/hashPassword.js index 8a10dfd192..ce2d0c9f10 100644 --- a/js/apps/system/_system/simple-auth/APP/test/hashPassword.js +++ b/js/apps/system/_system/simple-auth/APP/test/hashPassword.js @@ -1,4 +1,4 @@ -/*global require, module, describe, it, beforeEach */ +/*global describe, it, beforeEach */ (function () { 'use strict'; var sinon = require('sinon'), diff --git a/js/apps/system/_system/simple-auth/APP/test/verifyPassword.js b/js/apps/system/_system/simple-auth/APP/test/verifyPassword.js index 819418d348..b71c6a279d 100644 --- a/js/apps/system/_system/simple-auth/APP/test/verifyPassword.js +++ b/js/apps/system/_system/simple-auth/APP/test/verifyPassword.js @@ -1,4 +1,4 @@ -/*global require, module, describe, it, beforeEach */ +/*global describe, it, beforeEach */ (function () { 'use strict'; var sinon = require('sinon'), diff --git a/js/apps/system/_system/users/APP/errors.js b/js/apps/system/_system/users/APP/errors.js index 3477464f2f..74dcfb1ff1 100644 --- a/js/apps/system/_system/users/APP/errors.js +++ b/js/apps/system/_system/users/APP/errors.js @@ -1,4 +1,3 @@ -/*global exports */ (function () { 'use strict'; function UserNotFound(uid) { diff --git a/js/apps/system/_system/users/APP/setup.js b/js/apps/system/_system/users/APP/setup.js index 707341ae48..218713f926 100644 --- a/js/apps/system/_system/users/APP/setup.js +++ b/js/apps/system/_system/users/APP/setup.js @@ -1,4 +1,4 @@ -/*global require, applicationContext */ +/*global applicationContext */ (function () { 'use strict'; var db = require('org/arangodb').db, diff --git a/js/apps/system/_system/users/APP/storage.js b/js/apps/system/_system/users/APP/storage.js index 72d561db61..9513b622ff 100644 --- a/js/apps/system/_system/users/APP/storage.js +++ b/js/apps/system/_system/users/APP/storage.js @@ -1,4 +1,4 @@ -/*global require, exports, applicationContext */ +/*global applicationContext */ (function () { 'use strict'; var _ = require('underscore'), diff --git a/js/apps/system/_system/users/APP/test/errors.js b/js/apps/system/_system/users/APP/test/errors.js index c1d3ba2b1c..34bf08f756 100644 --- a/js/apps/system/_system/users/APP/test/errors.js +++ b/js/apps/system/_system/users/APP/test/errors.js @@ -1,4 +1,4 @@ -/*global require, describe, it */ +/*global describe, it */ (function () { 'use strict'; var expect = require('expect.js'), diff --git a/js/apps/system/_system/users/APP/test/setup.js b/js/apps/system/_system/users/APP/test/setup.js index d76138d570..8dd9064c45 100644 --- a/js/apps/system/_system/users/APP/test/setup.js +++ b/js/apps/system/_system/users/APP/test/setup.js @@ -1,4 +1,4 @@ -/*global require, module, describe, it, beforeEach */ +/*global describe, it, beforeEach */ (function () { 'use strict'; var sinon = require('sinon'), diff --git a/js/client/bootstrap/module-internal.js b/js/client/bootstrap/module-internal.js index cfe9ea0cdf..e108bc925b 100644 --- a/js/client/bootstrap/module-internal.js +++ b/js/client/bootstrap/module-internal.js @@ -1,5 +1,4 @@ -/*jshint globalstrict:true, -W051:true */ -/*global global, require */ +/*jshint -W051:true */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/client.js b/js/client/client.js index 529415f9b4..309db04560 100644 --- a/js/client/client.js +++ b/js/client/client.js @@ -1,4 +1,4 @@ -/*jshint globalstrict:true, -W051:true */ +/*jshint -W051:true */ /*global global:true, window, require */ 'use strict'; diff --git a/js/client/modules/org/arangodb.js b/js/client/modules/org/arangodb.js index efd7836d82..076db20b67 100644 --- a/js/client/modules/org/arangodb.js +++ b/js/client/modules/org/arangodb.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief JavaScript base module @@ -30,13 +30,9 @@ var internal = require("internal"); var common = require("org/arangodb-common"); -var key; - -for (key in common) { - if (common.hasOwnProperty(key)) { - exports[key] = common[key]; - } -} +Object.keys(common).forEach(function (key) { + exports[key] = common[key]; +}); // ----------------------------------------------------------------------------- // --SECTION-- MODULE EXPORTS diff --git a/js/client/modules/org/arangodb/actions.js b/js/client/modules/org/arangodb/actions.js index ea34a10002..06f4d04213 100644 --- a/js/client/modules/org/arangodb/actions.js +++ b/js/client/modules/org/arangodb/actions.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief JavaScript actions module diff --git a/js/client/modules/org/arangodb/api/graph.js b/js/client/modules/org/arangodb/api/graph.js index 8b4777cc1f..96c72595f2 100644 --- a/js/client/modules/org/arangodb/api/graph.js +++ b/js/client/modules/org/arangodb/api/graph.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph functionality diff --git a/js/client/modules/org/arangodb/aql/queries.js b/js/client/modules/org/arangodb/aql/queries.js index cc6f632526..6106551a96 100644 --- a/js/client/modules/org/arangodb/aql/queries.js +++ b/js/client/modules/org/arangodb/aql/queries.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief AQL query management @@ -39,8 +39,6 @@ var arangosh = require("org/arangodb/arangosh"); //////////////////////////////////////////////////////////////////////////////// exports.clearSlow = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.DELETE("/_api/query/slow", ""); @@ -54,8 +52,6 @@ exports.clearSlow = function () { //////////////////////////////////////////////////////////////////////////////// exports.slow = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.GET("/_api/query/slow", ""); @@ -69,8 +65,6 @@ exports.slow = function () { //////////////////////////////////////////////////////////////////////////////// exports.current = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.GET("/_api/query/current", ""); @@ -84,8 +78,6 @@ exports.current = function () { //////////////////////////////////////////////////////////////////////////////// exports.properties = function (config) { - 'use strict'; - var db = internal.db; var requestResult; @@ -107,8 +99,6 @@ exports.properties = function (config) { //////////////////////////////////////////////////////////////////////////////// exports.kill = function (id) { - 'use strict'; - if (typeof id === 'object' && id.hasOwnProperty('id')) { id = id.id; diff --git a/js/client/modules/org/arangodb/arango-collection.js b/js/client/modules/org/arangodb/arango-collection.js index 7db6b93d6c..cdd3747190 100644 --- a/js/client/modules/org/arangodb/arango-collection.js +++ b/js/client/modules/org/arangodb/arango-collection.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoCollection diff --git a/js/client/modules/org/arangodb/arango-database.js b/js/client/modules/org/arangodb/arango-database.js index c269318cb3..762084bc0c 100644 --- a/js/client/modules/org/arangodb/arango-database.js +++ b/js/client/modules/org/arangodb/arango-database.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoDatabase diff --git a/js/client/modules/org/arangodb/arango-query-cursor.js b/js/client/modules/org/arangodb/arango-query-cursor.js index 727b78e459..8d81e751b5 100644 --- a/js/client/modules/org/arangodb/arango-query-cursor.js +++ b/js/client/modules/org/arangodb/arango-query-cursor.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, exports, more:true */ +/*global more:true */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoQueryCursor diff --git a/js/client/modules/org/arangodb/arango-statement.js b/js/client/modules/org/arangodb/arango-statement.js index 7f93ce2d6b..2c7166f28b 100644 --- a/js/client/modules/org/arangodb/arango-statement.js +++ b/js/client/modules/org/arangodb/arango-statement.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoStatement diff --git a/js/client/modules/org/arangodb/arangosh.js b/js/client/modules/org/arangodb/arangosh.js index 28a1d46bd7..cb78f7373b 100644 --- a/js/client/modules/org/arangodb/arangosh.js +++ b/js/client/modules/org/arangodb/arangosh.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoShell client API diff --git a/js/client/modules/org/arangodb/cluster.js b/js/client/modules/org/arangodb/cluster.js index 93a8ced257..ddff9a9c61 100644 --- a/js/client/modules/org/arangodb/cluster.js +++ b/js/client/modules/org/arangodb/cluster.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoShell client API for cluster operation @@ -32,7 +31,7 @@ var arangosh = require("org/arangodb/arangosh"); var db = require("org/arangodb").db; function Planner (userConfig) { - "use strict"; + 'use strict'; if (typeof userConfig !== "object") { throw "userConfig must be an object"; } @@ -48,7 +47,7 @@ Planner.prototype.getPlan = function () { }; function Kickstarter (clusterPlan, myname) { - "use strict"; + 'use strict'; if (typeof clusterPlan !== "object") { throw "clusterPlan must be an object"; } @@ -62,7 +61,7 @@ function Kickstarter (clusterPlan, myname) { } Kickstarter.prototype.launch = function () { - "use strict"; + 'use strict'; var r = db._connection.POST("/_admin/clusterDispatch", JSON.stringify({"action": "launch", "clusterPlan": this.clusterPlan, @@ -72,7 +71,7 @@ Kickstarter.prototype.launch = function () { }; Kickstarter.prototype.shutdown = function () { - "use strict"; + 'use strict'; var r = db._connection.POST("/_admin/clusterDispatch", JSON.stringify({"action": "shutdown", "clusterPlan": this.clusterPlan, @@ -82,7 +81,7 @@ Kickstarter.prototype.shutdown = function () { }; Kickstarter.prototype.relaunch = function () { - "use strict"; + 'use strict'; var r = db._connection.POST("/_admin/clusterDispatch", JSON.stringify({"action": "relaunch", "clusterPlan": this.clusterPlan, @@ -92,7 +91,7 @@ Kickstarter.prototype.relaunch = function () { }; Kickstarter.prototype.cleanup = function () { - "use strict"; + 'use strict'; var r = db._connection.POST("/_admin/clusterDispatch", JSON.stringify({"action": "cleanup", "clusterPlan": this.clusterPlan, @@ -101,7 +100,7 @@ Kickstarter.prototype.cleanup = function () { }; Kickstarter.prototype.isHealthy = function () { - "use strict"; + 'use strict'; var r = db._connection.POST("/_admin/clusterDispatch", JSON.stringify({"action": "isHealthy", "clusterPlan": this.clusterPlan, @@ -111,7 +110,7 @@ Kickstarter.prototype.isHealthy = function () { }; Kickstarter.prototype.upgrade = function (username, password) { - "use strict"; + 'use strict'; if (username === undefined || password === undefined) { username = "root"; password = ""; diff --git a/js/client/modules/org/arangodb/configuration.js b/js/client/modules/org/arangodb/configuration.js index db99898aed..22e527798f 100644 --- a/js/client/modules/org/arangodb/configuration.js +++ b/js/client/modules/org/arangodb/configuration.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief global configurations diff --git a/js/client/modules/org/arangodb/foxx/manager.js b/js/client/modules/org/arangodb/foxx/manager.js index ba6f5d05cc..346cedc617 100644 --- a/js/client/modules/org/arangodb/foxx/manager.js +++ b/js/client/modules/org/arangodb/foxx/manager.js @@ -1,5 +1,4 @@ /*jshint unused: false */ -/*global require, exports*/ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoDB Application Launcher @@ -31,7 +30,7 @@ //////////////////////////////////////////////////////////////////////////////// (function() { - "use strict"; + 'use strict'; // ----------------------------------------------------------------------------- // --SECTION-- imports diff --git a/js/client/modules/org/arangodb/graph-blueprint.js b/js/client/modules/org/arangodb/graph-blueprint.js index 7e8e7c2409..254fa38290 100644 --- a/js/client/modules/org/arangodb/graph-blueprint.js +++ b/js/client/modules/org/arangodb/graph-blueprint.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph functionality diff --git a/js/client/modules/org/arangodb/replication.js b/js/client/modules/org/arangodb/replication.js index 1c3881f6f9..b1db1daa56 100644 --- a/js/client/modules/org/arangodb/replication.js +++ b/js/client/modules/org/arangodb/replication.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Replication management @@ -46,8 +46,6 @@ var applier = { }; //////////////////////////////////////////////////////////////////////////////// logger.state = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.GET("/_api/replication/logger-state"); @@ -61,8 +59,6 @@ logger.state = function () { //////////////////////////////////////////////////////////////////////////////// applier.start = function (initialTick) { - 'use strict'; - var db = internal.db; var append = ""; @@ -81,8 +77,6 @@ applier.start = function (initialTick) { //////////////////////////////////////////////////////////////////////////////// applier.stop = applier.shutdown = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.PUT("/_api/replication/applier-stop", ""); @@ -96,8 +90,6 @@ applier.stop = applier.shutdown = function () { //////////////////////////////////////////////////////////////////////////////// applier.state = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.GET("/_api/replication/applier-state"); @@ -111,8 +103,6 @@ applier.state = function () { //////////////////////////////////////////////////////////////////////////////// applier.forget = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.DELETE("/_api/replication/applier-state"); @@ -126,8 +116,6 @@ applier.forget = function () { //////////////////////////////////////////////////////////////////////////////// applier.properties = function (config) { - 'use strict'; - var db = internal.db; var requestResult; @@ -153,8 +141,6 @@ applier.properties = function (config) { //////////////////////////////////////////////////////////////////////////////// var sync = function (config) { - 'use strict'; - var db = internal.db; var body = JSON.stringify(config || { }); @@ -170,8 +156,6 @@ var sync = function (config) { //////////////////////////////////////////////////////////////////////////////// var serverId = function () { - 'use strict'; - var db = internal.db; var requestResult = db._connection.GET("/_api/replication/server-id"); diff --git a/js/client/modules/org/arangodb/simple-query.js b/js/client/modules/org/arangodb/simple-query.js index 501b8fbd76..68786b015f 100644 --- a/js/client/modules/org/arangodb/simple-query.js +++ b/js/client/modules/org/arangodb/simple-query.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Arango Simple Query Language diff --git a/js/client/modules/org/arangodb/tasks.js b/js/client/modules/org/arangodb/tasks.js index ef33b77d53..99ffdbc5f1 100644 --- a/js/client/modules/org/arangodb/tasks.js +++ b/js/client/modules/org/arangodb/tasks.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Tasks diff --git a/js/client/modules/org/arangodb/tutorial.js b/js/client/modules/org/arangodb/tutorial.js index 4c870ea4b1..4e506001e9 100644 --- a/js/client/modules/org/arangodb/tutorial.js +++ b/js/client/modules/org/arangodb/tutorial.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Shell tutorial diff --git a/js/client/modules/org/arangodb/users.js b/js/client/modules/org/arangodb/users.js index 5badc362aa..0f84bec380 100644 --- a/js/client/modules/org/arangodb/users.js +++ b/js/client/modules/org/arangodb/users.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief User management diff --git a/js/client/tests/auth.js b/js/client/tests/auth.js index ae9d96373b..ffe97c94b3 100644 --- a/js/client/tests/auth.js +++ b/js/client/tests/auth.js @@ -1,4 +1,5 @@ -/*global require, fail, assertTrue */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the authentication @@ -41,7 +42,7 @@ var users = require("org/arangodb/users"); //////////////////////////////////////////////////////////////////////////////// function AuthSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/tests/shell-changeMode-noncluster-disabled.js b/js/client/tests/shell-changeMode-noncluster-disabled.js index c82b9d96af..a3473fbeda 100644 --- a/js/client/tests/shell-changeMode-noncluster-disabled.js +++ b/js/client/tests/shell-changeMode-noncluster-disabled.js @@ -1,4 +1,5 @@ -/*global require, assertTrue */ +/*jshint globalstrict:false, strict:false */ +/*global assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for client-specific functionality @@ -35,7 +36,7 @@ var db = require("org/arangodb").db; //////////////////////////////////////////////////////////////////////////////// function changeOperationModePositiveCaseTestSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/tests/shell-client.js b/js/client/tests/shell-client.js index 4ae558e67b..d76c968aa8 100644 --- a/js/client/tests/shell-client.js +++ b/js/client/tests/shell-client.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, assertNotEqual, +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertNotEqual, print, print_plain, COMPARE_STRING, NORMALIZE_STRING, help, start_pager, stop_pager, start_pretty_print, stop_pretty_print, start_color_print, stop_color_print */ @@ -37,7 +38,7 @@ var db = require("org/arangodb").db; //////////////////////////////////////////////////////////////////////////////// function clientTestSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/tests/shell-download.js b/js/client/tests/shell-download.js index fbe27dafa5..730a8a7a84 100644 --- a/js/client/tests/shell-download.js +++ b/js/client/tests/shell-download.js @@ -1,5 +1,5 @@ -/*jshint strict: true, sub: true */ -/*global require, fail, assertEqual, assertTrue, assertFalse, assertNotEqual, arango */ +/*jshint globalstrict:false, strict:false, sub: true */ +/*global fail, assertEqual, assertTrue, assertFalse, assertNotEqual, arango */ //////////////////////////////////////////////////////////////////////////////// /// @brief test download function @@ -42,7 +42,7 @@ var fs = require("fs"); //////////////////////////////////////////////////////////////////////////////// function DownloadSuite () { - "use strict"; + 'use strict'; var tempDir; var tempName; diff --git a/js/client/tests/shell-endpoints.js b/js/client/tests/shell-endpoints.js index f8a44230f1..c160b1f28a 100644 --- a/js/client/tests/shell-endpoints.js +++ b/js/client/tests/shell-endpoints.js @@ -1,4 +1,5 @@ -/*global require, fail, assertTrue, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertTrue, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the endpoints @@ -43,7 +44,7 @@ var originalEndpoint = arango.getEndpoint().replace(/localhost/, '127.0.0.1'); //////////////////////////////////////////////////////////////////////////////// function EndpointsSuite () { - "use strict"; + 'use strict'; var cleanupEndpoints = function () { db._useDatabase("_system"); diff --git a/js/client/tests/shell-fm.js b/js/client/tests/shell-fm.js index 39966127fa..79f7632034 100644 --- a/js/client/tests/shell-fm.js +++ b/js/client/tests/shell-fm.js @@ -1,4 +1,5 @@ -/*global require, fail, assertTrue, assertFalse, assertEqual, assertMatch, assertNotNull */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertTrue, assertFalse, assertEqual, assertMatch, assertNotNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the foxx manager @@ -41,7 +42,7 @@ var db = require("internal").db; //////////////////////////////////////////////////////////////////////////////// function FoxxManagerSuite () { - "use strict"; + 'use strict'; function inList (list, name) { var i; diff --git a/js/client/tests/shell-foxx-manager-spec.js b/js/client/tests/shell-foxx-manager-spec.js index 1ad9fef65b..318505bf2e 100644 --- a/js/client/tests/shell-foxx-manager-spec.js +++ b/js/client/tests/shell-foxx-manager-spec.js @@ -1,5 +1,5 @@ -/*jshint globalstrict: true */ -/*global module, require, describe, beforeEach, afterEach, it, expect*/ +/*jshint globalstrict:false, strict:false, globalstrict: true */ +/*global describe, beforeEach, afterEach, it, expect*/ //////////////////////////////////////////////////////////////////////////////// /// @brief Spec for foxx manager @@ -28,7 +28,7 @@ /// @author Copyright 2014, ArangoDB GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -"use strict"; +'use strict'; var FoxxManager = require("org/arangodb/foxx/manager"); var fs = require("fs"); diff --git a/js/client/tests/shell-noChangeMode-noncluster.js b/js/client/tests/shell-noChangeMode-noncluster.js index 67dbeb788c..d206e08a0f 100644 --- a/js/client/tests/shell-noChangeMode-noncluster.js +++ b/js/client/tests/shell-noChangeMode-noncluster.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for client-specific functionality @@ -36,7 +37,7 @@ var db = arangodb.db; //////////////////////////////////////////////////////////////////////////////// function changeOperationModeNegativeCaseTestSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/tests/shell-request.js b/js/client/tests/shell-request.js index 13519d926a..f94fc7e32f 100644 --- a/js/client/tests/shell-request.js +++ b/js/client/tests/shell-request.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, arango, Buffer */ +/*jshint globalstrict:false, strict:false */ +/*global arango, Buffer */ //////////////////////////////////////////////////////////////////////////////// /// @brief test request module @@ -44,7 +44,7 @@ var qs = require('qs'); //////////////////////////////////////////////////////////////////////////////// function RequestSuite () { - "use strict"; + 'use strict'; var buildUrl = function (append, base) { base = base === false ? '' : '/_admin/echo'; append = append || ''; diff --git a/js/common/bootstrap/errors.js b/js/common/bootstrap/errors.js index 003512792d..cfce39b3e2 100644 --- a/js/common/bootstrap/errors.js +++ b/js/common/bootstrap/errors.js @@ -1,12 +1,11 @@ /*jshint maxlen: 240 */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief auto-generated file generated from errors.dat //////////////////////////////////////////////////////////////////////////////// (function () { - "use strict"; + 'use strict'; var internal = require("internal"); internal.errors = { diff --git a/js/common/bootstrap/module-console.js b/js/common/bootstrap/module-console.js index b76f269f0d..349ce4266f 100644 --- a/js/common/bootstrap/module-console.js +++ b/js/common/bootstrap/module-console.js @@ -1,5 +1,5 @@ -/*jshint globalstrict:true, -W051:true */ -/*global global, require, jqconsole, Symbol */ +/*jshint -W051:true */ +/*global jqconsole, Symbol */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/bootstrap/module-fs.js b/js/common/bootstrap/module-fs.js index c045a91ac8..52586f8b3b 100644 --- a/js/common/bootstrap/module-fs.js +++ b/js/common/bootstrap/module-fs.js @@ -1,5 +1,4 @@ -/*jshint globalstrict:true, -W051:true */ -/*global global, require */ +/*jshint -W051:true */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/bootstrap/module-internal.js b/js/common/bootstrap/module-internal.js index 810897d7c6..df1fc34860 100644 --- a/js/common/bootstrap/module-internal.js +++ b/js/common/bootstrap/module-internal.js @@ -1,5 +1,4 @@ -/*jshint esnext:true, globalstrict:true, -W051:true */ -/*global global, require */ +/*jshint esnext:true, -W051:true */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/bootstrap/modules.js b/js/common/bootstrap/modules.js index b49276276d..d5fee22cf3 100644 --- a/js/common/bootstrap/modules.js +++ b/js/common/bootstrap/modules.js @@ -1,5 +1,4 @@ -/*jshint globalstrict:true, -W051:true */ -/*global global, require */ +/*jshint -W051:true */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/bootstrap/monkeypatches.js b/js/common/bootstrap/monkeypatches.js index 1dff30f91a..1a617a7ecf 100644 --- a/js/common/bootstrap/monkeypatches.js +++ b/js/common/bootstrap/monkeypatches.js @@ -1,4 +1,3 @@ -/*jshint globalstrict:true */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/modules/jasmine.js b/js/common/modules/jasmine.js index 0c3ba0688b..e3bf8b77dc 100755 --- a/js/common/modules/jasmine.js +++ b/js/common/modules/jasmine.js @@ -1,4 +1,4 @@ -/*global module, require, exports, print */ +/*global print */ /** Jasmine Wrapper * diff --git a/js/common/modules/jasmine/reporter.js b/js/common/modules/jasmine/reporter.js index b6a0b2d6ef..8ba3bddddb 100644 --- a/js/common/modules/jasmine/reporter.js +++ b/js/common/modules/jasmine/reporter.js @@ -1,4 +1,4 @@ -/*global module, require, exports, print, printf */ +/*global print, printf */ // Reporter // progress [default]: Dots diff --git a/js/common/modules/jsunity.js b/js/common/modules/jsunity.js index 08710fadd5..e8e0829f13 100644 --- a/js/common/modules/jsunity.js +++ b/js/common/modules/jsunity.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief JSUnity wrapper /// diff --git a/js/common/modules/loadtestrunner.js b/js/common/modules/loadtestrunner.js index 6fc5f2afb0..8f3aafd1e6 100644 --- a/js/common/modules/loadtestrunner.js +++ b/js/common/modules/loadtestrunner.js @@ -1,5 +1,3 @@ -/*global require, exports -*/ var measurements = ["time", "ast optimization", "plan instanciation", @@ -9,7 +7,7 @@ var measurements = ["time", "initialization"]; var loadTestRunner = function (tests, options, testMethods) { - "use strict"; + 'use strict'; // declare some useful modules and functions var internal = require("internal"), time = internal.time, diff --git a/js/common/modules/org/arangodb-common.js b/js/common/modules/org/arangodb-common.js index b4c8f4a31a..a99ecbd373 100644 --- a/js/common/modules/org/arangodb-common.js +++ b/js/common/modules/org/arangodb-common.js @@ -1,4 +1,4 @@ -/*global require, module, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief JavaScript base module @@ -45,17 +45,10 @@ var mimetypes = require("org/arangodb/mimetypes").mimeTypes; /// @brief errors //////////////////////////////////////////////////////////////////////////////// -(function () { - 'use strict'; - var name; - - for (name in internal.errors) { - if (internal.errors.hasOwnProperty(name)) { - exports[name] = internal.errors[name].code; - } - } -}()); +Object.keys(internal.errors).forEach(function (key) { + exports[key] = internal.errors[key].code; +}); exports.errors = internal.errors; @@ -78,8 +71,6 @@ exports.ArangoError = internal.ArangoError; //////////////////////////////////////////////////////////////////////////////// exports.defineModule = function (path, file) { - 'use strict'; - var content; var m; var mc; @@ -108,8 +99,6 @@ exports.defineModule = function (path, file) { //////////////////////////////////////////////////////////////////////////////// exports.guessContentType = function (filename, defaultValue) { - 'use strict'; - var re = /\.([a-zA-Z0-9]+)$/; var match = re.exec(filename); @@ -148,8 +137,6 @@ exports.guessContentType = function (filename, defaultValue) { //////////////////////////////////////////////////////////////////////////////// exports.normalizeURL = function (path) { - 'use strict'; - var i; var n; var p; @@ -230,8 +217,6 @@ exports.inspect = internal.inspect; //////////////////////////////////////////////////////////////////////////////// exports.output = function () { - 'use strict'; - internal.output.apply(internal.output, arguments); }; @@ -264,8 +249,6 @@ exports.printObject = internal.printObject; //////////////////////////////////////////////////////////////////////////////// exports.printTable = function (list, columns, options) { - 'use strict'; - options = options || { }; if (options.totalString === undefined) { options.totalString = "%s document(s)\n"; @@ -416,8 +399,6 @@ exports.printTable = function (list, columns, options) { //////////////////////////////////////////////////////////////////////////////// exports.stringPadding = function (str, len, pad, dir) { - 'use strict'; - // yes, this is more code than new Array(length).join(chr), but it makes jslint happy function fill (length, chr) { var result = '', i; @@ -464,8 +445,6 @@ exports.stringPadding = function (str, len, pad, dir) { //////////////////////////////////////////////////////////////////////////////// exports.throwDownloadError = function (msg) { - 'use strict'; - throw new exports.ArangoError({ errorNum: exports.errors.ERROR_APPLICATION_DOWNLOAD_FAILED.code, errorMessage: exports.errors.ERROR_APPLICATION_DOWNLOAD_FAILED.message + ': ' + String(msg) @@ -477,8 +456,6 @@ exports.throwDownloadError = function (msg) { //////////////////////////////////////////////////////////////////////////////// exports.throwFileNotFound = function (msg) { - 'use strict'; - throw new exports.ArangoError({ errorNum: exports.errors.ERROR_FILE_NOT_FOUND.code, errorMessage: exports.errors.ERROR_FILE_NOT_FOUND.message + ': ' + String(msg) @@ -490,8 +467,6 @@ exports.throwFileNotFound = function (msg) { //////////////////////////////////////////////////////////////////////////////// exports.throwBadParameter = function (msg) { - 'use strict'; - throw new exports.ArangoError({ errorNum: exports.errors.ERROR_BAD_PARAMETER.code, errorMessage: exports.errors.ERROR_BAD_PARAMETER.message + ': ' + String(msg) @@ -503,8 +478,6 @@ exports.throwBadParameter = function (msg) { //////////////////////////////////////////////////////////////////////////////// exports.checkParameter = function (usage, descs, vars) { - 'use strict'; - var i; for (i = 0; i < descs.length; ++i) { diff --git a/js/common/modules/org/arangodb/aql/explainer.js b/js/common/modules/org/arangodb/aql/explainer.js index ac5c6864b6..2aadbd57ea 100644 --- a/js/common/modules/org/arangodb/aql/explainer.js +++ b/js/common/modules/org/arangodb/aql/explainer.js @@ -1,5 +1,4 @@ /*jshint strict: false, maxlen: 300 */ -/*global require, exports */ var db = require("org/arangodb").db, internal = require("internal"), @@ -13,7 +12,7 @@ if (typeof internal.printBrowser === "function") { /* set colors for output */ function setColors (useSystemColors) { - "use strict"; + 'use strict'; [ "COLOR_RESET", "COLOR_CYAN", "COLOR_BLUE", "COLOR_GREEN", "COLOR_MAGENTA", "COLOR_YELLOW", "COLOR_RED", "COLOR_WHITE", @@ -26,27 +25,27 @@ function setColors (useSystemColors) { /* colorizer and output helper functions */ function passthru (v) { - "use strict"; + 'use strict'; return v; } function keyword (v) { - "use strict"; + 'use strict'; return colors.COLOR_CYAN + v + colors.COLOR_RESET; } function annotation (v) { - "use strict"; + 'use strict'; return colors.COLOR_BLUE + v + colors.COLOR_RESET; } function value (v) { - "use strict"; + 'use strict'; return colors.COLOR_GREEN + v + colors.COLOR_RESET; } function variable (v) { - "use strict"; + 'use strict'; if (v[0] === "#") { return colors.COLOR_MAGENTA + v + colors.COLOR_RESET; } @@ -54,37 +53,37 @@ function variable (v) { } function func (v) { - "use strict"; + 'use strict'; return colors.COLOR_GREEN + v + colors.COLOR_RESET; } function collection (v) { - "use strict"; + 'use strict'; return colors.COLOR_RED + v + colors.COLOR_RESET; } function attribute (v) { - "use strict"; + 'use strict'; return "`" + colors.COLOR_YELLOW + v + colors.COLOR_RESET + "`"; } function header (v) { - "use strict"; + 'use strict'; return colors.COLOR_MAGENTA + v + colors.COLOR_RESET; } function section (v) { - "use strict"; + 'use strict'; return colors.COLOR_BOLD_BLUE + v + colors.COLOR_RESET; } function pad (n) { - "use strict"; + 'use strict'; return new Array(n).join(" "); } function wrap (str, width) { - "use strict"; + 'use strict'; var re = ".{1," + width + "}(\\s|$)|\\S+?(\\s|$)"; return str.match(new RegExp(re, "g")).join("\n"); } @@ -94,7 +93,7 @@ function wrap (str, width) { /* print query string */ function printQuery (query) { - "use strict"; + 'use strict'; print(section("Query string:")); print(" " + value(wrap(query, 100).replace(/\n/g, "\n ", query))); print(); @@ -102,7 +101,7 @@ function printQuery (query) { /* print write query modification flags */ function printModificationFlags (flags) { - "use strict"; + 'use strict'; if (flags === undefined) { return; } @@ -122,7 +121,7 @@ function printModificationFlags (flags) { /* print optimizer rules */ function printRules (rules) { - "use strict"; + 'use strict'; print(section("Optimization rules applied:")); if (rules.length === 0) { print(" " + value("none")); @@ -139,7 +138,7 @@ function printRules (rules) { /* print warnings */ function printWarnings (warnings) { - "use strict"; + 'use strict'; if (! Array.isArray(warnings) || warnings.length === 0) { return; } @@ -155,7 +154,7 @@ function printWarnings (warnings) { /* print indexes used */ function printIndexes (indexes) { - "use strict"; + 'use strict'; print(section("Indexes used:")); if (indexes.length === 0) { print(" " + value("none")); @@ -223,7 +222,7 @@ function printIndexes (indexes) { /* analzye and print execution plan */ function processQuery (query, explain) { - "use strict"; + 'use strict'; var nodes = { }, parents = { }, rootNode = null, @@ -583,7 +582,7 @@ function processQuery (query, explain) { /* the exposed function */ function explain (data, options) { - "use strict"; + 'use strict'; if (typeof data === "string") { data = { query: data }; } diff --git a/js/common/modules/org/arangodb/aql/functions.js b/js/common/modules/org/arangodb/aql/functions.js index 63ac0c1b34..9200e4af31 100644 --- a/js/common/modules/org/arangodb/aql/functions.js +++ b/js/common/modules/org/arangodb/aql/functions.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief AQL user functions management @@ -47,7 +46,7 @@ var ArangoError = arangodb.ArangoError; //////////////////////////////////////////////////////////////////////////////// var getStorage = function () { - "use strict"; + 'use strict'; var functions = db._collection("_aqlfunctions"); @@ -67,7 +66,7 @@ var getStorage = function () { //////////////////////////////////////////////////////////////////////////////// var getFiltered = function (group) { - "use strict"; + 'use strict'; var result = [ ]; @@ -96,7 +95,7 @@ var getFiltered = function (group) { //////////////////////////////////////////////////////////////////////////////// var validateName = function (name) { - "use strict"; + 'use strict'; if (typeof name !== 'string' || ! name.match(/^[a-zA-Z0-9_]+(::[a-zA-Z0-9_]+)+$/) || @@ -114,7 +113,7 @@ var validateName = function (name) { //////////////////////////////////////////////////////////////////////////////// var stringifyFunction = function (code, name) { - "use strict"; + 'use strict'; if (typeof code === 'function') { code = String(code) + "\n"; @@ -172,7 +171,7 @@ var stringifyFunction = function (code, name) { //////////////////////////////////////////////////////////////////////////////// var unregisterFunction = function (name) { - "use strict"; + 'use strict'; var func = null; @@ -220,7 +219,7 @@ var unregisterFunction = function (name) { //////////////////////////////////////////////////////////////////////////////// var unregisterFunctionsGroup = function (group) { - "use strict"; + 'use strict'; if (group.length === 0) { var err = new ArangoError(); @@ -387,7 +386,7 @@ var registerFunction = function (name, code, isDeterministic) { //////////////////////////////////////////////////////////////////////////////// var toArrayFunctions = function (group) { - "use strict"; + 'use strict'; var result = [ ]; diff --git a/js/common/modules/org/arangodb/arango-collection-common.js b/js/common/modules/org/arangodb/arango-collection-common.js index a779c4dafa..130fd3074c 100644 --- a/js/common/modules/org/arangodb/arango-collection-common.js +++ b/js/common/modules/org/arangodb/arango-collection-common.js @@ -1,5 +1,4 @@ /*jshint strict: false, unused: false, maxlen: 200 */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoCollection diff --git a/js/common/modules/org/arangodb/arango-statement-common.js b/js/common/modules/org/arangodb/arango-statement-common.js index a0f156d4ee..a64d18bbc0 100644 --- a/js/common/modules/org/arangodb/arango-statement-common.js +++ b/js/common/modules/org/arangodb/arango-statement-common.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Arango statements diff --git a/js/common/modules/org/arangodb/crypto.js b/js/common/modules/org/arangodb/crypto.js index bb57476fde..10de5791ef 100644 --- a/js/common/modules/org/arangodb/crypto.js +++ b/js/common/modules/org/arangodb/crypto.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, exports, Buffer */ +/*global Buffer */ //////////////////////////////////////////////////////////////////////////////// /// @brief Some crypto functions diff --git a/js/common/modules/org/arangodb/examples/example-users.js b/js/common/modules/org/arangodb/examples/example-users.js index 91708f77e5..78f54da087 100644 --- a/js/common/modules/org/arangodb/examples/example-users.js +++ b/js/common/modules/org/arangodb/examples/example-users.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief example-users @@ -1030,8 +1030,6 @@ var regions = { //////////////////////////////////////////////////////////////////////////////// exports.createUsers = function (name) { - 'use strict'; - var i; var collection = db._collection(name); @@ -1055,8 +1053,6 @@ exports.createUsers = function (name) { //////////////////////////////////////////////////////////////////////////////// exports.createRegions = function (name) { - 'use strict'; - var i; var collection = db._collection(name); @@ -1082,8 +1078,6 @@ exports.createRegions = function (name) { //////////////////////////////////////////////////////////////////////////////// exports.createLocations = function (name, usersCollection, limit) { - 'use strict'; - var i; if (limit === null || limit === undefined) { diff --git a/js/common/modules/org/arangodb/extend.js b/js/common/modules/org/arangodb/extend.js index a0bd073fb4..16c515f095 100644 --- a/js/common/modules/org/arangodb/extend.js +++ b/js/common/modules/org/arangodb/extend.js @@ -1,4 +1,3 @@ -/*global require, exports */ // TODO Deprecated in 2.7 // require('console').log('"org/arangodb/extend" is deprecated, use "extendible" instead'); diff --git a/js/common/modules/org/arangodb/foxx/manager-utils.js b/js/common/modules/org/arangodb/foxx/manager-utils.js index e8788dca83..394190f307 100644 --- a/js/common/modules/org/arangodb/foxx/manager-utils.js +++ b/js/common/modules/org/arangodb/foxx/manager-utils.js @@ -1,5 +1,4 @@ /*jshint globalstrict: true */ -/*global require, exports */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/modules/org/arangodb/foxx/preprocessor.js b/js/common/modules/org/arangodb/foxx/preprocessor.js index cb2e36efc0..1dd939c7dd 100644 --- a/js/common/modules/org/arangodb/foxx/preprocessor.js +++ b/js/common/modules/org/arangodb/foxx/preprocessor.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx Preprocessor @@ -27,81 +27,66 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -var Preprocessor, - preprocess, - ArrayIterator, - extend = require("underscore").extend, +var extend = require("underscore").extend, coffeeScript = require("coffee-script"); -ArrayIterator = function (arr) { - 'use strict'; +function ArrayIterator(arr) { this.array = arr; this.currentLineNumber = -1; -}; +} extend(ArrayIterator.prototype, { next: function () { - 'use strict'; - this.currentLineNumber += 1; + this.currentLineNumber += 1; return this.array[this.currentLineNumber]; }, current: function () { - 'use strict'; - return this.array[this.currentLineNumber]; + return this.array[this.currentLineNumber]; }, hasNext: function () { - 'use strict'; - return this.currentLineNumber < (this.array.length - 1); + return this.currentLineNumber < (this.array.length - 1); }, replaceWith: function (newLine) { - 'use strict'; - this.array[this.currentLineNumber] = newLine; + this.array[this.currentLineNumber] = newLine; }, entireString: function () { - 'use strict'; - return this.array.join("\n"); + return this.array.join("\n"); }, getCurrentLineNumber: function () { - 'use strict'; - if (this.hasNext()) { + if (this.hasNext()) { return this.currentLineNumber; } } }); -Preprocessor = function (input, type) { - 'use strict'; - +function Preprocessor(input, type) { if (type === 'coffee') { input = coffeeScript.compile(input, {bare: true}); } this.iterator = new ArrayIterator(input.replace('\r', '').split("\n")); this.inJSDoc = false; -}; +} extend(Preprocessor.prototype, { result: function () { - 'use strict'; - return this.iterator.entireString(); + return this.iterator.entireString(); }, convert: function () { - 'use strict'; - while (this.searchNext()) { + while (this.searchNext()) { this.convertLine(); } return this; }, searchNext: function () { - 'use strict'; - while (this.iterator.hasNext()) { + while (this.iterator.hasNext()) { if (this.isJSDoc(this.iterator.next())) { return true; } @@ -109,22 +94,19 @@ extend(Preprocessor.prototype, { }, convertLine: function () { - 'use strict'; - this.iterator.replaceWith( + this.iterator.replaceWith( "applicationContext.comment(\"" + this.stripComment(this.iterator.current()) + "\");" ); }, getCurrentLineNumber: function () { - 'use strict'; - return this.iterator.getCurrentLineNumber(); + return this.iterator.getCurrentLineNumber(); }, // helper stripComment: function (str) { - 'use strict'; - return str.replace(/^\s*\/\*\*/, ''). // start of JSDoc comment + return str.replace(/^\s*\/\*\*/, ''). // start of JSDoc comment replace(/^(.*?)\*\/.*$/, '$1'). // end of JSDoc comment replace(/^\s*\*/, ''). // continuation of JSDoc comment replace(/\\/g, '\\\\'). // replace backslashes @@ -133,8 +115,7 @@ extend(Preprocessor.prototype, { }, isJSDoc: function (str) { - 'use strict'; - var matched; + var matched; if (this.inJSDoc) { if (str.match(/\*\//)) { @@ -158,11 +139,10 @@ extend(Preprocessor.prototype, { } }); -preprocess = function (input, type) { - 'use strict'; +function preprocess(input, type) { var processor = new Preprocessor(input, type); return processor.convert().result(); -}; +} // Only Exported for Tests, please use `process` exports.Preprocessor = Preprocessor; diff --git a/js/common/modules/org/arangodb/foxx/store.js b/js/common/modules/org/arangodb/foxx/store.js index 073e8c8258..df3bd2cd37 100644 --- a/js/common/modules/org/arangodb/foxx/store.js +++ b/js/common/modules/org/arangodb/foxx/store.js @@ -1,5 +1,4 @@ /*jslint continue:true */ -/*global require, exports*/ //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx application store @@ -29,7 +28,7 @@ //////////////////////////////////////////////////////////////////////////////// (function() { - "use strict"; + 'use strict'; // ----------------------------------------------------------------------------- diff --git a/js/common/modules/org/arangodb/general-graph.js b/js/common/modules/org/arangodb/general-graph.js index d4ac298990..ebe8cdd3ff 100644 --- a/js/common/modules/org/arangodb/general-graph.js +++ b/js/common/modules/org/arangodb/general-graph.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, exports, ArangoClusterComm */ +/*global ArangoClusterComm */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph functionality diff --git a/js/common/modules/org/arangodb/graph-common.js b/js/common/modules/org/arangodb/graph-common.js index a54cf2c94b..fa4716ecb8 100644 --- a/js/common/modules/org/arangodb/graph-common.js +++ b/js/common/modules/org/arangodb/graph-common.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph functionality diff --git a/js/common/modules/org/arangodb/graph-examples/example-graph.js b/js/common/modules/org/arangodb/graph-examples/example-graph.js index 127e9bc313..899c91be08 100644 --- a/js/common/modules/org/arangodb/graph-examples/example-graph.js +++ b/js/common/modules/org/arangodb/graph-examples/example-graph.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph Data for Example diff --git a/js/common/modules/org/arangodb/graph.js b/js/common/modules/org/arangodb/graph.js index e0d89271e6..fd647ba507 100644 --- a/js/common/modules/org/arangodb/graph.js +++ b/js/common/modules/org/arangodb/graph.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph functionality diff --git a/js/common/modules/org/arangodb/graph/algorithms-common.js b/js/common/modules/org/arangodb/graph/algorithms-common.js index d6d571e47d..c87fcd7b4e 100644 --- a/js/common/modules/org/arangodb/graph/algorithms-common.js +++ b/js/common/modules/org/arangodb/graph/algorithms-common.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph functionality diff --git a/js/common/modules/org/arangodb/graph/traversal.js b/js/common/modules/org/arangodb/graph/traversal.js index df588efe37..ac8895be4c 100644 --- a/js/common/modules/org/arangodb/graph/traversal.js +++ b/js/common/modules/org/arangodb/graph/traversal.js @@ -1,5 +1,5 @@ /*jshint strict: false, unused: false */ -/*global require, exports, ArangoClusterComm, AQL_QUERY_IS_KILLED */ +/*global ArangoClusterComm, AQL_QUERY_IS_KILLED */ //////////////////////////////////////////////////////////////////////////////// /// @brief Traversal "classes" diff --git a/js/common/modules/org/arangodb/heap.js b/js/common/modules/org/arangodb/heap.js index 35876488e3..b2d1924116 100644 --- a/js/common/modules/org/arangodb/heap.js +++ b/js/common/modules/org/arangodb/heap.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief binary min heap diff --git a/js/common/modules/org/arangodb/is.js b/js/common/modules/org/arangodb/is.js index bc8a84ee75..5c680a8d3e 100644 --- a/js/common/modules/org/arangodb/is.js +++ b/js/common/modules/org/arangodb/is.js @@ -1,4 +1,4 @@ -/*global exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Check if something is something @@ -28,28 +28,24 @@ //////////////////////////////////////////////////////////////////////////////// // Check if a value is not undefined or null -var existy = function (x) { - "use strict"; +function existy (x) { return x !== null && x !== undefined; -}; +} // Check if a value is undefined or null -var notExisty = function (x) { - "use strict"; +function notExisty (x) { return !existy(x); -}; +} // Check if a value is existy and not false -var truthy = function (x) { - "use strict"; +function truthy (x) { return (x !== false) && existy(x); -}; +} // Check if a value is not truthy -var falsy = function (x) { - "use strict"; +function falsy (x) { return !truthy(x); -}; +} // is.object, is.noObject, is.array, is.noArray... [ @@ -62,12 +58,11 @@ var falsy = function (x) { 'String', 'RegExp' ].forEach(function(type) { - "use strict"; - exports[type.toLowerCase()] = function(obj) { + exports[type.toLowerCase()] = function (obj) { return Object.prototype.toString.call(obj) === '[object '+type+']'; }; - exports["no" + type] = function(obj) { + exports["no" + type] = function (obj) { return Object.prototype.toString.call(obj) !== '[object '+type+']'; }; }); diff --git a/js/common/modules/org/arangodb/mimetypes.js b/js/common/modules/org/arangodb/mimetypes.js index 2f6b0b7edd..6bb9e98b88 100644 --- a/js/common/modules/org/arangodb/mimetypes.js +++ b/js/common/modules/org/arangodb/mimetypes.js @@ -5,7 +5,6 @@ vars: true, white: true, plusplus: true */ -/*global exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief auto-generated file generated from mimetypes.dat diff --git a/js/common/modules/org/arangodb/request.js b/js/common/modules/org/arangodb/request.js index 97709925dc..116fe78aa8 100644 --- a/js/common/modules/org/arangodb/request.js +++ b/js/common/modules/org/arangodb/request.js @@ -1,5 +1,5 @@ /*jshint globalstrict: true, sub: true */ -/*global module, require, exports: true */ +/*global exports: true */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/modules/org/arangodb/simple-query-common.js b/js/common/modules/org/arangodb/simple-query-common.js index bf81b0de8b..c951b945ca 100644 --- a/js/common/modules/org/arangodb/simple-query-common.js +++ b/js/common/modules/org/arangodb/simple-query-common.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Arango Simple Query Language diff --git a/js/common/modules/org/arangodb/test-helper.js b/js/common/modules/org/arangodb/test-helper.js index 20326cef08..99461cbfe8 100644 --- a/js/common/modules/org/arangodb/test-helper.js +++ b/js/common/modules/org/arangodb/test-helper.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Helper for JavaScript Tests diff --git a/js/common/modules/org/arangodb/testrunner.js b/js/common/modules/org/arangodb/testrunner.js index 643b66f9ce..80063e3ae4 100644 --- a/js/common/modules/org/arangodb/testrunner.js +++ b/js/common/modules/org/arangodb/testrunner.js @@ -1,18 +1,15 @@ -/*global require, exports, print */ +/*global print */ +'use strict'; var runTest = require('jsunity').runTest, _ = require('underscore'), - internal = require('internal'), - runJSUnityTests, - runJasmineTests, - runCommandLineTests; + internal = require('internal'); //////////////////////////////////////////////////////////////////////////////// /// @brief runs all jsunity tests //////////////////////////////////////////////////////////////////////////////// -runJSUnityTests = function (tests) { - 'use strict'; +function runJSUnityTests(tests) { var result = true; var allResults = []; var res; @@ -46,14 +43,13 @@ runJSUnityTests = function (tests) { }); require("fs").write("testresult.json", JSON.stringify(allResults)); return result; -}; +} //////////////////////////////////////////////////////////////////////////////// /// @brief runs all jsunity tests //////////////////////////////////////////////////////////////////////////////// -runJasmineTests = function (testFiles, options) { - 'use strict'; +function runJasmineTests(testFiles, options) { var result = true; if (testFiles.length > 0) { @@ -62,14 +58,13 @@ runJasmineTests = function (testFiles, options) { } return result; -}; +} //////////////////////////////////////////////////////////////////////////////// /// @brief runs tests from command-line //////////////////////////////////////////////////////////////////////////////// -runCommandLineTests = function (opts) { - 'use strict'; +function runCommandLineTests(opts) { var result = true, options = opts || {}, jasmineReportFormat = options.jasmineReportFormat || 'progress', @@ -84,6 +79,6 @@ runCommandLineTests = function (opts) { result = runJSUnityTests(jsUnity) && runJasmineTests(jasmine, { format: jasmineReportFormat }); internal.setUnitTestsResult(result); -}; +} exports.runCommandLineTests = runCommandLineTests; diff --git a/js/common/modules/reportgenerator.js b/js/common/modules/reportgenerator.js index d1c1de6ee7..834139aa98 100644 --- a/js/common/modules/reportgenerator.js +++ b/js/common/modules/reportgenerator.js @@ -1,9 +1,7 @@ -/*global require, exports - */ var fs = require("fs"); var generatePerfReportXML = function (reportName, testdata) { - "use strict"; + 'use strict'; var x = '\n' + '\n' + ' \n'; //// TODO: zeit einsetzen. @@ -41,7 +39,7 @@ var generatePerfReportXML = function (reportName, testdata) { }; var generatePerfReportGrinderCSV = function (reportName, testdata) { - "use strict"; + 'use strict'; var x = "Thread, Run, Test 1, Start time (ms since Epoch), Test time, Errors, TPS , HTTP response length, HTTP response errors, Time to resolve host, Time to establish connection, Time to first byte, New connections"; diff --git a/js/common/test-data/apps/broken-if-unconfigured/needs-config.js b/js/common/test-data/apps/broken-if-unconfigured/needs-config.js index 838bee07f9..630bf73b1d 100644 --- a/js/common/test-data/apps/broken-if-unconfigured/needs-config.js +++ b/js/common/test-data/apps/broken-if-unconfigured/needs-config.js @@ -1,4 +1,4 @@ -"use strict"; +'use strict'; // this throws if config is not set (undefined has no method) var value = applicationContext.configuration.stringValue.toLowerCase(); require('console').log(value); \ No newline at end of file diff --git a/js/common/test-data/apps/fanciful-comments/controller.js b/js/common/test-data/apps/fanciful-comments/controller.js index 471de5f5ad..0882751f6d 100644 --- a/js/common/test-data/apps/fanciful-comments/controller.js +++ b/js/common/test-data/apps/fanciful-comments/controller.js @@ -1,5 +1,5 @@ (function() { - "use strict"; + 'use strict'; var FoxxApplication = require("org/arangodb/foxx").Controller; var controller = new FoxxApplication(applicationContext); diff --git a/js/common/test-data/apps/itzpapalotl/itzpapalotl.js b/js/common/test-data/apps/itzpapalotl/itzpapalotl.js index 8d06d44e72..3176695e29 100644 --- a/js/common/test-data/apps/itzpapalotl/itzpapalotl.js +++ b/js/common/test-data/apps/itzpapalotl/itzpapalotl.js @@ -1,5 +1,5 @@ /*jslint indent: 2, nomen: true, maxlen: 100, white: true, plusplus: true, unparam: true */ -/*global require, applicationContext */ +/*global applicationContext */ //////////////////////////////////////////////////////////////////////////////// /// @brief An example Foxx-Application for ArangoDB @@ -29,7 +29,7 @@ //////////////////////////////////////////////////////////////////////////////// (function() { - "use strict"; + 'use strict'; // initialise a new FoxxApplication var FoxxApplication = require("org/arangodb/foxx").Controller; diff --git a/js/common/test-data/apps/minimal-working-setup-teardown/controller.js b/js/common/test-data/apps/minimal-working-setup-teardown/controller.js index cef5148a8d..4465d08db0 100644 --- a/js/common/test-data/apps/minimal-working-setup-teardown/controller.js +++ b/js/common/test-data/apps/minimal-working-setup-teardown/controller.js @@ -2,6 +2,6 @@ var FoxxApplication = require("org/arangodb/foxx").Controller; var controller = new FoxxApplication(applicationContext); controller.get('/test', function (req, res) { - "use strict"; + 'use strict'; res.json(true); }); diff --git a/js/common/tests/execute-infinite-shortest-path.js b/js/common/tests/execute-infinite-shortest-path.js index c0d1871be2..803f45b06a 100644 --- a/js/common/tests/execute-infinite-shortest-path.js +++ b/js/common/tests/execute-infinite-shortest-path.js @@ -1,5 +1,4 @@ -/*jshint strict: true, unused:false */ -/*global require */ +/*jshint globalstrict:false, strict:false, unused:false */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the graph class @@ -29,7 +28,7 @@ //////////////////////////////////////////////////////////////////////////////// function main(args) { - "use strict"; + 'use strict'; var Graph = require("org/arangodb/graph").Graph, graph_name = "UnitTestsCollectionGraph", vertex = "UnitTestsCollectionVertex", diff --git a/js/common/tests/execute-nothing.js b/js/common/tests/execute-nothing.js index 0ae1f48678..486dc419c8 100644 --- a/js/common/tests/execute-nothing.js +++ b/js/common/tests/execute-nothing.js @@ -1,4 +1,4 @@ -/*jshint unused: false */ +/*jshint globalstrict:false, strict:false, unused: false */ /*global assertTrue */ //////////////////////////////////////////////////////////////////////////////// @@ -29,6 +29,6 @@ //////////////////////////////////////////////////////////////////////////////// function main(args) { - "use strict"; + 'use strict'; while (true) {assertTrue(true);} } diff --git a/js/common/tests/replication.js b/js/common/tests/replication.js index 78c3dcaabf..41ba4809a3 100644 --- a/js/common/tests/replication.js +++ b/js/common/tests/replication.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, assertTrue, assertMatch, assertNotEqual, +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertMatch, assertNotEqual, assertUndefined, assertFalse, fail, REPLICATION_LOGGER_LAST */ //////////////////////////////////////////////////////////////////////////////// @@ -45,7 +46,7 @@ var replication = require("org/arangodb/replication"); //////////////////////////////////////////////////////////////////////////////// function ReplicationLoggerSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsReplication"; var cn2 = "UnitTestsReplication2"; @@ -1757,7 +1758,7 @@ function ReplicationLoggerSuite () { //////////////////////////////////////////////////////////////////////////////// function ReplicationApplierSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// @@ -2083,7 +2084,7 @@ function ReplicationApplierSuite () { //////////////////////////////////////////////////////////////////////////////// function ReplicationSyncSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-aqlfunctions.js b/js/common/tests/shell-aqlfunctions.js index 36c1a9572d..945d85c4cb 100644 --- a/js/common/tests/shell-aqlfunctions.js +++ b/js/common/tests/shell-aqlfunctions.js @@ -1,5 +1,5 @@ -/*jshint maxlen: 200, unused: false*/ -/*global require, assertEqual, fail */ +/*jshint globalstrict:false, strict:false, maxlen: 200, unused: false*/ +/*global assertEqual, fail */ /* unused for functions with 'what' parameter.*/ //////////////////////////////////////////////////////////////////////////////// @@ -45,7 +45,7 @@ var aqlfunctions = require("org/arangodb/aql/functions"); //////////////////////////////////////////////////////////////////////////////// function AqlFunctionsSuite () { - "use strict"; + 'use strict'; var unregister = function (name) { try { aqlfunctions.unregister(name); diff --git a/js/common/tests/shell-attributes.js b/js/common/tests/shell-attributes.js index 60555540d8..8d19a05988 100644 --- a/js/common/tests/shell-attributes.js +++ b/js/common/tests/shell-attributes.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual, assertTrue, assertFalse, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertFalse, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test attribute naming @@ -44,7 +44,7 @@ var wait = require("internal").wait; //////////////////////////////////////////////////////////////////////////////// function AttributesSuite () { - "use strict"; + 'use strict'; var ERRORS = require("internal").errors; var cn = "UnitTestsCollectionAttributes"; var c = null; diff --git a/js/common/tests/shell-base64.js b/js/common/tests/shell-base64.js index 9f1b6fe428..a17632be58 100644 --- a/js/common/tests/shell-base64.js +++ b/js/common/tests/shell-base64.js @@ -1,5 +1,5 @@ -/*jshint strict: true, maxlen:400 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen:400 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the base64 functions @@ -40,7 +40,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function Base64Suite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-cap-constraint-timecritical.js b/js/common/tests/shell-cap-constraint-timecritical.js index 0fa8c010ad..6da75c6540 100644 --- a/js/common/tests/shell-cap-constraint-timecritical.js +++ b/js/common/tests/shell-cap-constraint-timecritical.js @@ -1,4 +1,5 @@ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the cap constraint @@ -43,7 +44,7 @@ var testHelper = require("org/arangodb/test-helper").Helper; //////////////////////////////////////////////////////////////////////////////// function CapConstraintTimecriticalSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionCap"; var collection = null; diff --git a/js/common/tests/shell-cap-constraint.js b/js/common/tests/shell-cap-constraint.js index 2822f3cd4a..40c7a803f7 100644 --- a/js/common/tests/shell-cap-constraint.js +++ b/js/common/tests/shell-cap-constraint.js @@ -1,4 +1,5 @@ -/*global require, fail, assertEqual, assertTrue, assertNotEqual */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertEqual, assertTrue, assertNotEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the cap constraint @@ -40,7 +41,7 @@ var testHelper = require("org/arangodb/test-helper").Helper; //////////////////////////////////////////////////////////////////////////////// function CapConstraintSuite() { - "use strict"; + 'use strict'; var ERRORS = internal.errors; var cn = "UnitTestsCollectionCap"; var collection = null; diff --git a/js/common/tests/shell-cluster-collection.js b/js/common/tests/shell-cluster-collection.js index 2a60c835b3..e1c33743bd 100644 --- a/js/common/tests/shell-cluster-collection.js +++ b/js/common/tests/shell-cluster-collection.js @@ -1,4 +1,5 @@ -/*global require, fail, assertEqual, assertTrue, assertFalse, assertNull */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertEqual, assertTrue, assertFalse, assertNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief test collection functionality in a cluster @@ -41,7 +42,7 @@ var db = arangodb.db; //////////////////////////////////////////////////////////////////////////////// function ClusterCollectionSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-cluster-crud.js b/js/common/tests/shell-cluster-crud.js index d3e2b1994e..1bc0f7e11e 100644 --- a/js/common/tests/shell-cluster-crud.js +++ b/js/common/tests/shell-cluster-crud.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, assertTrue, assertFalse, assertNotEqual, assertUndefined, assertNull, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertFalse, assertNotEqual, assertUndefined, assertNull, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test CRUD functionality in a cluster @@ -33,7 +34,7 @@ var ERRORS = arangodb.errors; var db = arangodb.db; var createCollection = function (properties) { - "use strict"; + 'use strict'; try { db._drop("UnitTestsClusterCrud"); } @@ -57,7 +58,7 @@ var createCollection = function (properties) { //////////////////////////////////////////////////////////////////////////////// function ClusterCrudSaveSuite () { - "use strict"; + 'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief helper function to execute save tests @@ -231,7 +232,7 @@ function ClusterCrudSaveSuite () { //////////////////////////////////////////////////////////////////////////////// function ClusterCrudReplaceSuite () { - "use strict"; + 'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief helper function for replace @@ -437,7 +438,7 @@ function ClusterCrudReplaceSuite () { //////////////////////////////////////////////////////////////////////////////// function ClusterCrudUpdateSuite () { - "use strict"; + 'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief helper function for update @@ -699,7 +700,7 @@ function ClusterCrudUpdateSuite () { //////////////////////////////////////////////////////////////////////////////// function ClusterCrudDeleteSuite () { - "use strict"; + 'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief helper function for delete @@ -864,7 +865,7 @@ function ClusterCrudDeleteSuite () { //////////////////////////////////////////////////////////////////////////////// function ClusterCrudDocumentSuite () { - "use strict"; + 'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief helper function for document //////////////////////////////////////////////////////////////////////////////// @@ -1029,7 +1030,7 @@ function ClusterCrudDocumentSuite () { //////////////////////////////////////////////////////////////////////////////// function ClusterCrudExistsSuite () { - "use strict"; + 'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief helper function for exists //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-cluster-simple.js b/js/common/tests/shell-cluster-simple.js index bffed76335..a7e428fa39 100644 --- a/js/common/tests/shell-cluster-simple.js +++ b/js/common/tests/shell-cluster-simple.js @@ -1,4 +1,5 @@ -/*global require, fail, assertEqual, assertTrue, assertNull */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertEqual, assertTrue, assertNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief test simple queries in a cluster @@ -34,7 +35,7 @@ var db = arangodb.db; var _ = require("underscore"); var createCollection = function (properties) { - "use strict"; + 'use strict'; try { db._drop("UnitTestsClusterCrud"); } @@ -58,7 +59,7 @@ var createCollection = function (properties) { //////////////////////////////////////////////////////////////////////////////// function ClusterCrudSimpleSuite () { - "use strict"; + 'use strict'; var queryToArray = function (q, n, cb) { var result = q.toArray(); assertEqual(n, result.length); diff --git a/js/common/tests/shell-collection-noncluster.js b/js/common/tests/shell-collection-noncluster.js index d87cb8afe6..1e4afb454d 100644 --- a/js/common/tests/shell-collection-noncluster.js +++ b/js/common/tests/shell-collection-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual, assertTrue, assertEqual, assertTypeOf, assertNotEqual, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertEqual, assertTypeOf, assertNotEqual, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the collection interface @@ -44,7 +44,7 @@ var ERRORS = arangodb.errors; //////////////////////////////////////////////////////////////////////////////// function CollectionSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-collection-volatile-noncluster.js b/js/common/tests/shell-collection-volatile-noncluster.js index b3be21d299..a5e188eac7 100644 --- a/js/common/tests/shell-collection-volatile-noncluster.js +++ b/js/common/tests/shell-collection-volatile-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false */ -/*global require, fail, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the collection interface w/ volatile collections diff --git a/js/common/tests/shell-collection.js b/js/common/tests/shell-collection.js index 2f58a42593..f45990a3e0 100644 --- a/js/common/tests/shell-collection.js +++ b/js/common/tests/shell-collection.js @@ -1,5 +1,5 @@ -/*jshint strict: false */ -/*global require, assertEqual, assertTypeOf, assertNotEqual, assertTrue, assertNull, assertUndefined, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTypeOf, assertNotEqual, assertTrue, assertNull, assertUndefined, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the collection interface diff --git a/js/common/tests/shell-crypto.js b/js/common/tests/shell-crypto.js index dda77a5cc5..e3b0067fac 100644 --- a/js/common/tests/shell-crypto.js +++ b/js/common/tests/shell-crypto.js @@ -1,5 +1,6 @@ -/*jshint strict: true, maxlen: 500 */ -/*global require, assertTrue, assertEqual, fail */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertTrue, assertEqual, fail */ + //////////////////////////////////////////////////////////////////////////////// /// @brief test the crypto interface /// @@ -39,7 +40,7 @@ var crypto = require("org/arangodb/crypto"); //////////////////////////////////////////////////////////////////////////////// function CryptoSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-database.js b/js/common/tests/shell-database.js index 1170ee5e70..b0834456de 100644 --- a/js/common/tests/shell-database.js +++ b/js/common/tests/shell-database.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual, assertTrue, assertFalse, assertNotEqual, assertMatch, assertEqual, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertFalse, assertNotEqual, assertMatch, assertEqual, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the common database interface @@ -42,7 +42,7 @@ var ERRORS = arangodb.errors; //////////////////////////////////////////////////////////////////////////////// function DatabaseSuite () { - "use strict"; + 'use strict'; return { setUp : function () { diff --git a/js/common/tests/shell-document.js b/js/common/tests/shell-document.js index a82b587f9a..714443b4a0 100644 --- a/js/common/tests/shell-document.js +++ b/js/common/tests/shell-document.js @@ -1,5 +1,5 @@ -/*jshint strict: true, maxlen: 5000 */ -/*global require, fail, assertTrue, assertFalse, assertEqual, assertNotEqual, assertTypeOf */ +/*jshint globalstrict:false, strict:false, maxlen: 5000 */ +/*global fail, assertTrue, assertFalse, assertEqual, assertNotEqual, assertTypeOf */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the document interface @@ -45,7 +45,7 @@ var testHelper = require("org/arangodb/test-helper").Helper; //////////////////////////////////////////////////////////////////////////////// function CollectionDocumentSuiteErrorHandling () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionBasics"; var collection = null; @@ -192,7 +192,7 @@ function CollectionDocumentSuiteErrorHandling () { //////////////////////////////////////////////////////////////////////////////// function CollectionDocumentSuite () { - "use strict"; + 'use strict'; var ERRORS = require("internal").errors; var cn = "UnitTestsCollectionBasics"; @@ -1300,7 +1300,7 @@ function CollectionDocumentSuite () { //////////////////////////////////////////////////////////////////////////////// function DatabaseDocumentSuiteErrorHandling () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionBasics"; var ERRORS = require("internal").errors; @@ -1373,7 +1373,7 @@ function DatabaseDocumentSuiteErrorHandling () { //////////////////////////////////////////////////////////////////////////////// function DatabaseDocumentSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionBasics"; var ERRORS = require("internal").errors; var collection = null; diff --git a/js/common/tests/shell-edge.js b/js/common/tests/shell-edge.js index 2ac450a9ba..b2ada460f9 100644 --- a/js/common/tests/shell-edge.js +++ b/js/common/tests/shell-edge.js @@ -1,5 +1,5 @@ -/*jshint strict: false */ -/*global require, assertEqual, assertMatch, assertTypeOf, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertMatch, assertTypeOf, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the document interface diff --git a/js/common/tests/shell-env.js b/js/common/tests/shell-env.js index 3c368801c4..05d85c9606 100644 --- a/js/common/tests/shell-env.js +++ b/js/common/tests/shell-env.js @@ -1,5 +1,6 @@ -/*jshint strict: true, sub: true */ -/*global require, assertTrue, assertFalse, assertEqual, assertNotEqual */ +/*jshint globalstrict:false, strict:false, sub: true */ +/*global assertTrue, assertFalse, assertEqual, assertNotEqual */ + //////////////////////////////////////////////////////////////////////////////// /// @brief test filesystem functions /// @@ -38,7 +39,7 @@ var jsunity = require("jsunity"); //////////////////////////////////////////////////////////////////////////////// function EnvironmentSuite () { - "use strict"; + 'use strict'; var env = require("process").env; return { diff --git a/js/common/tests/shell-errors.js b/js/common/tests/shell-errors.js index 7b035f02dd..62752bb6e5 100644 --- a/js/common/tests/shell-errors.js +++ b/js/common/tests/shell-errors.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, fail, assertFalse, assertTrue, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertFalse, assertTrue, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the error codes @@ -42,7 +42,7 @@ var ERRORS = arangodb.errors; //////////////////////////////////////////////////////////////////////////////// function ErrorsSuite () { - "use strict"; + 'use strict'; var throwError = function (code, message) { var err = new ArangoError(); err.errorNum = code; diff --git a/js/common/tests/shell-explain-cluster.js b/js/common/tests/shell-explain-cluster.js index 4a8c156d61..7d4b473ab8 100644 --- a/js/common/tests/shell-explain-cluster.js +++ b/js/common/tests/shell-explain-cluster.js @@ -1,4 +1,5 @@ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the statement class @@ -43,7 +44,7 @@ var ERRORS = arangodb.errors; //////////////////////////////////////////////////////////////////////////////// function ExplainSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsExplain"; return { diff --git a/js/common/tests/shell-explain-noncluster.js b/js/common/tests/shell-explain-noncluster.js index f334c68105..baabe1e325 100644 --- a/js/common/tests/shell-explain-noncluster.js +++ b/js/common/tests/shell-explain-noncluster.js @@ -1,4 +1,5 @@ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the statement class @@ -43,7 +44,7 @@ var ERRORS = arangodb.errors; //////////////////////////////////////////////////////////////////////////////// function ExplainSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsExplain"; return { diff --git a/js/common/tests/shell-figures-noncluster.js b/js/common/tests/shell-figures-noncluster.js index 192eb3e12c..a9f65ed4fe 100644 --- a/js/common/tests/shell-figures-noncluster.js +++ b/js/common/tests/shell-figures-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual, assertTrue, assertEqual, assertNotEqual, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertEqual, assertNotEqual, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the collection interface @@ -45,7 +45,7 @@ var db = arangodb.db; //////////////////////////////////////////////////////////////////////////////// function FiguresSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-foxx-manager-install-spec.js b/js/common/tests/shell-foxx-manager-install-spec.js index 7b3d89c8f1..8949bad7b8 100644 --- a/js/common/tests/shell-foxx-manager-install-spec.js +++ b/js/common/tests/shell-foxx-manager-install-spec.js @@ -1,5 +1,5 @@ -/*jshint globalstrict: true */ -/*global module, require, describe, beforeEach, afterEach, it, expect*/ +/*jshint globalstrict:false, strict:false */ +/*global describe, beforeEach, afterEach, it, expect*/ //////////////////////////////////////////////////////////////////////////////// /// @brief Spec for foxx manager @@ -28,7 +28,7 @@ /// @author Copyright 2014, ArangoDB GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -"use strict"; +'use strict'; var FoxxManager = require("org/arangodb/foxx/manager"); var arangodb = require("org/arangodb"); diff --git a/js/common/tests/shell-fs.js b/js/common/tests/shell-fs.js index c496bb3b74..82bb666b82 100644 --- a/js/common/tests/shell-fs.js +++ b/js/common/tests/shell-fs.js @@ -1,5 +1,6 @@ -/*jshint strict: true, maxlen: 5000 */ -/*global require, assertTrue, assertFalse, assertEqual, assertNotEqual, fail, Buffer */ +/*jshint globalstrict:false, strict:false, maxlen: 5000 */ +/*global assertTrue, assertFalse, assertEqual, assertNotEqual, fail, Buffer */ + //////////////////////////////////////////////////////////////////////////////// /// @brief test filesystem functions /// @@ -41,7 +42,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function FileSystemSuite () { - "use strict"; + 'use strict'; var ERRORS = require("internal").errors; var tempDir; diff --git a/js/common/tests/shell-fulltext.js b/js/common/tests/shell-fulltext.js index a7585f65ec..c7ea5b5969 100644 --- a/js/common/tests/shell-fulltext.js +++ b/js/common/tests/shell-fulltext.js @@ -1,5 +1,5 @@ -/*jshint strict: true, maxlen: 50000 */ -/*global require, assertTrue, assertFalse, assertEqual, fail */ +/*jshint globalstrict:false, strict:false, maxlen: 50000 */ +/*global assertTrue, assertFalse, assertEqual, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for fulltext indexes @@ -36,7 +36,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function fulltextCreateSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsFulltext"; var c = null; @@ -300,7 +300,7 @@ function fulltextCreateSuite () { //////////////////////////////////////////////////////////////////////////////// function fulltextQuerySuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsFulltext"; var collection = null; var idx = null; @@ -1387,7 +1387,7 @@ function fulltextQuerySuite () { //////////////////////////////////////////////////////////////////////////////// /* function fulltextQuerySubstringSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsFulltext"; var collection = null; var idx = null; diff --git a/js/common/tests/shell-general-graph.js b/js/common/tests/shell-general-graph.js index f05e2b3c4e..ca5733ab66 100644 --- a/js/common/tests/shell-general-graph.js +++ b/js/common/tests/shell-general-graph.js @@ -1,5 +1,5 @@ -/*jshint unused: false */ -/*global require, assertEqual, assertTrue, assertFalse, fail */ +/*jshint globalstrict:false, strict:false, unused: false */ +/*global assertEqual, assertTrue, assertFalse, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the general-graph class @@ -45,7 +45,7 @@ var _ = require("underscore"); //////////////////////////////////////////////////////////////////////////////// function GeneralGraphCreationSuite() { - "use strict"; + 'use strict'; var rn = "UnitTestRelationName"; var rn1 = "UnitTestRelationName1"; var vn1 = "UnitTestVerticies1"; @@ -689,7 +689,7 @@ function GeneralGraphCreationSuite() { // ----------------------------------------------------------------------------- function GeneralGraphAQLQueriesSuite() { - "use strict"; + 'use strict'; // Definition of names var graphName = "UnitTestsGraph"; var included = "UnitTestIncluded"; @@ -957,7 +957,7 @@ function GeneralGraphAQLQueriesSuite() { } function ChainedFluentAQLResultsSuite() { - "use strict"; + 'use strict'; var gn = "UnitTestGraph"; var user = "UnitTestUsers"; @@ -1810,7 +1810,7 @@ function ChainedFluentAQLResultsSuite() { } function EdgesAndVerticesSuite() { - "use strict"; + 'use strict'; var g; var vertexId1, vertexId2; @@ -2385,7 +2385,7 @@ function EdgesAndVerticesSuite() { } function GeneralGraphCommonNeighborsSuite() { - "use strict"; + 'use strict'; var testGraph, actual; var v1ColName = "UnitTestsAhuacatlVertex1"; @@ -2611,7 +2611,7 @@ function GeneralGraphCommonNeighborsSuite() { } function OrphanCollectionSuite() { - "use strict"; + 'use strict'; var prefix = "UnitTestGraphVertexCollection", g1, g2, @@ -2783,7 +2783,7 @@ function OrphanCollectionSuite() { } function MeasurementsSuite() { - "use strict"; + 'use strict'; var g; var vertexId1, vertexId2; var unitTestGraphName = "unitTestGraph"; diff --git a/js/common/tests/shell-graph-algorithms.js b/js/common/tests/shell-graph-algorithms.js index b057b02ac9..f3fbf76cb0 100644 --- a/js/common/tests/shell-graph-algorithms.js +++ b/js/common/tests/shell-graph-algorithms.js @@ -1,5 +1,5 @@ -/*jshint unused: false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused: false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the graph class @@ -41,7 +41,7 @@ var console = require("console"); //////////////////////////////////////////////////////////////////////////////// function neighborSuite() { - "use strict"; + 'use strict'; var Graph = require("org/arangodb/graph").Graph, graph_name = "UnitTestsCollectionGraph", vertex = "UnitTestsCollectionVertex", @@ -157,7 +157,7 @@ function neighborSuite() { //////////////////////////////////////////////////////////////////////////////// function dijkstraSuite() { - "use strict"; + 'use strict'; var Graph = require("org/arangodb/graph").Graph, graph_name = "UnitTestsCollectionGraph", vertex = "UnitTestsCollectionVertex", @@ -450,7 +450,7 @@ function dijkstraSuite() { //////////////////////////////////////////////////////////////////////////////// function commonSuite() { - "use strict"; + 'use strict'; var Graph = require("org/arangodb/graph").Graph, graph_name = "UnitTestsCollectionGraph", vertex = "UnitTestsCollectionVertex", diff --git a/js/common/tests/shell-graph-measurement.js b/js/common/tests/shell-graph-measurement.js index e25d53d4b3..0106b68129 100644 --- a/js/common/tests/shell-graph-measurement.js +++ b/js/common/tests/shell-graph-measurement.js @@ -1,5 +1,5 @@ -/*jshint unused:false */ -/*global require, assertEqual, assertException */ +/*jshint globalstrict:false, strict:false, unused:false */ +/*global assertEqual, assertException */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the graph class @@ -40,7 +40,7 @@ var jsunity = require("jsunity"), //////////////////////////////////////////////////////////////////////////////// function measurementSuite() { - "use strict"; + 'use strict'; var Graph = require("org/arangodb/general-graph"), graph_name = "UnitTestsCollectionGraph", vertex = "UnitTestsCollectionVertex", @@ -215,7 +215,7 @@ function measurementSuite() { //////////////////////////////////////////////////////////////////////////////// function geodesicSuite() { - "use strict"; + 'use strict'; var Graph = require("org/arangodb/general-graph"), graph_name = "UnitTestsCollectionGraph", vertex = "UnitTestsCollectionVertex", @@ -383,7 +383,7 @@ function geodesicSuite() { //////////////////////////////////////////////////////////////////////////////// function normalizedSuite() { - "use strict"; + 'use strict'; var Graph = require("org/arangodb/general-graph"), graph_name = "UnitTestsCollectionGraph", vertex = "UnitTestsCollectionVertex", diff --git a/js/common/tests/shell-graph-traversal.js b/js/common/tests/shell-graph-traversal.js index ec733781a9..960ab56a02 100644 --- a/js/common/tests/shell-graph-traversal.js +++ b/js/common/tests/shell-graph-traversal.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused: false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused: false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the graph traversal class @@ -47,7 +47,7 @@ var Traverser = traversal.Traverser; //////////////////////////////////////////////////////////////////////////////// function GraphTraversalSuite () { - "use strict"; + 'use strict'; var gn = "UnitTestsGraphTraversal"; var vn = "UnitTestsGraphTraversalVertices"; var en = "UnitTestsGraphTraversalEdges"; @@ -228,7 +228,7 @@ function GraphTraversalSuite () { //////////////////////////////////////////////////////////////////////////////// function memoryDatasource (nodes, connections) { - "use strict"; + 'use strict'; var vertices = { }; var inEdges = { }; var outEdges = { }; @@ -332,7 +332,7 @@ function memoryDatasource (nodes, connections) { //////////////////////////////////////////////////////////////////////////////// function MemoryTraversalSuite () { - "use strict"; + 'use strict'; var datasourceWorld; var datasourcePeople; @@ -1541,7 +1541,7 @@ function MemoryTraversalSuite () { //////////////////////////////////////////////////////////////////////////////// function CollectionTraversalSuite () { - "use strict"; + 'use strict'; var vn = "UnitTestsVertices"; var en = "UnitTestsEdges"; @@ -1883,7 +1883,7 @@ function CollectionTraversalSuite () { //////////////////////////////////////////////////////////////////////////////// function GeneralGraphTraversalSuite () { - "use strict"; + 'use strict'; // Definition of the edges: A -> BDEH <-> CFGI var vnA = "UnitTestsVertices1"; var enDir = "UnitTestsEdges1"; diff --git a/js/common/tests/shell-graph.js b/js/common/tests/shell-graph.js index dc2e65ab78..67dc1988ed 100644 --- a/js/common/tests/shell-graph.js +++ b/js/common/tests/shell-graph.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, assertTrue, assertNotNull, assertNull */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertNotNull, assertNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the graph class @@ -44,7 +45,7 @@ var print = arangodb.print; //////////////////////////////////////////////////////////////////////////////// function GraphCreationSuite() { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// @@ -202,7 +203,7 @@ function GraphCreationSuite() { //////////////////////////////////////////////////////////////////////////////// function GraphBasicsSuite() { - "use strict"; + 'use strict'; var Graph = require("org/arangodb/graph").Graph, graph_name = "UnitTestsCollectionGraph", vertex = "UnitTestsCollectionVertex", @@ -487,7 +488,7 @@ function GraphBasicsSuite() { //////////////////////////////////////////////////////////////////////////////// function VertexSuite() { - "use strict"; + 'use strict'; var Graph = require("org/arangodb/graph").Graph, graph_name = "UnitTestsCollectionGraph", vertex = "UnitTestsCollectionVertex", @@ -619,7 +620,7 @@ function VertexSuite() { //////////////////////////////////////////////////////////////////////////////// function EdgeSuite() { - "use strict"; + 'use strict'; var Graph = require("org/arangodb/graph").Graph, graph_name = "UnitTestsCollectionGraph", vertex = "UnitTestsCollectionVertex", diff --git a/js/common/tests/shell-hash-index-noncluster.js b/js/common/tests/shell-hash-index-noncluster.js index 0860a9fd76..3eee7935fe 100644 --- a/js/common/tests/shell-hash-index-noncluster.js +++ b/js/common/tests/shell-hash-index-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual, assertTrue, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the hash index, selectivity estimates @@ -40,7 +40,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function HashIndexSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionHash"; var collection = null; diff --git a/js/common/tests/shell-hash-index.js b/js/common/tests/shell-hash-index.js index c8b8041731..2706e952fc 100644 --- a/js/common/tests/shell-hash-index.js +++ b/js/common/tests/shell-hash-index.js @@ -1,4 +1,5 @@ -/*global require, fail, assertEqual, assertTrue, assertNotEqual */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertEqual, assertTrue, assertNotEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the unique constraint @@ -41,7 +42,7 @@ var testHelper = require("org/arangodb/test-helper").Helper; //////////////////////////////////////////////////////////////////////////////// function HashIndexSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionHash"; var collection = null; diff --git a/js/common/tests/shell-index-ensure.js b/js/common/tests/shell-index-ensure.js index 2f3bfc495a..b032811888 100644 --- a/js/common/tests/shell-index-ensure.js +++ b/js/common/tests/shell-index-ensure.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, assertTrue, assertFalse, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertFalse, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the index @@ -40,7 +41,7 @@ var errors = internal.errors; //////////////////////////////////////////////////////////////////////////////// function ensureIndexSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionIdx"; var collection = null; diff --git a/js/common/tests/shell-index-geo.js b/js/common/tests/shell-index-geo.js index 9ba26325d4..c050098797 100644 --- a/js/common/tests/shell-index-geo.js +++ b/js/common/tests/shell-index-geo.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, assertTrue, assertFalse, assertNotEqual, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertFalse, assertNotEqual, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the geo index @@ -40,7 +41,7 @@ var console = require("console"); //////////////////////////////////////////////////////////////////////////////// function GeoIndexCreationSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionGeo"; var collection = null; @@ -491,7 +492,7 @@ function GeoIndexCreationSuite() { //////////////////////////////////////////////////////////////////////////////// function GeoIndexErrorHandlingSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionGeo"; var collection = null; @@ -557,7 +558,7 @@ function GeoIndexErrorHandlingSuite() { //////////////////////////////////////////////////////////////////////////////// function GeoIndexSimpleQueriesSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionGeo"; var collection = null; diff --git a/js/common/tests/shell-index.js b/js/common/tests/shell-index.js index e0be195454..62927c1283 100644 --- a/js/common/tests/shell-index.js +++ b/js/common/tests/shell-index.js @@ -1,4 +1,5 @@ -/*global require, fail, assertEqual, assertNotEqual, assertTrue, assertFalse */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertEqual, assertNotEqual, assertTrue, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the index @@ -41,7 +42,7 @@ var testHelper = require("org/arangodb/test-helper").Helper; //////////////////////////////////////////////////////////////////////////////// function indexSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionIdx"; var collection = null; @@ -231,7 +232,7 @@ function indexSuite() { //////////////////////////////////////////////////////////////////////////////// function getIndexesSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionIdx"; var collection = null; @@ -571,7 +572,7 @@ function getIndexesSuite() { //////////////////////////////////////////////////////////////////////////////// function getIndexesEdgesSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionIdx"; var collection = null; diff --git a/js/common/tests/shell-keygen-noncluster.js b/js/common/tests/shell-keygen-noncluster.js index 908be7277a..47df542348 100644 --- a/js/common/tests/shell-keygen-noncluster.js +++ b/js/common/tests/shell-keygen-noncluster.js @@ -1,5 +1,6 @@ -/*jshint strict: true, maxlen: 5000 */ -/*global require, assertEqual, fail */ +/*jshint globalstrict:false, strict:false, maxlen: 5000 */ +/*global assertEqual, fail */ + //////////////////////////////////////////////////////////////////////////////// /// @brief test the non-traditional key generators /// @@ -44,7 +45,7 @@ var ERRORS = arangodb.errors; //////////////////////////////////////////////////////////////////////////////// function AutoIncrementSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsKeyGen"; return { diff --git a/js/common/tests/shell-keygen.js b/js/common/tests/shell-keygen.js index afe007775e..b26ca17c22 100644 --- a/js/common/tests/shell-keygen.js +++ b/js/common/tests/shell-keygen.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual, assertTrue, assertEqual, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertEqual, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the traditional key generators @@ -43,7 +43,7 @@ var ERRORS = arangodb.errors; //////////////////////////////////////////////////////////////////////////////// function TraditionalSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsKeyGen"; return { diff --git a/js/common/tests/shell-noncluster-edge.js b/js/common/tests/shell-noncluster-edge.js index 52bfbce06f..a5f4c94c31 100644 --- a/js/common/tests/shell-noncluster-edge.js +++ b/js/common/tests/shell-noncluster-edge.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the edges interface @@ -44,7 +44,7 @@ var wait = require("internal").wait; //////////////////////////////////////////////////////////////////////////////// function CollectionEdgeSuite () { - "use strict"; + 'use strict'; var vn = "UnitTestsCollectionVertex"; var vertex = null; diff --git a/js/common/tests/shell-query-timecritical-spec.js b/js/common/tests/shell-query-timecritical-spec.js index abb930aa93..6c453814a8 100644 --- a/js/common/tests/shell-query-timecritical-spec.js +++ b/js/common/tests/shell-query-timecritical-spec.js @@ -1,7 +1,8 @@ +/*jshint globalstrict:false, strict:false */ /*global describe, require, beforeEach, it, expect, afterEach, arango */ (function() { - "use strict"; + 'use strict'; describe("AQL query analyzer", function() { var isServer = false; diff --git a/js/common/tests/shell-rename-noncluster.js b/js/common/tests/shell-rename-noncluster.js index a0578f59ff..9011b7c314 100644 --- a/js/common/tests/shell-rename-noncluster.js +++ b/js/common/tests/shell-rename-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual, assertMatch */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertMatch */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the random document selector @@ -42,7 +42,7 @@ var db = arangodb.db; //////////////////////////////////////////////////////////////////////////////// function RenameSuite () { - "use strict"; + 'use strict'; var cn1 = "UnitTestsRename1"; var cn2 = "UnitTestsRename2"; diff --git a/js/common/tests/shell-require.js b/js/common/tests/shell-require.js index 1a579a2a26..509c42159e 100644 --- a/js/common/tests/shell-require.js +++ b/js/common/tests/shell-require.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, assertTrue, assertFalse, assertNotEqual, assertNull, module */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertFalse, assertNotEqual, assertNull, module */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the module and package require @@ -38,7 +39,7 @@ var jsunity = require("jsunity"); //////////////////////////////////////////////////////////////////////////////// function RequireTestSuite () { - "use strict"; + 'use strict'; var console = require("console"); function createTestPackage () { var test = module.createTestEnvironment("./js/common/test-data/modules"); @@ -140,7 +141,7 @@ function RequireTestSuite () { //////////////////////////////////////////////////////////////////////////////// function CommonJSTestSuite () { - "use strict"; + 'use strict'; var fs = require("fs"); var console = require("console"); diff --git a/js/common/tests/shell-simple-query.js b/js/common/tests/shell-simple-query.js index d0535201f4..5a0ebc1871 100644 --- a/js/common/tests/shell-simple-query.js +++ b/js/common/tests/shell-simple-query.js @@ -1,4 +1,5 @@ -/*global require, fail, assertEqual, assertNotNull, assertNull */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertEqual, assertNotNull, assertNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the graph class @@ -41,7 +42,7 @@ var SimpleQueryArray = require("org/arangodb/simple-query").SimpleQueryArray; //////////////////////////////////////////////////////////////////////////////// function SimpleQueryArraySkipLimitSuite () { - "use strict"; + 'use strict'; var numbers = null; var query = null; @@ -157,7 +158,7 @@ function SimpleQueryArraySkipLimitSuite () { //////////////////////////////////////////////////////////////////////////////// function SimpleQueryAllSkipLimitSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionSkipLimit"; var collection = null; var numbers = null; @@ -271,7 +272,7 @@ function SimpleQueryAllSkipLimitSuite () { //////////////////////////////////////////////////////////////////////////////// function SimpleQueryByExampleSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionByExample"; var collection = null; var id = function(d) { return d._id; }; @@ -1302,7 +1303,7 @@ function SimpleQueryByExampleSuite () { //////////////////////////////////////////////////////////////////////////////// function SimpleQueryByExampleHashSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionByExample"; var collection = null; var errors = require("org/arangodb").errors; @@ -1504,7 +1505,7 @@ function SimpleQueryByExampleHashSuite () { //////////////////////////////////////////////////////////////////////////////// function SimpleQueryByExampleSkiplistSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionByExample"; var collection = null; var errors = require("org/arangodb").errors; @@ -1706,7 +1707,7 @@ function SimpleQueryByExampleSkiplistSuite () { //////////////////////////////////////////////////////////////////////////////// function SimpleQueryByExampleEdgeSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionByExample"; var c1 = "UnitTestsCollectionByExampleEdge"; var collection = null; @@ -1887,7 +1888,7 @@ function SimpleQueryByExampleEdgeSuite () { //////////////////////////////////////////////////////////////////////////////// function SimpleQueryRangeSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionRange"; var collection = null; var age = function(d) { return d.age; }; @@ -1947,7 +1948,7 @@ function SimpleQueryRangeSuite () { //////////////////////////////////////////////////////////////////////////////// function SimpleQuerySparseRangeSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionRange"; var collection = null; var age = function(d) { return d.age; }; @@ -2039,7 +2040,7 @@ function SimpleQuerySparseRangeSuite () { //////////////////////////////////////////////////////////////////////////////// function SimpleQueryUniqueRangeSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionRange"; var collection = null; var age = function(d) { return d.age; }; @@ -2099,7 +2100,7 @@ function SimpleQueryUniqueRangeSuite () { //////////////////////////////////////////////////////////////////////////////// function SimpleQueryUniqueSparseRangeSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionRange"; var collection = null; var age = function(d) { return d.age; }; @@ -2190,7 +2191,7 @@ function SimpleQueryUniqueSparseRangeSuite () { //////////////////////////////////////////////////////////////////////////////// function SimpleQueryAnySuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionAny"; var collectionEmpty = null; var collectionOne = null; diff --git a/js/common/tests/shell-statement-cluster.js b/js/common/tests/shell-statement-cluster.js index 3c4e580ca7..42e63a1590 100644 --- a/js/common/tests/shell-statement-cluster.js +++ b/js/common/tests/shell-statement-cluster.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, assertTrue, assertFalse */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the statement class @@ -41,7 +42,7 @@ var db = arangodb.db; //////////////////////////////////////////////////////////////////////////////// function StatementSuiteNonCluster () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-statement-noncluster.js b/js/common/tests/shell-statement-noncluster.js index 046a4e961f..1ff3456f5b 100644 --- a/js/common/tests/shell-statement-noncluster.js +++ b/js/common/tests/shell-statement-noncluster.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, assertTrue, assertFalse */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the statement class @@ -41,7 +42,7 @@ var db = arangodb.db; //////////////////////////////////////////////////////////////////////////////// function StatementSuiteNonCluster () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-statement.js b/js/common/tests/shell-statement.js index e381dcdf7f..46d5617b67 100644 --- a/js/common/tests/shell-statement.js +++ b/js/common/tests/shell-statement.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, assertTrue, assertFalse, assertUndefined, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertFalse, assertUndefined, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the statement class @@ -42,7 +43,7 @@ var ERRORS = arangodb.errors; //////////////////////////////////////////////////////////////////////////////// function StatementSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-tasks-timecritical.js b/js/common/tests/shell-tasks-timecritical.js index 6df3cadc80..8cb4d40b11 100644 --- a/js/common/tests/shell-tasks-timecritical.js +++ b/js/common/tests/shell-tasks-timecritical.js @@ -1,5 +1,5 @@ -/*jshint strict: false */ -/*global require, assertTrue, assertEqual, assertMatch, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertTrue, assertEqual, assertMatch, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the task manager diff --git a/js/common/tests/shell-transactions.js b/js/common/tests/shell-transactions.js index 604d03bb7c..974bd5cc4a 100644 --- a/js/common/tests/shell-transactions.js +++ b/js/common/tests/shell-transactions.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for client/server side transaction invocation @@ -42,7 +43,7 @@ var db = arangodb.db; //////////////////////////////////////////////////////////////////////////////// function TransactionsInvocationsSuite () { - "use strict"; + 'use strict'; return { diff --git a/js/common/tests/shell-unique-constraint.js b/js/common/tests/shell-unique-constraint.js index 13629649ae..d22fc0cd27 100644 --- a/js/common/tests/shell-unique-constraint.js +++ b/js/common/tests/shell-unique-constraint.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual, assertNotEqual, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertNotEqual, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the unique constraint @@ -40,7 +40,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function UniqueConstraintSuite() { - "use strict"; + 'use strict'; var ERRORS = internal.errors; var cn = "UnitTestsCollectionHash"; var collection = null; diff --git a/js/common/tests/shell-unload.js b/js/common/tests/shell-unload.js index ff9aaa0b9f..02f5725669 100644 --- a/js/common/tests/shell-unload.js +++ b/js/common/tests/shell-unload.js @@ -1,4 +1,4 @@ -/*global require */ +/*jshint globalstrict:false, strict:false */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests unloading while there are still document barriers @@ -39,7 +39,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function UnloadSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionUnload"; var collection; diff --git a/js/common/tests/shell-users.js b/js/common/tests/shell-users.js index 1960c01560..c328ea66e4 100644 --- a/js/common/tests/shell-users.js +++ b/js/common/tests/shell-users.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, fail */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the users management @@ -43,7 +44,7 @@ var users = require("org/arangodb/users"); //////////////////////////////////////////////////////////////////////////////// function UsersSuite () { - "use strict"; + 'use strict'; var c = db._collection("_users"); var clearGarbage = function () { diff --git a/js/node/process.js b/js/node/process.js index cf86731fd6..30716a3315 100644 --- a/js/node/process.js +++ b/js/node/process.js @@ -1,5 +1,5 @@ /*jshint esnext: true, strict: false, unused: false, -W051: true */ -/*global require, module, exports:true */ +/*global exports:true */ var EventEmitter = require('events').EventEmitter; exports = module.exports = new EventEmitter(); exports.env = require("internal").env; diff --git a/js/server/bootstrap/autoload.js b/js/server/bootstrap/autoload.js index b755ea9474..44f76bf677 100644 --- a/js/server/bootstrap/autoload.js +++ b/js/server/bootstrap/autoload.js @@ -1,6 +1,4 @@ -/*jshint globalstrict:true */ -/*global require */ -"use strict"; +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief autoload modules diff --git a/js/server/bootstrap/coordinator-database.js b/js/server/bootstrap/coordinator-database.js index 79d06053ee..b62fce52d1 100644 --- a/js/server/bootstrap/coordinator-database.js +++ b/js/server/bootstrap/coordinator-database.js @@ -1,5 +1,3 @@ -/*jshint globalstrict:true */ -/*global global, require */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/bootstrap/coordinator.js b/js/server/bootstrap/coordinator.js index 5659ef5644..54228a0c4c 100644 --- a/js/server/bootstrap/coordinator.js +++ b/js/server/bootstrap/coordinator.js @@ -1,6 +1,4 @@ -/*jshint globalstrict:true */ -/*global global, require */ -"use strict"; +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief initialise a new database diff --git a/js/server/bootstrap/db-server.js b/js/server/bootstrap/db-server.js index e64a3ff804..de1a2a9919 100644 --- a/js/server/bootstrap/db-server.js +++ b/js/server/bootstrap/db-server.js @@ -1,5 +1,4 @@ -/*jshint globalstrict:true, -W051:true */ -/*global global, require */ +/*jshint -W051:true */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/bootstrap/foxxes.js b/js/server/bootstrap/foxxes.js index 4a763956f9..5ff7d8e818 100644 --- a/js/server/bootstrap/foxxes.js +++ b/js/server/bootstrap/foxxes.js @@ -1,5 +1,3 @@ -/*jshint globalstrict:true */ -/*global require */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/bootstrap/local-database.js b/js/server/bootstrap/local-database.js index 1bfadbbfbf..050abd9e34 100644 --- a/js/server/bootstrap/local-database.js +++ b/js/server/bootstrap/local-database.js @@ -1,5 +1,4 @@ -/*jshint globalstrict:true, -W051:true */ -/*global global, require */ +/*jshint -W051:true */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/bootstrap/module-internal.js b/js/server/bootstrap/module-internal.js index 6fde8e41c7..fee35a6701 100644 --- a/js/server/bootstrap/module-internal.js +++ b/js/server/bootstrap/module-internal.js @@ -1,5 +1,4 @@ -/*jshint globalstrict:true, -W051:true */ -/*global global, require */ +/*jshint -W051:true */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/bootstrap/routing.js b/js/server/bootstrap/routing.js index 002e9bd57b..270d9aca22 100644 --- a/js/server/bootstrap/routing.js +++ b/js/server/bootstrap/routing.js @@ -1,5 +1,3 @@ -/*jshint globalstrict:true */ -/*global require */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/check-version.js b/js/server/check-version.js index 8ed3900921..16e62242f2 100644 --- a/js/server/check-version.js +++ b/js/server/check-version.js @@ -1,4 +1,4 @@ -/*global require, exports, module, UPGRADE_ARGS */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief check if the version of database is a match diff --git a/js/server/initialise.js b/js/server/initialise.js index f8cea42606..be5d716c92 100644 --- a/js/server/initialise.js +++ b/js/server/initialise.js @@ -1,4 +1,4 @@ -/*global global, require */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief basic initialisation diff --git a/js/server/modules/org/arangodb.js b/js/server/modules/org/arangodb.js index 7774bb4ed2..7ef4361860 100644 --- a/js/server/modules/org/arangodb.js +++ b/js/server/modules/org/arangodb.js @@ -1,4 +1,4 @@ -/*global require, exports, module */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief JavaScript base module @@ -30,13 +30,10 @@ module.isSystem = true; var common = require("org/arangodb-common"); -var key; -for (key in common) { - if (common.hasOwnProperty(key)) { - exports[key] = common[key]; - } -} +Object.keys(common).forEach(function (key) { + exports[key] = common[key]; +}); var internal = require("internal"); // OK: db diff --git a/js/server/modules/org/arangodb/actions.js b/js/server/modules/org/arangodb/actions.js index 62f0184268..77ec7ad5df 100644 --- a/js/server/modules/org/arangodb/actions.js +++ b/js/server/modules/org/arangodb/actions.js @@ -1,5 +1,5 @@ /*jshint strict: false, unused: false */ -/*global require, exports, module, JSON_CURSOR */ +/*global JSON_CURSOR */ //////////////////////////////////////////////////////////////////////////////// /// @brief JavaScript actions module diff --git a/js/server/modules/org/arangodb/actions/echoController.js b/js/server/modules/org/arangodb/actions/echoController.js index 56d046d69b..cd65e38239 100644 --- a/js/server/modules/org/arangodb/actions/echoController.js +++ b/js/server/modules/org/arangodb/actions/echoController.js @@ -1,5 +1,4 @@ /*jshint strict: false, unused: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief example echo controller diff --git a/js/server/modules/org/arangodb/actions/staticContentController.js b/js/server/modules/org/arangodb/actions/staticContentController.js index e27ab7355b..0d3f0d230f 100644 --- a/js/server/modules/org/arangodb/actions/staticContentController.js +++ b/js/server/modules/org/arangodb/actions/staticContentController.js @@ -1,5 +1,4 @@ /*jshint strict: false, unused: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief deliver static content from collection diff --git a/js/server/modules/org/arangodb/aql-helper.js b/js/server/modules/org/arangodb/aql-helper.js index 3d89bb521b..b6ad45ba59 100644 --- a/js/server/modules/org/arangodb/aql-helper.js +++ b/js/server/modules/org/arangodb/aql-helper.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, exports, assertTrue, assertEqual, fail, +/*global assertTrue, assertEqual, fail, AQL_EXECUTE, AQL_PARSE, AQL_EXPLAIN, AQL_EXECUTEJSON */ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/modules/org/arangodb/aql.js b/js/server/modules/org/arangodb/aql.js index 5288558496..1ea4f27625 100644 --- a/js/server/modules/org/arangodb/aql.js +++ b/js/server/modules/org/arangodb/aql.js @@ -1,5 +1,5 @@ /*jshint strict: false, unused: false, bitwise: false */ -/*global require, exports, COMPARE_STRING, AQL_TO_BOOL, AQL_TO_NUMBER, AQL_TO_STRING, AQL_WARNING, AQL_QUERY_SLEEP */ +/*global COMPARE_STRING, AQL_TO_BOOL, AQL_TO_NUMBER, AQL_TO_STRING, AQL_WARNING, AQL_QUERY_SLEEP */ //////////////////////////////////////////////////////////////////////////////// /// @brief Ahuacatl, internal query functions @@ -152,7 +152,7 @@ var TYPEWEIGHT_OBJECT = 16; //////////////////////////////////////////////////////////////////////////////// function WARN (func, error, data) { - "use strict"; + 'use strict'; if (error.code === INTERNAL.errors.ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH.code) { AQL_WARNING(error.code, error.message.replace(/%s/, func)); @@ -177,7 +177,7 @@ function WARN (func, error, data) { //////////////////////////////////////////////////////////////////////////////// function THROW (func, error, data) { - "use strict"; + 'use strict'; var prefix = ""; if (func !== null && func !== "") { @@ -210,7 +210,7 @@ function DB_PREFIX () { //////////////////////////////////////////////////////////////////////////////// function resetRegexCache () { - "use strict"; + 'use strict'; RegexCache = { 'i' : { }, '' : { } }; } @@ -220,7 +220,7 @@ function resetRegexCache () { //////////////////////////////////////////////////////////////////////////////// function reloadUserFunctions () { - "use strict"; + 'use strict'; var prefix = DB_PREFIX(); var c = INTERNAL.db._collection("_aqlfunctions"); @@ -377,7 +377,7 @@ function GET_EXPANDFILTER (name, config) { //////////////////////////////////////////////////////////////////////////////// function NORMALIZE_FNAME (functionName) { - "use strict"; + 'use strict'; var p = functionName.indexOf('::'); @@ -393,7 +393,7 @@ function NORMALIZE_FNAME (functionName) { //////////////////////////////////////////////////////////////////////////////// function FILTER (list, examples) { - "use strict"; + 'use strict'; var result = [ ], i; @@ -417,7 +417,7 @@ function FILTER (list, examples) { //////////////////////////////////////////////////////////////////////////////// function INDEX_FULLTEXT (collection, attribute) { - "use strict"; + 'use strict'; var indexes = collection.getIndexes(), i; @@ -436,7 +436,7 @@ function INDEX_FULLTEXT (collection, attribute) { //////////////////////////////////////////////////////////////////////////////// function INDEX (collection, indexTypes) { - "use strict"; + 'use strict'; var indexes = collection.getIndexes(), i, j; @@ -458,7 +458,7 @@ function INDEX (collection, indexTypes) { //////////////////////////////////////////////////////////////////////////////// function COLLECTION (name) { - "use strict"; + 'use strict'; if (typeof name !== 'string') { THROW(null, INTERNAL.errors.ERROR_INTERNAL); @@ -495,7 +495,7 @@ function TO_LIST (param, isStringHash) { //////////////////////////////////////////////////////////////////////////////// function CLONE (obj) { - "use strict"; + 'use strict'; if (obj === null || typeof(obj) !== "object" || obj instanceof ShapedJson) { return obj; @@ -523,7 +523,7 @@ function CLONE (obj) { //////////////////////////////////////////////////////////////////////////////// function FIX_VALUE (value) { - "use strict"; + 'use strict'; if (value instanceof ShapedJson) { return value; @@ -570,7 +570,7 @@ function FIX_VALUE (value) { //////////////////////////////////////////////////////////////////////////////// function TYPEWEIGHT (value) { - "use strict"; + 'use strict'; if (value !== undefined && value !== null) { if (Array.isArray(value)) { @@ -601,7 +601,7 @@ function TYPEWEIGHT (value) { //////////////////////////////////////////////////////////////////////////////// function CREATE_REGEX_PATTERN (chars) { - "use strict"; + 'use strict'; chars = AQL_TO_STRING(chars); var i, n = chars.length, pattern = ''; @@ -641,7 +641,7 @@ function CREATE_REGEX_PATTERN (chars) { //////////////////////////////////////////////////////////////////////////////// function COMPILE_REGEX (regex, modifiers) { - "use strict"; + 'use strict'; regex = AQL_TO_STRING(regex); var i, n = regex.length; @@ -706,7 +706,7 @@ function COMPILE_REGEX (regex, modifiers) { //////////////////////////////////////////////////////////////////////////////// function FCALL_USER (name, parameters) { - "use strict"; + 'use strict'; var prefix = DB_PREFIX(), reloaded = false; if (! UserFunctions.hasOwnProperty(prefix)) { @@ -812,7 +812,7 @@ function FCALL_DYNAMIC (func, applyDirect, values, name, args) { //////////////////////////////////////////////////////////////////////////////// function NUMERIC_VALUE (value) { - "use strict"; + 'use strict'; if (isNaN(value) || ! isFinite(value)) { return null; @@ -826,7 +826,7 @@ function NUMERIC_VALUE (value) { //////////////////////////////////////////////////////////////////////////////// function FIX (value) { - "use strict"; + 'use strict'; if (value === undefined) { return null; @@ -840,7 +840,7 @@ function FIX (value) { //////////////////////////////////////////////////////////////////////////////// function VALUES (value) { - "use strict"; + 'use strict'; var values = [ ]; @@ -856,7 +856,7 @@ function VALUES (value) { //////////////////////////////////////////////////////////////////////////////// function EXTRACT_KEYS (args, startArgument, func) { - "use strict"; + 'use strict'; var keys = { }, i, j, key, key2; @@ -890,7 +890,7 @@ function EXTRACT_KEYS (args, startArgument, func) { //////////////////////////////////////////////////////////////////////////////// function KEYS (value, doSort) { - "use strict"; + 'use strict'; var keys; @@ -919,7 +919,7 @@ function KEYS (value, doSort) { //////////////////////////////////////////////////////////////////////////////// function KEYLIST (lhs, rhs) { - "use strict"; + 'use strict'; if (Array.isArray(lhs)) { // lhs & rhs are lists @@ -945,7 +945,7 @@ function KEYLIST (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function GET_INDEX (value, index) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(value) === TYPEWEIGHT_NULL) { return null; @@ -982,7 +982,7 @@ function GET_INDEX (value, index) { //////////////////////////////////////////////////////////////////////////////// function NORMALIZE (value) { - "use strict"; + 'use strict'; if (value === null || value === undefined) { return null; @@ -1015,7 +1015,7 @@ function NORMALIZE (value) { //////////////////////////////////////////////////////////////////////////////// function DOCUMENT_MEMBER (value, attributeName) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(value) !== TYPEWEIGHT_OBJECT) { return null; @@ -1035,7 +1035,7 @@ function DOCUMENT_MEMBER (value, attributeName) { //////////////////////////////////////////////////////////////////////////////// function DOCUMENT_HANDLE (id) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(id) === TYPEWEIGHT_ARRAY) { var result = [ ], i; @@ -1062,7 +1062,7 @@ function DOCUMENT_HANDLE (id) { //////////////////////////////////////////////////////////////////////////////// function AQL_DOCUMENT (collection, id) { - "use strict"; + 'use strict'; // we're polymorphic if (id === undefined) { @@ -1101,7 +1101,7 @@ function AQL_DOCUMENT (collection, id) { //////////////////////////////////////////////////////////////////////////////// function GET_DOCUMENTS (collection, offset, limit) { - "use strict"; + 'use strict'; if (offset === undefined) { offset = 0; @@ -1124,7 +1124,7 @@ function GET_DOCUMENTS (collection, offset, limit) { //////////////////////////////////////////////////////////////////////////////// function AQL_COLLECTIONS () { - "use strict"; + 'use strict'; var result = [ ]; @@ -1150,7 +1150,7 @@ function AQL_COLLECTIONS () { //////////////////////////////////////////////////////////////////////////////// function TERNARY_OPERATOR (condition, truePart, falsePart) { - "use strict"; + 'use strict'; if (condition) { return truePart(); @@ -1166,7 +1166,7 @@ function TERNARY_OPERATOR (condition, truePart, falsePart) { //////////////////////////////////////////////////////////////////////////////// function LOGICAL_AND (lhs, rhs) { - "use strict"; + 'use strict'; var l = lhs(); @@ -1185,7 +1185,7 @@ function LOGICAL_AND (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function LOGICAL_OR (lhs, rhs) { - "use strict"; + 'use strict'; var l = lhs(); @@ -1203,7 +1203,7 @@ function LOGICAL_OR (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function LOGICAL_NOT (lhs) { - "use strict"; + 'use strict'; return ! AQL_TO_BOOL(lhs); } @@ -1219,7 +1219,7 @@ function LOGICAL_NOT (lhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_EQUAL (lhs, rhs) { - "use strict"; + 'use strict'; var leftWeight = TYPEWEIGHT(lhs); var rightWeight = TYPEWEIGHT(rhs); @@ -1261,7 +1261,7 @@ function RELATIONAL_EQUAL (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_UNEQUAL (lhs, rhs) { - "use strict"; + 'use strict'; var leftWeight = TYPEWEIGHT(lhs); var rightWeight = TYPEWEIGHT(rhs); @@ -1302,7 +1302,7 @@ function RELATIONAL_UNEQUAL (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_GREATER_REC (lhs, rhs) { - "use strict"; + 'use strict'; var leftWeight = TYPEWEIGHT(lhs); var rightWeight = TYPEWEIGHT(rhs); @@ -1352,7 +1352,7 @@ function RELATIONAL_GREATER_REC (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_GREATER (lhs, rhs) { - "use strict"; + 'use strict'; var result = RELATIONAL_GREATER_REC(lhs, rhs); @@ -1368,7 +1368,7 @@ function RELATIONAL_GREATER (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_GREATEREQUAL_REC (lhs, rhs) { - "use strict"; + 'use strict'; var leftWeight = TYPEWEIGHT(lhs); var rightWeight = TYPEWEIGHT(rhs); @@ -1418,7 +1418,7 @@ function RELATIONAL_GREATEREQUAL_REC (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_GREATEREQUAL (lhs, rhs) { - "use strict"; + 'use strict'; var result = RELATIONAL_GREATEREQUAL_REC(lhs, rhs); @@ -1434,7 +1434,7 @@ function RELATIONAL_GREATEREQUAL (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_LESS_REC (lhs, rhs) { - "use strict"; + 'use strict'; var leftWeight = TYPEWEIGHT(lhs); var rightWeight = TYPEWEIGHT(rhs); @@ -1484,7 +1484,7 @@ function RELATIONAL_LESS_REC (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_LESS (lhs, rhs) { - "use strict"; + 'use strict'; var result = RELATIONAL_LESS_REC(lhs, rhs); @@ -1500,7 +1500,7 @@ function RELATIONAL_LESS (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_LESSEQUAL_REC (lhs, rhs) { - "use strict"; + 'use strict'; var leftWeight = TYPEWEIGHT(lhs); var rightWeight = TYPEWEIGHT(rhs); @@ -1550,7 +1550,7 @@ function RELATIONAL_LESSEQUAL_REC (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_LESSEQUAL (lhs, rhs) { - "use strict"; + 'use strict'; var result = RELATIONAL_LESSEQUAL_REC(lhs, rhs); @@ -1569,7 +1569,7 @@ function RELATIONAL_LESSEQUAL (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_CMP (lhs, rhs) { - "use strict"; + 'use strict'; var leftWeight = TYPEWEIGHT(lhs); var rightWeight = TYPEWEIGHT(rhs); @@ -1623,7 +1623,7 @@ function RELATIONAL_CMP (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_IN (lhs, rhs) { - "use strict"; + 'use strict'; var rightWeight = TYPEWEIGHT(rhs); @@ -1649,7 +1649,7 @@ function RELATIONAL_IN (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function RELATIONAL_NOT_IN (lhs, rhs) { - "use strict"; + 'use strict'; return ! RELATIONAL_IN(lhs, rhs); } @@ -1663,7 +1663,7 @@ function RELATIONAL_NOT_IN (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function UNARY_PLUS (value) { - "use strict"; + 'use strict'; value = AQL_TO_NUMBER(value); if (value === null) { @@ -1677,7 +1677,7 @@ function UNARY_PLUS (value) { //////////////////////////////////////////////////////////////////////////////// function UNARY_MINUS (value) { - "use strict"; + 'use strict'; value = AQL_TO_NUMBER(value); if (value === null) { @@ -1692,7 +1692,7 @@ function UNARY_MINUS (value) { //////////////////////////////////////////////////////////////////////////////// function ARITHMETIC_PLUS (lhs, rhs) { - "use strict"; + 'use strict'; lhs = AQL_TO_NUMBER(lhs); if (lhs === null) { @@ -1712,7 +1712,7 @@ function ARITHMETIC_PLUS (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function ARITHMETIC_MINUS (lhs, rhs) { - "use strict"; + 'use strict'; lhs = AQL_TO_NUMBER(lhs); if (lhs === null) { @@ -1732,7 +1732,7 @@ function ARITHMETIC_MINUS (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function ARITHMETIC_TIMES (lhs, rhs) { - "use strict"; + 'use strict'; lhs = AQL_TO_NUMBER(lhs); if (lhs === null) { @@ -1752,7 +1752,7 @@ function ARITHMETIC_TIMES (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function ARITHMETIC_DIVIDE (lhs, rhs) { - "use strict"; + 'use strict'; lhs = AQL_TO_NUMBER(lhs); if (lhs === null) { @@ -1773,7 +1773,7 @@ function ARITHMETIC_DIVIDE (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function ARITHMETIC_MODULUS (lhs, rhs) { - "use strict"; + 'use strict'; lhs = AQL_TO_NUMBER(lhs); if (lhs === null) { @@ -1798,7 +1798,7 @@ function ARITHMETIC_MODULUS (lhs, rhs) { //////////////////////////////////////////////////////////////////////////////// function AQL_CONCAT () { - "use strict"; + 'use strict'; var result = '', i, j; @@ -1828,7 +1828,7 @@ function AQL_CONCAT () { //////////////////////////////////////////////////////////////////////////////// function AQL_CONCAT_SEPARATOR () { - "use strict"; + 'use strict'; var separator, found = false, result = '', i, j; @@ -1874,7 +1874,7 @@ function AQL_CONCAT_SEPARATOR () { //////////////////////////////////////////////////////////////////////////////// function AQL_CHAR_LENGTH (value) { - "use strict"; + 'use strict'; return AQL_TO_STRING(value).length; } @@ -1884,7 +1884,7 @@ function AQL_CHAR_LENGTH (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_LOWER (value) { - "use strict"; + 'use strict'; return AQL_TO_STRING(value).toLowerCase(); } @@ -1894,7 +1894,7 @@ function AQL_LOWER (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_UPPER (value) { - "use strict"; + 'use strict'; return AQL_TO_STRING(value).toUpperCase(); } @@ -1904,7 +1904,7 @@ function AQL_UPPER (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_SUBSTRING (value, offset, count) { - "use strict"; + 'use strict'; if (count !== undefined) { count = AQL_TO_NUMBER(count); @@ -1918,7 +1918,7 @@ function AQL_SUBSTRING (value, offset, count) { //////////////////////////////////////////////////////////////////////////////// function AQL_CONTAINS (value, search, returnIndex) { - "use strict"; + 'use strict'; search = AQL_TO_STRING(search); @@ -1942,7 +1942,7 @@ function AQL_CONTAINS (value, search, returnIndex) { //////////////////////////////////////////////////////////////////////////////// function AQL_LIKE (value, regex, caseInsensitive) { - "use strict"; + 'use strict'; var modifiers = ''; if (caseInsensitive) { @@ -1969,7 +1969,7 @@ function AQL_LIKE (value, regex, caseInsensitive) { //////////////////////////////////////////////////////////////////////////////// function AQL_LEFT (value, length) { - "use strict"; + 'use strict'; return AQL_TO_STRING(value).substr(0, AQL_TO_NUMBER(length)); } @@ -1979,7 +1979,7 @@ function AQL_LEFT (value, length) { //////////////////////////////////////////////////////////////////////////////// function AQL_RIGHT (value, length) { - "use strict"; + 'use strict'; value = AQL_TO_STRING(value); length = AQL_TO_NUMBER(length); @@ -1997,7 +1997,7 @@ function AQL_RIGHT (value, length) { //////////////////////////////////////////////////////////////////////////////// function AQL_TRIM (value, chars) { - "use strict"; + 'use strict'; if (chars === 1) { return AQL_LTRIM(value); @@ -2018,7 +2018,7 @@ function AQL_TRIM (value, chars) { //////////////////////////////////////////////////////////////////////////////// function AQL_LTRIM (value, chars) { - "use strict"; + 'use strict'; if (chars === null || chars === undefined) { chars = "^\\s+"; @@ -2035,7 +2035,7 @@ function AQL_LTRIM (value, chars) { //////////////////////////////////////////////////////////////////////////////// function AQL_RTRIM (value, chars) { - "use strict"; + 'use strict'; if (chars === null || chars === undefined) { chars = "\\s+$"; @@ -2052,7 +2052,7 @@ function AQL_RTRIM (value, chars) { //////////////////////////////////////////////////////////////////////////////// function AQL_SPLIT (value, separator, limit) { - "use strict"; + 'use strict'; if (separator === null || separator === undefined) { return [ AQL_TO_STRING(value) ]; @@ -2087,7 +2087,7 @@ function AQL_SPLIT (value, separator, limit) { //////////////////////////////////////////////////////////////////////////////// function AQL_SUBSTITUTE (value, search, replace, limit) { - "use strict"; + 'use strict'; var pattern, patterns, replacements = { }, sWeight = TYPEWEIGHT(search); value = AQL_TO_STRING(value); @@ -2178,7 +2178,7 @@ function AQL_SUBSTITUTE (value, search, replace, limit) { //////////////////////////////////////////////////////////////////////////////// function AQL_MD5 (value) { - "use strict"; + 'use strict'; return INTERNAL.md5(AQL_TO_STRING(value)); } @@ -2188,7 +2188,7 @@ function AQL_MD5 (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_SHA1 (value) { - "use strict"; + 'use strict'; return INTERNAL.sha1(AQL_TO_STRING(value)); } @@ -2198,7 +2198,7 @@ function AQL_SHA1 (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_RANDOM_TOKEN (length) { - "use strict"; + 'use strict'; length = AQL_TO_NUMBER(length); @@ -2214,7 +2214,7 @@ function AQL_RANDOM_TOKEN (length) { //////////////////////////////////////////////////////////////////////////////// function AQL_FIND_FIRST (value, search, start, end) { - "use strict"; + 'use strict'; if (start !== undefined && start !== null) { start = AQL_TO_NUMBER(start); @@ -2248,7 +2248,7 @@ function AQL_FIND_FIRST (value, search, start, end) { //////////////////////////////////////////////////////////////////////////////// function AQL_FIND_LAST (value, search, start, end) { - "use strict"; + 'use strict'; if (start !== undefined && start !== null) { start = AQL_TO_NUMBER(start); @@ -2296,7 +2296,7 @@ function AQL_FIND_LAST (value, search, start, end) { //////////////////////////////////////////////////////////////////////////////// function AQL_TO_BOOL (value) { - "use strict"; + 'use strict'; switch (TYPEWEIGHT(value)) { case TYPEWEIGHT_NULL: @@ -2320,7 +2320,7 @@ function AQL_TO_BOOL (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_TO_NUMBER (value) { - "use strict"; + 'use strict'; if (value === undefined) { return null; @@ -2359,7 +2359,7 @@ function AQL_TO_NUMBER (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_TO_STRING (value) { - "use strict"; + 'use strict'; switch (TYPEWEIGHT(value)) { case TYPEWEIGHT_NULL: @@ -2382,7 +2382,7 @@ function AQL_TO_STRING (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_TO_ARRAY (value) { - "use strict"; + 'use strict'; switch (TYPEWEIGHT(value)) { case TYPEWEIGHT_NULL: @@ -2409,7 +2409,7 @@ function AQL_TO_ARRAY (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_IS_NULL (value) { - "use strict"; + 'use strict'; return (TYPEWEIGHT(value) === TYPEWEIGHT_NULL); } @@ -2421,7 +2421,7 @@ function AQL_IS_NULL (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_IS_BOOL (value) { - "use strict"; + 'use strict'; return (TYPEWEIGHT(value) === TYPEWEIGHT_BOOL); } @@ -2433,7 +2433,7 @@ function AQL_IS_BOOL (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_IS_NUMBER (value) { - "use strict"; + 'use strict'; return (TYPEWEIGHT(value) === TYPEWEIGHT_NUMBER); } @@ -2445,7 +2445,7 @@ function AQL_IS_NUMBER (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_IS_STRING (value) { - "use strict"; + 'use strict'; return (TYPEWEIGHT(value) === TYPEWEIGHT_STRING); } @@ -2457,7 +2457,7 @@ function AQL_IS_STRING (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_IS_ARRAY (value) { - "use strict"; + 'use strict'; return (TYPEWEIGHT(value) === TYPEWEIGHT_ARRAY); } @@ -2469,7 +2469,7 @@ function AQL_IS_ARRAY (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_IS_OBJECT (value) { - "use strict"; + 'use strict'; return (TYPEWEIGHT(value) === TYPEWEIGHT_OBJECT); } @@ -2483,7 +2483,7 @@ function AQL_IS_OBJECT (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_FLOOR (value) { - "use strict"; + 'use strict'; return NUMERIC_VALUE(Math.floor(AQL_TO_NUMBER(value))); } @@ -2493,7 +2493,7 @@ function AQL_FLOOR (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_CEIL (value) { - "use strict"; + 'use strict'; return NUMERIC_VALUE(Math.ceil(AQL_TO_NUMBER(value))); } @@ -2503,7 +2503,7 @@ function AQL_CEIL (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_ROUND (value) { - "use strict"; + 'use strict'; return NUMERIC_VALUE(Math.round(AQL_TO_NUMBER(value))); } @@ -2513,7 +2513,7 @@ function AQL_ROUND (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_ABS (value) { - "use strict"; + 'use strict'; return NUMERIC_VALUE(Math.abs(AQL_TO_NUMBER(value))); } @@ -2523,7 +2523,7 @@ function AQL_ABS (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_RAND () { - "use strict"; + 'use strict'; return Math.random(); } @@ -2533,7 +2533,7 @@ function AQL_RAND () { //////////////////////////////////////////////////////////////////////////////// function AQL_SQRT (value) { - "use strict"; + 'use strict'; return NUMERIC_VALUE(Math.sqrt(AQL_TO_NUMBER(value))); } @@ -2547,7 +2547,7 @@ function AQL_SQRT (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_LENGTH (value) { - "use strict"; + 'use strict'; var result, typeWeight = TYPEWEIGHT(value); @@ -2566,7 +2566,7 @@ function AQL_LENGTH (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_FIRST (value) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(value) !== TYPEWEIGHT_ARRAY) { WARN("FIRST", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -2585,7 +2585,7 @@ function AQL_FIRST (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_LAST (value) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(value) !== TYPEWEIGHT_ARRAY) { WARN("LAST", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -2604,7 +2604,7 @@ function AQL_LAST (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_POSITION (value, search, returnIndex) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(value) !== TYPEWEIGHT_ARRAY) { WARN("POSITION", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -2631,7 +2631,7 @@ function AQL_POSITION (value, search, returnIndex) { //////////////////////////////////////////////////////////////////////////////// function AQL_NTH (value, position) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(value) !== TYPEWEIGHT_ARRAY) { WARN("NTH", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -2651,7 +2651,7 @@ function AQL_NTH (value, position) { //////////////////////////////////////////////////////////////////////////////// function AQL_REVERSE (value) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(value) === TYPEWEIGHT_STRING) { return value.split("").reverse().join(""); @@ -2670,7 +2670,7 @@ function AQL_REVERSE (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_RANGE (from, to, step) { - "use strict"; + 'use strict'; from = AQL_TO_NUMBER(from); to = AQL_TO_NUMBER(to); @@ -2720,7 +2720,7 @@ function AQL_RANGE (from, to, step) { //////////////////////////////////////////////////////////////////////////////// function AQL_UNIQUE (values) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(values) !== TYPEWEIGHT_ARRAY) { WARN("UNIQUE", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -2750,7 +2750,7 @@ function AQL_UNIQUE (values) { //////////////////////////////////////////////////////////////////////////////// function AQL_UNION () { - "use strict"; + 'use strict'; var result = [ ], i; @@ -2779,7 +2779,7 @@ function AQL_UNION () { //////////////////////////////////////////////////////////////////////////////// function AQL_UNION_DISTINCT () { - "use strict"; + 'use strict'; var keys = { }, i; @@ -2818,7 +2818,7 @@ function AQL_UNION_DISTINCT () { //////////////////////////////////////////////////////////////////////////////// function AQL_CALL (values, name) { - "use strict"; + 'use strict'; var args = [ null ], i; for (i = 2; i < arguments.length; ++i) { @@ -2833,7 +2833,7 @@ function AQL_CALL (values, name) { //////////////////////////////////////////////////////////////////////////////// function AQL_APPLY (values, name, parameters) { - "use strict"; + 'use strict'; var args = [ null ], i; if (Array.isArray(parameters)) { @@ -2848,7 +2848,7 @@ function AQL_APPLY (values, name, parameters) { //////////////////////////////////////////////////////////////////////////////// function AQL_CALL (name) { - "use strict"; + 'use strict'; var args = [ ], i; for (i = 1; i < arguments.length; ++i) { @@ -2863,7 +2863,7 @@ function AQL_CALL (name) { //////////////////////////////////////////////////////////////////////////////// function AQL_APPLY (name, parameters) { - "use strict"; + 'use strict'; var args = [ ], i; if (Array.isArray(parameters)) { @@ -2878,7 +2878,7 @@ function AQL_APPLY (name, parameters) { //////////////////////////////////////////////////////////////////////////////// function AQL_REMOVE_VALUES (list, values) { - "use strict"; + 'use strict'; var type = TYPEWEIGHT(values); if (type === TYPEWEIGHT_NULL) { @@ -2913,7 +2913,7 @@ function AQL_REMOVE_VALUES (list, values) { //////////////////////////////////////////////////////////////////////////////// function AQL_REMOVE_VALUE (list, value, limit) { - "use strict"; + 'use strict'; var type = TYPEWEIGHT(list); if (type === TYPEWEIGHT_NULL) { @@ -2947,7 +2947,7 @@ function AQL_REMOVE_VALUE (list, value, limit) { //////////////////////////////////////////////////////////////////////////////// function AQL_REMOVE_NTH (list, position) { - "use strict"; + 'use strict'; var type = TYPEWEIGHT(list); if (type === TYPEWEIGHT_NULL) { @@ -2983,7 +2983,7 @@ function AQL_REMOVE_NTH (list, position) { //////////////////////////////////////////////////////////////////////////////// function AQL_PUSH (list, value, unique) { - "use strict"; + 'use strict'; var type = TYPEWEIGHT(list); if (type === TYPEWEIGHT_NULL) { @@ -3010,7 +3010,7 @@ function AQL_PUSH (list, value, unique) { //////////////////////////////////////////////////////////////////////////////// function AQL_APPEND (list, values, unique) { - "use strict"; + 'use strict'; var type = TYPEWEIGHT(values); if (type === TYPEWEIGHT_NULL) { @@ -3058,7 +3058,7 @@ function AQL_APPEND (list, values, unique) { //////////////////////////////////////////////////////////////////////////////// function AQL_POP (list) { - "use strict"; + 'use strict'; var type = TYPEWEIGHT(list); if (type === TYPEWEIGHT_NULL) { @@ -3083,7 +3083,7 @@ function AQL_POP (list) { //////////////////////////////////////////////////////////////////////////////// function AQL_UNSHIFT (list, value, unique) { - "use strict"; + 'use strict'; var type = TYPEWEIGHT(list); if (type === TYPEWEIGHT_NULL) { @@ -3109,7 +3109,7 @@ function AQL_UNSHIFT (list, value, unique) { //////////////////////////////////////////////////////////////////////////////// function AQL_SHIFT (list) { - "use strict"; + 'use strict'; var type = TYPEWEIGHT(list); if (type === TYPEWEIGHT_NULL) { @@ -3134,7 +3134,7 @@ function AQL_SHIFT (list) { //////////////////////////////////////////////////////////////////////////////// function AQL_SLICE (value, from, to) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(value) !== TYPEWEIGHT_ARRAY) { WARN("SLICE", INTERNAL.errors.ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH); @@ -3161,7 +3161,7 @@ function AQL_SLICE (value, from, to) { //////////////////////////////////////////////////////////////////////////////// function AQL_MINUS () { - "use strict"; + 'use strict'; var keys = { }, i, first = true; @@ -3208,7 +3208,7 @@ function AQL_MINUS () { //////////////////////////////////////////////////////////////////////////////// function AQL_INTERSECTION () { - "use strict"; + 'use strict'; var result = [ ], i, first = true, keys = { }; @@ -3259,7 +3259,7 @@ function AQL_INTERSECTION () { //////////////////////////////////////////////////////////////////////////////// function AQL_FLATTEN (values, maxDepth, depth) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(values) !== TYPEWEIGHT_ARRAY) { WARN("FLATTEN", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -3299,7 +3299,7 @@ function AQL_FLATTEN (values, maxDepth, depth) { //////////////////////////////////////////////////////////////////////////////// function AQL_MAX (values) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(values) !== TYPEWEIGHT_ARRAY) { WARN("MAX", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -3326,7 +3326,7 @@ function AQL_MAX (values) { //////////////////////////////////////////////////////////////////////////////// function AQL_MIN (values) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(values) !== TYPEWEIGHT_ARRAY) { WARN("MIN", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -3353,7 +3353,7 @@ function AQL_MIN (values) { //////////////////////////////////////////////////////////////////////////////// function AQL_SUM (values) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(values) !== TYPEWEIGHT_ARRAY) { WARN("SUM", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -3384,7 +3384,7 @@ function AQL_SUM (values) { //////////////////////////////////////////////////////////////////////////////// function AQL_AVERAGE (values) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(values) !== TYPEWEIGHT_ARRAY) { WARN("AVERAGE", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -3421,7 +3421,7 @@ function AQL_AVERAGE (values) { //////////////////////////////////////////////////////////////////////////////// function AQL_MEDIAN (values) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(values) !== TYPEWEIGHT_ARRAY) { WARN("MEDIAN", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -3464,7 +3464,7 @@ function AQL_MEDIAN (values) { //////////////////////////////////////////////////////////////////////////////// function AQL_PERCENTILE (values, p, method) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(values) !== TYPEWEIGHT_ARRAY) { WARN("PERCENTILE", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -3545,7 +3545,7 @@ function AQL_PERCENTILE (values, p, method) { //////////////////////////////////////////////////////////////////////////////// function VARIANCE (values) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(values) !== TYPEWEIGHT_ARRAY) { WARN("VARIANCE", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -3582,7 +3582,7 @@ function VARIANCE (values) { //////////////////////////////////////////////////////////////////////////////// function AQL_VARIANCE_SAMPLE (values) { - "use strict"; + 'use strict'; var result = VARIANCE(values); if (result === null || result === undefined) { @@ -3601,7 +3601,7 @@ function AQL_VARIANCE_SAMPLE (values) { //////////////////////////////////////////////////////////////////////////////// function AQL_VARIANCE_POPULATION (values) { - "use strict"; + 'use strict'; var result = VARIANCE(values); if (result === null || result === undefined) { @@ -3620,7 +3620,7 @@ function AQL_VARIANCE_POPULATION (values) { //////////////////////////////////////////////////////////////////////////////// function AQL_STDDEV_SAMPLE (values) { - "use strict"; + 'use strict'; var result = VARIANCE(values); if (result === null || result === undefined) { @@ -3639,7 +3639,7 @@ function AQL_STDDEV_SAMPLE (values) { //////////////////////////////////////////////////////////////////////////////// function AQL_STDDEV_POPULATION (values) { - "use strict"; + 'use strict'; var result = VARIANCE(values); if (result === null || result === undefined) { @@ -3662,7 +3662,7 @@ function AQL_STDDEV_POPULATION (values) { //////////////////////////////////////////////////////////////////////////////// function AQL_NEAR (collection, latitude, longitude, limit, distanceAttribute) { - "use strict"; + 'use strict'; if (limit === null || limit === undefined) { // use default value @@ -3713,7 +3713,7 @@ function AQL_NEAR (collection, latitude, longitude, limit, distanceAttribute) { //////////////////////////////////////////////////////////////////////////////// function AQL_WITHIN (collection, latitude, longitude, radius, distanceAttribute) { - "use strict"; + 'use strict'; var weight = TYPEWEIGHT(distanceAttribute); if (weight !== TYPEWEIGHT_NULL && weight !== TYPEWEIGHT_STRING) { @@ -3754,7 +3754,7 @@ function AQL_WITHIN (collection, latitude, longitude, radius, distanceAttribute) //////////////////////////////////////////////////////////////////////////////// function AQL_WITHIN_RECTANGLE (collection, latitude1, longitude1, latitude2, longitude2) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(latitude1) !== TYPEWEIGHT_NUMBER || TYPEWEIGHT(longitude1) !== TYPEWEIGHT_NUMBER || @@ -3772,7 +3772,7 @@ function AQL_WITHIN_RECTANGLE (collection, latitude1, longitude1, latitude2, lon //////////////////////////////////////////////////////////////////////////////// function AQL_IS_IN_POLYGON (points, latitude, longitude) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(points) !== TYPEWEIGHT_ARRAY) { WARN("POINT_IN_POLYGON", INTERNAL.errors.ERROR_QUERY_ARRAY_EXPECTED); @@ -3844,7 +3844,7 @@ function AQL_IS_IN_POLYGON (points, latitude, longitude) { //////////////////////////////////////////////////////////////////////////////// function AQL_FULLTEXT (collection, attribute, query) { - "use strict"; + 'use strict'; var idx = INDEX_FULLTEXT(COLLECTION(collection), attribute); @@ -3872,7 +3872,7 @@ function AQL_FULLTEXT (collection, attribute, query) { //////////////////////////////////////////////////////////////////////////////// function AQL_NOT_NULL () { - "use strict"; + 'use strict'; var i; for (i in arguments) { @@ -3897,7 +3897,7 @@ function AQL_NOT_NULL () { //////////////////////////////////////////////////////////////////////////////// function AQL_FIRST_LIST () { - "use strict"; + 'use strict'; var i; for (i in arguments) { @@ -3922,7 +3922,7 @@ function AQL_FIRST_LIST () { //////////////////////////////////////////////////////////////////////////////// function AQL_FIRST_DOCUMENT () { - "use strict"; + 'use strict'; var i; for (i in arguments) { @@ -3946,7 +3946,7 @@ function AQL_FIRST_DOCUMENT () { //////////////////////////////////////////////////////////////////////////////// function AQL_PARSE_IDENTIFIER (value) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(value) === TYPEWEIGHT_STRING) { var parts = value.split('/'); @@ -3977,7 +3977,7 @@ function AQL_PARSE_IDENTIFIER (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_SKIPLIST (collection, condition, skip, limit) { - "use strict"; + 'use strict'; var keys = [ ], key, idx; @@ -4024,7 +4024,7 @@ function AQL_SKIPLIST (collection, condition, skip, limit) { //////////////////////////////////////////////////////////////////////////////// function AQL_HAS (element, name) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(element) !== TYPEWEIGHT_OBJECT) { return false; @@ -4038,7 +4038,7 @@ function AQL_HAS (element, name) { //////////////////////////////////////////////////////////////////////////////// function AQL_ATTRIBUTES (element, removeInternal, sort) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(element) !== TYPEWEIGHT_OBJECT) { WARN("ATTRIBUTES", INTERNAL.errors.ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH); @@ -4069,7 +4069,7 @@ function AQL_ATTRIBUTES (element, removeInternal, sort) { //////////////////////////////////////////////////////////////////////////////// function AQL_VALUES (element, removeInternal) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(element) !== TYPEWEIGHT_OBJECT) { WARN("VALUES", INTERNAL.errors.ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH); @@ -4094,7 +4094,7 @@ function AQL_VALUES (element, removeInternal) { //////////////////////////////////////////////////////////////////////////////// function AQL_ZIP (keys, values) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(keys) !== TYPEWEIGHT_ARRAY || TYPEWEIGHT(values) !== TYPEWEIGHT_ARRAY || @@ -4117,7 +4117,7 @@ function AQL_ZIP (keys, values) { //////////////////////////////////////////////////////////////////////////////// function AQL_UNSET (value) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(value) !== TYPEWEIGHT_OBJECT) { WARN("UNSET", INTERNAL.errors.ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH); @@ -4141,7 +4141,7 @@ function AQL_UNSET (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_KEEP (value) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(value) !== TYPEWEIGHT_OBJECT) { WARN("KEEP", INTERNAL.errors.ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH); @@ -4165,7 +4165,7 @@ function AQL_KEEP (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_MERGE () { - "use strict"; + 'use strict'; var result = { }, i; @@ -4197,7 +4197,7 @@ function AQL_MERGE () { //////////////////////////////////////////////////////////////////////////////// function AQL_MERGE_RECURSIVE () { - "use strict"; + 'use strict'; var result = { }, i, recurse; @@ -4237,7 +4237,7 @@ function AQL_MERGE_RECURSIVE () { //////////////////////////////////////////////////////////////////////////////// function AQL_TRANSLATE (value, lookup, defaultValue) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(lookup) !== TYPEWEIGHT_OBJECT) { WARN("TRANSLATE", INTERNAL.errors.ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH); @@ -4263,7 +4263,7 @@ function AQL_TRANSLATE (value, lookup, defaultValue) { //////////////////////////////////////////////////////////////////////////////// function AQL_MATCHES (element, examples, returnIndex) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(element) !== TYPEWEIGHT_OBJECT) { return false; @@ -4314,7 +4314,7 @@ function AQL_MATCHES (element, examples, returnIndex) { //////////////////////////////////////////////////////////////////////////////// function AQL_PASSTHRU (value) { - "use strict"; + 'use strict'; return value; } @@ -4326,7 +4326,7 @@ function AQL_PASSTHRU (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_SLEEP (duration) { - "use strict"; + 'use strict'; duration = AQL_TO_NUMBER(duration); if (TYPEWEIGHT(duration) !== TYPEWEIGHT_NUMBER || duration < 0) { @@ -4345,7 +4345,7 @@ function AQL_SLEEP (duration) { //////////////////////////////////////////////////////////////////////////////// function AQL_CURRENT_USER () { - "use strict"; + 'use strict'; if (INTERNAL.getCurrentRequest) { var req = INTERNAL.getCurrentRequest(); @@ -4364,7 +4364,7 @@ function AQL_CURRENT_USER () { //////////////////////////////////////////////////////////////////////////////// function AQL_CURRENT_DATABASE () { - "use strict"; + 'use strict'; return INTERNAL.db._name(); } @@ -4377,7 +4377,7 @@ function AQL_CURRENT_DATABASE () { //////////////////////////////////////////////////////////////////////////////// function AQL_FAIL (message) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(message) === TYPEWEIGHT_STRING) { THROW("FAIL", INTERNAL.errors.ERROR_QUERY_FAIL_CALLED, message); @@ -4395,7 +4395,7 @@ function AQL_FAIL (message) { //////////////////////////////////////////////////////////////////////////////// function MAKE_DATE (args, func) { - "use strict"; + 'use strict'; var weight; var i, n = args.length; @@ -4467,7 +4467,7 @@ function MAKE_DATE (args, func) { //////////////////////////////////////////////////////////////////////////////// function AQL_DATE_NOW () { - "use strict"; + 'use strict'; return Date.now(); } @@ -4477,7 +4477,7 @@ function AQL_DATE_NOW () { //////////////////////////////////////////////////////////////////////////////// function AQL_DATE_TIMESTAMP () { - "use strict"; + 'use strict'; try { return MAKE_DATE(arguments, "DATE_TIMESTAMP").getTime(); @@ -4493,7 +4493,7 @@ function AQL_DATE_TIMESTAMP () { //////////////////////////////////////////////////////////////////////////////// function AQL_DATE_ISO8601 () { - "use strict"; + 'use strict'; try { return MAKE_DATE(arguments, "DATE_ISO8601").toISOString(); @@ -4509,7 +4509,7 @@ function AQL_DATE_ISO8601 () { //////////////////////////////////////////////////////////////////////////////// function AQL_DATE_DAYOFWEEK (value) { - "use strict"; + 'use strict'; try { return MAKE_DATE([ value ], "DATE_DAYOFWEEK").getUTCDay(); @@ -4525,7 +4525,7 @@ function AQL_DATE_DAYOFWEEK (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_DATE_YEAR (value) { - "use strict"; + 'use strict'; try { return MAKE_DATE([ value ], "DATE_YEAR").getUTCFullYear(); @@ -4541,7 +4541,7 @@ function AQL_DATE_YEAR (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_DATE_MONTH (value) { - "use strict"; + 'use strict'; try { return MAKE_DATE([ value ], "DATE_MONTH").getUTCMonth() + 1; @@ -4557,7 +4557,7 @@ function AQL_DATE_MONTH (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_DATE_DAY (value) { - "use strict"; + 'use strict'; try { return MAKE_DATE([ value ], "DATE_DAY").getUTCDate(); @@ -4573,7 +4573,7 @@ function AQL_DATE_DAY (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_DATE_HOUR (value) { - "use strict"; + 'use strict'; try { return MAKE_DATE([ value ], "DATE_HOUR").getUTCHours(); @@ -4589,7 +4589,7 @@ function AQL_DATE_HOUR (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_DATE_MINUTE (value) { - "use strict"; + 'use strict'; try { return MAKE_DATE([ value ], "DATE_MINUTE").getUTCMinutes(); @@ -4605,7 +4605,7 @@ function AQL_DATE_MINUTE (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_DATE_SECOND (value) { - "use strict"; + 'use strict'; try { return MAKE_DATE([ value ], "DATE_SECOND").getUTCSeconds(); @@ -4621,7 +4621,7 @@ function AQL_DATE_SECOND (value) { //////////////////////////////////////////////////////////////////////////////// function AQL_DATE_MILLISECOND (value) { - "use strict"; + 'use strict'; try { return MAKE_DATE([ value ], "DATE_MILLISECOND").getUTCMilliseconds(); @@ -4666,7 +4666,7 @@ function GET_SUB_EDGES (edgeCollections, direction, vertexId) { //////////////////////////////////////////////////////////////////////////////// function SUBNODES (searchAttributes, vertexId, visited, edges, vertices, level) { - "use strict"; + 'use strict'; var result = [ ]; @@ -4745,7 +4745,7 @@ function SUBNODES (searchAttributes, vertexId, visited, edges, vertices, level) //////////////////////////////////////////////////////////////////////////////// function AQL_PATHS (vertices, edgeCollection, direction, options) { - "use strict"; + 'use strict'; direction = direction || "outbound"; followCycles = followCycles || false; @@ -4859,7 +4859,7 @@ function AQL_PATHS (vertices, edgeCollection, direction, options) { //////////////////////////////////////////////////////////////////////////////// function AQL_GRAPH_PATHS (graphName, options) { - "use strict"; + 'use strict'; var searchDirection; if (! options) { @@ -4959,7 +4959,7 @@ function AQL_GRAPH_PATHS (graphName, options) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_VISITOR (config, result, vertex, path) { - "use strict"; + 'use strict'; if (config.trackPaths) { result.push(CLONE({ vertex: vertex, path: path })); @@ -4974,7 +4974,7 @@ function TRAVERSAL_VISITOR (config, result, vertex, path) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_NEIGHBOR_VISITOR (config, result, vertex, path) { - "use strict"; + 'use strict'; result.push(CLONE({ vertex: vertex, path: path, startVertex : config.startVertex })); } @@ -4984,7 +4984,7 @@ function TRAVERSAL_NEIGHBOR_VISITOR (config, result, vertex, path) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_TREE_VISITOR (config, result, vertex, path) { - "use strict"; + 'use strict'; if (result.length === 0) { result.push({ }); @@ -5017,7 +5017,7 @@ function TRAVERSAL_TREE_VISITOR (config, result, vertex, path) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_EDGE_EXAMPLE_FILTER (config, vertex, edge, path) { - "use strict"; + 'use strict'; if (config.edgeCollectionRestriction) { if (typeof config.edgeCollectionRestriction === "string" ) { config.edgeCollectionRestriction = [config.edgeCollectionRestriction]; @@ -5038,7 +5038,7 @@ function TRAVERSAL_EDGE_EXAMPLE_FILTER (config, vertex, edge, path) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_VERTEX_FILTER (config, vertex, path) { - "use strict"; + 'use strict'; if (config.filterVertexExamples && ! AQL_MATCHES(vertex, config.filterVertexExamples)) { if (config.filterVertexCollections && config.vertexFilterMethod.indexOf("exclude") === -1 @@ -5063,7 +5063,7 @@ function TRAVERSAL_VERTEX_FILTER (config, vertex, path) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_CHECK_EXAMPLES_TYPEWEIGHTS (examples, func) { - "use strict"; + 'use strict'; if (TYPEWEIGHT(examples) === TYPEWEIGHT_STRING) { // a callback function was supplied. this is considered valid @@ -5095,7 +5095,7 @@ function TRAVERSAL_CHECK_EXAMPLES_TYPEWEIGHTS (examples, func) { //////////////////////////////////////////////////////////////////////////////// function TO_ID (vertex, collection) { - "use strict"; + 'use strict'; if (typeof vertex === 'object' && vertex.hasOwnProperty('_id')) { return vertex._id; @@ -5246,7 +5246,7 @@ function TRAVERSAL_FUNC (func, endVertex, direction, params) { - "use strict"; + 'use strict'; var info = TRAVERSAL_CONFIG(func, datasource, startVertex, endVertex, direction, params); var result = [ ]; @@ -5471,7 +5471,7 @@ function DETERMINE_WEIGHT (edge, weight, defaultWeight) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_DISTANCE_VISITOR (config, result, vertex, path) { - "use strict"; + 'use strict'; if (config.endVertex && config.endVertex === vertex._id) { var dist = 0; @@ -5497,7 +5497,7 @@ function TRAVERSAL_DISTANCE_VISITOR (config, result, vertex, path) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_DIJKSTRA_VISITOR (config, result, node, path) { - "use strict"; + 'use strict'; var vertex = node.vertex; var res; if (config.hasOwnProperty("includeData") @@ -5547,7 +5547,7 @@ function TRAVERSAL_DIJKSTRA_VISITOR (config, result, node, path) { //////////////////////////////////////////////////////////////////////////////// function SHORTEST_PATH_PARAMS (params) { - "use strict"; + 'use strict'; if (params === undefined) { params = { }; @@ -5589,7 +5589,7 @@ function AQL_SHORTEST_PATH (vertexCollection, endVertex, direction, params) { - "use strict"; + 'use strict'; params = SHORTEST_PATH_PARAMS(params); @@ -5606,7 +5606,7 @@ function AQL_SHORTEST_PATH (vertexCollection, //////////////////////////////////////////////////////////////////////////////// function CALCULATE_SHORTEST_PATHES_WITH_FLOYD_WARSHALL (graphData, options) { - "use strict"; + 'use strict'; var graph = graphData, result = []; @@ -5775,7 +5775,7 @@ function CALCULATE_SHORTEST_PATHES_WITH_FLOYD_WARSHALL (graphData, options) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_PARAMS (params, defaultVisitor) { - "use strict"; + 'use strict'; if (params === undefined) { params = { }; @@ -6000,7 +6000,7 @@ function AQL_GRAPH_SHORTEST_PATH (graphName, startVertexExample, endVertexExample, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; @@ -6034,7 +6034,7 @@ function AQL_TRAVERSAL (vertexCollection, startVertex, direction, params) { - "use strict"; + 'use strict'; params = TRAVERSAL_PARAMS(params); @@ -6120,7 +6120,7 @@ function AQL_GRAPH_TRAVERSAL (graphName, startVertexExample, direction, options) { - "use strict"; + 'use strict'; var result = []; options = TRAVERSAL_PARAMS(options); @@ -6147,7 +6147,7 @@ function AQL_GRAPH_TRAVERSAL (graphName, //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_TREE_PARAMS (params, connectName, func) { - "use strict"; + 'use strict'; if (params === undefined) { params = { }; @@ -6183,7 +6183,7 @@ function AQL_TRAVERSAL_TREE (vertexCollection, direction, connectName, params) { - "use strict"; + 'use strict'; params = TRAVERSAL_TREE_PARAMS(params, connectName, "TRAVERSAL_TREE"); if (params === null) { @@ -6249,7 +6249,7 @@ function AQL_GRAPH_DISTANCE_TO (graphName, startVertexExample, endVertexExample, options) { - "use strict"; + 'use strict'; if (! options) { options = {}; @@ -6319,7 +6319,7 @@ function AQL_GRAPH_TRAVERSAL_TREE (graphName, direction, connectName, options) { - "use strict"; + 'use strict'; var result = []; options = TRAVERSAL_TREE_PARAMS(options, connectName, "GRAPH_TRAVERSAL_TREE"); @@ -6354,7 +6354,7 @@ function AQL_EDGES (edgeCollection, vertex, direction, examples) { - "use strict"; + 'use strict'; var c = COLLECTION(edgeCollection), result; @@ -6381,7 +6381,7 @@ function AQL_EDGES (edgeCollection, //////////////////////////////////////////////////////////////////////////////// function FILTERED_EDGES (edges, vertex, direction, examples) { - "use strict"; + 'use strict'; var result = [ ]; @@ -6425,7 +6425,7 @@ function AQL_NEIGHBORS (vertexCollection, vertex, direction, examples) { - "use strict"; + 'use strict'; vertex = TO_ID(vertex, vertexCollection); var edges = AQL_EDGES(edgeCollection, vertex, direction); @@ -6499,7 +6499,7 @@ function AQL_NEIGHBORS (vertexCollection, function AQL_GRAPH_NEIGHBORS (graphName, vertexExample, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; } @@ -6639,7 +6639,7 @@ function AQL_GRAPH_NEIGHBORS (graphName, function AQL_GRAPH_EDGES (graphName, vertexExample, options) { - "use strict"; + 'use strict'; var neighbors = AQL_GRAPH_NEIGHBORS(graphName, vertexExample, @@ -6707,7 +6707,7 @@ function AQL_GRAPH_EDGES (graphName, function AQL_GRAPH_VERTICES (graphName, vertexExamples, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; @@ -6802,7 +6802,7 @@ function AQL_GRAPH_COMMON_NEIGHBORS (graphName, vertex2Examples, options1, options2) { - "use strict"; + 'use strict'; var neighbors1 = TRANSFER_GRAPH_NEIGHBORS_RESULT( AQL_GRAPH_NEIGHBORS(graphName, vertex1Examples, options1) @@ -6910,7 +6910,7 @@ function AQL_GRAPH_COMMON_PROPERTIES (graphName, vertex1Examples, vertex2Examples, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; @@ -7021,7 +7021,7 @@ function RUN_DIJKSTRA_WITH_RESULT_HANDLE (func, graphName, options, result, afte //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_ABSOLUTE_ECCENTRICITY_VISITOR (config, result, node, path) { - "use strict"; + 'use strict'; result[path.vertices[0]._id] = Math.max(node.dist, result[path.vertices[0]._id] || 0); } @@ -7106,7 +7106,7 @@ function TRAVERSAL_ABSOLUTE_ECCENTRICITY_VISITOR (config, result, node, path) { //////////////////////////////////////////////////////////////////////////////// function AQL_GRAPH_ABSOLUTE_ECCENTRICITY (graphName, vertexExample, options) { - "use strict"; + 'use strict'; if (! options) { options = {}; } @@ -7134,7 +7134,7 @@ function AQL_GRAPH_ABSOLUTE_ECCENTRICITY (graphName, vertexExample, options) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_ECCENTRICITY_VISITOR (config, result, node, path) { - "use strict"; + 'use strict'; if(path.edges.length > 0) { result.current = Math.min(1 / node.dist, result.current || 1); } @@ -7194,7 +7194,7 @@ function TRAVERSAL_ECCENTRICITY_VISITOR (config, result, node, path) { //////////////////////////////////////////////////////////////////////////////// function AQL_GRAPH_ECCENTRICITY (graphName, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; @@ -7241,7 +7241,7 @@ function AQL_GRAPH_ECCENTRICITY (graphName, options) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_ABSOLUTE_CLOSENESS_VISITOR (config, result, node, path) { - "use strict"; + 'use strict'; result[path.vertices[0]._id] = result[path.vertices[0]._id] || 0; result[path.vertices[0]._id] += node.dist; } @@ -7328,7 +7328,7 @@ function TRAVERSAL_ABSOLUTE_CLOSENESS_VISITOR (config, result, node, path) { /* function AQL_GRAPH_ABSOLUTE_CLOSENESS (graphName, vertexExample, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; } @@ -7350,7 +7350,7 @@ function AQL_GRAPH_ABSOLUTE_CLOSENESS (graphName, vertexExample, options) { } function AQL_GRAPH_CLOSENESS (graphName, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; } @@ -7375,7 +7375,7 @@ function AQL_GRAPH_CLOSENESS (graphName, options) { */ function AQL_GRAPH_ABSOLUTE_CLOSENESS (graphName, vertexExample, options) { - "use strict"; + 'use strict'; if (! options) { options = {}; } @@ -7402,7 +7402,7 @@ function AQL_GRAPH_ABSOLUTE_CLOSENESS (graphName, vertexExample, options) { //////////////////////////////////////////////////////////////////////////////// function TRAVERSAL_CLOSENESS_VISITOR (config, result, node, path) { - "use strict"; + 'use strict'; result.current += node.dist; } @@ -7474,7 +7474,7 @@ function TRAVERSAL_CLOSENESS_VISITOR (config, result, node, path) { //////////////////////////////////////////////////////////////////////////////// function AQL_GRAPH_CLOSENESS (graphName, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; @@ -7579,7 +7579,7 @@ function AQL_GRAPH_CLOSENESS (graphName, options) { //////////////////////////////////////////////////////////////////////////////// function AQL_GRAPH_ABSOLUTE_BETWEENNESS (graphName, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; @@ -7684,7 +7684,7 @@ function AQL_GRAPH_ABSOLUTE_BETWEENNESS (graphName, options) { //////////////////////////////////////////////////////////////////////////////// function AQL_GRAPH_BETWEENNESS (graphName, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; @@ -7766,7 +7766,7 @@ function AQL_GRAPH_BETWEENNESS (graphName, options) { //////////////////////////////////////////////////////////////////////////////// function AQL_GRAPH_RADIUS (graphName, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; @@ -7857,7 +7857,7 @@ function AQL_GRAPH_RADIUS (graphName, options) { //////////////////////////////////////////////////////////////////////////////// function AQL_GRAPH_DIAMETER (graphName, options) { - "use strict"; + 'use strict'; if (! options) { options = { }; diff --git a/js/server/modules/org/arangodb/aql/queries.js b/js/server/modules/org/arangodb/aql/queries.js index 056b03a915..b80a670d80 100644 --- a/js/server/modules/org/arangodb/aql/queries.js +++ b/js/server/modules/org/arangodb/aql/queries.js @@ -1,4 +1,4 @@ -/*global exports, AQL_QUERIES_SLOW, AQL_QUERIES_CURRENT, AQL_QUERIES_PROPERTIES, +/*global AQL_QUERIES_SLOW, AQL_QUERIES_CURRENT, AQL_QUERIES_PROPERTIES, AQL_QUERIES_KILL */ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/modules/org/arangodb/arango-collection.js b/js/server/modules/org/arangodb/arango-collection.js index 0286bcbc1a..066209180d 100644 --- a/js/server/modules/org/arangodb/arango-collection.js +++ b/js/server/modules/org/arangodb/arango-collection.js @@ -965,7 +965,7 @@ ArangoCollection.prototype.updateByExample = function (example, //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.ensureCapConstraint = function (size, byteSize) { - "use strict"; + 'use strict'; return this.ensureIndex({ type: "cap", @@ -1009,7 +1009,7 @@ ArangoCollection.prototype.ensureCapConstraint = function (size, byteSize) { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.ensureUniqueSkiplist = function () { - "use strict"; + 'use strict'; return this.ensureIndex(addIndexOptions({ type: "skiplist", @@ -1046,7 +1046,7 @@ ArangoCollection.prototype.ensureUniqueSkiplist = function () { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.ensureSkiplist = function () { - "use strict"; + 'use strict'; return this.ensureIndex(addIndexOptions({ type: "skiplist" @@ -1076,7 +1076,7 @@ ArangoCollection.prototype.ensureSkiplist = function () { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.ensureFulltextIndex = function (field, minLength) { - "use strict"; + 'use strict'; if (! Array.isArray(field)) { field = [ field ]; @@ -1126,7 +1126,7 @@ ArangoCollection.prototype.ensureFulltextIndex = function (field, minLength) { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.ensureUniqueConstraint = function () { - "use strict"; + 'use strict'; return this.ensureIndex(addIndexOptions({ type: "hash", @@ -1166,7 +1166,7 @@ ArangoCollection.prototype.ensureUniqueConstraint = function () { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.ensureHashIndex = function () { - "use strict"; + 'use strict'; return this.ensureIndex(addIndexOptions({ type: "hash" @@ -1221,7 +1221,7 @@ ArangoCollection.prototype.ensureHashIndex = function () { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.ensureGeoIndex = function (lat, lon) { - "use strict"; + 'use strict'; if (typeof lat !== "string") { throw "usage: ensureGeoIndex(, ) or ensureGeoIndex([, ])"; @@ -1266,7 +1266,7 @@ ArangoCollection.prototype.ensureGeoIndex = function (lat, lon) { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.ensureGeoConstraint = function (lat, lon) { - "use strict"; + 'use strict'; return this.ensureGeoIndex(lat, lon); }; @@ -1276,7 +1276,7 @@ ArangoCollection.prototype.ensureGeoConstraint = function (lat, lon) { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.lookupUniqueConstraint = function () { - "use strict"; + 'use strict'; return this.lookupIndex({ type: "hash", @@ -1290,7 +1290,7 @@ ArangoCollection.prototype.lookupUniqueConstraint = function () { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.lookupHashIndex = function () { - "use strict"; + 'use strict'; return this.lookupIndex({ type: "hash", @@ -1303,7 +1303,7 @@ ArangoCollection.prototype.lookupHashIndex = function () { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.lookupUniqueSkiplist = function () { - "use strict"; + 'use strict'; return this.lookupIndex({ type: "skiplist", @@ -1317,7 +1317,7 @@ ArangoCollection.prototype.lookupUniqueSkiplist = function () { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.lookupSkiplist = function () { - "use strict"; + 'use strict'; return this.lookupIndex({ type: "skiplist", @@ -1335,7 +1335,7 @@ ArangoCollection.prototype.lookupSkiplist = function () { //////////////////////////////////////////////////////////////////////////////// ArangoCollection.prototype.lookupFulltextIndex = function (field, minLength) { - "use strict"; + 'use strict'; if (! Array.isArray(field)) { field = [ field ]; diff --git a/js/server/modules/org/arangodb/arango-database.js b/js/server/modules/org/arangodb/arango-database.js index a34ad32fb8..3d0de5b3f4 100644 --- a/js/server/modules/org/arangodb/arango-database.js +++ b/js/server/modules/org/arangodb/arango-database.js @@ -1,5 +1,5 @@ /*jshint strict: false, unused: false */ -/*global require, exports, module, TRANSACTION */ +/*global TRANSACTION */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoDatabase diff --git a/js/server/modules/org/arangodb/arango-statement.js b/js/server/modules/org/arangodb/arango-statement.js index f239e79cbb..db2e1af872 100644 --- a/js/server/modules/org/arangodb/arango-statement.js +++ b/js/server/modules/org/arangodb/arango-statement.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, exports, module, AQL_PARSE, AQL_EXPLAIN, AQL_EXECUTE */ +/*global AQL_PARSE, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief ArangoStatement diff --git a/js/server/modules/org/arangodb/cluster.js b/js/server/modules/org/arangodb/cluster.js index a495afe237..9588b3d648 100644 --- a/js/server/modules/org/arangodb/cluster.js +++ b/js/server/modules/org/arangodb/cluster.js @@ -1,5 +1,4 @@ -/*jshint strict: false, unused: false */ -/*global ArangoAgency, ArangoClusterComm, ArangoClusterInfo, ArangoServerState, require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief JavaScript cluster functionality @@ -180,15 +179,15 @@ function writeLocked (lockInfo, cb, args) { timeout *= 10; } - ArangoAgency.lockWrite(lockInfo.part, ttl, timeout); + global.ArangoAgency.lockWrite(lockInfo.part, ttl, timeout); try { - cb.apply(this, args); - ArangoAgency.increaseVersion(lockInfo.part + "/Version"); - ArangoAgency.unlockWrite(lockInfo.part, timeout); + cb.apply(null, args); + global.ArangoAgency.increaseVersion(lockInfo.part + "/Version"); + global.ArangoAgency.unlockWrite(lockInfo.part, timeout); } catch (err) { - ArangoAgency.unlockWrite(lockInfo.part, timeout); + global.ArangoAgency.unlockWrite(lockInfo.part, timeout); throw err; } } @@ -249,10 +248,10 @@ function getLocalCollections () { //////////////////////////////////////////////////////////////////////////////// function createLocalDatabases (plannedDatabases) { - var ourselves = ArangoServerState.id(); + var ourselves = global.ArangoServerState.id(); var createDatabaseAgency = function (payload) { - ArangoAgency.set("Current/Databases/" + payload.name + "/" + ourselves, + global.ArangoAgency.set("Current/Databases/" + payload.name + "/" + ourselves, payload); }; @@ -302,11 +301,11 @@ function createLocalDatabases (plannedDatabases) { //////////////////////////////////////////////////////////////////////////////// function dropLocalDatabases (plannedDatabases) { - var ourselves = ArangoServerState.id(); + var ourselves = global.ArangoServerState.id(); var dropDatabaseAgency = function (payload) { try { - ArangoAgency.remove("Current/Databases/" + payload.name + "/" + ourselves); + global.ArangoAgency.remove("Current/Databases/" + payload.name + "/" + ourselves); } catch (err) { // ignore errors @@ -341,11 +340,11 @@ function dropLocalDatabases (plannedDatabases) { //////////////////////////////////////////////////////////////////////////////// function cleanupCurrentDatabases () { - var ourselves = ArangoServerState.id(); + var ourselves = global.ArangoServerState.id(); var dropDatabaseAgency = function (payload) { try { - ArangoAgency.remove("Current/Databases/" + payload.name + "/" + ourselves); + global.ArangoAgency.remove("Current/Databases/" + payload.name + "/" + ourselves); } catch (err) { // ignore errors @@ -355,7 +354,7 @@ function cleanupCurrentDatabases () { var db = require("internal").db; db._useDatabase("_system"); - var all = ArangoAgency.get("Current/Databases", true); + var all = global.ArangoAgency.get("Current/Databases", true); var currentDatabases = getByPrefix3d(all, "Current/Databases/"); var localDatabases = getLocalDatabases(); var name; @@ -383,7 +382,7 @@ function cleanupCurrentDatabases () { /// @brief handle database changes //////////////////////////////////////////////////////////////////////////////// -function handleDatabaseChanges (plan, current) { +function handleDatabaseChanges (plan) { var plannedDatabases = getByPrefix(plan, "Plan/Databases/"); createLocalDatabases(plannedDatabases); @@ -396,10 +395,10 @@ function handleDatabaseChanges (plan, current) { //////////////////////////////////////////////////////////////////////////////// function createLocalCollections (plannedCollections) { - var ourselves = ArangoServerState.id(); + var ourselves = global.ArangoServerState.id(); var createCollectionAgency = function (database, shard, payload) { - ArangoAgency.set("Current/Collections/" + database + "/" + payload.planId + "/" + shard, + global.ArangoAgency.set("Current/Collections/" + database + "/" + payload.planId + "/" + shard, payload); }; @@ -636,11 +635,11 @@ function createLocalCollections (plannedCollections) { //////////////////////////////////////////////////////////////////////////////// function dropLocalCollections (plannedCollections) { - var ourselves = ArangoServerState.id(); + var ourselves = global.ArangoServerState.id(); var dropCollectionAgency = function (database, shardID, id) { try { - ArangoAgency.remove("Current/Collections/" + database + "/" + id + "/" + shardID); + global.ArangoAgency.remove("Current/Collections/" + database + "/" + id + "/" + shardID); } catch (err) { // ignore errors @@ -707,11 +706,11 @@ function dropLocalCollections (plannedCollections) { //////////////////////////////////////////////////////////////////////////////// function cleanupCurrentCollections (plannedCollections) { - var ourselves = ArangoServerState.id(); + var ourselves = global.ArangoServerState.id(); var dropCollectionAgency = function (database, collection, shardID) { try { - ArangoAgency.remove("Current/Collections/" + database + "/" + collection + "/" + shardID); + global.ArangoAgency.remove("Current/Collections/" + database + "/" + collection + "/" + shardID); } catch (err) { // ignore errors @@ -721,7 +720,7 @@ function cleanupCurrentCollections (plannedCollections) { var db = require("internal").db; db._useDatabase("_system"); - var all = ArangoAgency.get("Current/Collections", true); + var all = global.ArangoAgency.get("Current/Collections", true); var currentCollections = getByPrefix4d(all, "Current/Collections/"); var shardMap = getShardMap(plannedCollections); var database; @@ -765,7 +764,7 @@ function cleanupCurrentCollections (plannedCollections) { /// @brief handle collection changes //////////////////////////////////////////////////////////////////////////////// -function handleCollectionChanges (plan, current) { +function handleCollectionChanges (plan) { var plannedCollections = getByPrefix3d(plan, "Plan/Collections/"); createLocalCollections(plannedCollections); @@ -799,7 +798,7 @@ var raiseError = function (code, msg) { //////////////////////////////////////////////////////////////////////////////// var shardList = function (dbName, collectionName) { - var ci = ArangoClusterInfo.getCollectionInfo(dbName, collectionName); + var ci = global.ArangoClusterInfo.getCollectionInfo(dbName, collectionName); if (ci === undefined || typeof ci !== 'object') { throw "unable to determine shard list for '" + dbName + "/" + collectionName + "'"; @@ -828,7 +827,7 @@ var wait = function (data, shards) { var received = [ ]; while (received.length < shards.length) { - var result = ArangoClusterComm.wait(data); + var result = global.ArangoClusterComm.wait(data); var status = result.status; if (status === "ERROR") { @@ -879,8 +878,8 @@ var wait = function (data, shards) { //////////////////////////////////////////////////////////////////////////////// var isCluster = function () { - return (typeof ArangoServerState !== "undefined" && - ArangoServerState.initialised()); + return (typeof global.ArangoServerState !== "undefined" && + global.ArangoServerState.initialised()); }; //////////////////////////////////////////////////////////////////////////////// @@ -892,7 +891,7 @@ var isCoordinator = function () { return false; } - return ArangoServerState.isCoordinator(); + return global.ArangoServerState.isCoordinator(); }; //////////////////////////////////////////////////////////////////////////////// @@ -904,7 +903,7 @@ var role = function () { return undefined; } - return ArangoServerState.role(); + return global.ArangoServerState.role(); }; //////////////////////////////////////////////////////////////////////////////// @@ -916,7 +915,7 @@ var status = function () { return undefined; } - return ArangoServerState.status(); + return global.ArangoServerState.status(); }; //////////////////////////////////////////////////////////////////////////////// @@ -941,8 +940,8 @@ var handlePlanChange = function () { } try { - var plan = ArangoAgency.get("Plan", true); - var current = ArangoAgency.get("Current", true); + var plan = global.ArangoAgency.get("Plan", true); + var current = global.ArangoAgency.get("Current", true); handleChanges(plan, current); console.info("plan change handling successful"); @@ -959,7 +958,7 @@ var handlePlanChange = function () { //////////////////////////////////////////////////////////////////////////////// var dispatcherDisabled = function () { - return ArangoServerState.disableDispatcherFrontend(); + return global.ArangoServerState.disableDispatcherFrontend(); }; //////////////////////////////////////////////////////////////////////////////// @@ -970,7 +969,7 @@ var coordinatorId = function () { if (! isCoordinator()) { console.error("not a coordinator"); } - return ArangoServerState.id(); + return global.ArangoServerState.id(); }; //////////////////////////////////////////////////////////////////////////////// @@ -978,21 +977,21 @@ var coordinatorId = function () { //////////////////////////////////////////////////////////////////////////////// var bootstrapDbServers = function (isRelaunch) { - ArangoClusterInfo.reloadDBServers(); + global.ArangoClusterInfo.reloadDBServers(); - var dbServers = ArangoClusterInfo.getDBServers(); + var dbServers = global.ArangoClusterInfo.getDBServers(); var ops = []; var i; var options = { - coordTransactionID: ArangoClusterInfo.uniqid(), + coordTransactionID: global.ArangoClusterInfo.uniqid(), timeout: 90 }; for (i = 0; i < dbServers.length; ++i) { var server = dbServers[i]; - var op = ArangoClusterComm.asyncRequest( + var op = global.ArangoClusterComm.asyncRequest( "POST", "server:" + server, "_system", @@ -1007,7 +1006,7 @@ var bootstrapDbServers = function (isRelaunch) { var result = true; for (i = 0; i < ops.length; ++i) { - var r = ArangoClusterComm.wait(ops[i]); + var r = global.ArangoClusterComm.wait(ops[i]); if (r.status === "RECEIVED") { console.info("bootstraped DB server %s", dbServers[i]); diff --git a/js/server/modules/org/arangodb/cluster/agency-communication.js b/js/server/modules/org/arangodb/cluster/agency-communication.js index 17a3fae587..aecacd533c 100644 --- a/js/server/modules/org/arangodb/cluster/agency-communication.js +++ b/js/server/modules/org/arangodb/cluster/agency-communication.js @@ -1,5 +1,5 @@ /*jshint unused: false */ -/*global require, exports, ArangoAgency */ +/*global ArangoAgency */ //////////////////////////////////////////////////////////////////////////////// /// @brief Agency Communication @@ -32,7 +32,7 @@ // --SECTION-- Agency-Communication // ----------------------------------------------------------------------------- exports.Communication = function() { - "use strict"; + 'use strict'; var agency, AgencyWrapper, splitServerName, @@ -857,7 +857,7 @@ exports.Communication = function() { /// @endcode //////////////////////////////////////////////////////////////////////////////// exports._createAgency = function() { - "use strict"; + 'use strict'; var agency; if (agency) { return agency; diff --git a/js/server/modules/org/arangodb/cluster/kickstarter.js b/js/server/modules/org/arangodb/cluster/kickstarter.js index 7c35066166..cf34d18638 100644 --- a/js/server/modules/org/arangodb/cluster/kickstarter.js +++ b/js/server/modules/org/arangodb/cluster/kickstarter.js @@ -1,5 +1,5 @@ /*jshint strict: false, unused: false */ -/*global require, exports, ArangoServerState */ +/*global ArangoServerState */ //////////////////////////////////////////////////////////////////////////////// /// @brief Cluster kickstarting functionality using dispatchers diff --git a/js/server/modules/org/arangodb/cluster/planner.js b/js/server/modules/org/arangodb/cluster/planner.js index ef9d021703..7a411bc601 100644 --- a/js/server/modules/org/arangodb/cluster/planner.js +++ b/js/server/modules/org/arangodb/cluster/planner.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Cluster planning functionality @@ -433,7 +432,7 @@ function checkDispatcherIps (config) { //////////////////////////////////////////////////////////////////////////////// function Planner (userConfig) { - "use strict"; + 'use strict'; if (typeof userConfig !== "object") { throw new Error("userConfig must be an object"); } diff --git a/js/server/modules/org/arangodb/configuration.js b/js/server/modules/org/arangodb/configuration.js index 8850ace662..6614911a5f 100644 --- a/js/server/modules/org/arangodb/configuration.js +++ b/js/server/modules/org/arangodb/configuration.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief global configurations diff --git a/js/server/modules/org/arangodb/database-version.js b/js/server/modules/org/arangodb/database-version.js index a493c715b8..cb1af85ea3 100644 --- a/js/server/modules/org/arangodb/database-version.js +++ b/js/server/modules/org/arangodb/database-version.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief database version check diff --git a/js/server/modules/org/arangodb/formatter.js b/js/server/modules/org/arangodb/formatter.js index 27045c78b8..9d7b742086 100644 --- a/js/server/modules/org/arangodb/formatter.js +++ b/js/server/modules/org/arangodb/formatter.js @@ -1,5 +1,5 @@ /*jshint strict: false, unused: false */ -/*global require, exports, FORMAT_DATETIME, PARSE_DATETIME */ +/*global FORMAT_DATETIME, PARSE_DATETIME */ //////////////////////////////////////////////////////////////////////////////// /// @brief formatter functions diff --git a/js/server/modules/org/arangodb/foxx.js b/js/server/modules/org/arangodb/foxx.js index 1f4870d60b..7ca748143e 100644 --- a/js/server/modules/org/arangodb/foxx.js +++ b/js/server/modules/org/arangodb/foxx.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief The Foxx Framework @@ -27,23 +27,17 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -var Controller = require("org/arangodb/foxx/controller").Controller, - Model = require("org/arangodb/foxx/model").Model, - Repository = require("org/arangodb/foxx/repository").Repository, - queues = require("org/arangodb/foxx/queues"), - createQuery = require("org/arangodb/foxx/query").createQuery, - manager = require("org/arangodb/foxx/manager"), - toJSONSchema = require("org/arangodb/foxx/schema").toJSONSchema, - arangodb = require("org/arangodb"); +exports.Controller = require("org/arangodb/foxx/controller").Controller; +exports.Model = require("org/arangodb/foxx/model").Model; +exports.Repository = require("org/arangodb/foxx/repository").Repository; +exports.queues = require("org/arangodb/foxx/queues"); +exports.createQuery = require("org/arangodb/foxx/query").createQuery; +exports.toJSONSchema = require("org/arangodb/foxx/schema").toJSONSchema; + +var manager = require("org/arangodb/foxx/manager"); +var arangodb = require("org/arangodb"); -exports.Controller = Controller; -exports.Model = Model; -exports.Repository = Repository; -exports.queues = queues; -exports.createQuery = createQuery; -exports.toJSONSchema = toJSONSchema; exports.requireApp = function (path) { - 'use strict'; return manager.requireApp(arangodb.normalizeURL('/' + path)); }; diff --git a/js/server/modules/org/arangodb/foxx/arangoApp.js b/js/server/modules/org/arangodb/foxx/arangoApp.js index 1a6c2f54b3..a42c1d407b 100644 --- a/js/server/modules/org/arangodb/foxx/arangoApp.js +++ b/js/server/modules/org/arangodb/foxx/arangoApp.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global module, require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx application module diff --git a/js/server/modules/org/arangodb/foxx/authentication.js b/js/server/modules/org/arangodb/foxx/authentication.js index eca1c24f85..b7a2896eb8 100644 --- a/js/server/modules/org/arangodb/foxx/authentication.js +++ b/js/server/modules/org/arangodb/foxx/authentication.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx Authentication @@ -34,31 +34,13 @@ var db = require("org/arangodb").db, _ = require("underscore"), errors = require("internal").errors, defaultsFor = {}, - checkAuthenticationOptions, - createStandardLoginHandler, - createStandardLogoutHandler, - createStandardRegistrationHandler, - createStandardChangePasswordHandler, - createAuthenticationMiddleware, - createSessionUpdateMiddleware, - createAuthObject, - generateToken, - cloneDocument, - checkPassword, - encodePassword, - Users, - Sessions, - CookieAuthentication, - Authentication, - UserAlreadyExistsError, UnauthorizedError = require("./sessions").UnauthorizedError; // ----------------------------------------------------------------------------- // --SECTION-- helper functions // ----------------------------------------------------------------------------- -createAuthenticationMiddleware = function (auth, applicationContext) { - "use strict"; +function createAuthenticationMiddleware(auth, applicationContext) { return function (req) { var users = new Users(applicationContext), authResult = auth.authenticate(req); @@ -71,10 +53,9 @@ createAuthenticationMiddleware = function (auth, applicationContext) { req.user = null; } }; -}; +} -createSessionUpdateMiddleware = function () { - "use strict"; +function createSessionUpdateMiddleware() { return function (req) { var session = req.currentSession; @@ -82,10 +63,9 @@ createSessionUpdateMiddleware = function () { session.update(); } }; -}; +} -createAuthObject = function (applicationContext, opts) { - "use strict"; +function createAuthObject(applicationContext, opts) { var sessions, cookieAuth, auth, @@ -98,10 +78,9 @@ createAuthObject = function (applicationContext, opts) { auth = new Authentication(applicationContext, sessions, cookieAuth); return auth; -}; +} -checkAuthenticationOptions = function (options) { - "use strict"; +function checkAuthenticationOptions(options) { if (options.type !== "cookie") { throw new Error("Currently only the following auth types are supported: cookie"); } @@ -114,14 +93,13 @@ checkAuthenticationOptions = function (options) { if (is.falsy(options.sessionLifetime)) { throw new Error("Please provide the sessionLifetime"); } -}; +} defaultsFor.login = { usernameField: "username", passwordField: "password", onSuccess: function (req, res) { - "use strict"; res.json({ user: req.user.identifier, key: req.currentSession._key @@ -129,7 +107,6 @@ defaultsFor.login = { }, onError: function (req, res) { - "use strict"; res.status(401); res.json({ error: "Username or Password was wrong" @@ -137,8 +114,7 @@ defaultsFor.login = { } }; -createStandardLoginHandler = function (auth, users, opts) { - "use strict"; +function createStandardLoginHandler(auth, users, opts) { var options = _.defaults(opts || {}, defaultsFor.login); return function (req, res) { @@ -153,18 +129,16 @@ createStandardLoginHandler = function (auth, users, opts) { options.onError(req, res); } }; -}; +} defaultsFor.logout = { onSuccess: function (req, res) { - "use strict"; res.json({ notice: "Logged out!" }); }, onError: function (req, res) { - "use strict"; res.status(401); res.json({ error: "No session was found" @@ -172,8 +146,7 @@ defaultsFor.logout = { } }; -createStandardLogoutHandler = function (auth, opts) { - "use strict"; +function createStandardLogoutHandler(auth, opts) { var options = _.defaults(opts || {}, defaultsFor.logout); return function (req, res) { @@ -186,7 +159,7 @@ createStandardLogoutHandler = function (auth, opts) { options.onError(req, res); } }; -}; +} defaultsFor.registration = { usernameField: "username", @@ -195,14 +168,12 @@ defaultsFor.registration = { defaultAttributes: {}, onSuccess: function (req, res) { - "use strict"; res.json({ user: req.user }); }, onError: function (req, res) { - "use strict"; res.status(401); res.json({ error: "Registration failed" @@ -210,8 +181,7 @@ defaultsFor.registration = { } }; -createStandardRegistrationHandler = function (auth, users, opts) { - "use strict"; +function createStandardRegistrationHandler(auth, users, opts) { var options = _.defaults(opts || {}, defaultsFor.registration); return function (req, res) { @@ -234,20 +204,18 @@ createStandardRegistrationHandler = function (auth, users, opts) { req.currentSession = auth.beginSession(req, res, username, {}); options.onSuccess(req, res); }; -}; +} defaultsFor.changePassword = { passwordField: "password", onSuccess: function (req, res) { - "use strict"; res.json({ notice: "Changed password!" }); }, onError: function (req, res) { - "use strict"; res.status(401); res.json({ error: "No session was found" @@ -255,8 +223,7 @@ defaultsFor.changePassword = { } }; -createStandardChangePasswordHandler = function (users, opts) { - "use strict"; +function createStandardChangePasswordHandler(users, opts) { var options = _.defaults(opts || {}, defaultsFor.changePassword); return function (req, res) { @@ -274,24 +241,21 @@ createStandardChangePasswordHandler = function (users, opts) { options.onError(req, res); } }; -}; +} //////////////////////////////////////////////////////////////////////////////// /// @brief constructor //////////////////////////////////////////////////////////////////////////////// -generateToken = function () { - "use strict"; - +function generateToken() { return internal.genRandomAlphaNumbers(32); -}; +} //////////////////////////////////////////////////////////////////////////////// /// @brief deep-copies a document //////////////////////////////////////////////////////////////////////////////// -cloneDocument = function (obj) { - "use strict"; +function cloneDocument(obj) { var copy, a; if (obj === null || typeof obj !== "object") { @@ -313,26 +277,24 @@ cloneDocument = function (obj) { } return copy; -}; +} //////////////////////////////////////////////////////////////////////////////// /// @brief checks whether the plain text password matches the encoded one //////////////////////////////////////////////////////////////////////////////// -checkPassword = function (plain, encoded) { - "use strict"; +function checkPassword(plain, encoded) { var salted = encoded.substr(3, 8) + plain, hex = crypto.sha256(salted); return (encoded.substr(12) === hex); -}; +} //////////////////////////////////////////////////////////////////////////////// /// @brief encodes a password //////////////////////////////////////////////////////////////////////////////// -encodePassword = function (password) { - "use strict"; +function encodePassword(password) { var salt, encoded, random; @@ -350,7 +312,7 @@ encodePassword = function (password) { encoded = "$1$" + salt + "$" + crypto.sha256(salt + password); return encoded; -}; +} // ----------------------------------------------------------------------------- // --SECTION-- FOXX-USERS @@ -364,9 +326,7 @@ encodePassword = function (password) { /// @brief constructor //////////////////////////////////////////////////////////////////////////////// -Users = function (applicationContext, options) { - "use strict"; - +function Users(applicationContext, options) { this._options = options || {}; this._collection = null; @@ -375,7 +335,7 @@ Users = function (applicationContext, options) { } else { this._collectionName = applicationContext.collectionName("users"); } -}; +} // ----------------------------------------------------------------------------- // --SECTION-- private functions @@ -386,7 +346,6 @@ Users = function (applicationContext, options) { //////////////////////////////////////////////////////////////////////////////// Users.prototype.storage = function () { - "use strict"; if (this._collection === null) { this._collection = db._collection(this._collectionName); @@ -404,7 +363,6 @@ Users.prototype.storage = function () { //////////////////////////////////////////////////////////////////////////////// Users.prototype._validateIdentifier = function (identifier, allowObject) { - "use strict"; if (allowObject) { if (typeof identifier === "object" && identifier.hasOwnProperty("identifier")) { @@ -432,7 +390,6 @@ Users.prototype._validateIdentifier = function (identifier, allowObject) { //////////////////////////////////////////////////////////////////////////////// Users.prototype.setup = function (options) { - "use strict"; var journalSize, createOptions; @@ -456,7 +413,6 @@ Users.prototype.setup = function (options) { //////////////////////////////////////////////////////////////////////////////// Users.prototype.teardown = function () { - "use strict"; var c = db._collection(this._collectionName); if (c) { @@ -469,7 +425,6 @@ Users.prototype.teardown = function () { //////////////////////////////////////////////////////////////////////////////// Users.prototype.flush = function () { - "use strict"; this.storage().truncate(); }; @@ -479,7 +434,6 @@ Users.prototype.flush = function () { //////////////////////////////////////////////////////////////////////////////// Users.prototype.add = function (identifier, password, active, data) { - "use strict"; var c = this.storage(), user; @@ -533,7 +487,6 @@ Users.prototype.add = function (identifier, password, active, data) { //////////////////////////////////////////////////////////////////////////////// Users.prototype.updateData = function (identifier, data) { - "use strict"; var c = this.storage(); identifier = this._validateIdentifier(identifier, true); @@ -566,7 +519,6 @@ Users.prototype.updateData = function (identifier, data) { //////////////////////////////////////////////////////////////////////////////// Users.prototype.setActive = function (identifier, active) { - "use strict"; var c = this.storage(), user, doc; @@ -592,7 +544,6 @@ Users.prototype.setActive = function (identifier, active) { //////////////////////////////////////////////////////////////////////////////// Users.prototype.setPassword = function (identifier, password) { - "use strict"; var c = this.storage(), user, doc; @@ -621,7 +572,6 @@ Users.prototype.setPassword = function (identifier, password) { //////////////////////////////////////////////////////////////////////////////// Users.prototype.remove = function (identifier) { - "use strict"; var c = this.storage(), user; @@ -646,7 +596,6 @@ Users.prototype.remove = function (identifier) { //////////////////////////////////////////////////////////////////////////////// Users.prototype.get = function (identifier) { - "use strict"; var c = this.storage(), user; @@ -668,7 +617,6 @@ Users.prototype.get = function (identifier) { //////////////////////////////////////////////////////////////////////////////// Users.prototype.exists = function (identifier) { - "use strict"; var c = this.storage(), user; @@ -682,7 +630,6 @@ Users.prototype.exists = function (identifier) { //////////////////////////////////////////////////////////////////////////////// Users.prototype.isValid = function (identifier, password) { - "use strict"; var c = this.storage(), user; @@ -719,8 +666,7 @@ Users.prototype.isValid = function (identifier, password) { /// @brief constructor //////////////////////////////////////////////////////////////////////////////// -Sessions = function (applicationContext, options) { - "use strict"; +function Sessions(applicationContext, options) { this._applicationContext = applicationContext; this._options = options || {}; @@ -735,7 +681,7 @@ Sessions = function (applicationContext, options) { } else { this._collectionName = applicationContext.collectionName("sessions"); } -}; +} // ----------------------------------------------------------------------------- // --SECTION-- private functions @@ -746,7 +692,6 @@ Sessions = function (applicationContext, options) { //////////////////////////////////////////////////////////////////////////////// Sessions.prototype._toObject = function (session) { - "use strict"; var that = this; return { @@ -795,7 +740,6 @@ Sessions.prototype._toObject = function (session) { //////////////////////////////////////////////////////////////////////////////// Sessions.prototype.setup = function (options) { - "use strict"; var journalSize, createOptions; @@ -819,7 +763,6 @@ Sessions.prototype.setup = function (options) { //////////////////////////////////////////////////////////////////////////////// Sessions.prototype.teardown = function () { - "use strict"; var c = db._collection(this._collectionName); if (c) { @@ -832,7 +775,6 @@ Sessions.prototype.teardown = function () { //////////////////////////////////////////////////////////////////////////////// Sessions.prototype.storage = function () { - "use strict"; if (this._collection === null) { this._collection = db._collection(this._collectionName); @@ -850,7 +792,6 @@ Sessions.prototype.storage = function () { //////////////////////////////////////////////////////////////////////////////// Sessions.prototype.generate = function (identifier, data) { - "use strict"; var storage, token, session; if (typeof identifier !== "string" || identifier.length === 0) { @@ -900,7 +841,6 @@ Sessions.prototype.generate = function (identifier, data) { //////////////////////////////////////////////////////////////////////////////// Sessions.prototype.update = function (token, data) { - "use strict"; this.storage().update(token, { expires: internal.time() + this._options.sessionLifetime, @@ -913,7 +853,6 @@ Sessions.prototype.update = function (token, data) { //////////////////////////////////////////////////////////////////////////////// Sessions.prototype.terminate = function (token) { - "use strict"; try { this.storage().remove(token); @@ -927,7 +866,6 @@ Sessions.prototype.terminate = function (token) { //////////////////////////////////////////////////////////////////////////////// Sessions.prototype.get = function (token) { - "use strict"; var storage = this.storage(), session, sessionLifetime; @@ -971,8 +909,7 @@ Sessions.prototype.get = function (token) { /// @brief constructor //////////////////////////////////////////////////////////////////////////////// -CookieAuthentication = function (applicationContext, options) { - "use strict"; +function CookieAuthentication(applicationContext, options) { options = options || {}; @@ -989,7 +926,7 @@ CookieAuthentication = function (applicationContext, options) { this._collectionName = applicationContext.collectionName("sessions"); this._collection = null; -}; +} // ----------------------------------------------------------------------------- // --SECTION-- public functions @@ -1000,7 +937,6 @@ CookieAuthentication = function (applicationContext, options) { //////////////////////////////////////////////////////////////////////////////// CookieAuthentication.prototype.getTokenFromRequest = function (req) { - "use strict"; if (!req.hasOwnProperty("cookies")) { return null; @@ -1018,7 +954,6 @@ CookieAuthentication.prototype.getTokenFromRequest = function (req) { //////////////////////////////////////////////////////////////////////////////// CookieAuthentication.prototype.setCookie = function (res, value) { - "use strict"; var name = this._options.name, cookie, i, @@ -1059,7 +994,6 @@ CookieAuthentication.prototype.setCookie = function (res, value) { //////////////////////////////////////////////////////////////////////////////// CookieAuthentication.prototype.getAuthenticationData = function (req) { - "use strict"; var token = this.getTokenFromRequest(req); @@ -1077,7 +1011,6 @@ CookieAuthentication.prototype.getAuthenticationData = function (req) { //////////////////////////////////////////////////////////////////////////////// CookieAuthentication.prototype.beginSession = function (req, res, token) { - "use strict"; this.setCookie(res, token); }; @@ -1086,7 +1019,6 @@ CookieAuthentication.prototype.beginSession = function (req, res, token) { //////////////////////////////////////////////////////////////////////////////// CookieAuthentication.prototype.endSession = function (req, res) { - "use strict"; this.setCookie(res, ""); }; @@ -1095,7 +1027,6 @@ CookieAuthentication.prototype.endSession = function (req, res) { //////////////////////////////////////////////////////////////////////////////// CookieAuthentication.prototype.updateSession = function (req, res, session) { - "use strict"; // update the cookie (expire date) this.setCookie(res, session._key); }; @@ -1105,7 +1036,6 @@ CookieAuthentication.prototype.updateSession = function (req, res, session) { //////////////////////////////////////////////////////////////////////////////// CookieAuthentication.prototype.isResponsible = function () { - "use strict"; return true; }; @@ -1121,8 +1051,7 @@ CookieAuthentication.prototype.isResponsible = function () { /// @brief constructor //////////////////////////////////////////////////////////////////////////////// -Authentication = function (applicationContext, sessions, authenticators) { - "use strict"; +function Authentication(applicationContext, sessions, authenticators) { this._applicationContext = applicationContext; this._sessions = sessions; @@ -1132,7 +1061,7 @@ Authentication = function (applicationContext, sessions, authenticators) { } this._authenticators = authenticators; -}; +} // ----------------------------------------------------------------------------- // --SECTION-- public functions @@ -1143,7 +1072,6 @@ Authentication = function (applicationContext, sessions, authenticators) { //////////////////////////////////////////////////////////////////////////////// Authentication.prototype.authenticate = function (req) { - "use strict"; var i, n = this._authenticators.length, authenticator, @@ -1174,7 +1102,6 @@ Authentication.prototype.authenticate = function (req) { //////////////////////////////////////////////////////////////////////////////// Authentication.prototype.beginSession = function (req, res, identifier, data) { - "use strict"; var session = this._sessions.generate(identifier, data), i, n = this._authenticators.length, @@ -1197,7 +1124,6 @@ Authentication.prototype.beginSession = function (req, res, identifier, data) { //////////////////////////////////////////////////////////////////////////////// Authentication.prototype.endSession = function (req, res, token) { - "use strict"; var i, n = this._authenticators.length, authenticator; @@ -1219,7 +1145,6 @@ Authentication.prototype.endSession = function (req, res, token) { //////////////////////////////////////////////////////////////////////////////// Authentication.prototype.updateSession = function (req, res, session) { - "use strict"; var i, n = this._authenticators.length, authenticator; @@ -1246,19 +1171,17 @@ Authentication.prototype.updateSession = function (req, res, session) { /// @brief constructor //////////////////////////////////////////////////////////////////////////////// -UserAlreadyExistsError = function (message) { - "use strict"; +function UserAlreadyExistsError(message) { this.message = message || "User already exists"; this.statusCode = 400; -}; +} UserAlreadyExistsError.prototype = new Error(); -UnauthorizedError = function (message) { - "use strict"; +function UnauthorizedError(message) { this.message = message || "Unauthorized"; this.statusCode = 401; -}; +} UnauthorizedError.prototype = new Error(); diff --git a/js/server/modules/org/arangodb/foxx/base_middleware.js b/js/server/modules/org/arangodb/foxx/base_middleware.js index 40f50e42e2..5197431352 100644 --- a/js/server/modules/org/arangodb/foxx/base_middleware.js +++ b/js/server/modules/org/arangodb/foxx/base_middleware.js @@ -1,4 +1,4 @@ -/*global require, exports, Buffer */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx BaseMiddleware @@ -27,8 +27,6 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -var BaseMiddleware; - //////////////////////////////////////////////////////////////////////////////// /// @fn JSF_foxx_BaseMiddleware_initializer /// @brief The Base Middleware @@ -37,8 +35,7 @@ var BaseMiddleware; /// objects to give you a nicer API. //////////////////////////////////////////////////////////////////////////////// -BaseMiddleware = function () { - 'use strict'; +function BaseMiddleware() { var middleware = function (request, response, options, next) { var responseFunctions, requestFunctions, @@ -464,7 +461,7 @@ BaseMiddleware = function () { stringRepresentation: String(middleware), functionRepresentation: middleware }; -}; +} exports.BaseMiddleware = BaseMiddleware; diff --git a/js/server/modules/org/arangodb/foxx/console.js b/js/server/modules/org/arangodb/foxx/console.js index b5f2a2a0af..ea7a0891e0 100644 --- a/js/server/modules/org/arangodb/foxx/console.js +++ b/js/server/modules/org/arangodb/foxx/console.js @@ -1,5 +1,4 @@ /*jshint globalstrict: true */ -/*global require, module */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/modules/org/arangodb/foxx/controller.js b/js/server/modules/org/arangodb/foxx/controller.js index 9cb36ad3f3..b86e23d68e 100644 --- a/js/server/modules/org/arangodb/foxx/controller.js +++ b/js/server/modules/org/arangodb/foxx/controller.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx Controller @@ -27,8 +27,7 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -var Controller, - RequestContext = require("org/arangodb/foxx/request_context").RequestContext, +var RequestContext = require("org/arangodb/foxx/request_context").RequestContext, RequestContextBuffer = require("org/arangodb/foxx/request_context").RequestContextBuffer, BaseMiddleware = require("org/arangodb/foxx/base_middleware").BaseMiddleware, _ = require("underscore"), @@ -62,8 +61,7 @@ var Controller, /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// -Controller = function (context, options) { - 'use strict'; +function Controller(context, options) { var urlPrefix, baseMiddleware; context.clearComments(); @@ -126,13 +124,12 @@ Controller = function (context, options) { } this.applicationContext = context; -}; +} extend(Controller.prototype, { currentPriority: 0, addInjector: function (name, factory) { - 'use strict'; if (factory === undefined) { _.extend(this.injectors, name); } else { @@ -151,7 +148,6 @@ extend(Controller.prototype, { //////////////////////////////////////////////////////////////////////////////// handleRequest: function (method, route, callback) { - 'use strict'; var constraints = {queryParams: {}, urlParams: {}}, newRoute = internal.constructRoute(method, route, callback, this, constraints), requestContext = new RequestContext( @@ -196,7 +192,6 @@ extend(Controller.prototype, { //////////////////////////////////////////////////////////////////////////////// head: function (route, callback) { - 'use strict'; return this.handleRequest("head", route, callback); }, @@ -224,7 +219,6 @@ extend(Controller.prototype, { //////////////////////////////////////////////////////////////////////////////// get: function (route, callback) { - 'use strict'; return this.handleRequest("get", route, callback); }, @@ -248,7 +242,6 @@ extend(Controller.prototype, { //////////////////////////////////////////////////////////////////////////////// post: function (route, callback) { - 'use strict'; return this.handleRequest("post", route, callback); }, @@ -272,7 +265,6 @@ extend(Controller.prototype, { //////////////////////////////////////////////////////////////////////////////// put: function (route, callback) { - 'use strict'; return this.handleRequest("put", route, callback); }, @@ -296,7 +288,6 @@ extend(Controller.prototype, { //////////////////////////////////////////////////////////////////////////////// patch: function (route, callback) { - 'use strict'; return this.handleRequest("patch", route, callback); }, @@ -328,12 +319,10 @@ extend(Controller.prototype, { //////////////////////////////////////////////////////////////////////////////// 'delete': function (route, callback) { - 'use strict'; return this.handleRequest("delete", route, callback); }, del: function (route, callback) { - 'use strict'; return this['delete'](route, callback); }, @@ -363,7 +352,6 @@ extend(Controller.prototype, { //////////////////////////////////////////////////////////////////////////////// before: function (path, func) { - 'use strict'; if (is.notExisty(func)) { func = path; path = "/*"; @@ -403,7 +391,6 @@ extend(Controller.prototype, { //////////////////////////////////////////////////////////////////////////////// after: function (path, func) { - 'use strict'; if (is.notExisty(func)) { func = path; path = "/*"; @@ -443,7 +430,6 @@ extend(Controller.prototype, { //////////////////////////////////////////////////////////////////////////////// around: function (path, func) { - 'use strict'; if (is.notExisty(func)) { func = path; @@ -466,7 +452,6 @@ extend(Controller.prototype, { /// @brief Get the users of this controller //////////////////////////////////////////////////////////////////////////////// getUsers: function () { - 'use strict'; var foxxAuthentication = require("org/arangodb/foxx/authentication"), users = new foxxAuthentication.Users(this.applicationContext); @@ -478,7 +463,6 @@ extend(Controller.prototype, { /// @brief Get the auth object of this controller //////////////////////////////////////////////////////////////////////////////// getAuth: function () { - 'use strict'; if (is.notExisty(this.auth)) { throw new Error("Setup authentication first"); } @@ -513,7 +497,6 @@ extend(Controller.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// activateAuthentication: function (opts) { - 'use strict'; var authentication = require("org/arangodb/foxx/authentication"); this.auth = authentication.createAuthObject(this.applicationContext, opts); @@ -555,7 +538,6 @@ extend(Controller.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// login: function (route, opts) { - 'use strict'; var authentication = require("org/arangodb/foxx/authentication"); return this.post(route, authentication.createStandardLoginHandler(this.getAuth(), this.getUsers(), opts)); }, @@ -593,7 +575,6 @@ extend(Controller.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// logout: function (route, opts) { - 'use strict'; var authentication = require("org/arangodb/foxx/authentication"); return this.post(route, authentication.createStandardLogoutHandler(this.getAuth(), opts)); }, @@ -642,7 +623,6 @@ extend(Controller.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// register: function (route, opts) { - 'use strict'; var authentication = require("org/arangodb/foxx/authentication"); return this.post( route, @@ -684,7 +664,6 @@ extend(Controller.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// changePassword: function (route, opts) { - 'use strict'; var authentication = require("org/arangodb/foxx/authentication"); return this.post(route, authentication.createStandardChangePasswordHandler(this.getUsers(), opts)); }, @@ -694,7 +673,6 @@ extend(Controller.prototype, { /// @brief Get the sessions object of this controller //////////////////////////////////////////////////////////////////////////////// getSessions: function () { - 'use strict'; return this.sessions; }, @@ -727,7 +705,6 @@ extend(Controller.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// activateSessions: function (opts) { - 'use strict'; var sessions = require("org/arangodb/foxx/sessions"); this.sessions = new sessions.Sessions(opts); @@ -761,7 +738,6 @@ extend(Controller.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// destroySession: function (route, opts) { - 'use strict'; var method = opts.method; if (typeof method === 'string') { method = method.toLowerCase(); @@ -784,7 +760,6 @@ extend(Controller.prototype, { //////////////////////////////////////////////////////////////////////////////// extend: function(extensions) { - 'use strict'; var attr; for (attr in extensions) { if (extensions.hasOwnProperty(attr)) { diff --git a/js/server/modules/org/arangodb/foxx/format_middleware.js b/js/server/modules/org/arangodb/foxx/format_middleware.js index 61ff9cd298..0360f9fe8f 100644 --- a/js/server/modules/org/arangodb/foxx/format_middleware.js +++ b/js/server/modules/org/arangodb/foxx/format_middleware.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx Format Middleware @@ -27,14 +27,11 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -var FormatMiddleware; - //////////////////////////////////////////////////////////////////////////////// /// @brief FormatMiddleware //////////////////////////////////////////////////////////////////////////////// -FormatMiddleware = function (allowedFormats, defaultFormat) { - "use strict"; +function FormatMiddleware(allowedFormats, defaultFormat) { var stringRepresentation, middleware = function (request, response, options, next) { var parsed, determinePathAndFormat; @@ -113,7 +110,7 @@ FormatMiddleware = function (allowedFormats, defaultFormat) { .replace("defaultFormat", JSON.stringify(defaultFormat)); return middleware; -}; +} exports.FormatMiddleware = FormatMiddleware; diff --git a/js/server/modules/org/arangodb/foxx/internals.js b/js/server/modules/org/arangodb/foxx/internals.js index fb09e53b74..db6d18b360 100644 --- a/js/server/modules/org/arangodb/foxx/internals.js +++ b/js/server/modules/org/arangodb/foxx/internals.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx internals @@ -28,13 +28,7 @@ //////////////////////////////////////////////////////////////////////////////// var _ = require("underscore"), - is = require("org/arangodb/is"), - constructUrlObject, - constructNickname, - constructRoute, - constructPathParamDoc, - constructQueryParamDoc, - constructErrorResponseDoc; + is = require("org/arangodb/is"); //////////////////////////////////////////////////////////////////////////////// /// @fn JSF_foxx_internals_constructUrlObject @@ -53,8 +47,7 @@ var _ = require("underscore"), /// @endcode //////////////////////////////////////////////////////////////////////////////// -constructUrlObject = function (url, constraint, method) { - 'use strict'; +function constructUrlObject(url, constraint, method) { var urlObject = {}; if (is.noString(url)) { @@ -69,23 +62,21 @@ constructUrlObject = function (url, constraint, method) { } return urlObject; -}; +} //////////////////////////////////////////////////////////////////////////////// /// @fn JSF_foxx_internals_constructNickname /// @brief Construct a swagger-compatible nickname from a httpMethod and URL //////////////////////////////////////////////////////////////////////////////// -constructNickname = function (httpMethod, url) { - 'use strict'; +function constructNickname(httpMethod, url) { return (httpMethod + "_" + url) .replace(/\W/g, '_') .replace(/((_){2,})/g, '_') .toLowerCase(); -}; +} -constructRoute = function (method, route, callback, controller, constraints) { - 'use strict'; +function constructRoute(method, route, callback, controller, constraints) { var res = {}; res.url = constructUrlObject(route, undefined, method); res.docs = { @@ -114,10 +105,9 @@ constructRoute = function (method, route, callback, controller, constraints) { res.action.bodyParams = []; res.action.checks = []; return res; -}; +} -constructPathParamDoc = function (paramName, description, dataType, required) { - 'use strict'; +function constructPathParamDoc(paramName, description, dataType, required) { return { paramType: "path", name: paramName, @@ -125,10 +115,9 @@ constructPathParamDoc = function (paramName, description, dataType, required) { dataType: dataType, required: required }; -}; +} -constructQueryParamDoc = function (paramName, description, dataType, required, allowMultiple) { - 'use strict'; +function constructQueryParamDoc(paramName, description, dataType, required, allowMultiple) { return { paramType: "query", name: paramName, @@ -137,15 +126,14 @@ constructQueryParamDoc = function (paramName, description, dataType, required, a required: required, allowMultiple: allowMultiple }; -}; +} -constructErrorResponseDoc = function (code, reason) { - 'use strict'; +function constructErrorResponseDoc(code, reason) { return { code: code, reason: reason }; -}; +} exports.constructUrlObject = constructUrlObject; exports.constructNickname = constructNickname; diff --git a/js/server/modules/org/arangodb/foxx/manager.js b/js/server/modules/org/arangodb/foxx/manager.js index e51d963f7d..de7b52c413 100644 --- a/js/server/modules/org/arangodb/foxx/manager.js +++ b/js/server/modules/org/arangodb/foxx/manager.js @@ -1,5 +1,4 @@ -/*jshint esnext: true, globalstrict: true */ -/*global module, require, exports*/ +/*jshint esnext: true */ /*global ArangoServerState, ArangoClusterInfo, ArangoClusterComm */ 'use strict'; diff --git a/js/server/modules/org/arangodb/foxx/mocha.js b/js/server/modules/org/arangodb/foxx/mocha.js index b97a9324ba..a45cc5482d 100644 --- a/js/server/modules/org/arangodb/foxx/mocha.js +++ b/js/server/modules/org/arangodb/foxx/mocha.js @@ -1,5 +1,3 @@ -/*jshint globalstrict: true */ -/*global global, require, exports */ 'use strict'; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/modules/org/arangodb/foxx/model.js b/js/server/modules/org/arangodb/foxx/model.js index 3f7b5aaf02..96e38e5b71 100644 --- a/js/server/modules/org/arangodb/foxx/model.js +++ b/js/server/modules/org/arangodb/foxx/model.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx Model @@ -27,14 +27,12 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -var Model, - _ = require('underscore'), +var _ = require('underscore'), joi = require('joi'), is = require('org/arangodb/is'), extend = require('extendible'), EventEmitter = require('events').EventEmitter, util = require('util'), - excludeExtraAttributes, metadataSchema = { _id: joi.string().optional(), _key: joi.string().optional(), @@ -62,8 +60,7 @@ var Model, /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// -excludeExtraAttributes = function (attributes, model) { - 'use strict'; +function excludeExtraAttributes(attributes, model) { if (!model.schema) { return _.clone(attributes); } @@ -71,10 +68,9 @@ excludeExtraAttributes = function (attributes, model) { _.keys(metadataSchema), _.keys(model.schema) )); -}; +} -Model = function (attributes) { - 'use strict'; +function Model(attributes) { //////////////////////////////////////////////////////////////////////////////// /// @startDocuBlock JSF_foxx_model_attributes /// @@ -127,12 +123,11 @@ Model = function (attributes) { this.attributes = _.clone(attributes); } EventEmitter.call(this); -}; +} util.inherits(Model, EventEmitter); Model.fromClient = function (attributes) { - 'use strict'; var model = new this(); model.set(excludeExtraAttributes(attributes, model)); return model; @@ -160,7 +155,6 @@ _.extend(Model.prototype, { //////////////////////////////////////////////////////////////////////////////// get: function (attributeName) { - 'use strict'; return this.attributes[attributeName]; }, @@ -187,7 +181,6 @@ _.extend(Model.prototype, { //////////////////////////////////////////////////////////////////////////////// set: function (attributeName, value) { - 'use strict'; if (is.object(attributeName)) { _.each(attributeName, function (value, key) { @@ -243,7 +236,6 @@ _.extend(Model.prototype, { //////////////////////////////////////////////////////////////////////////////// has: function (attributeName) { - 'use strict'; return !(_.isUndefined(this.attributes[attributeName]) || _.isNull(this.attributes[attributeName])); }, @@ -258,7 +250,6 @@ _.extend(Model.prototype, { //////////////////////////////////////////////////////////////////////////////// forDB: function () { - 'use strict'; return this.attributes; }, @@ -272,7 +263,6 @@ _.extend(Model.prototype, { //////////////////////////////////////////////////////////////////////////////// forClient: function () { - 'use strict'; return excludeExtraAttributes(this.attributes, this); } }); diff --git a/js/server/modules/org/arangodb/foxx/query.js b/js/server/modules/org/arangodb/foxx/query.js index 10937c293d..e0f9d5189a 100644 --- a/js/server/modules/org/arangodb/foxx/query.js +++ b/js/server/modules/org/arangodb/foxx/query.js @@ -1,4 +1,4 @@ -/*global exports, require */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx queries @@ -31,8 +31,6 @@ var _ = require('underscore'), db = require('org/arangodb').db; exports.createQuery = function createQuery (cfg) { - 'use strict'; - if (!cfg) { cfg = {}; } else if (typeof cfg === 'string' || typeof cfg.toAQL === 'function') { diff --git a/js/server/modules/org/arangodb/foxx/queues.js b/js/server/modules/org/arangodb/foxx/queues.js index 9eeb154ad3..8bee0dfa88 100644 --- a/js/server/modules/org/arangodb/foxx/queues.js +++ b/js/server/modules/org/arangodb/foxx/queues.js @@ -1,4 +1,4 @@ -/*global module, require */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx queues @@ -31,29 +31,20 @@ var _ = require('underscore'), flatten = require('internal').flatten, arangodb = require('org/arangodb'), console = require('console'), - db = arangodb.db, - failImmutable, - queueMap, - jobMap, - queues, - getJobs, - Job, - Queue; + db = arangodb.db; -failImmutable = function (name) { - 'use strict'; +function failImmutable(name) { return function () { throw new Error(name + ' is not mutable'); }; -}; +} -queueMap = Object.create(null); -jobMap = Object.create(null); +var queueMap = Object.create(null); +var jobMap = Object.create(null); -queues = { +var queues = { _jobTypes: Object.create(null), get: function (key) { - 'use strict'; var queueKey = db._name() + ":" + key; if (!queueMap[queueKey]) { @@ -65,7 +56,6 @@ queues = { return queueMap[queueKey]; }, create: function (key, maxWorkers) { - 'use strict'; try { db._queues.save({_key: key, maxWorkers: maxWorkers || 1}); } catch (err) { @@ -84,7 +74,6 @@ queues = { return queueMap[queueKey]; }, delete: function (key) { - 'use strict'; var result = false; db._executeTransaction({ collections: { @@ -101,7 +90,6 @@ queues = { return result; }, registerJobType: function (type, opts) { - 'use strict'; if (typeof opts === 'function') { opts = {execute: opts}; } @@ -116,8 +104,7 @@ queues = { } }; -getJobs = function (queue, status, type) { - 'use strict'; +function getJobs(queue, status, type) { var vars = {}, aql = 'FOR job IN _jobs'; if (queue !== undefined) { @@ -137,10 +124,9 @@ getJobs = function (queue, status, type) { query: aql, bindVars: vars }).execute().toArray(); -}; +} -Job = function Job(id) { - 'use strict'; +function Job(id) { var self = this; Object.defineProperty(self, 'id', { get: function () { @@ -160,11 +146,10 @@ Job = function Job(id) { enumerable: true }); }); -}; +} _.extend(Job.prototype, { abort: function () { - 'use strict'; var self = this; db._executeTransaction({ collections: { @@ -186,15 +171,13 @@ _.extend(Job.prototype, { }); }, reset: function () { - 'use strict'; db._jobs.update(this.id, { status: 'pending' }); } }); -Queue = function Queue(name) { - 'use strict'; +function Queue(name) { Object.defineProperty(this, 'name', { get: function () { return name; @@ -203,11 +186,10 @@ Queue = function Queue(name) { configurable: false, enumerable: true }); -}; +} _.extend(Queue.prototype, { push: function (name, data, opts) { - 'use strict'; var type, result, now; if (typeof name !== 'string') { throw new Error('Must pass a job type!'); @@ -250,7 +232,6 @@ _.extend(Queue.prototype, { })._id; }, get: function (id) { - 'use strict'; if (id === undefined || id === null) { throw new Error('Invalid job id'); } @@ -263,7 +244,6 @@ _.extend(Queue.prototype, { return jobMap[id]; }, delete: function (id) { - 'use strict'; return db._executeTransaction({ collections: { read: ['_jobs'], @@ -280,23 +260,18 @@ _.extend(Queue.prototype, { }); }, pending: function (jobType) { - 'use strict'; return getJobs(this.name, 'pending', jobType); }, complete: function (jobType) { - 'use strict'; return getJobs(this.name, 'complete', jobType); }, failed: function (jobType) { - 'use strict'; return getJobs(this.name, 'failed', jobType); }, progress: function (jobType) { - 'use strict'; return getJobs(this.name, 'progress', jobType); }, all: function (jobType) { - 'use strict'; return getJobs(this.name, undefined, jobType); } }); diff --git a/js/server/modules/org/arangodb/foxx/queues/manager.js b/js/server/modules/org/arangodb/foxx/queues/manager.js index 1083e4e912..3711c1e39b 100644 --- a/js/server/modules/org/arangodb/foxx/queues/manager.js +++ b/js/server/modules/org/arangodb/foxx/queues/manager.js @@ -1,4 +1,4 @@ -/*global exports, require */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx queues manager @@ -33,7 +33,6 @@ var QUEUE_MANAGER_PERIOD = 1000, // in ms db = require('org/arangodb').db; exports.manage = function () { - 'use strict'; db._executeTransaction({ collections: { read: ['_queues', '_jobs'], @@ -79,7 +78,6 @@ exports.manage = function () { }; exports.run = function () { - 'use strict'; db._jobs.updateByExample({status: 'progress'}, {status: 'pending'}); return tasks.register({ command: function () { diff --git a/js/server/modules/org/arangodb/foxx/queues/worker.js b/js/server/modules/org/arangodb/foxx/queues/worker.js index 129ddd8dfb..7ee617d65f 100644 --- a/js/server/modules/org/arangodb/foxx/queues/worker.js +++ b/js/server/modules/org/arangodb/foxx/queues/worker.js @@ -1,5 +1,5 @@ /*jshint evil: true */ -/*global exports, require */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx queues workers @@ -32,11 +32,9 @@ var db = require('org/arangodb').db, flatten = require('internal').flatten, exponentialBackOff = require('internal').exponentialBackOff, console = require('console'), - queues = require('org/arangodb/foxx').queues, - getBackOffDelay; + queues = require('org/arangodb/foxx').queues; -getBackOffDelay = function (job, cfg) { - 'use strict'; +function getBackOffDelay(job, cfg) { var n = job.failures.length - 1; if (typeof job.backOff === 'string') { try { @@ -64,10 +62,9 @@ getBackOffDelay = function (job, cfg) { return exponentialBackOff(n, cfg.backOff); } return exponentialBackOff(n, 1000); -}; +} exports.work = function (job) { - 'use strict'; var cfg = queues._jobTypes[job.type], success = true, callback = null, diff --git a/js/server/modules/org/arangodb/foxx/repository.js b/js/server/modules/org/arangodb/foxx/repository.js index e7488a636d..8a4091f5be 100644 --- a/js/server/modules/org/arangodb/foxx/repository.js +++ b/js/server/modules/org/arangodb/foxx/repository.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// Foxx Repository @@ -27,8 +27,7 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -var Repository, - Model = require("org/arangodb/foxx/model").Model, +var Model = require("org/arangodb/foxx/model").Model, _ = require("underscore"), arangodb = require("org/arangodb"), ArangoError = arangodb.ArangoError, @@ -67,9 +66,7 @@ var Repository, /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// -Repository = function (collection, opts) { - 'use strict'; - +function Repository(collection, opts) { if (! collection instanceof ArangoCollection) { throw new ArangoError({ errorNum: errors.ERROR_BAD_PARAMETER.code, @@ -131,7 +128,7 @@ Repository = function (collection, opts) { } EventEmitter.call(this); -}; +} util.inherits(Repository, EventEmitter); @@ -160,7 +157,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// save: function (model) { - 'use strict'; this.emit('beforeCreate', model); model.emit('beforeCreate'); this.emit('beforeSave', model); @@ -196,7 +192,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// byId: function (id) { - 'use strict'; var data = this.collection.document(id); return (new this.model(data)); }, @@ -216,7 +211,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// byExample: function (example) { - 'use strict'; var rawDocuments = this.collection.byExample(example).toArray(); return _.map(rawDocuments, function (rawDocument) { return (new this.model(rawDocument)); @@ -238,7 +232,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// firstExample: function (example) { - 'use strict'; var rawDocument = this.collection.firstExample(example); return (new this.model(rawDocument)); }, @@ -268,7 +261,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// all: function (options) { - 'use strict'; if (!options) { options = {}; } @@ -298,7 +290,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// any: function () { - 'use strict'; var data = this.collection.any(); if (!data) { return null; @@ -325,7 +316,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// remove: function (model) { - 'use strict'; this.emit('beforeRemove', model); model.emit('beforeRemove'); var id = model.get('_id'), @@ -351,7 +341,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// removeById: function (id) { - 'use strict'; return this.collection.remove(id); }, @@ -369,7 +358,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// removeByExample: function (example) { - 'use strict'; return this.collection.removeByExample(example); }, @@ -394,7 +382,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// replace: function (model) { - 'use strict'; var id = model.get("_id") || model.get("_key"), data = model.forDB(), id_and_rev = this.collection.replace(id, data); @@ -420,7 +407,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// replaceById: function (id, data) { - 'use strict'; if (data instanceof Model) { var id_and_rev = this.collection.replace(id, data.forDB()); data.set(id_and_rev); @@ -444,7 +430,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// replaceByExample: function (example, data) { - 'use strict'; return this.collection.replaceByExample(example, data); }, @@ -468,7 +453,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// update: function (model, data) { - 'use strict'; this.emit('beforeUpdate', model, data); model.emit('beforeUpdate', data); this.emit('beforeSave', model, data); @@ -502,7 +486,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// updateById: function (id, data) { - 'use strict'; if (data instanceof Model) { var id_and_rev = this.collection.update(id, data.forDB()); data.set(id_and_rev); @@ -526,7 +509,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// updateByExample: function (example, data) { - 'use strict'; return this.collection.updateByExample(example, data); }, @@ -544,7 +526,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// exists: function (id) { - 'use strict'; return this.collection.exists(id); }, @@ -566,7 +547,6 @@ _.extend(Repository.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// count: function () { - 'use strict'; return this.collection.count(); } }); @@ -599,7 +579,6 @@ var indexPrototypes = { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// range: function (attribute, left, right) { - 'use strict'; var rawDocuments = this.collection.range(attribute, left, right).toArray(); return _.map(rawDocuments, function (rawDocument) { return (new this.model(rawDocument)); @@ -638,7 +617,6 @@ var indexPrototypes = { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// near: function (latitude, longitude, options) { - 'use strict'; var collection = this.collection, rawDocuments; if (!options) { @@ -698,7 +676,6 @@ var indexPrototypes = { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// within: function (latitude, longitude, radius, options) { - 'use strict'; var collection = this.collection, rawDocuments; if (!options) { @@ -755,7 +732,6 @@ var indexPrototypes = { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// fulltext: function (attribute, query, options) { - 'use strict'; if (!options) { options = {}; } @@ -770,8 +746,7 @@ var indexPrototypes = { } }; -var addIndexMethods = function (prototype) { - 'use strict'; +function addIndexMethods(prototype) { _.each(prototype.indexes, function (index) { var protoMethods = indexPrototypes[index.type]; if (!protoMethods) { @@ -783,10 +758,9 @@ var addIndexMethods = function (prototype) { } }); }); -}; +} Repository.extend = function (prototypeProperties, constructorProperties) { - 'use strict'; var constructor = extend.call(this, prototypeProperties, constructorProperties); if (constructor.prototype.hasOwnProperty('indexes')) { addIndexMethods(constructor.prototype); diff --git a/js/server/modules/org/arangodb/foxx/request_context.js b/js/server/modules/org/arangodb/foxx/request_context.js index 34f4d3c7ba..c089deea99 100644 --- a/js/server/modules/org/arangodb/foxx/request_context.js +++ b/js/server/modules/org/arangodb/foxx/request_context.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx Request Context @@ -28,23 +28,16 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -var RequestContext, - RequestContextBuffer, - SwaggerDocs = require("org/arangodb/foxx/swaggerDocs").Docs, +var SwaggerDocs = require("org/arangodb/foxx/swaggerDocs").Docs, joi = require("joi"), _ = require("underscore"), extend = _.extend, internal = require("org/arangodb/foxx/internals"), toJSONSchema = require("org/arangodb/foxx/schema").toJSONSchema, is = require("org/arangodb/is"), - isJoi, - createBodyParamExtractor, - createModelInstantiator, - validateOrThrow, UnauthorizedError = require("org/arangodb/foxx/sessions").UnauthorizedError; -createBodyParamExtractor = function (rootElement, paramName, allowInvalid) { - 'use strict'; +function createBodyParamExtractor(rootElement, paramName, allowInvalid) { var extractElement; if (rootElement) { @@ -68,10 +61,9 @@ createBodyParamExtractor = function (rootElement, paramName, allowInvalid) { return {}; } }; -}; +} -createModelInstantiator = function (Model, allowInvalid) { - 'use strict'; +function createModelInstantiator(Model, allowInvalid) { var multiple = is.array(Model); Model = multiple ? Model[0] : Model; var instantiate = function (raw) { @@ -86,10 +78,9 @@ createModelInstantiator = function (Model, allowInvalid) { return function (raw) { return _.map(raw, instantiate); }; -}; +} -isJoi = function (schema) { - 'use strict'; +function isJoi(schema) { if (!schema || typeof schema !== 'object' || is.array(schema)) { return false; } @@ -101,10 +92,9 @@ isJoi = function (schema) { return Object.keys(schema).some(function (key) { return schema[key].isJoi; }); -}; +} -validateOrThrow = function (raw, schema, allowInvalid) { - 'use strict'; +function validateOrThrow(raw, schema, allowInvalid) { if (!isJoi(schema)) { return raw; } @@ -113,7 +103,7 @@ validateOrThrow = function (raw, schema, allowInvalid) { throw result.error; } return result.value; -}; +} //////////////////////////////////////////////////////////////////////////////// /// @fn JSF_foxx_RequestContext_initializer @@ -122,8 +112,7 @@ validateOrThrow = function (raw, schema, allowInvalid) { /// Used for documenting and constraining the routes. //////////////////////////////////////////////////////////////////////////////// -RequestContext = function (executionBuffer, models, route, rootElement, constraints, extensions) { - 'use strict'; +function RequestContext(executionBuffer, models, route, rootElement, constraints, extensions) { this.route = route; this.typeToRegex = { "int": "/[0-9]+/", @@ -149,7 +138,7 @@ RequestContext = function (executionBuffer, models, route, rootElement, constrai this[attr] = extensionWrapper(this, extensions[attr]); } } -}; +} extend(RequestContext.prototype, { @@ -192,7 +181,6 @@ extend(RequestContext.prototype, { //////////////////////////////////////////////////////////////////////////////// pathParam: function (paramName, attributes) { - 'use strict'; var url = this.route.url, urlConstraint = url.constraint || {}, type = attributes.type, @@ -302,7 +290,6 @@ extend(RequestContext.prototype, { //////////////////////////////////////////////////////////////////////////////// queryParam: function (paramName, attributes) { - 'use strict'; var type = attributes.type, required = attributes.required, description = attributes.description, @@ -448,7 +435,6 @@ extend(RequestContext.prototype, { //////////////////////////////////////////////////////////////////////////////// bodyParam: function (paramName, attributes) { - 'use strict'; var type = attributes.type, description = attributes.description, allowInvalid = attributes.allowInvalid, @@ -515,7 +501,6 @@ extend(RequestContext.prototype, { //////////////////////////////////////////////////////////////////////////////// summary: function (summary) { - 'use strict'; if (summary.length > 8192) { throw new Error("Summary can't be longer than 8192 characters"); } @@ -530,7 +515,6 @@ extend(RequestContext.prototype, { //////////////////////////////////////////////////////////////////////////////// notes: function (notes) { - 'use strict'; this.docs.addNotes(notes); return this; }, @@ -578,7 +562,6 @@ extend(RequestContext.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// errorResponse: function (errorClass, code, reason, errorHandler) { - 'use strict'; this.route.action.errorResponses.push({ errorClass: errorClass, code: code, @@ -608,7 +591,6 @@ extend(RequestContext.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// onlyIf: function (check) { - 'use strict'; this.route.action.checks.push({ check: check }); @@ -636,7 +618,6 @@ extend(RequestContext.prototype, { /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// onlyIfAuthenticated: function (code, reason) { - 'use strict'; var check; check = function (req) { @@ -662,14 +643,12 @@ extend(RequestContext.prototype, { } }); -RequestContextBuffer = function () { - 'use strict'; +function RequestContextBuffer() { this.applyChain = []; -}; +} extend(RequestContextBuffer.prototype, { applyEachFunction: function (target) { - 'use strict'; _.each(this.applyChain, function (x) { target[x.functionName].apply(target, x.argumentList); }); @@ -740,7 +719,6 @@ _.each([ //////////////////////////////////////////////////////////////////////////////// "onlyIfAuthenticated" ], function (functionName) { - 'use strict'; extend(RequestContextBuffer.prototype[functionName] = function () { this.applyChain.push({ functionName: functionName, diff --git a/js/server/modules/org/arangodb/foxx/routing.js b/js/server/modules/org/arangodb/foxx/routing.js index 1894788258..f641fea1e2 100644 --- a/js/server/modules/org/arangodb/foxx/routing.js +++ b/js/server/modules/org/arangodb/foxx/routing.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx routing @@ -29,7 +28,7 @@ //////////////////////////////////////////////////////////////////////////////// (function() { - "use strict"; + 'use strict'; // ----------------------------------------------------------------------------- // --SECTION-- Imports diff --git a/js/server/modules/org/arangodb/foxx/schema.js b/js/server/modules/org/arangodb/foxx/schema.js index c9e6f3a8f0..488298b23f 100644 --- a/js/server/modules/org/arangodb/foxx/schema.js +++ b/js/server/modules/org/arangodb/foxx/schema.js @@ -1,4 +1,4 @@ -/*global exports, require */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx schema helper @@ -31,7 +31,6 @@ var _ = require('underscore'), joi = require('joi'); function toJSONSchema(id, schema) { - 'use strict'; var jsonSchema = { id: id, required: [], diff --git a/js/server/modules/org/arangodb/foxx/sessions.js b/js/server/modules/org/arangodb/foxx/sessions.js index 644e4d5c8b..0e25106335 100644 --- a/js/server/modules/org/arangodb/foxx/sessions.js +++ b/js/server/modules/org/arangodb/foxx/sessions.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx Sessions @@ -39,7 +39,6 @@ var Foxx = require('org/arangodb/foxx'), //////////////////////////////////////////////////////////////////////////////// function decorateController(auth, controller) { - 'use strict'; var cfg = auth.configuration; controller.before('/*', function (req) { @@ -98,7 +97,6 @@ function decorateController(auth, controller) { //////////////////////////////////////////////////////////////////////////////// function createDestroySessionHandler(auth, opts) { - 'use strict'; if (!opts) { opts = {}; } @@ -153,7 +151,6 @@ var sessionTypes = ['cookie', 'header']; //////////////////////////////////////////////////////////////////////////////// function Sessions(opts) { - 'use strict'; if (!opts) { opts = {}; } @@ -237,7 +234,6 @@ function Sessions(opts) { //////////////////////////////////////////////////////////////////////////////// Sessions.prototype.getSessionStorage = function () { - 'use strict'; return Foxx.requireApp(this.configuration.sessionStorageApp).sessionStorage; }; @@ -252,7 +248,6 @@ Sessions.prototype.getSessionStorage = function () { //////////////////////////////////////////////////////////////////////////////// function UnauthorizedError(message) { - 'use strict'; this.message = message; this.statusCode = 401; } diff --git a/js/server/modules/org/arangodb/foxx/swaggerDocs.js b/js/server/modules/org/arangodb/foxx/swaggerDocs.js index 7d185c4701..e46b943bb6 100644 --- a/js/server/modules/org/arangodb/foxx/swaggerDocs.js +++ b/js/server/modules/org/arangodb/foxx/swaggerDocs.js @@ -1,4 +1,3 @@ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx Swagger documentation @@ -28,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////// (function() { - "use strict"; + 'use strict'; var foxxInternal = require("org/arangodb/foxx/internals"); var _ = require("underscore"); diff --git a/js/server/modules/org/arangodb/foxx/templateEngine.js b/js/server/modules/org/arangodb/foxx/templateEngine.js index 29c2f3feb2..a214b6e420 100644 --- a/js/server/modules/org/arangodb/foxx/templateEngine.js +++ b/js/server/modules/org/arangodb/foxx/templateEngine.js @@ -1,4 +1,3 @@ -/*global require, module, exports*/ //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx template engine @@ -29,7 +28,7 @@ //////////////////////////////////////////////////////////////////////////////// (function() { - "use strict"; + 'use strict'; var fs = require("fs"), _ = require("underscore"), diff --git a/js/server/modules/org/arangodb/foxx/template_middleware.js b/js/server/modules/org/arangodb/foxx/template_middleware.js index 2ddfd230b5..4b0053d7e2 100644 --- a/js/server/modules/org/arangodb/foxx/template_middleware.js +++ b/js/server/modules/org/arangodb/foxx/template_middleware.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Foxx Template Middleware @@ -27,8 +27,7 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -var TemplateMiddleware, - db = require("org/arangodb").db, +var db = require("org/arangodb").db, _ = require("underscore"); //////////////////////////////////////////////////////////////////////////////// @@ -52,8 +51,7 @@ var TemplateMiddleware, /// @endDocuBlock //////////////////////////////////////////////////////////////////////////////// -TemplateMiddleware = function (templateCollection, helper) { - "use strict"; +function TemplateMiddleware(templateCollection, helper) { var middleware = function (request, response) { var responseFunctions, _ = require("underscore"); @@ -106,7 +104,7 @@ TemplateMiddleware = function (templateCollection, helper) { } return middleware; -}; +} exports.TemplateMiddleware = TemplateMiddleware; diff --git a/js/server/modules/org/arangodb/graph-blueprint.js b/js/server/modules/org/arangodb/graph-blueprint.js index 64e45cf747..dee2d55d98 100644 --- a/js/server/modules/org/arangodb/graph-blueprint.js +++ b/js/server/modules/org/arangodb/graph-blueprint.js @@ -1,5 +1,4 @@ /*jshint strict: false, unused: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief Graph functionality diff --git a/js/server/modules/org/arangodb/parser.js b/js/server/modules/org/arangodb/parser.js index b39495f2fa..c60bef4d7f 100644 --- a/js/server/modules/org/arangodb/parser.js +++ b/js/server/modules/org/arangodb/parser.js @@ -1,5 +1,4 @@ /*jshint strict: false, unused: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief parser functions diff --git a/js/server/modules/org/arangodb/replication.js b/js/server/modules/org/arangodb/replication.js index 3d348ebc8d..b764904b9d 100644 --- a/js/server/modules/org/arangodb/replication.js +++ b/js/server/modules/org/arangodb/replication.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Replication management @@ -45,8 +45,6 @@ var applier = { }; //////////////////////////////////////////////////////////////////////////////// logger.state = function () { - 'use strict'; - return internal.getStateReplicationLogger(); }; @@ -55,8 +53,6 @@ logger.state = function () { //////////////////////////////////////////////////////////////////////////////// applier.start = function (initialTick) { - 'use strict'; - if (initialTick === undefined) { return internal.startReplicationApplier(); } @@ -69,8 +65,6 @@ applier.start = function (initialTick) { //////////////////////////////////////////////////////////////////////////////// applier.shutdown = applier.stop = function () { - 'use strict'; - return internal.shutdownReplicationApplier(); }; @@ -79,8 +73,6 @@ applier.shutdown = applier.stop = function () { //////////////////////////////////////////////////////////////////////////////// applier.state = function () { - 'use strict'; - return internal.getStateReplicationApplier(); }; @@ -89,8 +81,6 @@ applier.state = function () { //////////////////////////////////////////////////////////////////////////////// applier.forget = function () { - 'use strict'; - return internal.forgetStateReplicationApplier(); }; @@ -99,8 +89,6 @@ applier.forget = function () { //////////////////////////////////////////////////////////////////////////////// applier.properties = function (config) { - 'use strict'; - if (config === undefined) { return internal.configureReplicationApplier(); } @@ -116,21 +104,17 @@ applier.properties = function (config) { /// @brief performs a one-time synchronisation with a remote endpoint //////////////////////////////////////////////////////////////////////////////// -var sync = function (config) { - 'use strict'; - +function sync(config) { return internal.synchroniseReplication(config); -}; +} //////////////////////////////////////////////////////////////////////////////// /// @brief returns the server's id //////////////////////////////////////////////////////////////////////////////// -var serverId = function () { - 'use strict'; - +function serverId() { return internal.serverId(); -}; +} // ----------------------------------------------------------------------------- // --SECTION-- module exports diff --git a/js/server/modules/org/arangodb/shaped-json.js b/js/server/modules/org/arangodb/shaped-json.js index 8fa20a7640..6c38b4e92b 100644 --- a/js/server/modules/org/arangodb/shaped-json.js +++ b/js/server/modules/org/arangodb/shaped-json.js @@ -1,5 +1,4 @@ /*jshint strict: false */ -/*global require, exports, module */ //////////////////////////////////////////////////////////////////////////////// /// @brief ShapedJson diff --git a/js/server/modules/org/arangodb/simple-query.js b/js/server/modules/org/arangodb/simple-query.js index df3f776176..e635430696 100644 --- a/js/server/modules/org/arangodb/simple-query.js +++ b/js/server/modules/org/arangodb/simple-query.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, exports, ArangoClusterComm, ArangoClusterInfo */ +/*global ArangoClusterComm, ArangoClusterInfo */ //////////////////////////////////////////////////////////////////////////////// /// @brief Arango Simple Query Language @@ -235,7 +235,7 @@ function supportsQuery (idx, attributes) { //////////////////////////////////////////////////////////////////////////////// function docType (value) { - "use strict"; + 'use strict'; if (value !== undefined && value !== null) { if (Array.isArray(value)) { @@ -266,7 +266,7 @@ function docType (value) { //////////////////////////////////////////////////////////////////////////////// function isContained (doc, example) { - "use strict"; + 'use strict'; var eType = docType(example); var dType = docType(doc); diff --git a/js/server/modules/org/arangodb/statistics.js b/js/server/modules/org/arangodb/statistics.js index 69b2bf6d41..2e011f047a 100644 --- a/js/server/modules/org/arangodb/statistics.js +++ b/js/server/modules/org/arangodb/statistics.js @@ -1,4 +1,4 @@ -/*global require, exports, ArangoServerState */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief statistics handler @@ -57,8 +57,6 @@ var initialized = false; //////////////////////////////////////////////////////////////////////////////// function createStatisticsCollection (name) { - 'use strict'; - var collection = db._collection(name); if (collection === null) { @@ -89,8 +87,6 @@ function createStatisticsCollection (name) { //////////////////////////////////////////////////////////////////////////////// function collectGarbage (collection, start) { - 'use strict'; - var values = db._query( "FOR s in @@collection " + " FILTER s.time < @start " @@ -115,8 +111,6 @@ function collectGarbage (collection, start) { //////////////////////////////////////////////////////////////////////////////// function lastEntry (collection, start, clusterId) { - 'use strict'; - var filter = ""; if (clusterId !== undefined) { @@ -143,8 +137,6 @@ function lastEntry (collection, start, clusterId) { //////////////////////////////////////////////////////////////////////////////// function avgPercentDistributon (now, last, cuts) { - 'use strict'; - var n = cuts.length + 1; var result = new Array(n); var count = 0; @@ -183,8 +175,6 @@ function avgPercentDistributon (now, last, cuts) { //////////////////////////////////////////////////////////////////////////////// function computePerSeconds (current, prev) { - 'use strict'; - // sanity check if we have restarted the server if (prev.time + exports.STATISTICS_INTERVAL * 1.5 < current.time) { return null; @@ -318,8 +308,6 @@ function computePerSeconds (current, prev) { //////////////////////////////////////////////////////////////////////////////// function compute15Minute (start, clusterId) { - 'use strict'; - var filter = ""; if (clusterId !== undefined) { @@ -460,8 +448,6 @@ exports.STATISTICS_HISTORY_INTERVAL = 15 * 60; //////////////////////////////////////////////////////////////////////////////// exports.createStatisticsCollections = function () { - 'use strict'; - if (initialized) { return true; } @@ -485,8 +471,6 @@ exports.createStatisticsCollections = function () { //////////////////////////////////////////////////////////////////////////////// exports.historian = function () { - "use strict"; - if (! exports.createStatisticsCollections()) { return; } @@ -497,7 +481,7 @@ exports.historian = function () { var clusterId; if (cluster.isCluster()) { - clusterId = ArangoServerState.id(); + clusterId = global.ArangoServerState.id(); } try { @@ -546,8 +530,6 @@ exports.historian = function () { //////////////////////////////////////////////////////////////////////////////// exports.historianAverage = function () { - "use strict"; - if (! exports.createStatisticsCollections()) { return; } @@ -557,7 +539,7 @@ exports.historianAverage = function () { var clusterId; if (cluster.isCluster()) { - clusterId = ArangoServerState.id(); + clusterId = global.ArangoServerState.id(); } try { @@ -600,8 +582,6 @@ exports.historianAverage = function () { //////////////////////////////////////////////////////////////////////////////// exports.garbageCollector = function () { - 'use strict'; - if (! exports.createStatisticsCollections()) { return; } @@ -618,8 +598,6 @@ exports.garbageCollector = function () { //////////////////////////////////////////////////////////////////////////////// exports.startup = function () { - 'use strict'; - if (typeof internal.registerTask !== "function") { return; } diff --git a/js/server/modules/org/arangodb/tasks.js b/js/server/modules/org/arangodb/tasks.js index 0e8a17c191..e6de9f0675 100644 --- a/js/server/modules/org/arangodb/tasks.js +++ b/js/server/modules/org/arangodb/tasks.js @@ -1,4 +1,4 @@ -/*global require, exports */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief Tasks diff --git a/js/server/modules/org/arangodb/testing.js b/js/server/modules/org/arangodb/testing.js index b8a09ad3f5..f62558660f 100644 --- a/js/server/modules/org/arangodb/testing.js +++ b/js/server/modules/org/arangodb/testing.js @@ -1,5 +1,4 @@ /*jshint strict: false, sub: true */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief General unittest framework diff --git a/js/server/modules/org/arangodb/users.js b/js/server/modules/org/arangodb/users.js index f4a465dc25..5e71a73361 100644 --- a/js/server/modules/org/arangodb/users.js +++ b/js/server/modules/org/arangodb/users.js @@ -1,5 +1,5 @@ /*jshint strict: false */ -/*global require, exports, ArangoAgency */ +/*global ArangoAgency */ //////////////////////////////////////////////////////////////////////////////// /// @brief User management diff --git a/js/server/modules/org/arangodb/validator.js b/js/server/modules/org/arangodb/validator.js index 9e72ccce1b..709e638e03 100644 --- a/js/server/modules/org/arangodb/validator.js +++ b/js/server/modules/org/arangodb/validator.js @@ -1,5 +1,4 @@ /*jshint strict: false, unused: false */ -/*global require, exports */ //////////////////////////////////////////////////////////////////////////////// /// @brief validator functions diff --git a/js/server/perftests/bigcollections.js b/js/server/perftests/bigcollections.js index 839064b271..f89df00dab 100644 --- a/js/server/perftests/bigcollections.js +++ b/js/server/perftests/bigcollections.js @@ -1,4 +1,3 @@ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/perftests/join.js b/js/server/perftests/join.js index 156d661d40..076ec82c9c 100644 --- a/js/server/perftests/join.js +++ b/js/server/perftests/join.js @@ -1,4 +1,3 @@ -/*global require */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/perftests/sort.js b/js/server/perftests/sort.js index 53246cc233..4e92d9c0d6 100644 --- a/js/server/perftests/sort.js +++ b/js/server/perftests/sort.js @@ -1,4 +1,4 @@ -/*global require, AQL_EXECUTE */ +/*global AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/server.js b/js/server/server.js index daf3b0f0b9..4ab2b32d59 100644 --- a/js/server/server.js +++ b/js/server/server.js @@ -1,4 +1,4 @@ -/*global require, ArangoAgency */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief server initialisation @@ -41,11 +41,10 @@ //////////////////////////////////////////////////////////////////////////////// (function () { - "use strict"; var internal = require("internal"); // in the cluster the kickstarter will call boostrap-role.js - if (ArangoAgency.prefix() !== "") { + if (global.ArangoAgency.prefix() !== "") { return true; } diff --git a/js/server/tests/aql-arithmetic.js b/js/server/tests/aql-arithmetic.js index 60899ae632..e2c73816b5 100644 --- a/js/server/tests/aql-arithmetic.js +++ b/js/server/tests/aql-arithmetic.js @@ -1,5 +1,5 @@ -/*jshint strict: false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, arithmetic operators diff --git a/js/server/tests/aql-bind.js b/js/server/tests/aql-bind.js index e225ac3e73..af79cfb311 100644 --- a/js/server/tests/aql-bind.js +++ b/js/server/tests/aql-bind.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertException */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertException */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, bind parameters diff --git a/js/server/tests/aql-call-apply.js b/js/server/tests/aql-call-apply.js index f076698eba..cb07a88003 100644 --- a/js/server/tests/aql-call-apply.js +++ b/js/server/tests/aql-call-apply.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, functions /// diff --git a/js/server/tests/aql-complex.js b/js/server/tests/aql-complex.js index 67022549c5..78b16cdc6e 100644 --- a/js/server/tests/aql-complex.js +++ b/js/server/tests/aql-complex.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, complex queries diff --git a/js/server/tests/aql-cross.js b/js/server/tests/aql-cross.js index f89bfa3ba9..2b6cec510a 100644 --- a/js/server/tests/aql-cross.js +++ b/js/server/tests/aql-cross.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, cross-collection queries diff --git a/js/server/tests/aql-dynamic-attributes.js b/js/server/tests/aql-dynamic-attributes.js index db6f127ec6..6e8b1cada9 100644 --- a/js/server/tests/aql-dynamic-attributes.js +++ b/js/server/tests/aql-dynamic-attributes.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXECUTE, AQL_EXPLAIN, AQL_EXECUTEJSON */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXECUTE, AQL_EXPLAIN, AQL_EXECUTEJSON */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dynamic attributes diff --git a/js/server/tests/aql-edges-cluster.js b/js/server/tests/aql-edges-cluster.js index 9861910679..722fbd888e 100644 --- a/js/server/tests/aql-edges-cluster.js +++ b/js/server/tests/aql-edges-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, sub: true, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, edges /// diff --git a/js/server/tests/aql-edges-noncluster.js b/js/server/tests/aql-edges-noncluster.js index 993fbcf404..3ffa3e6218 100644 --- a/js/server/tests/aql-edges-noncluster.js +++ b/js/server/tests/aql-edges-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, sub: true, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, edges /// diff --git a/js/server/tests/aql-escaping.js b/js/server/tests/aql-escaping.js index 7ce3075f87..f37afcd4f0 100644 --- a/js/server/tests/aql-escaping.js +++ b/js/server/tests/aql-escaping.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, escaping diff --git a/js/server/tests/aql-explain-cluster.js b/js/server/tests/aql-explain-cluster.js index 3d4a7fd450..c8a70d5836 100644 --- a/js/server/tests/aql-explain-cluster.js +++ b/js/server/tests/aql-explain-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, fail, assertEqual, assertTrue, assertFalse, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global fail, assertEqual, assertTrue, assertFalse, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules /// diff --git a/js/server/tests/aql-explain-noncluster.js b/js/server/tests/aql-explain-noncluster.js index a3f6d4db97..e794c477f3 100644 --- a/js/server/tests/aql-explain-noncluster.js +++ b/js/server/tests/aql-explain-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, fail, assertEqual, assertTrue, assertFalse, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global fail, assertEqual, assertTrue, assertFalse, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules /// diff --git a/js/server/tests/aql-failures.js b/js/server/tests/aql-failures.js index e60ac903a3..af51cae26d 100644 --- a/js/server/tests/aql-failures.js +++ b/js/server/tests/aql-failures.js @@ -1,5 +1,5 @@ -/*jshint strict: true, maxlen: 400 */ -/*global require, fail, assertEqual, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 400 */ +/*global fail, assertEqual, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief test failure scenarios @@ -42,7 +42,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function ahuacatlFailureSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsAhuacatlFailures"; var c; var count = 5000; diff --git a/js/server/tests/aql-fullcount.js b/js/server/tests/aql-fullcount.js index ad3d79e72d..8133e4b089 100644 --- a/js/server/tests/aql-fullcount.js +++ b/js/server/tests/aql-fullcount.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertUndefined, assertEqual, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertUndefined, assertEqual, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for index usage diff --git a/js/server/tests/aql-functions-date.js b/js/server/tests/aql-functions-date.js index d43b220a54..00e57cad3d 100644 --- a/js/server/tests/aql-functions-date.js +++ b/js/server/tests/aql-functions-date.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, functions /// diff --git a/js/server/tests/aql-functions-list.js b/js/server/tests/aql-functions-list.js index 82ce1cf86b..bc8630dae5 100644 --- a/js/server/tests/aql-functions-list.js +++ b/js/server/tests/aql-functions-list.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, functions /// diff --git a/js/server/tests/aql-functions-misc.js b/js/server/tests/aql-functions-misc.js index b3c4bf45af..9aeed65e18 100644 --- a/js/server/tests/aql-functions-misc.js +++ b/js/server/tests/aql-functions-misc.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, functions /// diff --git a/js/server/tests/aql-functions-numeric.js b/js/server/tests/aql-functions-numeric.js index f9b09b2288..5bb6814fd5 100644 --- a/js/server/tests/aql-functions-numeric.js +++ b/js/server/tests/aql-functions-numeric.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertNull, assertTrue */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertNull, assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, functions /// diff --git a/js/server/tests/aql-functions-string.js b/js/server/tests/aql-functions-string.js index 2070beaebf..602e95b89d 100644 --- a/js/server/tests/aql-functions-string.js +++ b/js/server/tests/aql-functions-string.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, functions /// diff --git a/js/server/tests/aql-functions-types.js b/js/server/tests/aql-functions-types.js index 1ef464f01f..5d97046266 100644 --- a/js/server/tests/aql-functions-types.js +++ b/js/server/tests/aql-functions-types.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, functions /// diff --git a/js/server/tests/aql-functions.js b/js/server/tests/aql-functions.js index bbe2d37083..dfb51fb8de 100644 --- a/js/server/tests/aql-functions.js +++ b/js/server/tests/aql-functions.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertNull, assertTrue, assertFalse */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertNull, assertTrue, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, functions /// diff --git a/js/server/tests/aql-gather-block-cluster.js b/js/server/tests/aql-gather-block-cluster.js index 4df0aa5b11..1d72804716 100644 --- a/js/server/tests/aql-gather-block-cluster.js +++ b/js/server/tests/aql-gather-block-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-general-graph.js b/js/server/tests/aql-general-graph.js index aaaee70d2a..ad6d633001 100644 --- a/js/server/tests/aql-general-graph.js +++ b/js/server/tests/aql-general-graph.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, fail */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, graph functions diff --git a/js/server/tests/aql-graph-visitors.js b/js/server/tests/aql-graph-visitors.js index 5719489ccd..237a15adfd 100644 --- a/js/server/tests/aql-graph-visitors.js +++ b/js/server/tests/aql-graph-visitors.js @@ -1,5 +1,5 @@ -/*jshint strict: false, sub: true, maxlen: 500 */ -/*global require, assertEqual, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ +/*global assertEqual, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, graph functions diff --git a/js/server/tests/aql-graph.js b/js/server/tests/aql-graph.js index d4030a3c63..e2b3c7a196 100644 --- a/js/server/tests/aql-graph.js +++ b/js/server/tests/aql-graph.js @@ -1,5 +1,5 @@ -/*jshint strict: false, sub: true, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, graph functions diff --git a/js/server/tests/aql-hash-cluster.js b/js/server/tests/aql-hash-cluster.js index 0bbca0b942..9b57589175 100644 --- a/js/server/tests/aql-hash-cluster.js +++ b/js/server/tests/aql-hash-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, sub: true, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for Ahuacatl, hash index queries diff --git a/js/server/tests/aql-hash-noncluster.js b/js/server/tests/aql-hash-noncluster.js index 733667bb5b..f3a7a26ca5 100644 --- a/js/server/tests/aql-hash-noncluster.js +++ b/js/server/tests/aql-hash-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, sub: true, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for Ahuacatl, hash index queries diff --git a/js/server/tests/aql-is-in-polygon.js b/js/server/tests/aql-is-in-polygon.js index 65713a2aa9..41cbe9a340 100644 --- a/js/server/tests/aql-is-in-polygon.js +++ b/js/server/tests/aql-is-in-polygon.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, AQL_EXECUTE, assertTrue, assertFalse */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global AQL_EXECUTE, assertTrue, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-join-cluster.js b/js/server/tests/aql-join-cluster.js index 4f94afd989..42600c76ae 100644 --- a/js/server/tests/aql-join-cluster.js +++ b/js/server/tests/aql-join-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, bind parameters diff --git a/js/server/tests/aql-logical.js b/js/server/tests/aql-logical.js index b304fff241..775c33cc03 100644 --- a/js/server/tests/aql-logical.js +++ b/js/server/tests/aql-logical.js @@ -1,5 +1,5 @@ -/*jshint strict: false, sub: true, maxlen: 500 */ -/*global require, assertEqual, assertException */ +/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ +/*global assertEqual, assertException */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, logical operators diff --git a/js/server/tests/aql-modify-cluster.js b/js/server/tests/aql-modify-cluster.js index 98b99c6217..85c4c74b72 100644 --- a/js/server/tests/aql-modify-cluster.js +++ b/js/server/tests/aql-modify-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, assertFalse, assertNull, assertMatch, fail, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, assertFalse, assertNull, assertMatch, fail, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, bind parameters diff --git a/js/server/tests/aql-modify-noncluster-serializetest.js b/js/server/tests/aql-modify-noncluster-serializetest.js index f78820cd05..7f653c64ba 100644 --- a/js/server/tests/aql-modify-noncluster-serializetest.js +++ b/js/server/tests/aql-modify-noncluster-serializetest.js @@ -1,5 +1,5 @@ -/*jshint strict: false, sub: true, maxlen: 500 */ -/*global require, assertEqual, assertFalse, assertNull */ +/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ +/*global assertEqual, assertFalse, assertNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, bind parameters diff --git a/js/server/tests/aql-modify-noncluster.js b/js/server/tests/aql-modify-noncluster.js index 5ae2cee32c..8e01128df2 100644 --- a/js/server/tests/aql-modify-noncluster.js +++ b/js/server/tests/aql-modify-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, sub: true, maxlen: 500 */ -/*global require, assertEqual, assertFalse, assertNull, assertNotNull, assertTrue, +/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ +/*global assertEqual, assertFalse, assertNull, assertNotNull, assertTrue, assertNotEqual, assertUndefined, fail, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/tests/aql-operators.js b/js/server/tests/aql-operators.js index b362ffef25..772bc339f5 100644 --- a/js/server/tests/aql-operators.js +++ b/js/server/tests/aql-operators.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertFalse, assertTrue, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertFalse, assertTrue, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, operators diff --git a/js/server/tests/aql-optimizer-collect-count.js b/js/server/tests/aql-optimizer-collect-count.js index 141cec4453..e6349bdd03 100644 --- a/js/server/tests/aql-optimizer-collect-count.js +++ b/js/server/tests/aql-optimizer-collect-count.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertTrue, assertEqual, assertNotEqual, AQL_EXECUTE, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertTrue, assertEqual, assertNotEqual, AQL_EXECUTE, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for COLLECT w/ COUNT diff --git a/js/server/tests/aql-optimizer-collect-into.js b/js/server/tests/aql-optimizer-collect-into.js index de30aa3c82..69841fd369 100644 --- a/js/server/tests/aql-optimizer-collect-into.js +++ b/js/server/tests/aql-optimizer-collect-into.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for COLLECT w/ INTO var = expr diff --git a/js/server/tests/aql-optimizer-costs.js b/js/server/tests/aql-optimizer-costs.js index 031492236e..872f0c657e 100644 --- a/js/server/tests/aql-optimizer-costs.js +++ b/js/server/tests/aql-optimizer-costs.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for cost estimation diff --git a/js/server/tests/aql-optimizer-dynamic-bounds.js b/js/server/tests/aql-optimizer-dynamic-bounds.js index e0cd2233ff..4ab42f7516 100644 --- a/js/server/tests/aql-optimizer-dynamic-bounds.js +++ b/js/server/tests/aql-optimizer-dynamic-bounds.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertNotEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE, AQL_EXECUTEJSON */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertNotEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE, AQL_EXECUTEJSON */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-filters.js b/js/server/tests/aql-optimizer-filters.js index d8058f06d4..61475d9f2b 100644 --- a/js/server/tests/aql-optimizer-filters.js +++ b/js/server/tests/aql-optimizer-filters.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for filters diff --git a/js/server/tests/aql-optimizer-indexes.js b/js/server/tests/aql-optimizer-indexes.js index 96832eefb4..64642de38a 100644 --- a/js/server/tests/aql-optimizer-indexes.js +++ b/js/server/tests/aql-optimizer-indexes.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertTrue, assertFalse, assertEqual, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertTrue, assertFalse, assertEqual, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for index usage diff --git a/js/server/tests/aql-optimizer-keep.js b/js/server/tests/aql-optimizer-keep.js index c050380ad8..4d783fff75 100644 --- a/js/server/tests/aql-optimizer-keep.js +++ b/js/server/tests/aql-optimizer-keep.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertTrue, assertFalse, assertEqual, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertTrue, assertFalse, assertEqual, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for COLLECT w/ KEEP diff --git a/js/server/tests/aql-optimizer-plans.js b/js/server/tests/aql-optimizer-plans.js index 5ff69a12ee..4fcc1c3c65 100644 --- a/js/server/tests/aql-optimizer-plans.js +++ b/js/server/tests/aql-optimizer-plans.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXECUTE, fail */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXECUTE, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for cost estimation diff --git a/js/server/tests/aql-optimizer-rule-distribute-in-cluster.js b/js/server/tests/aql-optimizer-rule-distribute-in-cluster.js index c54b85dd27..62407552e0 100644 --- a/js/server/tests/aql-optimizer-rule-distribute-in-cluster.js +++ b/js/server/tests/aql-optimizer-rule-distribute-in-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js b/js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js index 34fc1765a7..326e724316 100644 --- a/js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js +++ b/js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE, AQL_EXECUTEJSON */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE, AQL_EXECUTEJSON */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js b/js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js index cc6267eb97..d4481b47d7 100644 --- a/js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js +++ b/js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE, AQL_EXECUTEJSON */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE, AQL_EXECUTEJSON */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-move-calculations-down.js b/js/server/tests/aql-optimizer-rule-move-calculations-down.js index abaa17f96b..797966703f 100644 --- a/js/server/tests/aql-optimizer-rule-move-calculations-down.js +++ b/js/server/tests/aql-optimizer-rule-move-calculations-down.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-move-calculations-up.js b/js/server/tests/aql-optimizer-rule-move-calculations-up.js index 36c0f70efe..ec668cec16 100644 --- a/js/server/tests/aql-optimizer-rule-move-calculations-up.js +++ b/js/server/tests/aql-optimizer-rule-move-calculations-up.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-move-filters-up.js b/js/server/tests/aql-optimizer-rule-move-filters-up.js index ef23e0952e..7aa4c27394 100644 --- a/js/server/tests/aql-optimizer-rule-move-filters-up.js +++ b/js/server/tests/aql-optimizer-rule-move-filters-up.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-remove-collect-into.js b/js/server/tests/aql-optimizer-rule-remove-collect-into.js index 5848a16804..b11593e261 100644 --- a/js/server/tests/aql-optimizer-rule-remove-collect-into.js +++ b/js/server/tests/aql-optimizer-rule-remove-collect-into.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-remove-filter-covered-by-index.js b/js/server/tests/aql-optimizer-rule-remove-filter-covered-by-index.js index 0a714124ab..0f4a4156a9 100644 --- a/js/server/tests/aql-optimizer-rule-remove-filter-covered-by-index.js +++ b/js/server/tests/aql-optimizer-rule-remove-filter-covered-by-index.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-remove-redundant-calculations.js b/js/server/tests/aql-optimizer-rule-remove-redundant-calculations.js index 2d5bbb7210..85aabd14ba 100644 --- a/js/server/tests/aql-optimizer-rule-remove-redundant-calculations.js +++ b/js/server/tests/aql-optimizer-rule-remove-redundant-calculations.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertNotEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertNotEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-remove-redundant-or.js b/js/server/tests/aql-optimizer-rule-remove-redundant-or.js index 193b70ede5..4fab7bfbde 100644 --- a/js/server/tests/aql-optimizer-rule-remove-redundant-or.js +++ b/js/server/tests/aql-optimizer-rule-remove-redundant-or.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for Ahuacatl, skiplist index queries diff --git a/js/server/tests/aql-optimizer-rule-remove-redundant-sorts.js b/js/server/tests/aql-optimizer-rule-remove-redundant-sorts.js index b28163b22c..a8184cf396 100644 --- a/js/server/tests/aql-optimizer-rule-remove-redundant-sorts.js +++ b/js/server/tests/aql-optimizer-rule-remove-redundant-sorts.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertTrue, assertEqual, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertTrue, assertEqual, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-remove-sort-rand.js b/js/server/tests/aql-optimizer-rule-remove-sort-rand.js index d5027b0f9b..41f35e2c4f 100644 --- a/js/server/tests/aql-optimizer-rule-remove-sort-rand.js +++ b/js/server/tests/aql-optimizer-rule-remove-sort-rand.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, assertFalse, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, assertFalse, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-remove-unnecessary-calculations.js b/js/server/tests/aql-optimizer-rule-remove-unnecessary-calculations.js index 77a8b294f6..7f342f39fd 100644 --- a/js/server/tests/aql-optimizer-rule-remove-unnecessary-calculations.js +++ b/js/server/tests/aql-optimizer-rule-remove-unnecessary-calculations.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertNotEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertNotEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-remove-unnecessary-filters.js b/js/server/tests/aql-optimizer-rule-remove-unnecessary-filters.js index 3f4e1bea7b..38147e611d 100644 --- a/js/server/tests/aql-optimizer-rule-remove-unnecessary-filters.js +++ b/js/server/tests/aql-optimizer-rule-remove-unnecessary-filters.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js b/js/server/tests/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js index b30f4f611a..b491ec8cae 100644 --- a/js/server/tests/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js +++ b/js/server/tests/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertTrue, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertTrue, assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-replace-or-with-in.js b/js/server/tests/aql-optimizer-rule-replace-or-with-in.js index 5a4051f84c..82bc031e52 100644 --- a/js/server/tests/aql-optimizer-rule-replace-or-with-in.js +++ b/js/server/tests/aql-optimizer-rule-replace-or-with-in.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE, fail */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for Ahuacatl, replace-or-with-in rule diff --git a/js/server/tests/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js b/js/server/tests/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js index 8c9f041943..6a9da2cf32 100644 --- a/js/server/tests/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js +++ b/js/server/tests/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertTrue, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertTrue, assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-use-index-for-sort.js b/js/server/tests/aql-optimizer-rule-use-index-for-sort.js index c897460be0..29742ef059 100644 --- a/js/server/tests/aql-optimizer-rule-use-index-for-sort.js +++ b/js/server/tests/aql-optimizer-rule-use-index-for-sort.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, assertNotEqual, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-optimizer-rule-use-index-range.js b/js/server/tests/aql-optimizer-rule-use-index-range.js index 7088fff8c1..5742d76ce8 100644 --- a/js/server/tests/aql-optimizer-rule-use-index-range.js +++ b/js/server/tests/aql-optimizer-rule-use-index-range.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rule use index-range diff --git a/js/server/tests/aql-optimizer-stats-noncluster.js b/js/server/tests/aql-optimizer-stats-noncluster.js index 4ee2a72dbd..52aae2e84b 100644 --- a/js/server/tests/aql-optimizer-stats-noncluster.js +++ b/js/server/tests/aql-optimizer-stats-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertTrue, assertEqual, assertNotEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertTrue, assertEqual, assertNotEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for index usage diff --git a/js/server/tests/aql-parse.js b/js/server/tests/aql-parse.js index 5a13df390b..4ae74977c1 100644 --- a/js/server/tests/aql-parse.js +++ b/js/server/tests/aql-parse.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 700 */ -/*global require, assertEqual, assertTrue */ +/*jshint globalstrict:false, strict:false, maxlen: 700 */ +/*global assertEqual, assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, PARSE function diff --git a/js/server/tests/aql-primary-index-cluster.js b/js/server/tests/aql-primary-index-cluster.js index 7c70a66c5d..4d74c3241d 100644 --- a/js/server/tests/aql-primary-index-cluster.js +++ b/js/server/tests/aql-primary-index-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXECUTE, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXECUTE, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for primary index diff --git a/js/server/tests/aql-primary-index-noncluster.js b/js/server/tests/aql-primary-index-noncluster.js index 32a7bad3ca..7e677bbbc1 100644 --- a/js/server/tests/aql-primary-index-noncluster.js +++ b/js/server/tests/aql-primary-index-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXECUTE, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXECUTE, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for primary index diff --git a/js/server/tests/aql-queries-collection.js b/js/server/tests/aql-queries-collection.js index 9ca0c77551..75a0a2af87 100644 --- a/js/server/tests/aql-queries-collection.js +++ b/js/server/tests/aql-queries-collection.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 850 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 850 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, simple collection-based queries diff --git a/js/server/tests/aql-queries-fulltext.js b/js/server/tests/aql-queries-fulltext.js index 3ad6ef7cc2..dca3ca15e2 100644 --- a/js/server/tests/aql-queries-fulltext.js +++ b/js/server/tests/aql-queries-fulltext.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, fulltext queries diff --git a/js/server/tests/aql-queries-geo.js b/js/server/tests/aql-queries-geo.js index 66ff659950..19cbe68e94 100644 --- a/js/server/tests/aql-queries-geo.js +++ b/js/server/tests/aql-queries-geo.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, geo queries diff --git a/js/server/tests/aql-queries-noncollection.js b/js/server/tests/aql-queries-noncollection.js index 8c29b6867c..4c1a60b3a8 100644 --- a/js/server/tests/aql-queries-noncollection.js +++ b/js/server/tests/aql-queries-noncollection.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertException */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertException */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, simple non-collection-based queries diff --git a/js/server/tests/aql-queries-optimiser-in-cluster.js b/js/server/tests/aql-queries-optimiser-in-cluster.js index fcc7278783..0917f11647 100644 --- a/js/server/tests/aql-queries-optimiser-in-cluster.js +++ b/js/server/tests/aql-queries-optimiser-in-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, in diff --git a/js/server/tests/aql-queries-optimiser-in-noncluster.js b/js/server/tests/aql-queries-optimiser-in-noncluster.js index 46d3684bb9..55687ea643 100644 --- a/js/server/tests/aql-queries-optimiser-in-noncluster.js +++ b/js/server/tests/aql-queries-optimiser-in-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, in diff --git a/js/server/tests/aql-queries-optimiser-limit-cluster.js b/js/server/tests/aql-queries-optimiser-limit-cluster.js index 58d3438163..9c13b8444a 100644 --- a/js/server/tests/aql-queries-optimiser-limit-cluster.js +++ b/js/server/tests/aql-queries-optimiser-limit-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, limit optimisations diff --git a/js/server/tests/aql-queries-optimiser-limit-noncluster.js b/js/server/tests/aql-queries-optimiser-limit-noncluster.js index 6205177f35..1e7fe86e87 100644 --- a/js/server/tests/aql-queries-optimiser-limit-noncluster.js +++ b/js/server/tests/aql-queries-optimiser-limit-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, limit optimisations diff --git a/js/server/tests/aql-queries-optimiser-ref-cluster.js b/js/server/tests/aql-queries-optimiser-ref-cluster.js index 11eb076ae0..ffad34a7b1 100644 --- a/js/server/tests/aql-queries-optimiser-ref-cluster.js +++ b/js/server/tests/aql-queries-optimiser-ref-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, reference optimiser diff --git a/js/server/tests/aql-queries-optimiser-ref-noncluster.js b/js/server/tests/aql-queries-optimiser-ref-noncluster.js index 3276ecf42b..ceb288d6c0 100644 --- a/js/server/tests/aql-queries-optimiser-ref-noncluster.js +++ b/js/server/tests/aql-queries-optimiser-ref-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, reference optimiser diff --git a/js/server/tests/aql-queries-optimiser-sort-cluster.js b/js/server/tests/aql-queries-optimiser-sort-cluster.js index 8dd3c98c84..50d4ba7702 100644 --- a/js/server/tests/aql-queries-optimiser-sort-cluster.js +++ b/js/server/tests/aql-queries-optimiser-sort-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 5000 */ -/*global require, assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 5000 */ +/*global assertEqual, assertTrue, AQL_EXPLAIN, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, sort optimisations diff --git a/js/server/tests/aql-queries-optimiser-sort-noncluster.js b/js/server/tests/aql-queries-optimiser-sort-noncluster.js index b93b8438f3..3b18e32adf 100644 --- a/js/server/tests/aql-queries-optimiser-sort-noncluster.js +++ b/js/server/tests/aql-queries-optimiser-sort-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, sort optimisations diff --git a/js/server/tests/aql-queries-optimiser.js b/js/server/tests/aql-queries-optimiser.js index b28b096848..042c4ccec0 100644 --- a/js/server/tests/aql-queries-optimiser.js +++ b/js/server/tests/aql-queries-optimiser.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, optimiser tests diff --git a/js/server/tests/aql-queries-simple.js b/js/server/tests/aql-queries-simple.js index caadcbb6d1..ff04583348 100644 --- a/js/server/tests/aql-queries-simple.js +++ b/js/server/tests/aql-queries-simple.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, simple queries diff --git a/js/server/tests/aql-queries-variables.js b/js/server/tests/aql-queries-variables.js index 02e53b6de2..0ebeecfca7 100644 --- a/js/server/tests/aql-queries-variables.js +++ b/js/server/tests/aql-queries-variables.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, variable access diff --git a/js/server/tests/aql-range.js b/js/server/tests/aql-range.js index d5350bd8b2..d49ae38072 100644 --- a/js/server/tests/aql-range.js +++ b/js/server/tests/aql-range.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/aql-ranges-combined-01.js b/js/server/tests/aql-ranges-combined-01.js index 8a5ccc1a40..56aa72189d 100644 --- a/js/server/tests/aql-ranges-combined-01.js +++ b/js/server/tests/aql-ranges-combined-01.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-02.js b/js/server/tests/aql-ranges-combined-02.js index 62a650bb08..6586a374a7 100644 --- a/js/server/tests/aql-ranges-combined-02.js +++ b/js/server/tests/aql-ranges-combined-02.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-03.js b/js/server/tests/aql-ranges-combined-03.js index a7055df34b..00819a293e 100644 --- a/js/server/tests/aql-ranges-combined-03.js +++ b/js/server/tests/aql-ranges-combined-03.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-04.js b/js/server/tests/aql-ranges-combined-04.js index 2f6d6c9881..3f40c671e4 100644 --- a/js/server/tests/aql-ranges-combined-04.js +++ b/js/server/tests/aql-ranges-combined-04.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-05.js b/js/server/tests/aql-ranges-combined-05.js index b0453a2b9a..aa27a0e011 100644 --- a/js/server/tests/aql-ranges-combined-05.js +++ b/js/server/tests/aql-ranges-combined-05.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-06.js b/js/server/tests/aql-ranges-combined-06.js index 2aef264270..69235581d4 100644 --- a/js/server/tests/aql-ranges-combined-06.js +++ b/js/server/tests/aql-ranges-combined-06.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-07.js b/js/server/tests/aql-ranges-combined-07.js index e3990ca70b..184922dfd1 100644 --- a/js/server/tests/aql-ranges-combined-07.js +++ b/js/server/tests/aql-ranges-combined-07.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-08.js b/js/server/tests/aql-ranges-combined-08.js index 0c762a6d78..d1cc3dee1b 100644 --- a/js/server/tests/aql-ranges-combined-08.js +++ b/js/server/tests/aql-ranges-combined-08.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-09.js b/js/server/tests/aql-ranges-combined-09.js index ff5b4941b2..05108e8a36 100644 --- a/js/server/tests/aql-ranges-combined-09.js +++ b/js/server/tests/aql-ranges-combined-09.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-10.js b/js/server/tests/aql-ranges-combined-10.js index 94f1076e4a..9f95a3a33c 100644 --- a/js/server/tests/aql-ranges-combined-10.js +++ b/js/server/tests/aql-ranges-combined-10.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-11.js b/js/server/tests/aql-ranges-combined-11.js index 5a71a787d5..5fdf3b1916 100644 --- a/js/server/tests/aql-ranges-combined-11.js +++ b/js/server/tests/aql-ranges-combined-11.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-12.js b/js/server/tests/aql-ranges-combined-12.js index d9db816c49..be87908f2e 100644 --- a/js/server/tests/aql-ranges-combined-12.js +++ b/js/server/tests/aql-ranges-combined-12.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-13.js b/js/server/tests/aql-ranges-combined-13.js index 39d68e2b3e..3ed173033b 100644 --- a/js/server/tests/aql-ranges-combined-13.js +++ b/js/server/tests/aql-ranges-combined-13.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-14.js b/js/server/tests/aql-ranges-combined-14.js index df91651a77..500d24a878 100644 --- a/js/server/tests/aql-ranges-combined-14.js +++ b/js/server/tests/aql-ranges-combined-14.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-15.js b/js/server/tests/aql-ranges-combined-15.js index c555441682..9b9ca41048 100644 --- a/js/server/tests/aql-ranges-combined-15.js +++ b/js/server/tests/aql-ranges-combined-15.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges-combined-16.js b/js/server/tests/aql-ranges-combined-16.js index f116331993..a471a8825d 100644 --- a/js/server/tests/aql-ranges-combined-16.js +++ b/js/server/tests/aql-ranges-combined-16.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-ranges.js b/js/server/tests/aql-ranges.js index 3ec7bf6200..3ef2b03fdf 100644 --- a/js/server/tests/aql-ranges.js +++ b/js/server/tests/aql-ranges.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, range optimisations diff --git a/js/server/tests/aql-refaccess-attribute.js b/js/server/tests/aql-refaccess-attribute.js index f46cb9b242..c2ad1e1dd4 100644 --- a/js/server/tests/aql-refaccess-attribute.js +++ b/js/server/tests/aql-refaccess-attribute.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, ref access diff --git a/js/server/tests/aql-refaccess-variable.js b/js/server/tests/aql-refaccess-variable.js index 8cc75123e6..c46acf3174 100644 --- a/js/server/tests/aql-refaccess-variable.js +++ b/js/server/tests/aql-refaccess-variable.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, ref access diff --git a/js/server/tests/aql-relational.js b/js/server/tests/aql-relational.js index 9eb94bb1db..d79d89a4b9 100644 --- a/js/server/tests/aql-relational.js +++ b/js/server/tests/aql-relational.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, relational operators diff --git a/js/server/tests/aql-skiplist-cluster.js b/js/server/tests/aql-skiplist-cluster.js index 517daf86b3..cd14995dcd 100644 --- a/js/server/tests/aql-skiplist-cluster.js +++ b/js/server/tests/aql-skiplist-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for Ahuacatl, skiplist index queries diff --git a/js/server/tests/aql-skiplist-noncluster.js b/js/server/tests/aql-skiplist-noncluster.js index 54d5fa3f02..bb32f77334 100644 --- a/js/server/tests/aql-skiplist-noncluster.js +++ b/js/server/tests/aql-skiplist-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for Ahuacatl, skiplist index queries diff --git a/js/server/tests/aql-subquery.js b/js/server/tests/aql-subquery.js index 8e6c967fae..88cc83a796 100644 --- a/js/server/tests/aql-subquery.js +++ b/js/server/tests/aql-subquery.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXPLAIN */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXPLAIN */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for Ahuacatl, subqueries diff --git a/js/server/tests/aql-ternary.js b/js/server/tests/aql-ternary.js index 5a1850389e..5a1c5b0a08 100644 --- a/js/server/tests/aql-ternary.js +++ b/js/server/tests/aql-ternary.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, strict: false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, tenary operator diff --git a/js/server/tests/aql-upsert-cluster.js b/js/server/tests/aql-upsert-cluster.js index 30c0ba01b8..2138004c81 100644 --- a/js/server/tests/aql-upsert-cluster.js +++ b/js/server/tests/aql-upsert-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, assertFalse, assertNull, assertTrue, AQL_EXECUTE */ +/*jshint globalstrict:false, strict:false, strict: false, maxlen: 500 */ +/*global assertEqual, assertFalse, assertNull, assertTrue, AQL_EXECUTE */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, bind parameters diff --git a/js/server/tests/aql-variables.js b/js/server/tests/aql-variables.js index 5bf99dc00d..fa98fcc001 100644 --- a/js/server/tests/aql-variables.js +++ b/js/server/tests/aql-variables.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, strict: false, maxlen: 500 */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for query language, variables diff --git a/js/server/tests/aql-within-rectangle.js b/js/server/tests/aql-within-rectangle.js index 6c15aa15de..382cbd390a 100644 --- a/js/server/tests/aql-within-rectangle.js +++ b/js/server/tests/aql-within-rectangle.js @@ -1,5 +1,5 @@ -/*jshint strict: false, maxlen: 500 */ -/*global require, assertEqual, AQL_EXECUTE, assertTrue, fail */ +/*jshint globalstrict:false, strict:false, maxlen: 500 */ +/*global assertEqual, AQL_EXECUTE, assertTrue, fail */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for optimizer rules diff --git a/js/server/tests/dump-cluster.js b/js/server/tests/dump-cluster.js index 5194c815d4..5202522e74 100644 --- a/js/server/tests/dump-cluster.js +++ b/js/server/tests/dump-cluster.js @@ -1,5 +1,5 @@ -/*jshint strict: true, maxlen : 4000 */ -/*global require, assertEqual, assertTrue, assertFalse */ +/*jshint globalstrict:false, strict:false, maxlen : 4000 */ +/*global assertEqual, assertTrue, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -36,7 +36,7 @@ var jsunity = require("jsunity"); //////////////////////////////////////////////////////////////////////////////// function dumpTestSuite () { - "use strict"; + 'use strict'; var db = internal.db; return { diff --git a/js/server/tests/dump-setup-cluster.js b/js/server/tests/dump-setup-cluster.js index a99e3e8a55..18448a465f 100644 --- a/js/server/tests/dump-setup-cluster.js +++ b/js/server/tests/dump-setup-cluster.js @@ -1,5 +1,4 @@ -/*jshint strict: true, maxlen : 4000 */ -/*global require */ +/*jshint globalstrict:false, strict:false, maxlen : 4000 */ //////////////////////////////////////////////////////////////////////////////// /// @brief setup collections for dump/reload tests @@ -29,7 +28,7 @@ //////////////////////////////////////////////////////////////////////////////// (function () { - "use strict"; + 'use strict'; var db = require("org/arangodb").db; var i, c; diff --git a/js/server/tests/dump-setup.js b/js/server/tests/dump-setup.js index b759b5361c..bb6cc9b85a 100644 --- a/js/server/tests/dump-setup.js +++ b/js/server/tests/dump-setup.js @@ -1,5 +1,4 @@ -/*jshint strict: true, maxlen:4000, unused:false */ -/*global require */ +/*jshint globalstrict:false, strict:false, maxlen:4000, unused:false */ //////////////////////////////////////////////////////////////////////////////// /// @brief setup collections for dump/reload tests @@ -29,7 +28,7 @@ //////////////////////////////////////////////////////////////////////////////// (function () { - "use strict"; + 'use strict'; var db = require("org/arangodb").db; var i, c; diff --git a/js/server/tests/dump-teardown-cluster.js b/js/server/tests/dump-teardown-cluster.js index fe8428c155..d9233f3eff 100644 --- a/js/server/tests/dump-teardown-cluster.js +++ b/js/server/tests/dump-teardown-cluster.js @@ -1,4 +1,4 @@ -/*global require */ +/*jshint globalstrict:false, strict:false */ //////////////////////////////////////////////////////////////////////////////// /// @brief teardown for dump/reload tests @@ -28,7 +28,7 @@ //////////////////////////////////////////////////////////////////////////////// (function () { - "use strict"; + 'use strict'; var db = require("org/arangodb").db; db._dropDatabase("UnitTestsDumpSrc"); diff --git a/js/server/tests/dump-teardown.js b/js/server/tests/dump-teardown.js index 1a18767cab..ae5638b29a 100644 --- a/js/server/tests/dump-teardown.js +++ b/js/server/tests/dump-teardown.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require */ +/*jshint globalstrict:false, strict:false */ + //////////////////////////////////////////////////////////////////////////////// /// @brief teardown for dump/reload tests /// @@ -28,7 +28,7 @@ //////////////////////////////////////////////////////////////////////////////// (function () { - "use strict"; + 'use strict'; var db = require("org/arangodb").db; diff --git a/js/server/tests/dump.js b/js/server/tests/dump.js index 868027764c..1f8700a5e0 100644 --- a/js/server/tests/dump.js +++ b/js/server/tests/dump.js @@ -1,5 +1,6 @@ -/*jshint strict: true, maxlen:4000 */ -/*global require, assertEqual, assertTrue, assertFalse */ +/*jshint globalstrict:false, strict:false, maxlen:4000 */ +/*global assertEqual, assertTrue, assertFalse */ + //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload /// @@ -35,7 +36,7 @@ var jsunity = require("jsunity"); //////////////////////////////////////////////////////////////////////////////// function dumpTestSuite () { - "use strict"; + 'use strict'; var db = internal.db; return { diff --git a/js/server/tests/import-setup.js b/js/server/tests/import-setup.js index 33a077321f..0063de0324 100644 --- a/js/server/tests/import-setup.js +++ b/js/server/tests/import-setup.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require */ +/*jshint globalstrict:false, strict:false */ + //////////////////////////////////////////////////////////////////////////////// /// @brief setup for import tests /// @@ -28,7 +28,7 @@ //////////////////////////////////////////////////////////////////////////////// (function () { - "use strict"; + 'use strict'; var db = require("org/arangodb").db; db._drop("UnitTestsImportJson1"); diff --git a/js/server/tests/import-teardown.js b/js/server/tests/import-teardown.js index 3efa5a3e02..71f12c9032 100644 --- a/js/server/tests/import-teardown.js +++ b/js/server/tests/import-teardown.js @@ -1,5 +1,4 @@ -/*jshint strict: true */ -/*global require */ +/*jshint globalstrict:false, strict:false */ //////////////////////////////////////////////////////////////////////////////// /// @brief teardown for import tests @@ -29,7 +28,7 @@ //////////////////////////////////////////////////////////////////////////////// (function () { - "use strict"; + 'use strict'; var db = require("org/arangodb").db; db._drop("UnitTestsImportJson1"); diff --git a/js/server/tests/import.js b/js/server/tests/import.js index 997784d490..6f19f614e8 100644 --- a/js/server/tests/import.js +++ b/js/server/tests/import.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for import @@ -37,7 +37,7 @@ var ArangoError = require("org/arangodb").ArangoError; //////////////////////////////////////////////////////////////////////////////// function importTestSuite () { - "use strict"; + 'use strict'; var errors = internal.errors; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/tests/recovery/attributes.js b/js/server/tests/recovery/attributes.js index 06240d5ede..5df55d98bf 100644 --- a/js/server/tests/recovery/attributes.js +++ b/js/server/tests/recovery/attributes.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -56,7 +56,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -86,7 +86,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/big-transaction-durability.js b/js/server/tests/recovery/big-transaction-durability.js index 6b6f24812d..e9d2ff9009 100644 --- a/js/server/tests/recovery/big-transaction-durability.js +++ b/js/server/tests/recovery/big-transaction-durability.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -64,7 +64,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -101,7 +101,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/cap-constraint.js b/js/server/tests/recovery/cap-constraint.js index eb78affce5..6ebf16aaba 100644 --- a/js/server/tests/recovery/cap-constraint.js +++ b/js/server/tests/recovery/cap-constraint.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var i, j, c; @@ -61,7 +61,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -99,7 +99,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/collection-properties.js b/js/server/tests/recovery/collection-properties.js index 68ac07edf0..99453d09a1 100644 --- a/js/server/tests/recovery/collection-properties.js +++ b/js/server/tests/recovery/collection-properties.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused: false */ -/*global require, assertTrue, assertFalse, assertEqual */ +/*jshint globalstrict:false, strict:false, unused: false */ +/*global assertTrue, assertFalse, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var c; @@ -60,7 +60,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -103,7 +103,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/collection-recreate.js b/js/server/tests/recovery/collection-recreate.js index 2e73e61647..7bc568e0d1 100644 --- a/js/server/tests/recovery/collection-recreate.js +++ b/js/server/tests/recovery/collection-recreate.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -63,7 +63,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -93,7 +93,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/collection-rename-recreate-flush.js b/js/server/tests/recovery/collection-rename-recreate-flush.js index fdff38792b..9f94896fc4 100644 --- a/js/server/tests/recovery/collection-rename-recreate-flush.js +++ b/js/server/tests/recovery/collection-rename-recreate-flush.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var i, c; @@ -72,7 +72,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -106,7 +106,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/collection-rename-recreate.js b/js/server/tests/recovery/collection-rename-recreate.js index 5971a6c266..45626611d4 100644 --- a/js/server/tests/recovery/collection-rename-recreate.js +++ b/js/server/tests/recovery/collection-rename-recreate.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var i; @@ -65,7 +65,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -99,7 +99,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/collection-rename.js b/js/server/tests/recovery/collection-rename.js index 99e649409f..ed42e36ba5 100644 --- a/js/server/tests/recovery/collection-rename.js +++ b/js/server/tests/recovery/collection-rename.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertNull, assertTrue, assertFalse, assertNotNull */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertNull, assertTrue, assertFalse, assertNotNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var c; @@ -73,7 +73,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -119,7 +119,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/collection-unload.js b/js/server/tests/recovery/collection-unload.js index 9cc1976e96..9aedc5a961 100644 --- a/js/server/tests/recovery/collection-unload.js +++ b/js/server/tests/recovery/collection-unload.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused: false */ -/*global require, assertEqual, assertTrue */ +/*jshint globalstrict:false, strict:false, unused: false */ +/*global assertEqual, assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var c; @@ -50,7 +50,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -85,7 +85,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/collections-different-attributes.js b/js/server/tests/recovery/collections-different-attributes.js index 2af658b91c..a6089df93f 100644 --- a/js/server/tests/recovery/collections-different-attributes.js +++ b/js/server/tests/recovery/collections-different-attributes.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var c, i; @@ -65,7 +65,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -98,7 +98,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/collections-reuse.js b/js/server/tests/recovery/collections-reuse.js index 8add83a5f0..792b133c28 100644 --- a/js/server/tests/recovery/collections-reuse.js +++ b/js/server/tests/recovery/collections-reuse.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertNull */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var c, i, j; @@ -85,7 +85,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -123,7 +123,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/collector-oom.js b/js/server/tests/recovery/collector-oom.js index 671adcecd7..14336bb862 100644 --- a/js/server/tests/recovery/collector-oom.js +++ b/js/server/tests/recovery/collector-oom.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -55,7 +55,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -88,7 +88,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/corrupt-wal-marker-multiple.js b/js/server/tests/recovery/corrupt-wal-marker-multiple.js index 4066bea93d..4bc222af9f 100644 --- a/js/server/tests/recovery/corrupt-wal-marker-multiple.js +++ b/js/server/tests/recovery/corrupt-wal-marker-multiple.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var c = [ ], i, j; @@ -63,7 +63,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -97,7 +97,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/corrupt-wal-marker-single.js b/js/server/tests/recovery/corrupt-wal-marker-single.js index d8c0b29379..b633544e6c 100644 --- a/js/server/tests/recovery/corrupt-wal-marker-single.js +++ b/js/server/tests/recovery/corrupt-wal-marker-single.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; var doc; internal.debugClearFailAt(); @@ -68,7 +68,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -101,7 +101,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/create-and-drop-databases.js b/js/server/tests/recovery/create-and-drop-databases.js index 0b30c2b0bd..9953eb65f7 100644 --- a/js/server/tests/recovery/create-and-drop-databases.js +++ b/js/server/tests/recovery/create-and-drop-databases.js @@ -1,4 +1,4 @@ -/*jshint strict: true, unused : false */ +/*jshint globalstrict:false, strict:false, unused : false */ /*global fail, require, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("test"); @@ -72,7 +72,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -106,7 +106,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/create-collection-fail.js b/js/server/tests/recovery/create-collection-fail.js index 65bdf0b705..9f41c3ca3b 100644 --- a/js/server/tests/recovery/create-collection-fail.js +++ b/js/server/tests/recovery/create-collection-fail.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertNull, assertNotNull */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertNull, assertNotNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); internal.debugSetFailAt("CreateCollection::tempDirectory"); @@ -72,7 +72,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -100,7 +100,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/create-collections.js b/js/server/tests/recovery/create-collections.js index 39e4cd669a..7eda4e7115 100644 --- a/js/server/tests/recovery/create-collections.js +++ b/js/server/tests/recovery/create-collections.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertTrue, assertFalse */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertTrue, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var c; @@ -94,7 +94,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -170,7 +170,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/create-database-fail.js b/js/server/tests/recovery/create-database-fail.js index c6dd6baedd..5c2d6ab743 100644 --- a/js/server/tests/recovery/create-database-fail.js +++ b/js/server/tests/recovery/create-database-fail.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertNotEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertNotEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); internal.debugSetFailAt("CreateDatabase::tempDirectory"); @@ -72,7 +72,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -100,7 +100,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/create-databases.js b/js/server/tests/recovery/create-databases.js index 39f6b34fd2..afc3e4c38f 100644 --- a/js/server/tests/recovery/create-databases.js +++ b/js/server/tests/recovery/create-databases.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("test"); @@ -68,7 +68,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -99,7 +99,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/create-indexes.js b/js/server/tests/recovery/create-indexes.js index f6b458c572..89319bb8a0 100644 --- a/js/server/tests/recovery/create-indexes.js +++ b/js/server/tests/recovery/create-indexes.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertNotNull */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertNotNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var i, j, c; for (i = 0; i < 5; ++i) { @@ -61,7 +61,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -115,7 +115,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/create-with-temp.js b/js/server/tests/recovery/create-with-temp.js index 739c5163c8..1fddff1704 100644 --- a/js/server/tests/recovery/create-with-temp.js +++ b/js/server/tests/recovery/create-with-temp.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertFalse */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); var fs = require("fs"); function runSetup () { - "use strict"; + 'use strict'; var path = fs.join(db._path(), "collection-999999999999"); fs.makeDirectory(path); @@ -51,7 +51,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -82,7 +82,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/disk-full-no-collection-journal.js b/js/server/tests/recovery/disk-full-no-collection-journal.js index 3e9a0ad19c..5cc8681a56 100644 --- a/js/server/tests/recovery/disk-full-no-collection-journal.js +++ b/js/server/tests/recovery/disk-full-no-collection-journal.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -71,7 +71,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -108,7 +108,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/drop-collections.js b/js/server/tests/recovery/drop-collections.js index b31b2d278b..b9dc6c7964 100644 --- a/js/server/tests/recovery/drop-collections.js +++ b/js/server/tests/recovery/drop-collections.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertNull, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertNull, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var i; @@ -57,7 +57,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -88,7 +88,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/drop-database-and-fail.js b/js/server/tests/recovery/drop-database-and-fail.js index a416c12f52..0ed13de958 100644 --- a/js/server/tests/recovery/drop-database-and-fail.js +++ b/js/server/tests/recovery/drop-database-and-fail.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, fail, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global fail, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); internal.wal.properties({ historicLogfiles: 0 }); @@ -66,7 +66,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -97,7 +97,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/drop-database-flush-and-fail.js b/js/server/tests/recovery/drop-database-flush-and-fail.js index 479cf31a26..eaf2b1b23d 100644 --- a/js/server/tests/recovery/drop-database-flush-and-fail.js +++ b/js/server/tests/recovery/drop-database-flush-and-fail.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, fail, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global fail, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); internal.wal.flush(); @@ -60,7 +60,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -91,7 +91,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/drop-databases.js b/js/server/tests/recovery/drop-databases.js index 9cc30f538c..462c790039 100644 --- a/js/server/tests/recovery/drop-databases.js +++ b/js/server/tests/recovery/drop-databases.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused: false */ -/*global require, fail, assertEqual */ +/*jshint globalstrict:false, strict:false, unused: false */ +/*global fail, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var i; @@ -69,7 +69,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -107,7 +107,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/drop-indexes.js b/js/server/tests/recovery/drop-indexes.js index 5adb814a0e..5b6d6f1e8c 100644 --- a/js/server/tests/recovery/drop-indexes.js +++ b/js/server/tests/recovery/drop-indexes.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var i, j, c; for (i = 0; i < 5; ++i) { @@ -66,7 +66,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -102,7 +102,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/drop-single-collection.js b/js/server/tests/recovery/drop-single-collection.js index f69c732728..3e3592dfbd 100644 --- a/js/server/tests/recovery/drop-single-collection.js +++ b/js/server/tests/recovery/drop-single-collection.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertNull */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -35,7 +35,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -59,7 +59,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -86,7 +86,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/edges.js b/js/server/tests/recovery/edges.js index 71b9fe40ee..3b7e48388e 100644 --- a/js/server/tests/recovery/edges.js +++ b/js/server/tests/recovery/edges.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var c, v, e, i; @@ -65,7 +65,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -114,7 +114,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/empty-datafiles.js b/js/server/tests/recovery/empty-datafiles.js index 30f978040e..a0792dd8fd 100644 --- a/js/server/tests/recovery/empty-datafiles.js +++ b/js/server/tests/recovery/empty-datafiles.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertTrue */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertTrue */ var db = require("org/arangodb").db; var internal = require("internal"); @@ -7,7 +7,7 @@ var jsunity = require("jsunity"); var fs = require("fs"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -31,7 +31,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -58,7 +58,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/empty-logfiles.js b/js/server/tests/recovery/empty-logfiles.js index fb55c8adc5..135df02e5e 100644 --- a/js/server/tests/recovery/empty-logfiles.js +++ b/js/server/tests/recovery/empty-logfiles.js @@ -1,5 +1,4 @@ -/*jshint strict: true, unused : false */ -/*global require */ +/*jshint globalstrict:false, strict:false, unused : false */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +33,7 @@ var jsunity = require("jsunity"); var fs = require("fs"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var i, num = 9999999999; @@ -58,7 +57,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -83,7 +82,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/flush-drop-database-and-fail.js b/js/server/tests/recovery/flush-drop-database-and-fail.js index e0f6c52a4c..5651e8ed2f 100644 --- a/js/server/tests/recovery/flush-drop-database-and-fail.js +++ b/js/server/tests/recovery/flush-drop-database-and-fail.js @@ -1,4 +1,4 @@ -/*jshint strict: true, unused : false */ +/*jshint globalstrict:false, strict:false, unused : false */ /*global fail, require, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; var i; internal.debugClearFailAt(); @@ -68,7 +68,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -99,7 +99,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/foxx-directories.js b/js/server/tests/recovery/foxx-directories.js index 5162139bb4..000d546b27 100644 --- a/js/server/tests/recovery/foxx-directories.js +++ b/js/server/tests/recovery/foxx-directories.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, module, fail, assertTrue, assertFalse, assertEqual, TRANSACTION */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global fail, assertTrue, assertFalse, assertEqual, TRANSACTION */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); var fs = require("fs"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var appPath = fs.join(module.appPath(), ".."); @@ -69,7 +69,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -100,7 +100,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/indexes-geo.js b/js/server/tests/recovery/indexes-geo.js index 94ece8044c..0e7687edf0 100644 --- a/js/server/tests/recovery/indexes-geo.js +++ b/js/server/tests/recovery/indexes-geo.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse, assertTrue, assertNotNull */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse, assertTrue, assertNotNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var simple = require("org/arangodb/simple-query"); var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery1"); @@ -79,7 +79,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -152,7 +152,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/indexes-hash.js b/js/server/tests/recovery/indexes-hash.js index 385a620592..cb8d817739 100644 --- a/js/server/tests/recovery/indexes-hash.js +++ b/js/server/tests/recovery/indexes-hash.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse, assertTrue */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse, assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -33,7 +33,7 @@ var internal = require("internal"); var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery1"); @@ -73,7 +73,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -124,7 +124,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/indexes-skiplist.js b/js/server/tests/recovery/indexes-skiplist.js index b31c04d603..f5d67130a7 100644 --- a/js/server/tests/recovery/indexes-skiplist.js +++ b/js/server/tests/recovery/indexes-skiplist.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse, assertTrue */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse, assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -33,7 +33,7 @@ var internal = require("internal"); var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery1"); @@ -73,7 +73,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -124,7 +124,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/indexes-sparse-hash.js b/js/server/tests/recovery/indexes-sparse-hash.js index 7a132b7cd0..2c48727113 100644 --- a/js/server/tests/recovery/indexes-sparse-hash.js +++ b/js/server/tests/recovery/indexes-sparse-hash.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse, assertTrue */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse, assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -33,7 +33,7 @@ var internal = require("internal"); var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery1"); @@ -73,7 +73,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -124,7 +124,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/indexes-sparse-skiplist.js b/js/server/tests/recovery/indexes-sparse-skiplist.js index 125b01baff..c66c0f7928 100644 --- a/js/server/tests/recovery/indexes-sparse-skiplist.js +++ b/js/server/tests/recovery/indexes-sparse-skiplist.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse, assertTrue */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse, assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -33,7 +33,7 @@ var internal = require("internal"); var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery1"); @@ -73,7 +73,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -124,7 +124,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/indexes.js b/js/server/tests/recovery/indexes.js index e9277ec744..02d8ec5121 100644 --- a/js/server/tests/recovery/indexes.js +++ b/js/server/tests/recovery/indexes.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -57,7 +57,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -134,7 +134,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/insert-update-remove-distance.js b/js/server/tests/recovery/insert-update-remove-distance.js index 1002aaa5cf..ed5e1ca19e 100644 --- a/js/server/tests/recovery/insert-update-remove-distance.js +++ b/js/server/tests/recovery/insert-update-remove-distance.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -78,7 +78,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -111,7 +111,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/insert-update-remove.js b/js/server/tests/recovery/insert-update-remove.js index 830c8615de..c23163a79e 100644 --- a/js/server/tests/recovery/insert-update-remove.js +++ b/js/server/tests/recovery/insert-update-remove.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertFalse */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -72,7 +72,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -116,7 +116,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/leftover-collection-directory.js b/js/server/tests/recovery/leftover-collection-directory.js index 4d31d6c9b7..627041cafa 100644 --- a/js/server/tests/recovery/leftover-collection-directory.js +++ b/js/server/tests/recovery/leftover-collection-directory.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -35,7 +35,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var i, c, ids = [ ]; @@ -74,7 +74,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -104,7 +104,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/leftover-database-directory.js b/js/server/tests/recovery/leftover-database-directory.js index 22f321a7b6..eebbdc8b54 100644 --- a/js/server/tests/recovery/leftover-database-directory.js +++ b/js/server/tests/recovery/leftover-database-directory.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -35,7 +35,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var i, paths = [ ]; @@ -93,7 +93,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -119,7 +119,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/many-inserts.js b/js/server/tests/recovery/many-inserts.js index 2785d4a6f2..89e92fa192 100644 --- a/js/server/tests/recovery/many-inserts.js +++ b/js/server/tests/recovery/many-inserts.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertTrue */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -52,7 +52,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -82,7 +82,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/many-logs.js b/js/server/tests/recovery/many-logs.js index 0a29555426..a14fcc8ad5 100644 --- a/js/server/tests/recovery/many-logs.js +++ b/js/server/tests/recovery/many-logs.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); // disable collector @@ -61,7 +61,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -95,7 +95,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/many-updates.js b/js/server/tests/recovery/many-updates.js index 5d2ffee015..c7c5238ed1 100644 --- a/js/server/tests/recovery/many-updates.js +++ b/js/server/tests/recovery/many-updates.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused: false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused: false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -53,7 +53,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -81,7 +81,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/multi-database-durability.js b/js/server/tests/recovery/multi-database-durability.js index 6fed6540a7..bd5eae3efa 100644 --- a/js/server/tests/recovery/multi-database-durability.js +++ b/js/server/tests/recovery/multi-database-durability.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertFalse, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertFalse, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var databases = [ "UnitTestsRecovery1", "UnitTestsRecovery2", "UnitTestsRecovery3" ]; @@ -78,7 +78,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -121,7 +121,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/multiple-logs.js b/js/server/tests/recovery/multiple-logs.js index 258d9970c5..01cd1bcb64 100644 --- a/js/server/tests/recovery/multiple-logs.js +++ b/js/server/tests/recovery/multiple-logs.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual, assertNull */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual, assertNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); // disable collector @@ -62,7 +62,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -88,7 +88,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/no-journal.js b/js/server/tests/recovery/no-journal.js index 32dcc3c39c..956f582026 100644 --- a/js/server/tests/recovery/no-journal.js +++ b/js/server/tests/recovery/no-journal.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -55,7 +55,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -87,7 +87,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/no-shutdown-info-multiple-logs.js b/js/server/tests/recovery/no-shutdown-info-multiple-logs.js index 7089be21f1..fa7387cf09 100644 --- a/js/server/tests/recovery/no-shutdown-info-multiple-logs.js +++ b/js/server/tests/recovery/no-shutdown-info-multiple-logs.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -63,7 +63,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -96,7 +96,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/no-shutdown-info-no-flush.js b/js/server/tests/recovery/no-shutdown-info-no-flush.js index 28d358eab9..0b89589080 100644 --- a/js/server/tests/recovery/no-shutdown-info-no-flush.js +++ b/js/server/tests/recovery/no-shutdown-info-no-flush.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -71,7 +71,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -107,7 +107,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/no-shutdown-info-with-flush.js b/js/server/tests/recovery/no-shutdown-info-with-flush.js index edc9f85f49..b880ad429d 100644 --- a/js/server/tests/recovery/no-shutdown-info-with-flush.js +++ b/js/server/tests/recovery/no-shutdown-info-with-flush.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -55,7 +55,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -88,7 +88,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/recreate-collection.js b/js/server/tests/recovery/recreate-collection.js index 024c381050..7dd2375927 100644 --- a/js/server/tests/recovery/recreate-collection.js +++ b/js/server/tests/recovery/recreate-collection.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); var c; @@ -60,7 +60,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -87,7 +87,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/recreate-databases.js b/js/server/tests/recovery/recreate-databases.js index be45e497b1..c935c43e5b 100644 --- a/js/server/tests/recovery/recreate-databases.js +++ b/js/server/tests/recovery/recreate-databases.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("test"); @@ -90,7 +90,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -121,7 +121,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/resume-recovery-all.js b/js/server/tests/recovery/resume-recovery-all.js index 72683b5693..a02f487ad4 100644 --- a/js/server/tests/recovery/resume-recovery-all.js +++ b/js/server/tests/recovery/resume-recovery-all.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -71,7 +71,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -116,7 +116,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/resume-recovery-multi-flush.js b/js/server/tests/recovery/resume-recovery-multi-flush.js index 241c4673b0..5371b92a1a 100644 --- a/js/server/tests/recovery/resume-recovery-multi-flush.js +++ b/js/server/tests/recovery/resume-recovery-multi-flush.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertTrue, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertTrue, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -55,7 +55,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -88,7 +88,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/resume-recovery-simple.js b/js/server/tests/recovery/resume-recovery-simple.js index ae41827cfc..e9e67e19bb 100644 --- a/js/server/tests/recovery/resume-recovery-simple.js +++ b/js/server/tests/recovery/resume-recovery-simple.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -55,7 +55,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -88,7 +88,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/resume-recovery.js b/js/server/tests/recovery/resume-recovery.js index 4b4f492a82..8469ab36a8 100644 --- a/js/server/tests/recovery/resume-recovery.js +++ b/js/server/tests/recovery/resume-recovery.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -66,7 +66,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -111,7 +111,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/transaction-durability-multiple.js b/js/server/tests/recovery/transaction-durability-multiple.js index bc6be33071..d611f6f84e 100644 --- a/js/server/tests/recovery/transaction-durability-multiple.js +++ b/js/server/tests/recovery/transaction-durability-multiple.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery1"); @@ -68,7 +68,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -105,7 +105,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/transaction-durability.js b/js/server/tests/recovery/transaction-durability.js index 83152a879e..f3f506eff2 100644 --- a/js/server/tests/recovery/transaction-durability.js +++ b/js/server/tests/recovery/transaction-durability.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -62,7 +62,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -94,7 +94,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/transaction-no-abort.js b/js/server/tests/recovery/transaction-no-abort.js index 663196f02e..531db5ac96 100644 --- a/js/server/tests/recovery/transaction-no-abort.js +++ b/js/server/tests/recovery/transaction-no-abort.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -71,7 +71,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -98,7 +98,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/transaction-no-commit.js b/js/server/tests/recovery/transaction-no-commit.js index b0e3ab716c..74249624c7 100644 --- a/js/server/tests/recovery/transaction-no-commit.js +++ b/js/server/tests/recovery/transaction-no-commit.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -34,7 +34,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -69,7 +69,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -96,7 +96,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/wait-for-sync.js b/js/server/tests/recovery/wait-for-sync.js index e06fb696ea..73378ef2a4 100644 --- a/js/server/tests/recovery/wait-for-sync.js +++ b/js/server/tests/recovery/wait-for-sync.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -49,7 +49,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -76,7 +76,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/recovery/write-throttling.js b/js/server/tests/recovery/write-throttling.js index bcb0a718f6..2755429e8f 100644 --- a/js/server/tests/recovery/write-throttling.js +++ b/js/server/tests/recovery/write-throttling.js @@ -1,5 +1,5 @@ -/*jshint strict: true, unused : false */ -/*global require, assertFalse, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global assertFalse, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -33,7 +33,7 @@ var jsunity = require("jsunity"); function runSetup () { - "use strict"; + 'use strict'; internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); @@ -64,7 +64,7 @@ function runSetup () { //////////////////////////////////////////////////////////////////////////////// function recoverySuite () { - "use strict"; + 'use strict'; jsunity.jsUnity.attachAssertions(); return { @@ -99,7 +99,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// function main (argv) { - "use strict"; + 'use strict'; if (argv[1] === "setup") { runSetup(); return 0; diff --git a/js/server/tests/replication-data.js b/js/server/tests/replication-data.js index 4349256e07..fa3d4cc4dc 100644 --- a/js/server/tests/replication-data.js +++ b/js/server/tests/replication-data.js @@ -1,5 +1,5 @@ -/*jshint unused: false */ -/*global require, fail, assertEqual, assertTrue, assertFalse, assertNull, arango */ +/*jshint globalstrict:false, strict:false, unused: false */ +/*global fail, assertEqual, assertTrue, assertFalse, assertNull, arango */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the replication @@ -48,7 +48,7 @@ var slaveEndpoint = masterEndpoint.replace(/:3(\d+)$/, ':4$1'); //////////////////////////////////////////////////////////////////////////////// function ReplicationSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsReplication"; var cn2 = "UnitTestsReplication2"; diff --git a/js/server/tests/shell-any-cluster.js b/js/server/tests/shell-any-cluster.js index df8adb4dfe..d7c2e86e21 100644 --- a/js/server/tests/shell-any-cluster.js +++ b/js/server/tests/shell-any-cluster.js @@ -1,5 +1,6 @@ -/*jshint strict: true */ -/*global require, assertTrue */ +/*jshint globalstrict:false, strict:false */ +/*global assertTrue */ + //////////////////////////////////////////////////////////////////////////////// /// @brief test the random document selector /// @@ -41,7 +42,7 @@ var db = arangodb.db; //////////////////////////////////////////////////////////////////////////////// function AnySuite () { - "use strict"; + 'use strict'; var cn = "example"; var c; diff --git a/js/server/tests/shell-any-noncluster.js b/js/server/tests/shell-any-noncluster.js index 8ab6921a9e..5dc476cf25 100644 --- a/js/server/tests/shell-any-noncluster.js +++ b/js/server/tests/shell-any-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertTrue */ +/*jshint globalstrict:false, strict:false */ +/*global assertTrue */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the random document selector @@ -42,7 +42,7 @@ var db = arangodb.db; //////////////////////////////////////////////////////////////////////////////// function AnySuite () { - "use strict"; + 'use strict'; var cn = "example"; var c; diff --git a/js/server/tests/shell-cluster-agency-communication.js b/js/server/tests/shell-cluster-agency-communication.js index e744ff0501..23cbc355ac 100644 --- a/js/server/tests/shell-cluster-agency-communication.js +++ b/js/server/tests/shell-cluster-agency-communication.js @@ -1,4 +1,5 @@ -/*global require, fail, assertEqual, assertTrue, assertFalse, assertUndefined, assertNotUndefined*/ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertEqual, assertTrue, assertFalse, assertUndefined, assertNotUndefined*/ //////////////////////////////////////////////////////////////////////////////// /// @brief test the agency communication layer @@ -34,7 +35,7 @@ // ----------------------------------------------------------------------------- var createResult = function(prefixes, list) { - "use strict"; + 'use strict'; var prefix = prefixes.join("/") + "/"; var res = {}; _.each(list, function(v, k) { @@ -68,7 +69,7 @@ } }; var resetToDefault = function() { - "use strict"; + 'use strict'; var dbServers = { "pavel": "sandro", "paul": "sally", @@ -237,14 +238,14 @@ dummy.sync.interval = "1000"; }; var setup = function() { - "use strict"; + 'use strict'; resetToDefault(); comm = new Communication.Communication(); }; var teardown = function() {}; var agencyMock = { get: function(route, recursive) { - "use strict"; + 'use strict'; var parts = route.split("/"); var res; var returnResult = function(base) { @@ -322,7 +323,7 @@ fail("Requested route: GET " + route); }, list: function(route, recursive, flat) { - "use strict"; + 'use strict'; var parts = route.split("/"); var returnResult = function(route) { if (parts[1] === agencyRoutes.sub.databases) { @@ -367,7 +368,7 @@ }; Communication._createAgency = function() { - "use strict"; + 'use strict'; return agencyMock; }; @@ -376,7 +377,7 @@ // ----------------------------------------------------------------------------- function runTargetTests(test) { - "use strict"; + 'use strict'; // ----------------------------------------------------------------------------- // --SECTION-- DBServers @@ -720,7 +721,7 @@ // ----------------------------------------------------------------------------- function runPlanTests(test) { - "use strict"; + 'use strict'; function DBServersSuite() { var servers; @@ -867,7 +868,7 @@ // ----------------------------------------------------------------------------- function runCurrentTests(test) { - "use strict"; + 'use strict'; function DBServersSuite() { var targetServers; @@ -1033,7 +1034,7 @@ // ----------------------------------------------------------------------------- function runSyncTests(test) { - "use strict"; + 'use strict'; function HeartbeatSuite() { var beats; @@ -1106,7 +1107,7 @@ // ----------------------------------------------------------------------------- function runHighLevelTests(test) { - "use strict"; + 'use strict'; function ConfigureSuite() { var targetServers; diff --git a/js/server/tests/shell-cluster-agency.js b/js/server/tests/shell-cluster-agency.js index bf61fd06f8..d54d6e1bdf 100644 --- a/js/server/tests/shell-cluster-agency.js +++ b/js/server/tests/shell-cluster-agency.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, fail, assertFalse, assertTrue, assertEqual, assertNotEqual, ArangoAgency */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertFalse, assertTrue, assertEqual, assertNotEqual, ArangoAgency */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the agency communication layer @@ -39,7 +39,7 @@ var jsunity = require("jsunity"); //////////////////////////////////////////////////////////////////////////////// function AgencySuite () { - "use strict"; + 'use strict'; var agency = ArangoAgency; var oldPrefix = agency.prefix(true); diff --git a/js/server/tests/shell-compaction-noncluster-timecritical.js b/js/server/tests/shell-compaction-noncluster-timecritical.js index 5e52af77cc..d552370c89 100644 --- a/js/server/tests/shell-compaction-noncluster-timecritical.js +++ b/js/server/tests/shell-compaction-noncluster-timecritical.js @@ -1,6 +1,6 @@ -/*jshint strict: true, sub: true */ -/*global require, fail, assertEqual, assertTrue, assertFalse */ -// enable ['bla'] notation... +/*jshint globalstrict:false, strict:false, sub: true */ +/*global fail, assertEqual, assertTrue, assertFalse */ + //////////////////////////////////////////////////////////////////////////////// /// @brief test the compaction /// @@ -41,7 +41,7 @@ var testHelper = require("org/arangodb/test-helper").Helper; //////////////////////////////////////////////////////////////////////////////// function CompactionSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/tests/shell-database-noncluster.js b/js/server/tests/shell-database-noncluster.js index 3292ca37f9..c99bfd01a9 100644 --- a/js/server/tests/shell-database-noncluster.js +++ b/js/server/tests/shell-database-noncluster.js @@ -1,5 +1,6 @@ -/*jshint strict: true, unused : false */ -/*global require, fail, assertTrue, assertFalse, assertEqual */ +/*jshint globalstrict:false, strict:false, unused : false */ +/*global fail, assertTrue, assertFalse, assertEqual */ + //////////////////////////////////////////////////////////////////////////////// /// @brief test the server-side database interface /// @@ -39,7 +40,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function DatabaseSuite () { - "use strict"; + 'use strict'; return { setUp : function () { diff --git a/js/server/tests/shell-foxx-base-middleware.js b/js/server/tests/shell-foxx-base-middleware.js index e572c1f974..5ff1363660 100644 --- a/js/server/tests/shell-foxx-base-middleware.js +++ b/js/server/tests/shell-foxx-base-middleware.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertTrue, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global assertTrue, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the agency communication layer @@ -31,7 +31,7 @@ var jsunity = require("jsunity"); function BaseMiddlewareSpec () { - "use strict"; + 'use strict'; var request, response, options, next, baseMiddleware; return { diff --git a/js/server/tests/shell-foxx-console.js b/js/server/tests/shell-foxx-console.js index 4f1c5609b2..f6634ee59f 100644 --- a/js/server/tests/shell-foxx-console.js +++ b/js/server/tests/shell-foxx-console.js @@ -1,4 +1,4 @@ -/*global require */ +/*jshint globalstrict:false, strict:false */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for Foxx console @@ -37,7 +37,7 @@ var qb = require('aqb'); var mountPath = '##TEST##'; function ls() { - "use strict"; + 'use strict'; if (!db._foxxlog) { return []; } @@ -50,7 +50,7 @@ function ls() { } function rmrf() { - "use strict"; + 'use strict'; if (!db._foxxlog) { return []; } @@ -66,7 +66,7 @@ function rmrf() { //////////////////////////////////////////////////////////////////////////////// function ConsoleTestSuite () { - "use strict"; + 'use strict'; var console; return { diff --git a/js/server/tests/shell-foxx-format-middleware.js b/js/server/tests/shell-foxx-format-middleware.js index e83e46ab5a..6a55e676e9 100644 --- a/js/server/tests/shell-foxx-format-middleware.js +++ b/js/server/tests/shell-foxx-format-middleware.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual, assertFalse */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -30,7 +30,7 @@ var jsunity = require("jsunity"); function FormatMiddlewareSpec () { - "use strict"; + 'use strict'; var Middleware, middleware, request, response, options, next; return { diff --git a/js/server/tests/shell-foxx-manager-spec.js b/js/server/tests/shell-foxx-manager-spec.js index a3685846ee..64cd7cdaf6 100644 --- a/js/server/tests/shell-foxx-manager-spec.js +++ b/js/server/tests/shell-foxx-manager-spec.js @@ -1,5 +1,5 @@ -/*jshint globalstrict: true */ -/*global require, describe, beforeEach, it, expect*/ +/*jshint globalstrict:false, strict:false, globalstrict: true */ +/*global describe, beforeEach, it, expect*/ //////////////////////////////////////////////////////////////////////////////// /// @brief Spec for foxx manager @@ -28,7 +28,7 @@ /// @author Copyright 2014, ArangoDB GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -"use strict"; +'use strict'; var FoxxManager = require("org/arangodb/foxx/manager"); var arangodb = require("org/arangodb"); diff --git a/js/server/tests/shell-foxx-model-events-spec.js b/js/server/tests/shell-foxx-model-events-spec.js index a9df30490b..a6db9a8f53 100644 --- a/js/server/tests/shell-foxx-model-events-spec.js +++ b/js/server/tests/shell-foxx-model-events-spec.js @@ -1,4 +1,5 @@ -/*global require, describe, expect, it, beforeEach, createSpyObj */ +/*jshint globalstrict:false, strict:false */ +/*global describe, expect, it, beforeEach, createSpyObj */ var FoxxRepository = require("org/arangodb/foxx/repository").Repository, Model = require("org/arangodb/foxx/model").Model; diff --git a/js/server/tests/shell-foxx-model.js b/js/server/tests/shell-foxx-model.js index 12398ac93e..725c0c9b58 100644 --- a/js/server/tests/shell-foxx-model.js +++ b/js/server/tests/shell-foxx-model.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertFalse, assertTrue, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global assertFalse, assertTrue, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the agency communication layer @@ -33,7 +33,7 @@ var _ = require("underscore"), jsunity = require("jsunity"); function ModelSpec () { - "use strict"; + 'use strict'; var FoxxModel, instance; return { @@ -358,7 +358,7 @@ function ModelSpec () { } function ModelAnnotationSpec () { - "use strict"; + 'use strict'; var FoxxModel, toJSONSchema, jsonSchema, instance; return { diff --git a/js/server/tests/shell-foxx-preprocessor.js b/js/server/tests/shell-foxx-preprocessor.js index ed709d5a47..13ae871749 100644 --- a/js/server/tests/shell-foxx-preprocessor.js +++ b/js/server/tests/shell-foxx-preprocessor.js @@ -1,4 +1,5 @@ -/*global require, assertEqual, assertUndefined */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertUndefined */ //////////////////////////////////////////////////////////////////////////////// /// @brief simple queries @@ -34,7 +35,7 @@ var jsunity = require("jsunity"), // High Level Spec Suite for the preprocess Function function PreprocessSpec () { - "use strict"; + 'use strict'; var testFileWithoutJSDoc, testFileWithJSDoc, testFileWithJSDocTransformed; return { @@ -80,7 +81,7 @@ function PreprocessSpec () { // Low level Spec Suite for the Transform prototype function PreprocessorSpec () { - "use strict"; + 'use strict'; var i; var testFileWithSingleJSDoc; var testFileWithJSDocAndMultiline; diff --git a/js/server/tests/shell-foxx-query-spec.js b/js/server/tests/shell-foxx-query-spec.js index 0a07c6dc8f..26563f1c80 100644 --- a/js/server/tests/shell-foxx-query-spec.js +++ b/js/server/tests/shell-foxx-query-spec.js @@ -1,4 +1,5 @@ -/*global require, describe, beforeEach, it, expect, createSpy, afterEach */ +/*jshint globalstrict:false, strict:false */ +/*global describe, beforeEach, it, expect, createSpy, afterEach */ //////////////////////////////////////////////////////////////////////////////// /// @brief diff --git a/js/server/tests/shell-foxx-repository-events-spec.js b/js/server/tests/shell-foxx-repository-events-spec.js index 03e4ad32f4..73ed48754b 100644 --- a/js/server/tests/shell-foxx-repository-events-spec.js +++ b/js/server/tests/shell-foxx-repository-events-spec.js @@ -1,4 +1,5 @@ -/*global require, describe, expect, it, beforeEach, createSpyObj */ +/*jshint globalstrict:false, strict:false */ +/*global describe, expect, it, beforeEach, createSpyObj */ var FoxxRepository = require("org/arangodb/foxx/repository").Repository, Model = require("org/arangodb/foxx/model").Model; diff --git a/js/server/tests/shell-foxx-repository-spec.js b/js/server/tests/shell-foxx-repository-spec.js index e5cf8629ef..272dfea23e 100644 --- a/js/server/tests/shell-foxx-repository-spec.js +++ b/js/server/tests/shell-foxx-repository-spec.js @@ -1,4 +1,5 @@ -/*global require, describe, beforeEach, it, expect, spyOn, createSpy, createSpyObj */ +/*jshint globalstrict:false, strict:false */ +/*global describe, beforeEach, it, expect, spyOn, createSpy, createSpyObj */ //////////////////////////////////////////////////////////////////////////////// /// @brief Spec for foxx repository diff --git a/js/server/tests/shell-foxx-template-middleware.js b/js/server/tests/shell-foxx-template-middleware.js index ae37912dcd..5519eee94f 100644 --- a/js/server/tests/shell-foxx-template-middleware.js +++ b/js/server/tests/shell-foxx-template-middleware.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, assertEqual, assertTrue, assertFalse, assertNotNull */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual, assertTrue, assertFalse, assertNotNull */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for dump/reload @@ -33,7 +33,7 @@ var jsunity = require("jsunity"), db = arangodb.db; function TemplateMiddlewareSpec () { - "use strict"; + 'use strict'; var TemplateMiddleware, templateMiddleware, templateCollection, request, response, options, next, error; return { diff --git a/js/server/tests/shell-foxx.js b/js/server/tests/shell-foxx.js index dd6698481b..2d816f21f2 100644 --- a/js/server/tests/shell-foxx.js +++ b/js/server/tests/shell-foxx.js @@ -1,5 +1,5 @@ -/*jshint unused:false */ -/*global require, assertEqual, assertTrue, assertFalse, assertUndefined */ +/*jshint globalstrict:false, strict:false, unused:false */ +/*global assertEqual, assertTrue, assertFalse, assertUndefined */ //////////////////////////////////////////////////////////////////////////////// /// @brief simple queries @@ -1754,7 +1754,7 @@ function FoxxControllerWithRootElement () { } function ExtendFoxxControllerSpec () { - "use strict"; + 'use strict'; var app, routes; return { diff --git a/js/server/tests/shell-readonly-noncluster-disabled.js b/js/server/tests/shell-readonly-noncluster-disabled.js index 9e504e8d23..b02e5879e5 100644 --- a/js/server/tests/shell-readonly-noncluster-disabled.js +++ b/js/server/tests/shell-readonly-noncluster-disabled.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, fail, assertTrue, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertTrue, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief tests for readonly mode of arango @@ -40,7 +40,7 @@ var arangodb = require("org/arangodb"); //////////////////////////////////////////////////////////////////////////////// function databaseTestSuite () { - "use strict"; + 'use strict'; var db = require("internal").db; return { @@ -111,7 +111,7 @@ function databaseTestSuite () { //////////////////////////////////////////////////////////////////////////////// function operationsTestSuite () { - "use strict"; + 'use strict'; var db = require("internal").db; var collection; diff --git a/js/server/tests/shell-routing.js b/js/server/tests/shell-routing.js index 3e9272c316..37d5bef783 100644 --- a/js/server/tests/shell-routing.js +++ b/js/server/tests/shell-routing.js @@ -1,5 +1,6 @@ -/*jshint globalstrict: true */ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false, globalstrict: true */ +/*global assertEqual */ + //////////////////////////////////////////////////////////////////////////////// /// @brief tests for routing /// @@ -27,7 +28,7 @@ /// @author Copyright 2012, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -"use strict"; +'use strict'; var actions = require("org/arangodb/actions"); var jsunity = require("jsunity"); diff --git a/js/server/tests/shell-shaped-noncluster.js b/js/server/tests/shell-shaped-noncluster.js index 1e7df1cebe..dbb8e59814 100644 --- a/js/server/tests/shell-shaped-noncluster.js +++ b/js/server/tests/shell-shaped-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, fail, assertFalse, assertTrue, assertEqual, assertUndefined */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertFalse, assertTrue, assertEqual, assertUndefined */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the shaped json behavior @@ -43,7 +43,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function DocumentShapedJsonSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionShaped"; var c; @@ -598,7 +598,7 @@ function DocumentShapedJsonSuite () { //////////////////////////////////////////////////////////////////////////////// function EdgeShapedJsonSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionShaped"; var c; @@ -752,7 +752,7 @@ function EdgeShapedJsonSuite () { //////////////////////////////////////////////////////////////////////////////// function GeoShapedJsonSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionShaped"; var c; diff --git a/js/server/tests/shell-sharding-helpers.js b/js/server/tests/shell-sharding-helpers.js index 6fcb6ecd82..c568470d10 100644 --- a/js/server/tests/shell-sharding-helpers.js +++ b/js/server/tests/shell-sharding-helpers.js @@ -1,5 +1,6 @@ -/*jshint strict: true */ -/*global require, assertFalse, assertTrue, assertEqual, ArangoAgency, ArangoServerState, ArangoClusterInfo */ +/*jshint globalstrict:false, strict:false */ +/*global assertFalse, assertTrue, assertEqual, ArangoAgency, ArangoServerState, ArangoClusterInfo */ + //////////////////////////////////////////////////////////////////////////////// /// @brief test the cluster helper functions /// @@ -31,7 +32,7 @@ var cluster = require("org/arangodb/cluster"); var jsunity = require("jsunity"); var compareStringIds = function (l, r) { - "use strict"; + 'use strict'; var i; if (l.length !== r.length) { return l.length - r.length < 0 ? -1 : 1; @@ -56,7 +57,7 @@ var compareStringIds = function (l, r) { //////////////////////////////////////////////////////////////////////////////// function ClusterEnabledSuite () { - "use strict"; + 'use strict'; var agency = ArangoAgency; var ss = ArangoServerState; var ci = ArangoClusterInfo; @@ -409,7 +410,7 @@ function ClusterEnabledSuite () { //////////////////////////////////////////////////////////////////////////////// function ClusterDisabledSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/tests/shell-skiplist-correctness.js b/js/server/tests/shell-skiplist-correctness.js index c6c7e1561a..834bff91d6 100644 --- a/js/server/tests/shell-skiplist-correctness.js +++ b/js/server/tests/shell-skiplist-correctness.js @@ -1,4 +1,5 @@ -/*global require, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the correctness of a skip-list index @@ -39,7 +40,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function SkipListCorrSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionSkiplistCorr"; var coll = null; var helper = require("org/arangodb/aql-helper"); diff --git a/js/server/tests/shell-skiplist-index.js b/js/server/tests/shell-skiplist-index.js index daf8a7a43c..25720920de 100644 --- a/js/server/tests/shell-skiplist-index.js +++ b/js/server/tests/shell-skiplist-index.js @@ -1,4 +1,5 @@ -/*global require, fail, assertEqual, assertNotEqual */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertEqual, assertNotEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the skip-list index @@ -40,7 +41,7 @@ var errors = internal.errors; //////////////////////////////////////////////////////////////////////////////// function SkipListSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionSkiplist"; var collection = null; diff --git a/js/server/tests/shell-skiplist-rm-performance-timecritical.js b/js/server/tests/shell-skiplist-rm-performance-timecritical.js index 4f83fc2676..7f10c94830 100644 --- a/js/server/tests/shell-skiplist-rm-performance-timecritical.js +++ b/js/server/tests/shell-skiplist-rm-performance-timecritical.js @@ -1,4 +1,5 @@ -/*global require, assertFalse */ +/*jshint globalstrict:false, strict:false */ +/*global assertFalse */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the performance of removal with a skip-list index @@ -39,7 +40,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function SkipListPerfSuite() { - "use strict"; + 'use strict'; var cn = "UnitTestsCollectionSkiplistPerf"; var collection = null; diff --git a/js/server/tests/shell-transactions-noncluster.js b/js/server/tests/shell-transactions-noncluster.js index 0a942edbc2..a772df6d76 100644 --- a/js/server/tests/shell-transactions-noncluster.js +++ b/js/server/tests/shell-transactions-noncluster.js @@ -1,5 +1,6 @@ -/*jshint strict: true, maxlen : 200 */ -/*global require, fail, assertTrue, assertEqual, TRANSACTION */ +/*jshint globalstrict:false, strict:false, maxlen : 200 */ +/*global fail, assertTrue, assertEqual, TRANSACTION */ + //////////////////////////////////////////////////////////////////////////////// /// @brief tests for transactions /// @@ -35,7 +36,7 @@ var db = arangodb.db; var testHelper = require("org/arangodb/test-helper").Helper; var compareStringIds = function (l, r) { - "use strict"; + 'use strict'; var i; if (l.length !== r.length) { return l.length - r.length < 0 ? -1 : 1; @@ -52,7 +53,7 @@ var compareStringIds = function (l, r) { }; var sortedKeys = function (col) { - "use strict"; + 'use strict'; var keys = [ ]; col.toArray().forEach(function (d) { @@ -64,7 +65,7 @@ var sortedKeys = function (col) { }; var assertOrder = function (keys, col) { - "use strict"; + 'use strict'; assertEqual(keys.length, col.count()); assertEqual(keys, col.first(keys.length).map(function (doc) { return doc._key; })); }; @@ -78,7 +79,7 @@ var assertOrder = function (keys, col) { //////////////////////////////////////////////////////////////////////////////// function transactionInvocationSuite () { - "use strict"; + 'use strict'; return { //////////////////////////////////////////////////////////////////////////////// @@ -326,7 +327,7 @@ function transactionInvocationSuite () { //////////////////////////////////////////////////////////////////////////////// function transactionCollectionsSuite () { - "use strict"; + 'use strict'; var cn1 = "UnitTestsTransaction1"; var cn2 = "UnitTestsTransaction2"; @@ -901,7 +902,7 @@ function transactionCollectionsSuite () { //////////////////////////////////////////////////////////////////////////////// function transactionOperationsSuite () { - "use strict"; + 'use strict'; var cn1 = "UnitTestsTransaction1"; var cn2 = "UnitTestsTransaction2"; @@ -1795,7 +1796,7 @@ function transactionOperationsSuite () { //////////////////////////////////////////////////////////////////////////////// function transactionBarriersSuite () { - "use strict"; + 'use strict'; var cn1 = "UnitTestsTransaction1"; var cn2 = "UnitTestsTransaction2"; @@ -1930,7 +1931,7 @@ function transactionBarriersSuite () { //////////////////////////////////////////////////////////////////////////////// function transactionGraphSuite () { - "use strict"; + 'use strict'; var cn1 = "UnitTestsVertices"; var cn2 = "UnitTestsEdges"; @@ -2189,7 +2190,7 @@ function transactionGraphSuite () { //////////////////////////////////////////////////////////////////////////////// function transactionRollbackSuite () { - "use strict"; + 'use strict'; var cn1 = "UnitTestsTransaction1"; var c1 = null; @@ -3485,7 +3486,7 @@ function transactionRollbackSuite () { //////////////////////////////////////////////////////////////////////////////// function transactionCountSuite () { - "use strict"; + 'use strict'; var cn1 = "UnitTestsTransaction1"; var c1 = null; @@ -3679,7 +3680,7 @@ function transactionCountSuite () { //////////////////////////////////////////////////////////////////////////////// function transactionCrossCollectionSuite () { - "use strict"; + 'use strict'; var cn1 = "UnitTestsTransaction1"; var cn2 = "UnitTestsTransaction2"; @@ -4004,7 +4005,7 @@ function transactionCrossCollectionSuite () { //////////////////////////////////////////////////////////////////////////////// function transactionConstraintsSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsTransaction"; var c = null; @@ -4232,7 +4233,7 @@ function transactionConstraintsSuite () { //////////////////////////////////////////////////////////////////////////////// function transactionServerFailuresSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsTransaction"; var c = null; diff --git a/js/server/tests/shell-wal-noncluster.js b/js/server/tests/shell-wal-noncluster.js index 7e3dd0478f..bfdad3fd25 100644 --- a/js/server/tests/shell-wal-noncluster.js +++ b/js/server/tests/shell-wal-noncluster.js @@ -1,5 +1,5 @@ -/*jshint strict: true */ -/*global require, fail, assertTrue, assertNotEqual, assertEqual */ +/*jshint globalstrict:false, strict:false */ +/*global fail, assertTrue, assertNotEqual, assertEqual */ //////////////////////////////////////////////////////////////////////////////// /// @brief test the collection interface @@ -43,7 +43,7 @@ var internal = require("internal"); //////////////////////////////////////////////////////////////////////////////// function walFailureSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsWal"; var c; var props; @@ -201,7 +201,7 @@ function walFailureSuite () { //////////////////////////////////////////////////////////////////////////////// function walSuite () { - "use strict"; + 'use strict'; var cn = "UnitTestsWal"; var c; var props; diff --git a/js/server/upgrade-database.js b/js/server/upgrade-database.js index 59d92a8b2a..551c7e4c06 100644 --- a/js/server/upgrade-database.js +++ b/js/server/upgrade-database.js @@ -1,5 +1,5 @@ -/*jshint strict: false, unused: false, -W051: true */ -/*global require, module, ArangoAgency, UPGRADE_ARGS: true, UPGRADE_STARTED: true */ +/*jshint -W051:true */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief upgrade or initialise the database @@ -35,21 +35,12 @@ /// @author Copyright 2014, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -function updateGlobals() { - // set this global variable to inform the server we actually got until here... - UPGRADE_STARTED = true; - - // delete the global variable - delete UPGRADE_ARGS; -} - (function (args) { - "use strict"; var internal = require("internal"); var fs = require("fs"); var console = require("console"); var userManager = require("org/arangodb/users"); - var clusterManager = require("org/arangodb/cluster"); + require("org/arangodb/cluster"); // TODO Is this unused or magic? var currentVersion = require("org/arangodb/database-version").CURRENT_VERSION; var sprintf = internal.sprintf; var db = internal.db; @@ -413,7 +404,7 @@ function updateGlobals() { // cluster var cluster; - if (ArangoAgency.prefix() === "") { + if (global.ArangoAgency.prefix() === "") { cluster = CLUSTER_NONE; } else { @@ -1315,7 +1306,6 @@ function updateGlobals() { } var mapAppZip = {}; var tmp; - var tmpZip; var path; var fmUtils = require("org/arangodb/foxx/manager-utils"); var foxxManager = require("org/arangodb/foxx/manager"); @@ -1436,11 +1426,14 @@ function updateGlobals() { return upgradeDatabase(); } - updateGlobals(); + // set this global variable to inform the server we actually got until here... + global.UPGRADE_STARTED = true; + + delete global.UPGRADE_ARGS; // and run the upgrade return upgrade(); -}(UPGRADE_ARGS)); +}(global.UPGRADE_ARGS)); // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE diff --git a/js/server/worker.js b/js/server/worker.js index d5b4cd2742..1f96b659a1 100644 --- a/js/server/worker.js +++ b/js/server/worker.js @@ -1,4 +1,4 @@ -/*global require, ArangoAgency */ +'use strict'; //////////////////////////////////////////////////////////////////////////////// /// @brief worker initialisation @@ -37,7 +37,6 @@ (function () { var internal = require("internal"); - var db = internal.db; // autoload all modules internal.loadStartup("server/bootstrap/autoload.js").startup(); diff --git a/scripts/discover.js b/scripts/discover.js index 9f7f642d85..7b09ffb95a 100755 --- a/scripts/discover.js +++ b/scripts/discover.js @@ -1,5 +1,4 @@ -/*jshint strict: false, -W083 */ -/*global require */ +/*jshint globalstrict:false, strict:false, -W083 */ // Discover a new server and give it a role diff --git a/scripts/init_agency.js b/scripts/init_agency.js index a01e4cf885..ccf4b056c6 100755 --- a/scripts/init_agency.js +++ b/scripts/init_agency.js @@ -1,5 +1,4 @@ -/*jshint strict: false */ -/*global require*/ +/*jshint globalstrict:false, strict:false */ var agencyData = { "arango" : { "Sync" : { diff --git a/scripts/kill_cluster.js b/scripts/kill_cluster.js index 774ddbac77..0e8a171882 100644 --- a/scripts/kill_cluster.js +++ b/scripts/kill_cluster.js @@ -1,8 +1,6 @@ -/*jshint unused: false */ -/*global require */ +/*jshint globalstrict:false, unused:false */ function main (argv) { "use strict"; - var runInfoName = "runInfo.json"; var fs = require("fs"); var print = require("internal").print; diff --git a/scripts/launch_cluster.js b/scripts/launch_cluster.js index 2ccab0b3c7..5041e0d349 100644 --- a/scripts/launch_cluster.js +++ b/scripts/launch_cluster.js @@ -1,9 +1,6 @@ -/*jshint unused: false */ -/*global require */ - +/*jshint globalstrict:false, unused:false */ function main (argv) { "use strict"; - var options = {}; var runInfoName = "runInfo.json"; var print = require("internal").print; diff --git a/scripts/relaunch_cluster.js b/scripts/relaunch_cluster.js index 4100b4d507..10ee795808 100644 --- a/scripts/relaunch_cluster.js +++ b/scripts/relaunch_cluster.js @@ -1,9 +1,7 @@ -/*jshint unused: false */ -/*global require */ +/*jshint globalstrict:false, unused:false */ function main (argv) { "use strict"; - var runInfoName = "runInfo.json"; var fs = require("fs"); var print = require("internal").print; diff --git a/scripts/shutdown_cluster.js b/scripts/shutdown_cluster.js index c7bfdb1e21..8727c1d568 100644 --- a/scripts/shutdown_cluster.js +++ b/scripts/shutdown_cluster.js @@ -1,8 +1,6 @@ -/*jshint unused: false */ -/*global require */ +/*jshint globalstrict:false, unused:false */ function main (argv) { "use strict"; - var runInfoName = "runInfo.json"; var fs = require("fs"); var print = require("internal").print; diff --git a/scripts/unittest.js b/scripts/unittest.js index ccaae96bf9..daa8149617 100644 --- a/scripts/unittest.js +++ b/scripts/unittest.js @@ -1,5 +1,5 @@ -/*jshint unused: false */ -/*global require, start_pretty_print */ +/*jshint globalstrict:false, unused:false */ +/*global start_pretty_print */ var yaml = require("js-yaml");