verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3820 from strongloop/fix/eslint-issues 

Fix formatting issues reported by recent eslint
This commit is contained in:
Miroslav Bajtoš 2018-03-16 13:32:19 +01:00 committed by GitHub
parent 8e9fd36878 c611bbbe04
commit 6ddf268cb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/models/user.js
View File

@ -749,9 +749,9 @@ module.exports = function(User) {
displayPort + displayPort +
urlPath + urlPath +
'?' + qs.stringify({ '?' + qs.stringify({
uid: '' + verifyOptions.user[pkName], uid: '' + verifyOptions.user[pkName],
redirect: verifyOptions.redirect, redirect: verifyOptions.redirect,
}); });
verifyOptions.to = verifyOptions.to || user.email; verifyOptions.to = verifyOptions.to || user.email;
verifyOptions.subject = verifyOptions.subject || g.f('Thanks for Registering'); verifyOptions.subject = verifyOptions.subject || g.f('Thanks for Registering');

10
example/mobile-models/app.js
View File

@ -43,10 +43,10 @@ Application.create(data, function(err, data) {
}); });
Application.register('rfeng', 'MyApp', {description: g.f('My first mobile application')}, Application.register('rfeng', 'MyApp', {description: g.f('My first mobile application')},
function(err, result) { function(err, result) {
console.log(result.toObject());
result.resetKeys(function(err, result) {
console.log(result.toObject()); console.log(result.toObject());
result.resetKeys(function(err, result) {
console.log(result.toObject());
});
}); });
});

2
package.json
View File

@ -69,7 +69,7 @@
"cookie-parser": "^1.3.4", "cookie-parser": "^1.3.4",
"coveralls": "^2.11.15", "coveralls": "^2.11.15",
"dirty-chai": "^1.2.2", "dirty-chai": "^1.2.2",
"eslint": "^4.13.1", "eslint": "^4.18.2",
"eslint-config-loopback": "^10.0.0", "eslint-config-loopback": "^10.0.0",
"eslint-plugin-mocha": "^4.11.0", "eslint-plugin-mocha": "^4.11.0",
"express-session": "^1.14.0", "express-session": "^1.14.0",