summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-12-24 13:07:55 +0100
committerMaxime Quandalle <maxime@quandalle.com>2015-12-24 13:13:05 +0100
commit592aa6d5762b6d04e4f66364da4a58cea6b25d67 (patch)
tree6b320f99f7e894f5f7eeda85e0ad30bf45c2da17
parentd9bc56896dc1bb546dc8d430827dc17889c97535 (diff)
downloadwekan-592aa6d5762b6d04e4f66364da4a58cea6b25d67.tar.gz
wekan-592aa6d5762b6d04e4f66364da4a58cea6b25d67.tar.bz2
wekan-592aa6d5762b6d04e4f66364da4a58cea6b25d67.zip
Partially revert aae5030
As discussed in #370 and announced in the official Eslint-meteor plugin repository (https://github.com/dferber90/eslint-plugin-meteor), it is recommended to not use this plugin anymore has the author has it is currently broken and the author has abandoned it.
-rw-r--r--.eslintrc64
-rw-r--r--client/config/blazeHelpers.js2
-rw-r--r--models/attachments.js2
-rw-r--r--models/users.js2
-rw-r--r--sandstorm.js2
5 files changed, 32 insertions, 40 deletions
diff --git a/.eslintrc b/.eslintrc
index f9321bfb..64096dbf 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,11 +1,6 @@
ecmaFeatures:
experimentalObjectRestSpread: true
-plugins:
- - meteor
-
-parser: babel-eslint
-
rules:
strict: 0
no-undef: 2
@@ -50,39 +45,25 @@ rules:
prefer-spread: 2
prefer-template: 2
- # eslint-plugin-meteor
- ## Meteor API
- meteor/globals: 2
- meteor/core: 2
- meteor/pubsub: 2
- meteor/methods: 2
- meteor/check: 2
- meteor/connections: 2
- meteor/collections: 2
- meteor/session: [2, 'no-equal']
-
- ## Best practices
- meteor/no-session: 0
- meteor/no-zero-timeout: 2
- meteor/no-blaze-lifecycle-assignment: 2
-
-settings:
- meteor:
-
- # Our collections
- collections:
- - AccountsTemplates
- - Activities
- - Attachments
- - Boards
- - CardComments
- - Cards
- - Lists
- - UnsavedEditCollection
- - Users
-
globals:
+ # Meteor globals
+ Meteor: false
+ Session: false
+ HTML: false
+ check: false
+ Tracker: false
+ Blaze: false
+ Accounts: false
+ Match: false
+ Mongo: false
+ Random: false
+ ReactiveVar: false
+ Email: false
+ Template: false
+
# Exported by packages we use
+ '$': false
+ _: false
autosize: false
Avatar: true
Avatars: true
@@ -108,6 +89,17 @@ globals:
T9n: false
TAPi18n: false
+ # Our collections
+ AccountsTemplates: true
+ Activities: true
+ Attachments: true
+ Boards: true
+ CardComments: true
+ Cards: true
+ Lists: true
+ UnsavedEditCollection: true
+ Users: true
+
# Our objects
CSSEvents: true
EscapeActions: true
diff --git a/client/config/blazeHelpers.js b/client/config/blazeHelpers.js
index adf5ef6a..f3a1757f 100644
--- a/client/config/blazeHelpers.js
+++ b/client/config/blazeHelpers.js
@@ -14,6 +14,6 @@ Blaze.registerHelper('currentCard', () => {
Blaze.registerHelper('getUser', (userId) => Users.findOne(userId));
-UI.registerHelper('concat', function (...args) {
+Blaze.registerHelper('concat', function (...args) {
return Array.prototype.slice.call(args, 0, -1).join('');
});
diff --git a/models/attachments.js b/models/attachments.js
index 01e467ff..8ef0fef0 100644
--- a/models/attachments.js
+++ b/models/attachments.js
@@ -1,4 +1,4 @@
-Attachments = new FS.Collection('attachments', { // eslint-disable-line meteor/collections
+Attachments = new FS.Collection('attachments', {
stores: [
// XXX Add a new store for cover thumbnails so we don't load big images in
diff --git a/models/users.js b/models/users.js
index cf4c4193..bb7ecc45 100644
--- a/models/users.js
+++ b/models/users.js
@@ -1,4 +1,4 @@
-Users = Meteor.users; // eslint-disable-line meteor/collections
+Users = Meteor.users;
// Search a user in the complete server database by its name or username. This
// is used for instance to add a new user to a board.
diff --git a/sandstorm.js b/sandstorm.js
index 5148095f..11bafa10 100644
--- a/sandstorm.js
+++ b/sandstorm.js
@@ -160,7 +160,7 @@ if (isSandstorm && Meteor.isClient) {
// sandstorm client to return relative paths instead of absolutes.
const _absoluteUrl = Meteor.absoluteUrl;
const _defaultOptions = Meteor.absoluteUrl.defaultOptions;
- Meteor.absoluteUrl = (path, options) => { // eslint-disable-line meteor/core
+ Meteor.absoluteUrl = (path, options) => {
const url = _absoluteUrl(path, options);
return url.replace(/^https?:\/\/127\.0\.0\.1:[0-9]{2,5}/, '');
};