You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/02/12 10:54:41 UTC
[15/29] ignite git commit: IGNITE-843 Fixed eslint warnings.
IGNITE-843 Fixed eslint warnings.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4f79a2df
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4f79a2df
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4f79a2df
Branch: refs/heads/ignite-843-rc3
Commit: 4f79a2df23dc21ab7c3364ac33ff825e07a9e7a9
Parents: fdf9ddc
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Feb 12 14:18:36 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Feb 12 14:18:36 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/.eslintrc | 2 +-
modules/control-center-web/src/main/js/serve/mongo.js | 10 +++++-----
.../control-center-web/src/main/js/serve/routes/admin.js | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f79a2df/modules/control-center-web/src/main/js/.eslintrc
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/.eslintrc b/modules/control-center-web/src/main/js/.eslintrc
index b18ff6d..9174e14 100644
--- a/modules/control-center-web/src/main/js/.eslintrc
+++ b/modules/control-center-web/src/main/js/.eslintrc
@@ -56,7 +56,7 @@ rules:
generator-star-spacing: 0
guard-for-in: 1
handle-callback-err: 0
- id-length: [2, {"min": 1, "max": 30}]
+ id-length: [2, {"min": 1, "max": 40}]
indent: [2, 4, {"SwitchCase": 1}]
key-spacing: [2, { "beforeColon": false, "afterColon": true }]
lines-around-comment: 0
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f79a2df/modules/control-center-web/src/main/js/serve/mongo.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/mongo.js b/modules/control-center-web/src/main/js/serve/mongo.js
index 3768e77..c0d5228 100644
--- a/modules/control-center-web/src/main/js/serve/mongo.js
+++ b/modules/control-center-web/src/main/js/serve/mongo.js
@@ -56,7 +56,7 @@ module.exports.factory = function(deepPopulatePlugin, passportMongo, settings, p
// Configure transformation to JSON.
AccountSchema.set('toJSON', {
- transform: function(doc, ret) {
+ transform: (doc, ret) => {
return {
_id: ret._id,
email: ret.email,
@@ -524,16 +524,16 @@ module.exports.factory = function(deepPopulatePlugin, passportMongo, settings, p
// Define Notebook model.
result.Notebook = mongoose.model('Notebook', NotebookSchema);
- result.upsert = function(model, data, cb) {
+ result.upsert = function(Model, data, cb) {
if (data._id) {
const id = data._id;
delete data._id;
- model.findOneAndUpdate({_id: id}, data, cb);
+ Model.findOneAndUpdate({_id: id}, data, cb);
}
else
- new model(data).save(cb);
+ new Model(data).save(cb);
};
result.processed = function(err, res) {
@@ -547,7 +547,7 @@ module.exports.factory = function(deepPopulatePlugin, passportMongo, settings, p
};
// Registering the routes of all plugin modules
- for (var name in pluginMongo) {
+ for (const name in pluginMongo) {
if (pluginMongo.hasOwnProperty(name))
pluginMongo[name].register(mongoose, deepPopulate, result);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f79a2df/modules/control-center-web/src/main/js/serve/routes/admin.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/admin.js b/modules/control-center-web/src/main/js/serve/routes/admin.js
index 09e6c21..765b8e8 100644
--- a/modules/control-center-web/src/main/js/serve/routes/admin.js
+++ b/modules/control-center-web/src/main/js/serve/routes/admin.js
@@ -40,14 +40,14 @@ module.exports.factory = function(_, express, nodemailer, settings, mongo) {
// Remove user.
router.post('/remove', function(req, res) {
- var userId = req.body.userId;
+ const userId = req.body.userId;
mongo.Account.findByIdAndRemove(userId, function(err, user) {
if (err)
return res.status(500).send(err.message);
mongo.Space.find({owner: userId}, function(err, spaces) {
- _.forEach(spaces, function(space) {
+ _.forEach(spaces, (space) => {
mongo.Cluster.remove({space: space._id}).exec();
mongo.Cache.remove({space: space._id}).exec();
mongo.DomainModel.remove({space: space._id}).exec();
@@ -56,7 +56,7 @@ module.exports.factory = function(_, express, nodemailer, settings, mongo) {
});
});
- var transporter = {
+ const transporter = {
service: settings.smtp.service,
auth: {
user: settings.smtp.email,
@@ -110,7 +110,7 @@ module.exports.factory = function(_, express, nodemailer, settings, mongo) {
req.session.viewedUser = viewedUser;
return res.sendStatus(200);
- })
+ });
});
// Become user.