Remove /* globals */ wave 4 (#12999)

* Remove /* globals */ from files wave 1 * Fix lint * Remove /* globals */ wave 2 * remove-globals-wave-3 * Remove /* globals */ wave 4 * Remove some // eslint comments
RocketChat · Dec 20, 2018 · ce3da9e · ce3da9e
1 parent 3b7de77
commit ce3da9e
Show file tree

Hide file tree

Showing 52 changed files with 68 additions and 83 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -8,35 +8,43 @@
 		"alerts"                      : false,
 		"Apps"                        : false,
 		"Assets"                      : false,
+		"AudioRecorder"               : false,
 		"CachedChatSubscription"      : false,
 		"ChatMessage"                 : false,
 		"ChatMessages"                : false,
 		"chatMessages"                : false,
 		"ChatRoom"                    : false,
 		"ChatSubscription"            : false,
+		"chrome"                      : false,
 		"cordova"                     : false,
 		"device"                      : false,
 		"DynamicCss"                  : false,
 		"facebookConnectPlugin"       : false,
 		"FileUpload"                  : false,
+		"fileUpload"                  : false,
 		"fileUploadHandler"           : false,
 		"fireGlobalEvent"             : false,
 		"handleError"                 : false,
 		"getAvatarUrlFromUsername"    : false,
 		"getAvatarSuggestionForUser"  : false,
+		"globals"                     : true,
 		"isChrome"                    : false,
 		"isFirefox"                   : false,
 		"isRtl"                       : false,
+		"JitsiMeetExternalAPI"        : false,
 		"jscolor"                     : false,
 		"KonchatNotification"         : false,
+		"language_names"              : true,
 		"msgStream"                   : false,
 		"MsgTyping"                   : false,
 		"modal"                       : false,
+		"Modernizr"                   : false,
 		"menu"                        : false,
 		"Npm"                         : false,
 		"openRoom"                    : false,
 		"OnePassword"                 : false,
 		"Package"                     : false,
+		"popout"                      : false,
 		"popover"                     : false,
 		"readMessage"                 : false,
 		"RocketChat"                  : true,
@@ -47,9 +55,11 @@
 		"Servers"                     : false,
 		"Settings"                    : false,
 		"SideNav"                     : false,
+		"TAPi18next"                  : false,
 		"t"                           : false,
 		"toolbarSearch"               : false,
 		"TwitterConnect"              : false,
+		"updateAvatarOfUsername"      : false,
 		"UserRoles"                   : false,
 		"VideoRecorder"               : false,
 		"VRecDialog"                  : false

diff --git a/.scripts/version.js b/.scripts/version.js
@@ -1,5 +1,3 @@
-/* eslint object-shorthand: 0, prefer-template: 0 */
-
 const path = require('path');
 let pkgJson = {};
 

diff --git a/packages/rocketchat-grant/server/providers.js b/packages/rocketchat-grant/server/providers.js
@@ -1,4 +1,4 @@
-import { check } from 'meteor/check';
+import { Match, check } from 'meteor/check';
 
 import { Storage } from './storage';
 import { routes } from './routes';
@@ -7,8 +7,7 @@ class Providers extends Storage {
 	register(name, options, getUser) {
 		check(name, String);
 		check(options, {
-			// eslint-disable-next-line
-			scope: Match.OneOf(String, [String])
+			scope: Match.OneOf(String, [String]),
 		});
 		check(getUser, Function);
 

diff --git a/packages/rocketchat-lib/client/lib/openRoom.js b/packages/rocketchat-lib/client/lib/openRoom.js
@@ -7,7 +7,7 @@ import _ from 'underscore';
 
 export let currentTracker = undefined;
 
-openRoom = function(type, name) { // eslint-disable-line
+openRoom = function(type, name) {
 	Session.set('openedRoom', null);
 
 	return Meteor.defer(() =>
@@ -33,7 +33,7 @@ openRoom = function(type, name) { // eslint-disable-line
 					Meteor.call('createDirectMessage', name, function(error) {
 						if (!error) {
 							RoomManager.close(type + name);
-							return openRoom('d', name); // eslint-disable-line
+							return openRoom('d', name);
 						} else {
 							Session.set('roomNotFound', { type, name, error });
 							BlazeLayout.render('main', { center: 'roomNotFound' });
@@ -48,7 +48,7 @@ openRoom = function(type, name) { // eslint-disable-line
 						} else {
 							RocketChat.models.Rooms.upsert({ _id: record._id }, _.omit(record, '_id'));
 							RoomManager.close(type + name);
-							return openRoom(type, name); // eslint-disable-line
+							return openRoom(type, name);
 						}
 					});
 				}

diff --git a/packages/rocketchat-lib/server/methods/saveSetting.js b/packages/rocketchat-lib/server/methods/saveSetting.js
@@ -1,4 +1,3 @@
-/* eslint new-cap: 0 */
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 

diff --git a/packages/rocketchat-livechat/server/methods/saveCustomField.js b/packages/rocketchat-livechat/server/methods/saveCustomField.js
@@ -1,4 +1,3 @@
-/* eslint new-cap: [2, {"capIsNewExceptions": ["Match.ObjectIncluding", "Match.Optional"]}] */
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { RocketChat } from 'meteor/rocketchat:lib';

diff --git a/packages/rocketchat-livechat/server/methods/saveInfo.js b/packages/rocketchat-livechat/server/methods/saveInfo.js
@@ -1,4 +1,3 @@
-/* eslint new-cap: [2, {"capIsNewExceptions": ["Match.ObjectIncluding", "Match.Optional"]}] */
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { RocketChat } from 'meteor/rocketchat:lib';

diff --git a/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js b/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js
@@ -1,4 +1,3 @@
-/* eslint new-cap: [2, {"capIsNewExceptions": ["Match.ObjectIncluding"]}] */
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { RocketChat } from 'meteor/rocketchat:lib';

diff --git a/packages/rocketchat-livechat/server/methods/startVideoCall.js b/packages/rocketchat-livechat/server/methods/startVideoCall.js
@@ -1,4 +1,3 @@
-/* eslint new-cap: [2, {"capIsNewExceptions": ["MD5"]}] */
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import { RocketChat } from 'meteor/rocketchat:lib';

diff --git a/packages/rocketchat-livechat/server/methods/transfer.js b/packages/rocketchat-livechat/server/methods/transfer.js
@@ -1,5 +1,3 @@
-/* eslint new-cap: [2, {"capIsNewExceptions": ["Match.Optional"]}] */
-
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { RocketChat } from 'meteor/rocketchat:lib';

diff --git a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js
@@ -38,7 +38,7 @@ const extendedViewOption = (user) => {
 const showToolbar = new ReactiveVar(false);
 
 const selectorSearch = '.toolbar__search .rc-input__element';
-toolbarSearch = { //eslint-disable-line
+toolbarSearch = {
 	shortcut: false,
 	clear() {
 		const $inputMessage = $('.js-input-message');
@@ -67,7 +67,7 @@ const toolbarButtons = (user) => [{
 	name: t('Search'),
 	icon: 'magnifier',
 	action: () => {
-		toolbarSearch.show(false); //eslint-disable-line
+		toolbarSearch.show(false);
 	},
 },
 {

diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
@@ -1,4 +1,3 @@
-/* globals readMessage UserRoles RoomRoles*/
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Blaze } from 'meteor/blaze';
@@ -22,7 +21,7 @@ export const upsertMessage = ({ msg, subscription }) => {
 	return ChatMessage.upsert({ _id: msg._id }, msg);
 };
 
-RoomHistoryManager = new class { //eslint-disable-line
+RoomHistoryManager = new class {
 	constructor() {
 		this.defaultLimit = 50;
 		this.histories = {};

diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js
@@ -6,7 +6,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import _ from 'underscore';
 import { upsertMessage } from './RoomHistoryManager';
-
+import { CachedChatRoom } from './collections';
 
 const maxRoomsOpen = parseInt(localStorage && localStorage.getItem('rc-maxRoomsOpen')) || 5 ;
 
@@ -22,14 +22,13 @@ const onDeleteMessageBulkStream = ({ rid, ts, excludePinned, users }) => {
 	ChatMessage.remove(query);
 };
 
-RoomManager = new function() { //eslint-disable-line
+RoomManager = new function() {
 	const openedRooms = {};
 	const msgStream = new Meteor.Streamer('room-messages');
 	const onlineUsers = new ReactiveVar({});
 	const Dep = new Tracker.Dependency();
 	const Cls = class {
 		static initClass() {
-			/* globals CachedChatRoom CachedChatSubscription */
 			this.prototype.openedRooms = openedRooms;
 			this.prototype.onlineUsers = onlineUsers;
 			this.prototype.computation = Tracker.autorun(() => {

diff --git a/packages/rocketchat-ui/client/lib/accountBox.js b/packages/rocketchat-ui/client/lib/accountBox.js
@@ -6,7 +6,7 @@ import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 import { Session } from 'meteor/session';
 import _ from 'underscore';
 
-AccountBox = (function() { //eslint-disable-line
+AccountBox = (function() {
 	let status = 0;
 	const items = new ReactiveVar([]);
 	function setStatus(status) {

diff --git a/packages/rocketchat-ui/client/lib/avatar.js b/packages/rocketchat-ui/client/lib/avatar.js
@@ -24,8 +24,7 @@ export const getAvatarAsPng = function(username, cb) {
 	};
 };
 
-updateAvatarOfUsername = function(username) { //eslint-disable-line
-
+updateAvatarOfUsername = function(username) {
 	const key = `avatar_random_${ username }`;
 	Session.set(key, Math.round(Math.random() * 1000));
 

diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -19,10 +19,10 @@ Meteor.startup(() => {
 	});
 });
 
-ChatMessages = class ChatMessages { //eslint-disable-line
+ChatMessages = class ChatMessages {
 	constructor() {
 
-		this.saveTextMessageBox = _.debounce((rid, value) => { // eslint
+		this.saveTextMessageBox = _.debounce((rid, value) => {
 			const key = `messagebox_${ rid }`;
 			return value.length ? localStorage.setItem(key, value) : localStorage.removeItem(key);
 		}, 1000);

diff --git a/packages/rocketchat-ui/client/lib/collections.js b/packages/rocketchat-ui/client/lib/collections.js
@@ -3,28 +3,28 @@ import { Mongo } from 'meteor/mongo';
 import { Tracker } from 'meteor/tracker';
 import _ from 'underscore';
 
-ChatMessage = new Mongo.Collection(null); //eslint-disable-line
-this.CachedChatRoom = new RocketChat.CachedCollection({ name: 'rooms' });
-ChatRoom = this.CachedChatRoom.collection;
+ChatMessage = new Mongo.Collection(null);
+export const CachedChatRoom = new RocketChat.CachedCollection({ name: 'rooms' });
+ChatRoom = CachedChatRoom.collection;
 
-CachedChatSubscription = new RocketChat.CachedCollection({ name: 'subscriptions' }); //eslint-disable-line
-ChatSubscription = CachedChatSubscription.collection; //eslint-disable-line
-UserRoles = new Mongo.Collection(null); //eslint-disable-line
-RoomRoles = new Mongo.Collection(null); //eslint-disable-line
+CachedChatSubscription = new RocketChat.CachedCollection({ name: 'subscriptions' });
+ChatSubscription = CachedChatSubscription.collection;
+UserRoles = new Mongo.Collection(null);
+RoomRoles = new Mongo.Collection(null);
 this.UserAndRoom = new Mongo.Collection(null);
 this.CachedChannelList = new Mongo.Collection(null);
 this.CachedUserList = new Mongo.Collection(null);
 
 RocketChat.models.Users = _.extend({}, RocketChat.models.Users, Meteor.users);
-RocketChat.models.Subscriptions = _.extend({}, RocketChat.models.Subscriptions, ChatSubscription); //eslint-disable-line
+RocketChat.models.Subscriptions = _.extend({}, RocketChat.models.Subscriptions, ChatSubscription);
 RocketChat.models.Rooms = _.extend({}, RocketChat.models.Rooms, ChatRoom);
 RocketChat.models.Messages = _.extend({}, RocketChat.models.Messages, ChatMessage);
 
 Meteor.startup(() => {
 	Tracker.autorun(() => {
 		if (!Meteor.userId() && RocketChat.settings.get('Accounts_AllowAnonymousRead') === true) {
-			this.CachedChatRoom.init();
-			CachedChatSubscription.ready.set(true); //eslint-disable-line
+			CachedChatRoom.init();
+			CachedChatSubscription.ready.set(true);
 		}
 	});
 });
diff --git a/packages/rocketchat-ui/client/lib/fireEvent.js b/packages/rocketchat-ui/client/lib/fireEvent.js
@@ -1,6 +1,6 @@
 import { Tracker } from 'meteor/tracker';
 
-fireGlobalEvent = function _fireGlobalEvent(eventName, params) { //eslint-disable-line
+fireGlobalEvent = function _fireGlobalEvent(eventName, params) {
 	window.dispatchEvent(new CustomEvent(eventName, { detail: params }));
 
 	Tracker.autorun((computation) => {

diff --git a/packages/rocketchat-ui/client/lib/notification.js b/packages/rocketchat-ui/client/lib/notification.js
@@ -10,14 +10,14 @@ import s from 'underscore.string';
 import { e2e } from 'meteor/rocketchat:e2e';
 import { getAvatarAsPng } from './avatar';
 
-KonchatNotification = { //eslint-disable-line
+KonchatNotification = {
 	notificationStatus: new ReactiveVar,
 
 	// notificacoes HTML5
 	getDesktopPermission() {
 		if (window.Notification && (Notification.permission !== 'granted') && !Meteor.settings.public.sandstorm) {
 			return Notification.requestPermission(function(status) {
-				KonchatNotification.notificationStatus.set(status); //eslint-disable-line
+				KonchatNotification.notificationStatus.set(status);
 				if (Notification.permission !== status) {
 					return Notification.permission = status;
 				}
@@ -88,7 +88,7 @@ KonchatNotification = { //eslint-disable-line
 
 		return getAvatarAsPng(notification.payload.sender.username, function(avatarAsPng) {
 			notification.icon = avatarAsPng;
-			return KonchatNotification.notify(notification); //eslint-disable-line
+			return KonchatNotification.notify(notification);
 		});
 	},
 

diff --git a/packages/rocketchat-ui/client/lib/rocket.js b/packages/rocketchat-ui/client/lib/rocket.js
@@ -1,4 +1,3 @@
-/* globals Modernizr */
 RocketChat.Login = (function() {
 	function onClick(el) {
 		const $el = $(el);

diff --git a/packages/rocketchat-ui/client/lib/sideNav.js b/packages/rocketchat-ui/client/lib/sideNav.js
@@ -1,7 +1,7 @@
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 
-SideNav = new class { //eslint-disable-line
+SideNav = new class {
 	constructor() {
 		this.initiated = false;
 		this.sideNav = {};

diff --git a/packages/rocketchat-ui/client/lib/tapi18n.js b/packages/rocketchat-ui/client/lib/tapi18n.js
@@ -23,7 +23,7 @@ this.tr = function(key, options, ...replaces) {
 	}
 };
 
-isRtl = (lang) => { //eslint-disable-line
+isRtl = (lang) => {
 	const language = lang || localStorage.getItem('userLanguage') || 'en-US';
 	return ['ar', 'dv', 'fa', 'he', 'ku', 'ps', 'sd', 'ug', 'ur', 'yi'].includes(language.split('-').shift().toLowerCase());
 };
diff --git a/packages/rocketchat-ui/client/views/app/alerts.js b/packages/rocketchat-ui/client/views/app/alerts.js
@@ -1,8 +1,7 @@
-/* globals alerts */
 import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';
 
-alerts = { //eslint-disable-line
+alerts = {
 	renderedAlert: null,
 	open(config) {
 		this.close(false);

diff --git a/packages/rocketchat-ui/client/views/app/modal.js b/packages/rocketchat-ui/client/views/app/modal.js
@@ -1,4 +1,3 @@
-/* globals modal */
 import { Meteor } from 'meteor/meteor';
 import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';

diff --git a/packages/rocketchat-ui/client/views/app/popout.js b/packages/rocketchat-ui/client/views/app/popout.js
@@ -1,4 +1,3 @@
-/* eslint-disable */
 import { Blaze } from 'meteor/blaze';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';

diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
@@ -1,4 +1,3 @@
-/* globals popover isRtl */
 import { Meteor } from 'meteor/meteor';
 import { Blaze } from 'meteor/blaze';
 import { FlowRouter } from 'meteor/kadira:flow-router';
@@ -8,7 +7,7 @@ import _ from 'underscore';
 
 import { hide, leave } from 'meteor/rocketchat:lib';
 
-popover = { //eslint-disable-line
+popover = {
 	renderedPopover: null,
 	open({ currentTarget, ...config }) {
 		// Popover position must be computed as soon as possible, avoiding DOM changes over currentTarget

diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
@@ -1,4 +1,3 @@
-/* globals chatMessages, fileUpload , fireGlobalEvent , cordova , readMessage , RoomRoles, popover , device */
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Random } from 'meteor/random';
@@ -8,15 +7,15 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { RocketChatTabBar } from 'meteor/rocketchat:lib';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-
+import { WebRTC } from 'meteor/rocketchat:webrtc';
 import _ from 'underscore';
 import moment from 'moment';
 import mime from 'mime-type/with-db';
 import Clipboard from 'clipboard';
 
 import { lazyloadtick } from 'meteor/rocketchat:lazy-load';
 
-chatMessages = {}; // eslint-disable-line
+chatMessages = {};
 const isSubscribed = (_id) => ChatSubscription.find({ rid: _id }).count() > 0;
 
 const favoritesEnabled = () => RocketChat.settings.get('Favorite_Rooms');
@@ -1114,7 +1113,6 @@ Template.room.onRendered(function() {
 	});
 
 	wrapper.addEventListener('scroll', () => updateUnreadCount());
-	/* globals WebRTC */
 	// salva a data da renderização para exibir alertas de novas mensagens
 	$.data(this.firstNode, 'renderedAt', new Date);
 

diff --git a/packages/rocketchat-ui/client/views/app/secretURL.js b/packages/rocketchat-ui/client/views/app/secretURL.js
@@ -1,4 +1,3 @@
-/* globals KonchatNotification */
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';

diff --git a/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js b/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js
@@ -1,6 +1,6 @@
-/* globals WebRTC */
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
+import { WebRTC } from 'meteor/rocketchat:webrtc';
 
 Template.videoButtons.helpers({
 	videoAvaliable() {